diff --git a/.circleci/Dockerfiles/Dockerfile.android b/.circleci/Dockerfiles/Dockerfile.android
index 8d0e28803a5f..a4bdb0cbd0d2 100644
--- a/.circleci/Dockerfiles/Dockerfile.android
+++ b/.circleci/Dockerfiles/Dockerfile.android
@@ -14,14 +14,13 @@
 # and build a Android application that can be used to run the
 # tests specified in the scripts/ directory.
 #
-FROM reactnativecommunity/react-native-android:5.4
+FROM reactnativecommunity/react-native-android:6.1
 
 LABEL Description="React Native Android Test Image"
 LABEL maintainer="Héctor Ramos <hector@fb.com>"
 
 # set default environment variables
 ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
-ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
 ENV KOTLIN_HOME="third-party/kotlin"
 
 ADD .buckconfig /app/.buckconfig
diff --git a/.circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh b/.circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh
index 64f0ee465642..130ebbb01f0b 100644
--- a/.circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh
+++ b/.circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh
@@ -33,7 +33,7 @@ node cli.js bundle --platform android --dev true --entry-file ReactAndroid/src/a
 
 # build test APK
 # shellcheck disable=SC1091
-source ./scripts/android-setup.sh && NO_BUCKD=1 retry3 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=1
+source ./scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=1
 
 # run installed apk with tests
 node ./.circleci/Dockerfiles/scripts/run-android-ci-instrumentation-tests.js "$*"
diff --git a/.circleci/config.yml b/.circleci/config.yml
index fee64be10324..8464e162fb2f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,6 +26,10 @@ references:
 
   hermes_workspace_root: &hermes_workspace_root
     /tmp/hermes
+  hermes_tarball_artifacts_dir: &hermes_tarball_artifacts_dir
+    /tmp/hermes/hermes-runtime-darwin
+  hermes_osxbin_artifacts_dir: &hermes_osxbin_artifacts_dir
+    /tmp/hermes/osx-bin
   attach_hermes_workspace: &attach_hermes_workspace
     attach_workspace:
       at: *hermes_workspace_root
@@ -34,10 +38,7 @@ references:
   #        Dependency Anchors
   # -------------------------
   dependency_versions:
-    # The Xcode version used on CircleCI OSS tests must be kept in sync with
-    # the Xcode version used on Sandcastle OSS tests. See _XCODE_VERSION in
-    # tools/utd/migrated_nbtd_jobs/react_native_oss.td
-    xcode_version: &xcode_version "13.3.1"
+    xcode_version: &xcode_version "14.0.1"
     nodelts_image: &nodelts_image "cimg/node:16.14"
     nodeprevlts_image: &nodeprevlts_image "cimg/node:14.19"
 
@@ -47,17 +48,26 @@ references:
   # Anchors for the cache keys
 
   cache_keys:
-    buck_cache_key: &buck_cache_key v3-buck-v2019.01.10.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}}
-    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_cache_key: &hermes_cache_key v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
-    hermes_sdk_cache_key: &hermes_sdk_cache_key v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "sdks/.hermes-cache-key-file" }}
-    hermes_windows_cache_key: &hermes_windows_cache_key v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "tmp/hermes/hermesversion" }}
-    pods_cache_key: &pods_cache_key v6-pods-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock.bak" }}-{{ checksum "packages/rn-tester/Podfile" }}
+    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" }}-{{ checksum "/tmp/react-native-version" }}
+    hermes_workspace_release_cache_key: &hermes_workspace_release_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
+    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 v4-hermes-tarball-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
+    hermes_tarball_release_cache_key: &hermes_tarball_release_cache_key v3-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 }}
 
+  cache_paths:
+    hermes_workspace_macos_cache_paths: &hermes_workspace_macos_cache_paths
+      - ~/react-native/sdks/hermes/build_macosx
+      - ~/react-native/sdks/hermes/destroot
+    hermes_tarball_cache_paths: &hermes_tarball_cache_paths
+      - *hermes_tarball_artifacts_dir
+
   # -------------------------
   #        Filters
   # -------------------------
@@ -92,7 +102,7 @@ executors:
   reactnativeandroid:
     <<: *defaults
     docker:
-      - image: reactnativecommunity/react-native-android:5.4
+      - image: reactnativecommunity/react-native-android:6.1
     resource_class: "xlarge"
     environment:
       - TERM: "dumb"
@@ -109,6 +119,8 @@ executors:
     macos:
       xcode: *xcode_version
     resource_class: macos.x86.medium.gen2
+    environment:
+      - REACT_NATIVE_CI: true
 
 # -------------------------
 #        COMMANDS
@@ -122,13 +134,10 @@ commands:
         type: string
     steps:
       - restore_cache:
-            keys:
-              - << parameters.checkout_base_cache_key >>-{{ .Branch }}-{{ .Revision }}
-              - << parameters.checkout_base_cache_key >>-{{ .Branch }}-
-              - << parameters.checkout_base_cache_key >>
+          key: << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-{{ .Revision }}
       - checkout
       - save_cache:
-          key: << parameters.checkout_base_cache_key >>-{{ .Branch }}-{{ .Revision }}
+          key: << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-{{ .Revision }}
           paths:
             - ".git"
 
@@ -177,31 +186,6 @@ commands:
             - ~/.cache/yarn
           key: << parameters.yarn_base_cache_key >>-{{ arch }}-{{ checksum "yarn.lock" }}
 
-  install_buck_tooling:
-    steps:
-      - restore_cache:
-          keys:
-            - *buck_cache_key
-      - run:
-          name: Install BUCK
-          command: |
-            buck --version
-            # Install related tooling
-            if [[ ! -e ~/okbuck ]]; then
-              git clone https://github.com/uber/okbuck.git ~/okbuck --depth=1
-            fi
-      - save_cache:
-          paths:
-            - ~/buck
-            - ~/okbuck
-          key: *buck_cache_key
-
-  install_github_bot_deps:
-    steps:
-      - run:
-          name: "Yarn: Install dependencies (GitHub bots)"
-          command: cd bots && yarn install --non-interactive --cache-folder ~/.cache/yarn
-
   brew_install:
     parameters:
       package:
@@ -247,12 +231,6 @@ commands:
             - ReactAndroid/build/third-party-ndk
           key: *gradle_cache_key
 
-  download_buck_dependencies:
-    steps:
-      - run:
-          name: Download Dependencies Using Buck
-          command: ./scripts/circleci/buck_fetch.sh
-
   run_e2e:
     parameters:
       platform:
@@ -276,32 +254,175 @@ commands:
         type: enum
         enum: ["android", "ios"]
     steps:
-      - install_github_bot_deps
       - run:
           name: Report size of RNTester.app (analysis-bot)
           command: GITHUB_TOKEN="$PUBLIC_ANALYSISBOT_GITHUB_TOKEN_A""$PUBLIC_ANALYSISBOT_GITHUB_TOKEN_B" scripts/circleci/report-bundle-size.sh << parameters.platform >> || true
 
-  with_hermes_sdk_cache_span:
+  get_react_native_version:
+    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
+            echo "React Native Version is $(cat /tmp/react-native-version)"
+            echo "Hermes commit is $(cat /tmp/hermes/hermesversion)"
+
+  with_hermes_tarball_cache_span:
     parameters:
       steps:
         type: steps
+      set_tarball_path:
+        type: boolean
+        default: False
+      flavor:
+        default: "Debug"
+        description: The Hermes build type. Must be one of "Debug", "Release".
+        type: enum
+        enum: ["Debug", "Release"]
+      hermes_tarball_artifacts_dir:
+        type: string
+        default: *hermes_tarball_artifacts_dir
     steps:
+      - get_react_native_version
+      - when:
+          condition:
+            equal: [ << parameters.flavor >>, "Debug"]
+          steps:
+            - restore_cache:
+                keys:
+                  - *hermes_tarball_debug_cache_key
+      - when:
+          condition:
+            equal: [ << parameters.flavor >>, "Release"]
+          steps:
+            - restore_cache:
+                keys:
+                  - *hermes_tarball_release_cache_key
+      - when:
+          condition: << parameters.set_tarball_path >>
+          steps:
+            - run:
+                name: Set HERMES_ENGINE_TARBALL_PATH envvar if Hermes tarball is present
+                command: |
+                  HERMES_TARBALL_ARTIFACTS_DIR=<< parameters.hermes_tarball_artifacts_dir >>
+                  if [ ! -d $HERMES_TARBALL_ARTIFACTS_DIR ]; then
+                    echo "Hermes tarball artifacts dir not present ($HERMES_TARBALL_ARTIFACTS_DIR). Build Hermes from source."
+                    exit 0
+                  fi
+
+                  if [ ! -d ~/react-native ]; then
+                    echo "No React Native checkout found. Run `checkout` first."
+                    exit 0
+                  fi
+
+                  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"
+
+                  if [ ! -f $TARBALL_PATH ]; then
+                    echo "Hermes tarball not present ($TARBALL_PATH). Build Hermes from source."
+                    exit 0
+                  fi
+
+                  echo "Found Hermes tarball at $TARBALL_PATH"
+                  echo "export HERMES_ENGINE_TARBALL_PATH=$TARBALL_PATH" >> $BASH_ENV
       - run:
-          name: Setup Hermes cache
+          name: Print Hermes version
           command: |
-            HERMES_CACHE_KEY_FILE="sdks/.hermes-cache-key-file"
-            if [ ! -f "$HERMES_CACHE_KEY_FILE" ]; then
-              git ls-remote https://github.com/facebook/hermes main | cut -f 1 > $HERMES_CACHE_KEY_FILE
-            fi
-      - restore_cache:
-          keys:
-            - *hermes_sdk_cache_key
+              HERMES_TARBALL_ARTIFACTS_DIR=<< parameters.hermes_tarball_artifacts_dir >>
+              TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
+              TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME
+              if [[ -e $TARBALL_PATH ]]; then
+                tar -xf $TARBALL_PATH
+                echo 'print(HermesInternal?.getRuntimeProperties?.()["OSS Release Version"])' > test.js
+                ./destroot/bin/hermes test.js
+                rm test.js
+                rm -rf destroot
+              else
+                echo 'No Hermes tarball found.'
+              fi
       - steps: << parameters.steps >>
-      - save_cache:
-          key: *hermes_sdk_cache_key
-          paths:
-            - sdks/hermesc
-            - sdks/hermes
+      - when:
+          condition:
+            equal: [ << parameters.flavor >>, "Debug"]
+          steps:
+            - save_cache:
+                key: *hermes_tarball_debug_cache_key
+                paths: *hermes_tarball_cache_paths
+      - when:
+          condition:
+            equal: [ << parameters.flavor >>, "Release"]
+          steps:
+            - save_cache:
+                key: *hermes_tarball_release_cache_key
+                paths: *hermes_tarball_cache_paths
+
+  with_hermesc_span:
+    description: "Makes hermesc available to the provided steps, if hermesc is present."
+    parameters:
+      flavor:
+        default: "Debug"
+        description: The Hermes build type. Must be one of "Debug", "Release".
+        type: enum
+        enum: ["Debug", "Release"]
+      steps:
+        type: steps
+    steps:
+      - export_hermesc:
+          flavor: << parameters.flavor >>
+      - steps: << parameters.steps >>
+      - export_hermesc:
+          flavor: << parameters.flavor >>
+
+  export_hermesc:
+    description: "Configures hermesc for use in Hermes builds when possible. The binary is built by either of the macOS or iOS builds, and may be cached by previous builds."
+    parameters:
+      flavor:
+        default: "Debug"
+        description: The Hermes build type. Must be one of "Debug", "Release".
+        type: enum
+        enum: ["Debug", "Release"]
+      artifacts_dir:
+        type: string
+        default: *hermes_osxbin_artifacts_dir
+    steps:
+      - run:
+          name: "Export path to HermesC if available"
+          command: |
+            # Although the hermesc binary built by debug and release jobs is
+            # identical, we need to store it in distinct paths as Circle CI
+            # cannot have two different jobs write to the same path in
+            # artifacts.
+            mkdir -p << parameters.artifacts_dir >>/Debug << parameters.artifacts_dir >>/Release
+            hermesc_artifacts_path=<< parameters.artifacts_dir >>/<< parameters.flavor >>/hermesc
+
+            hermesc_bin_path=bin/hermesc
+            hermes_build_dir_macos=$(pwd)/sdks/hermes/build_macosx
+            hermes_build_dir_ios=$(pwd)/sdks/hermes/build_iphoneos
+
+            function export_hermesc_cmake_path {
+              build_dir=$1
+              hermesc_bin=$build_dir/$hermesc_bin_path
+              cmake_path=$build_dir/ImportHermesc.cmake
+
+              if [[ -f $cmake_path ]]; then
+                echo "export HERMES_OVERRIDE_HERMESC_PATH=$cmake_path" >> $BASH_ENV
+              fi
+
+              if [[ ! -f $hermesc_artifacts_path ]]; then
+                cp $hermesc_bin $hermesc_artifacts_path
+              fi
+            }
+
+            if [[ -f $hermes_build_dir_macos/$hermesc_bin_path ]]; then
+              export_hermesc_cmake_path $hermes_build_dir_macos
+            elif [[ -f $hermes_build_dir_ios/$hermesc_bin_path ]]; then
+              export_hermesc_cmake_path $hermes_build_dir_ios
+            fi
 
 # -------------------------
 #          JOBS
@@ -319,7 +440,6 @@ jobs:
       - checkout
       - run_yarn
 
-      - install_github_bot_deps
 
       # Note: The yarn gpg key needs to be refreshed to work around https://github.com/yarnpkg/yarn/issues/7866
       - run:
@@ -368,6 +488,11 @@ jobs:
           command: yarn flow-check-android
           when: always
 
+      - run:
+          name: Run TypeScript tests
+          command: yarn test-typescript
+          when: always
+
       - run:
           name: Sanity checks
           command: |
@@ -438,6 +563,11 @@ jobs:
         description: Specifies whether disabled tests should run. Set this to true to debug failing tests.
         type: boolean
         default: false
+      jsengine:
+        default: "Hermes"
+        description: Which JavaScript engine to use. Must be one of "Hermes", "JSC".
+        type: enum
+        enum: ["Hermes", "JSC"]
     environment:
       - REPORTS_DIR: "./reports/junit"
     steps:
@@ -450,6 +580,7 @@ jobs:
             cd scripts
             sh run_ruby_tests.sh
       - run_yarn
+      - *attach_hermes_workspace
       - run: |
           cd packages/rn-tester
           bundle check || bundle install
@@ -467,7 +598,7 @@ jobs:
           name: "Brew: Tap wix/brew"
           command: brew tap wix/brew >/dev/null
       - brew_install:
-          package: applesimutils watchman cmake
+          package: applesimutils watchman
 
       - run:
           name: Configure Watchman
@@ -480,25 +611,23 @@ jobs:
                 name: Set USE_FRAMEWORKS=1
                 command: echo "export USE_FRAMEWORKS=1" >> $BASH_ENV
 
-      - run:
-          name: Set USE_HERMES=1
-          command: echo "export USE_HERMES=1" >> $BASH_ENV
-
-      - run:
-          name: Set BUILD_HERMES_SOURCE=1
-          command: echo "export BUILD_HERMES_SOURCE=1" >> $BASH_ENV
-
       - run:
           name: Setup the CocoaPods environment
           command: bundle exec pod setup
 
-      - with_hermes_sdk_cache_span:
+      - with_hermes_tarball_cache_span:
+          set_tarball_path: True
           steps:
             - with_rntester_pods_cache_span:
                 steps:
                   - run:
                       name: Generate RNTesterPods Workspace
-                      command: cd packages/rn-tester && bundle exec pod install --verbose
+                      command: |
+                        if [[ << parameters.jsengine >> == "JSC" ]]; then
+                          export USE_HERMES=0
+                        fi
+
+                        cd packages/rn-tester && bundle exec pod install --verbose
 
       # -------------------------
       # Runs iOS unit tests
@@ -508,6 +637,16 @@ jobs:
             - run:
                 name: "Run Tests: iOS Unit and Integration Tests"
                 command: yarn test-ios
+            - run:
+                name: Zip Derived data folder
+                when: always
+                command: |
+                  echo "zipping tests results"
+                  cd /Users/distiller/Library/Developer/Xcode
+                  XCRESULT_PATH=$(find . -name '*.xcresult')
+                  tar -zcvf xcresults.tar.gz $XCRESULT_PATH
+            - store_artifacts:
+                path: /Users/distiller/Library/Developer/Xcode/xcresults.tar.gz
 
       # Optionally, run disabled tests
       - when:
@@ -534,6 +673,59 @@ jobs:
       - store_test_results:
           path: ./reports/junit
 
+  # -------------------------
+  #    JOBS: Test Buck
+  # -------------------------
+  test_buck:
+    executor: reactnativeandroid
+    environment:
+      KOTLIN_HOME=third-party/kotlin
+    steps:
+      - checkout
+      - setup_artifacts
+      - run_yarn
+
+      - run:
+          name: Download Dependencies Using Buck
+          command: ./scripts/circleci/buck_fetch.sh
+
+      - run:
+          name: Build & Test React Native using Buck
+          command: |
+            buck build ReactAndroid/src/main/java/com/facebook/react
+            buck build ReactAndroid/src/main/java/com/facebook/react/shell
+
+      - run:
+          name: Run Tests - Android Unit Tests with Buck
+          command: buck test ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml
+
+      - run:
+          name: Build JavaScript Bundle for instrumentation tests
+          command: node cli.js bundle --max-workers 2 --platform android --dev true --entry-file ReactAndroid/src/androidTest/js/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js
+
+      - run:
+          name: Build Tests - Android Instrumentation Tests with Buck
+          # Here, just build the instrumentation tests. There is a known issue with installing the APK to android-21+ emulator.
+          command: |
+            if [[ ! -e ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
+              echo "JavaScript bundle missing, cannot run instrumentation tests. Verify Build JavaScript Bundle step completed successfully."; exit 1;
+            fi
+            source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
+
+      - run:
+          name: Collect Test Results
+          command: |
+            find . -type f -regex ".*/build/test-results/debug/.*xml" -exec cp {} ./reports/build/ \;
+            find . -type f -regex ".*/outputs/androidTest-results/connected/.*xml" -exec cp {} ./reports/outputs/ \;
+            find . -type f -regex ".*/buck-out/gen/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
+            if [ -f ~/react-native/reports/buck/all-results-raw.xml ]; then
+              ~/react-native/scripts/circleci/buckToJunit/buckToJunit.sh ~/react-native/reports/buck/all-results-raw.xml ~/react-native/reports/junit/results.xml
+            fi
+          when: always
+
+      - store_test_results:
+          path: ./reports/junit
+
   # -------------------------
   #    JOBS: Test Android
   # -------------------------
@@ -543,18 +735,11 @@ jobs:
       run_disabled_tests:
         type: boolean
         default: false
-    environment:
-      KOTLIN_HOME=third-party/kotlin
     steps:
       - checkout
       - setup_artifacts
       - run_yarn
 
-      # Validate Android SDK installation and packages
-      - run:
-          name: Validate Android SDK Install
-          command: ./scripts/validate-android-sdk.sh
-
       # Starting emulator in advance as it takes some time to boot.
       - run:
           name: Create Android Virtual Device
@@ -564,60 +749,23 @@ jobs:
           command: source scripts/android-setup.sh && launchAVD
           background: true
 
-      # Install Buck
-      - install_buck_tooling
-
-      # Validate Android test environment (including Buck)
-      - run:
-          name: Validate Android Test Environment
-          command: ./scripts/validate-android-test-env.sh
-
-      - download_buck_dependencies
       - download_gradle_dependencies
 
-      # Build and compile
-      - run:
-          name: Build & Test React Native using Buck
-          command: |
-            buck build ReactAndroid/src/main/java/com/facebook/react
-            buck build ReactAndroid/src/main/java/com/facebook/react/shell
-
       - run:
           name: Build & Test React Native using Gradle
           command: ./gradlew buildAll
 
-      - run:
-          name: Compile Native Libs for Unit and Integration Tests
-          command: ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=$BUILD_THREADS
-          no_output_timeout: 30m
-
       - run:
           name: Build RN Tester for Release using Gradle
           command: ./gradlew packages:rn-tester:android:app:assembleRelease
 
-      # Build JavaScript Bundle for instrumentation tests
-      - run:
-          name: Build JavaScript Bundle
-          command: node cli.js bundle --max-workers 2 --platform android --dev true --entry-file ReactAndroid/src/androidTest/js/TestBundle.js --bundle-output ReactAndroid/src/androidTest/assets/AndroidTestBundle.js
-
       # Wait for AVD to finish booting before running tests
       - run:
           name: Wait for Android Virtual Device
           command: source scripts/android-setup.sh && waitForAVD
 
-      # -------------------------
-      # Run Android tests
-      - run:
-          name: Run Tests - Android Unit Tests with Buck
-          command: buck test ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml
-      - run:
-          name: Build Tests - Android Instrumentation Tests with Buck
-          # Here, just build the instrumentation tests. There is a known issue with installing the APK to android-21+ emulator.
-          command: |
-            if [[ ! -e ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
-              echo "JavaScript bundle missing, cannot run instrumentation tests. Verify Build JavaScript Bundle step completed successfully."; exit 1;
-            fi
-            source scripts/android-setup.sh && NO_BUCKD=1 retry3 timeout 300 buck build ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
+      - report_bundle_size:
+          platform: android
 
       # Optionally, run disabled tests
       - when:
@@ -626,72 +774,139 @@ jobs:
             - run: echo "Failing tests may be moved here temporarily."
             - run_e2e:
                 platform: android
-      # -------------------------
-
-      # Collect Results
-      - report_bundle_size:
-          platform: android
-      - run:
-          name: Collect Test Results
-          command: |
-            find . -type f -regex ".*/build/test-results/debug/.*xml" -exec cp {} ./reports/build/ \;
-            find . -type f -regex ".*/outputs/androidTest-results/connected/.*xml" -exec cp {} ./reports/outputs/ \;
-            find . -type f -regex ".*/buck-out/gen/ReactAndroid/src/test/.*/.*xml" -exec cp {} ./reports/buck/ \;
-            if [ -f ~/react-native/reports/buck/all-results-raw.xml ]; then
-              cd ~/okbuck
-              ./tooling/junit/buck_to_junit.sh ~/react-native/reports/buck/all-results-raw.xml ~/react-native/reports/junit/results.xml
-            fi
-          when: always
-      - store_test_results:
-          path: ./reports/junit
 
   # -------------------------
   #    JOBS: Test Android Template
   # -------------------------
   test_android_template:
     executor: reactnativeandroid
+    parameters:
+      flavor:
+        default: "Debug"
+        description: The Android build type. Must be one of "Debug", "Release".
+        type: enum
+        enum: ["Debug", "Release"]
+      architecture:
+        default: "OldArch"
+        description: Which React Native architecture to use. Must be one of "NewArch", "OldArch".
+        type: enum
+        enum: [ "NewArch", "OldArch" ]
+      jsengine:
+        default: "Hermes"
+        description: Which JavaScript engine to use. Must be one of "Hermes", "JSC".
+        type: enum
+        enum: ["Hermes", "JSC"]
+    environment:
+      - PROJECT_NAME: "AndroidTemplateProject"
     steps:
-      - checkout
+      - checkout_code_with_cache
       - run_yarn
       - attach_workspace:
           at: .
-
       - run:
           name: Create Android template project
           command: |
             REPO_ROOT=$(pwd)
-            PACKAGE=$(cat build/react-native-package-version)
-            PATH_TO_PACKAGE="$REPO_ROOT/build/$PACKAGE"
-            cd template
-            npm add $PATH_TO_PACKAGE
-            npm install
+            node ./scripts/set-rn-template-version.js "file:$REPO_ROOT/build/$(cat build/react-native-package-version)"
+            node cli.js init $PROJECT_NAME --directory "/tmp/$PROJECT_NAME" --template $REPO_ROOT --verbose --skip-install
+            cd /tmp/$PROJECT_NAME
+            yarn
 
       - run:
-          name: Build the template application
-          command: cd template/android/ && ./gradlew assembleDebug
+          name: Build the template application for << parameters.flavor >> with Architecture set to << parameters.architecture >>, and using the << parameters.jsengine>> JS engine.
+          command: |
+            cd /tmp/$PROJECT_NAME/android/
+            if [[ << parameters.architecture >> == "NewArch" ]]; then
+              export ORG_GRADLE_PROJECT_newArchEnabled=true
+            else
+              export ORG_GRADLE_PROJECT_newArchEnabled=false
+            fi
+            if [[ << parameters.jsengine >> == "Hermes" ]]; then
+              export ORG_GRADLE_PROJECT_hermesEnabled=true
+            else
+              export ORG_GRADLE_PROJECT_hermesEnabled=false
+            fi
+            ./gradlew assemble<< parameters.flavor >> -PREACT_NATIVE_MAVEN_LOCAL_REPO=/root/react-native/maven-local
 
   # -------------------------
   #    JOBS: Test iOS Template
   # -------------------------
   test_ios_template:
     executor: reactnativeios
+    parameters:
+      flavor:
+        default: "Debug"
+        description: The Xcode build type. Must be one of "Debug", "Release".
+        type: enum
+        enum: ["Debug", "Release"]
+      architecture:
+        default: "OldArch"
+        description: Which React Native architecture to use. Must be one of "NewArch", "OldArch".
+        type: enum
+        enum: ["NewArch", "OldArch"]
+      jsengine:
+        default: "Hermes"
+        description: Which JavaScript engine to use. Must be one of "Hermes", "JSC".
+        type: enum
+        enum: ["Hermes", "JSC"]
+      flipper:
+        default: "WithFlipper"
+        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
-
     steps:
+      # Early exit in case of Release and WithFlipper. The two does not make sense together.
+      # Unfortunately, the `exclude` parameter of `matrix` does not work, so we have to do it manually.
+      - when:
+          condition:
+            and:
+              - equal: [ << parameters.flavor >>, "Release"]
+              - equal: [ << parameters.flipper >>, "WithFlipper" ]
+          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
       - attach_workspace:
           at: .
       - *attach_hermes_workspace
-      - run:
-          name: Set USE_HERMES=1
-          command: echo "export USE_HERMES=1" >> $BASH_ENV
-      - 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
+      - when:
+          condition:
+            equal: ["Hermes", << parameters.jsengine >>]
+          steps:
+            - run:
+                name: Set HERMES_ENGINE_TARBALL_PATH
+                command: |
+                  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: |
@@ -699,14 +914,43 @@ jobs:
             PACKAGE=$(cat build/react-native-package-version)
             PATH_TO_PACKAGE="$REPO_ROOT/build/$PACKAGE"
             node ./scripts/set-rn-template-version.js "file:$PATH_TO_PACKAGE"
-            mkdir -p ~/tmp
-            cd ~/tmp
-            node "$REPO_ROOT/cli.js" init "$PROJECT_NAME" --template "$REPO_ROOT" --verbose
+            node cli.js init $PROJECT_NAME --directory "/tmp/$PROJECT_NAME" --template $REPO_ROOT --verbose --skip-install
+      - run:
+          name: Install iOS dependencies - Configuration << parameters.flavor >>; New Architecture << parameters.architecture >>; JS Engine << parameters.jsengine>>; Flipper << parameters.flipper >>
+          command: |
+            cd /tmp/$PROJECT_NAME
+            yarn install
+            cd ios
+
+            bundle install
+
+            if [[ << parameters.flavor >> == "Release" ]]; then
+              export PRODUCTION=1
+            fi
+
+            if [[ << parameters.architecture >> == "NewArch" ]]; then
+              export RCT_NEW_ARCH_ENABLED=1
+            fi
+
+            if [[ << parameters.jsengine >> == "JSC" ]]; then
+              export USE_HERMES=0
+            fi
+
+            if [[ << parameters.flipper >> == "WithoutFlipper" ]]; then
+              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
           command: |
             xcodebuild build \
-              -workspace ~/tmp/$PROJECT_NAME/ios/$PROJECT_NAME.xcworkspace \
+              -configuration << parameters.flavor >> \
+              -workspace /tmp/$PROJECT_NAME/ios/$PROJECT_NAME.xcworkspace \
               -scheme $PROJECT_NAME \
               -sdk iphonesimulator
 
@@ -715,9 +959,21 @@ jobs:
   # -------------------------
   test_ios_rntester:
     executor: reactnativeios
+    parameters:
+      jsengine:
+        default: "Hermes"
+        description: Which JavaScript engine to use. Must be one of "Hermes", "JSC".
+        type: enum
+        enum: ["Hermes", "JSC"]
+      architecture:
+        default: "OldArch"
+        description: Which React Native architecture to use. Must be one of "OldArch", "NewArch".
+        type: enum
+        enum: ["NewArch", "OldArch"]
     steps:
       - checkout_code_with_cache
       - run_yarn
+      - *attach_hermes_workspace
 
       # The macOS machine can run out of storage if Hermes is enabled and built from source.
       # Since this job does not use the iOS Simulator, deleting it provides a quick way to
@@ -727,23 +983,22 @@ jobs:
           background: true
           command: sudo rm -rf /Library/Developer/CoreSimulator/Profiles/Runtimes/
 
-      - run:
-          name: Set USE_HERMES=1
-          command: echo "export USE_HERMES=1" >> $BASH_ENV
-
-      - run:
-          name: Set BUILD_HERMES_SOURCE=1
-          command: echo "export BUILD_HERMES_SOURCE=1" >> $BASH_ENV
-
-      - brew_install:
-          package: cmake
-
-      - with_hermes_sdk_cache_span:
+      - with_hermes_tarball_cache_span:
+          set_tarball_path: True
           steps:
             - run:
-                name: Install CocoaPods dependencies
+                name: Install CocoaPods dependencies - Architecture << parameters.architecture >>
                 command: |
                   rm -rf packages/rn-tester/Pods
+
+                  if [[ << parameters.architecture >> == "NewArch" ]]; then
+                    export RCT_NEW_ARCH_ENABLED=1
+                  fi
+
+                  if [[ << parameters.jsengine >> == "JSC" ]]; then
+                    export USE_HERMES=0
+                  fi
+
                   cd packages/rn-tester && bundle exec pod install
 
       - run:
@@ -767,23 +1022,26 @@ 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
 
       - run:
-          name: Install Node
+          name: Disable NVM
+          # Use choco to manage node versions due to https://github.com/npm/cli/issues/4234
+          command: nvm off
+
+      - run:
+          name: Install Node JS
           # Note: Version set separately for non-Windows builds, see above.
-          command: |
-            nvm install 16
-            nvm use 16
+          command: choco install nodejs-lts
 
       # Setup Dependencies
       - run:
-          name: Install Yarn
-          command: choco install yarn
+          name: Enable Yarn with corepack
+          command: corepack enable
 
       - run:
           name: Display Environment info
@@ -863,14 +1121,15 @@ jobs:
           path: ~/react-native/coverage/
 
   # -------------------------
-  #      JOBS: Build hermesc
+  #      JOBS: Build Hermes
   # -------------------------
   prepare_hermes_workspace:
     docker:
-      - image: debian:bullseye
+      - image: debian:11
     environment:
       - HERMES_WS_DIR: *hermes_workspace_root
       - HERMES_VERSION_FILE: "sdks/.hermesversion"
+      - REACT_NATIVE_CI: true
     steps:
       - run:
           name: Install dependencies
@@ -893,16 +1152,19 @@ jobs:
               HERMES_TAG_SHA=$(git ls-remote https://github.com/facebook/hermes main | cut -f 1 | tr -d '[:space:]')
               echo $HERMES_TAG_SHA > /tmp/hermes/hermesversion
             fi
+            cat /tmp/hermes/hermesversion
       - restore_cache:
-          key: *hermes_cache_key
+          key: *hermes_workspace_cache_key
       - run:
           name: Download Hermes tarball
           command: |
-            node scripts/hermes/prepare-hermes-for-build
+            node scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
             cp sdks/download/* $HERMES_WS_DIR/download/.
             cp -r sdks/hermes/* $HERMES_WS_DIR/hermes/.
+
+            cat /tmp/hermes/hermesversion
       - save_cache:
-          key: *hermes_cache_key
+          key: *hermes_workspace_cache_key
           paths:
             - /tmp/hermes/download/
             - /tmp/hermes/hermes/
@@ -927,7 +1189,7 @@ jobs:
                 libreadline-dev libicu-dev zip python3
       - *attach_hermes_workspace
       - restore_cache:
-          key: *hermes_cache_key
+          key: *hermes_workspace_cache_key
       - run:
           name: Set up workspace
           command: |
@@ -946,7 +1208,7 @@ jobs:
               cp /tmp/hermes/build/bin/hermesc /tmp/hermes/linux64-bin/.
             fi
       - save_cache:
-          key: *hermes_cache_key
+          key: *hermes_workspace_cache_key
           paths:
             - /tmp/hermes/linux64-bin/
             - /tmp/hermes/hermes/destroot/
@@ -958,68 +1220,103 @@ jobs:
             - linux64-bin
 
   build_hermes_macos:
+    parameters:
+      flavor:
+        default: "Debug"
+        description: The Hermes build type. Must be one of "Debug", "Release".
+        type: enum
+        enum: ["Debug", "Release"]
     executor: reactnativeios
     environment:
       - HERMES_WS_DIR: *hermes_workspace_root
+      - HERMES_TARBALL_ARTIFACTS_DIR: *hermes_tarball_artifacts_dir
+      - HERMES_OSXBIN_ARTIFACTS_DIR: *hermes_osxbin_artifacts_dir
     steps:
       - checkout_code_with_cache
+      - run_yarn
       - *attach_hermes_workspace
-      - restore_cache:
-          key: *hermes_cache_key
+      - get_react_native_version
+      - when:
+          condition:
+            equal: [ << parameters.flavor >>, "Debug"]
+          steps:
+            - restore_cache:
+                keys:
+                  - *hermes_workspace_debug_cache_key
+      - when:
+          condition:
+            equal: [ << parameters.flavor >>, "Release"]
+          steps:
+            - restore_cache:
+                keys:
+                  - *hermes_workspace_release_cache_key
       - run:
           name: Set up workspace
           command: |
-            mkdir -p /tmp/hermes/osx-bin
-            mkdir -p ~/react-native/sdks/hermes
-            cp -r $HERMES_WS_DIR/hermes/* ~/react-native/sdks/hermes/.
-      - run:
-          name: Install dependencies
-          command: |
-            brew install cmake
-      - run:
-          name: Build the Hermes iOS frameworks
-          command: |
-            cd ~/react-native/sdks/hermes
-            ./utils/build-ios-framework.sh
-      - run:
-          name: Build the Hermes Mac frameworks
-          command: |
-            cd ~/react-native/sdks/hermes
-            ./utils/build-mac-framework.sh
-            cp build_macosx/bin/hermesc /tmp/hermes/osx-bin/.
-      - run:
-          name: Package the Hermes Apple frameworks
-          command: |
-            cd ~/react-native/sdks/hermes
-            . ./utils/build-apple-framework.sh
+            mkdir -p $HERMES_OSXBIN_ARTIFACTS_DIR ./sdks/hermes
+            cp -r $HERMES_WS_DIR/hermes/* ./sdks/hermes/.
+      - brew_install:
+          package: cmake
+      - with_hermes_tarball_cache_span:
+          flavor: << parameters.flavor >>
+          steps:
+            - with_hermesc_span:
+                flavor: << parameters.flavor >>
+                steps:
+                  - run:
+                      name: Build the Hermes Mac frameworks
+                      command: |
+                        cd ./sdks/hermes || exit 1
+                        BUILD_TYPE="<< parameters.flavor >>" ./utils/build-mac-framework.sh
+                  - run:
+                      name: Build the Hermes iOS frameworks
+                      command: |
+                        cd ./sdks/hermes || exit 1
+                        BUILD_TYPE="<< parameters.flavor >>" ./utils/build-ios-framework.sh
+            - run:
+                name: Package the Hermes Apple frameworks
+                command: |
+                  BUILD_TYPE="<< parameters.flavor >>"
+                  echo "Packaging Hermes Apple frameworks for $BUILD_TYPE build type"
 
-            mkdir -p /tmp/cocoapods-package-root/destroot
-            mkdir -p /tmp/hermes/output
-            cp -R ./destroot /tmp/cocoapods-package-root
-            cp LICENSE /tmp/cocoapods-package-root
+                  TARBALL_OUTPUT_DIR=$(mktemp -d /tmp/hermes-tarball-output-XXXXXXXX)
 
-            tar -C /tmp/cocoapods-package-root/ -czvf /tmp/hermes/output/hermes-runtime-darwin-v$(get_release_version).tar.gz .
+                  TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 
-            mkdir -p /tmp/hermes/hermes-runtime-darwin
-            cp /tmp/hermes/output/hermes-runtime-darwin-v$(get_release_version).tar.gz /tmp/hermes/hermes-runtime-darwin/.
-      - save_cache:
-          key: *hermes_cache_key
-          paths:
-            - ~/react-native/hermes/build_host_hermesc
-            - ~/react-native/hermes/build_iphoneos
-            - ~/react-native/hermes/build_catalyst
-            - ~/react-native/hermes/build_iphonesimulator
-            - ~/react-native/hermes/build_macosx
-            - ~/react-native/hermes/destroot
-      - store_artifacts:
-          path: /tmp/hermes/hermes-runtime-darwin/
-      - store_artifacts:
-          path: /tmp/hermes/osx-bin/
-      - persist_to_workspace:
-          root: /tmp/hermes/
-          paths:
-            - hermes-runtime-darwin
-            - osx-bin
+                  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" \
+                    --outputDir $TARBALL_OUTPUT_DIR)
+
+                  echo "Hermes tarball saved to $TARBALL_OUTPUT_PATH"
+
+                  mkdir -p $HERMES_TARBALL_ARTIFACTS_DIR
+                  cp $TARBALL_OUTPUT_PATH $HERMES_TARBALL_ARTIFACTS_DIR/.
+            - when:
+                condition:
+                  equal: [ << parameters.flavor >>, "Debug"]
+                steps:
+                  - save_cache:
+                      key: *hermes_workspace_debug_cache_key
+                      paths: *hermes_workspace_macos_cache_paths
+            - when:
+                condition:
+                  equal: [ << parameters.flavor >>, "Release"]
+                steps:
+                  - save_cache:
+                      key: *hermes_workspace_release_cache_key
+                      paths: *hermes_workspace_macos_cache_paths
+            - store_artifacts:
+                path: *hermes_tarball_artifacts_dir
+            - store_artifacts:
+                path: *hermes_osxbin_artifacts_dir
+            - persist_to_workspace:
+                root: /tmp/hermes/
+                paths:
+                  - hermes-runtime-darwin
+                  - osx-bin
 
   build_hermesc_windows:
     executor:
@@ -1106,6 +1403,9 @@ jobs:
       latest:
         type: boolean
         default: false
+      dryrun:
+        type: boolean
+        default: false
     executor: reactnativeios
     steps:
       - checkout_code_with_cache
@@ -1113,16 +1413,27 @@ jobs:
       - add_ssh_keys:
           fingerprints:
             - "1c:98:e0:3a:52:79:95:29:12:cd:b4:87:5b:41:e2:bb"
+      - brew_install:
+          package: cmake
       - run:
           name: "Set new react-native version and commit changes"
           command: |
-            node ./scripts/prepare-package-for-release.js -v << parameters.version >> -l << parameters.latest >>
+            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:
-      publish_npm_args:
-        type: string
-        default: --dry-run
+      release_type:
+        description: The type of release to build. Must be one of "nightly", "release", "dry-run".
+        type: enum
+        enum: ["nightly", "release", "dry-run"]
+        default: "dry-run"
     executor: reactnativeandroid
     environment:
       - HERMES_WS_DIR: *hermes_workspace_root
@@ -1135,16 +1446,27 @@ jobs:
       - checkout
       - *attach_hermes_workspace
       - run:
-          name: Copy HermesC binaries
+          name: Copy Hermes binaries
           command: |
             mkdir -p ./sdks/hermesc ./sdks/hermesc/osx-bin ./sdks/hermesc/win64-bin ./sdks/hermesc/linux64-bin
-            cp -r $HERMES_WS_DIR/osx-bin/* ./sdks/hermesc/osx-bin/.
+
+            # When build_hermes_macos runs as a matrix, it outputs
+            if [[ -d $HERMES_WS_DIR/osx-bin/Release ]]; then
+              cp -r $HERMES_WS_DIR/osx-bin/Release/* ./sdks/hermesc/osx-bin/.
+            elif [[ -d $HERMES_WS_DIR/osx-bin/Debug ]]; then
+              cp -r $HERMES_WS_DIR/osx-bin/Debug/* ./sdks/hermesc/osx-bin/.
+            else
+              ls $HERMES_WS_DIR/osx-bin || echo "hermesc macOS artifacts directory missing."
+              echo "Could not locate macOS hermesc binary."; exit 1;
+            fi
+
             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-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
-      - install_buck_tooling
-      - download_buck_dependencies
       - download_gradle_dependencies
 
       # START: Stables and nightlies
@@ -1154,8 +1476,8 @@ jobs:
       - when:
           condition:
             or:
-              - equal: [ --release, << parameters.publish_npm_args >> ]
-              - equal: [ --nightly, << parameters.publish_npm_args >> ]
+              - equal: [ "release", << parameters.release_type >> ]
+              - equal: [ "nightly", << parameters.release_type >> ]
           steps:
             - run: echo "//registry.npmjs.org/:_authToken=${CIRCLE_NPM_TOKEN}" > ~/.npmrc
             - run: |
@@ -1164,18 +1486,27 @@ jobs:
                 echo "machine github.com login react-native-bot password $GITHUB_TOKEN" > ~/.netrc
       # END: Stables and nightlies
 
-      - run: node ./scripts/publish-npm.js << parameters.publish_npm_args >>
+      - run: node ./scripts/publish-npm.js --<< parameters.release_type >>
       - run:
           name: Zip Hermes Native Symbols
           command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
       - store_artifacts:
           path: /tmp/hermes-native-symbols.zip
+      - run:
+          name: Zip Maven Artifacts from /tmp/maven-local
+          command: zip -r /tmp/maven-local.zip /tmp/maven-local
+      - store_artifacts:
+          path: /tmp/maven-local.zip
+      - persist_to_workspace:
+          root: /tmp
+          paths:
+            - maven-local
 
       # START: Commitlies
       # Provide a react-native package for this commit as a Circle CI release artifact.
       - when:
           condition:
-            equal: [ --dry-run, << parameters.publish_npm_args >> ]
+            equal: [ "dry-run", << parameters.release_type >> ]
           steps:
             - run:
                 name: Build release package as a job artifact
@@ -1199,7 +1530,6 @@ jobs:
           condition:
             matches: { pattern: '^pull\/.*$', value: << pipeline.git.branch >> }
           steps:
-            - install_github_bot_deps
             - run:
                 name: Post link to PR build artifacts (pull-bot)
                 command: GITHUB_TOKEN="$PUBLIC_PULLBOT_GITHUB_TOKEN_A""$PUBLIC_PULLBOT_GITHUB_TOKEN_B" scripts/circleci/post-artifacts-link.sh || true
@@ -1208,7 +1538,7 @@ jobs:
       # START: Stable releases
       - when:
           condition:
-            equal: [ --release, << parameters.publish_npm_args >> ]
+            equal: [ "release", << parameters.release_type >> ]
           steps:
             - run:
                 name: Update rn-diff-purge to generate upgrade-support diff
@@ -1217,14 +1547,6 @@ jobs:
                     -H "Accept: application/vnd.github.v3+json" \
                     -u "$PAT_USERNAME:$PAT_TOKEN" \
                     -d "{\"event_type\": \"publish\", \"client_payload\": { \"version\": \"${CIRCLE_TAG:1}\" }}"
-            - run:
-                name: Install dependencies
-                command: apt update && apt install -y jq jo
-            - run:
-                name: Create draft GitHub Release and upload Hermes binaries
-                command: |
-                  ARTIFACTS=("$HERMES_WS_DIR/hermes-runtime-darwin/hermes-runtime-darwin-$CIRCLE_TAG.tar.gz")
-                  ./scripts/circleci/create_github_release.sh $CIRCLE_TAG $CIRCLE_PROJECT_USERNAME $CIRCLE_PROJECT_REPONAME $GITHUB_TOKEN "${ARTIFACTS[@]}"
       # END: Stable releases
 
   # -------------------------
@@ -1276,12 +1598,15 @@ workflows:
       - build_hermes_macos:
           requires:
             - prepare_hermes_workspace
+          matrix:
+            parameters:
+              flavor: ["Debug", "Release"]
       - build_hermesc_windows:
           requires:
             - prepare_hermes_workspace
       - build_npm_package:
           # Build a release package on every untagged commit, but do not publish to npm.
-          publish_npm_args: --dry-run
+          release_type: "dry-run"
           requires:
             - build_hermesc_linux
             - build_hermes_macos
@@ -1293,12 +1618,36 @@ workflows:
       - test_android_template:
           requires:
             - build_npm_package
+          matrix:
+            parameters:
+              architecture: ["NewArch", "OldArch"]
+              jsengine: ["Hermes", "JSC"]
+              flavor: ["Debug", "Release"]
+      - test_buck
       - test_ios_template:
           requires:
             - build_npm_package
-      - test_ios_rntester
+          matrix:
+            parameters:
+              architecture: ["NewArch", "OldArch"]
+              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
+          matrix:
+            parameters:
+              architecture: ["NewArch", "OldArch"]
+              jsengine: ["Hermes", "JSC"]
       - test_ios:
           run_unit_tests: true
+          requires:
+            - build_hermes_macos
+          matrix:
+            parameters:
+              jsengine: ["Hermes", "JSC"]
       # DISABLED: USE_FRAMEWORKS=1 not supported by Flipper
       # - test_ios:
       #     name: test_ios_frameworks
@@ -1335,6 +1684,9 @@ workflows:
           filters: *only_release_tags
           requires:
             - prepare_hermes_workspace
+          matrix:
+            parameters:
+              flavor: ["Debug", "Release"]
       - build_hermesc_windows:
           filters: *only_release_tags
           requires:
@@ -1343,13 +1695,44 @@ workflows:
       - build_npm_package:
           name: build_and_publish_npm_package
           context: react-native-bot
-          publish_npm_args: --release
+          release_type: "release"
           filters: *only_release_tags
           requires:
             - build_hermesc_linux
             - build_hermes_macos
             - build_hermesc_windows
 
+  package_and_publish_release_dryrun:
+    jobs:
+      - prepare_package_for_release:
+          name: prepare_package_for_release
+          version: ''
+          latest : false
+          dryrun: true
+      - prepare_hermes_workspace:
+          requires:
+            - prepare_package_for_release
+      - build_hermesc_linux:
+          requires:
+            - prepare_hermes_workspace
+      - build_hermes_macos:
+          requires:
+            - prepare_hermes_workspace
+          matrix:
+            parameters:
+              flavor: ["Debug", "Release"]
+      - build_hermesc_windows:
+          requires:
+            - prepare_hermes_workspace
+      - build_npm_package:
+          name: build_and_publish_npm_package
+          context: react-native-bot
+          release_type: "dry-run"
+          requires:
+            - build_hermesc_linux
+            - build_hermes_macos
+            - build_hermesc_windows
+
   analysis:
     unless: << pipeline.parameters.run_package_release_workflow_only >>
     jobs:
@@ -1381,11 +1764,14 @@ workflows:
       - build_hermes_macos:
           requires:
             - prepare_hermes_workspace
+          matrix:
+            parameters:
+              flavor: ["Debug", "Release"]
       - build_hermesc_windows:
           requires:
             - prepare_hermes_workspace
       - build_npm_package:
-          publish_npm_args: --nightly
+          release_type: "nightly"
           requires:
             - build_hermesc_linux
             - build_hermes_macos
diff --git a/.circleci/verdaccio.yml b/.circleci/verdaccio.yml
new file mode 100644
index 000000000000..37e5d23b3802
--- /dev/null
+++ b/.circleci/verdaccio.yml
@@ -0,0 +1,44 @@
+storage: ./storage
+auth:
+  htpasswd:
+    file: ./htpasswd
+uplinks:
+  npmjs:
+    url: https://registry.npmjs.org/
+    max_fails: 40
+    maxage: 30m
+    timeout: 60s
+    fail_timeout: 10m
+    cache: false
+    agent_options:
+      keepAlive: true
+      maxSockets: 40
+      maxFreeSockets: 10
+packages:
+  # Group and isolate all local packages, avoid being proxy from outside
+  '@react-native/*':
+    access: $all
+    publish: $all
+  # The below specific entries can be removed once they are renamed and have the @react-native prefix
+  '@react-native-community/eslint-config':
+    access: $all
+    publish: $all
+  '@react-native-community/eslint-plugin':
+    access: $all
+    publish: $all
+  'react-native-codegen':
+    access: $all
+    publish: $all
+  'react-native-gradle-plugin':
+    access: $all
+    publish: $all
+  '@*/*':
+    access: $all
+    publish: $authenticated
+    proxy: npmjs
+  '**':
+    access: $all
+    publish: $all
+    proxy: npmjs
+logs:
+  - {type: file, path: verdaccio.log, format: json, level: warn}
diff --git a/.eslintignore b/.eslintignore
index f1beb735a483..49c1ac6eac73 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,6 +1,5 @@
 **/main.js
 **/staticBundle.js
-bots/node_modules
 docs/generatedComponentApiDocs.js
 flow/
 Libraries/Renderer/*
@@ -8,3 +7,4 @@ Libraries/vendor/**/*
 node_modules/
 packages/*/node_modules
 packages/react-native-codegen/lib
+tools/eslint/rules/sort-imports.js
diff --git a/.eslintrc.js b/.eslintrc.js
index 3d0dad11dfcd..1a9708475346 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -9,12 +9,16 @@
 
 'use strict';
 
+const path = require('node:path');
+
+require('eslint-plugin-lint').load(path.join(__dirname, 'tools/eslint/rules'));
+
 module.exports = {
   root: true,
 
-  extends: ['./packages/eslint-config-react-native-community/index.js'],
+  extends: ['@react-native-community'],
 
-  plugins: ['@react-native/eslint-plugin-specs'],
+  plugins: ['@react-native/eslint-plugin-specs', 'lint'],
 
   overrides: [
     // overriding the JS config from eslint-config-react-native-community config to ensure
@@ -26,8 +30,6 @@ module.exports = {
         // These rules are not required with hermes-eslint
         'ft-flow/define-flow-type': 0,
         'ft-flow/use-flow-type': 0,
-        'flowtype/define-flow-type': 0,
-        'flowtype/use-flow-type': 0,
         // flow handles this check for us, so it's not required
         'no-undef': 0,
       },
@@ -36,15 +38,19 @@ module.exports = {
     {
       files: ['Libraries/**/*.js'],
       rules: {
-        '@react-native-community/no-haste-imports': 2,
-        '@react-native-community/error-subclass-name': 2,
         '@react-native-community/platform-colors': 2,
         '@react-native/specs/react-native-modules': 2,
+        'lint/no-haste-imports': 2,
+        'lint/no-react-native-imports': 2,
+        'lint/require-extends-error': 2,
+        'lint/sort-imports': 1,
       },
     },
     {
       files: ['flow-typed/**/*.js'],
       rules: {
+        'lint/valid-flow-typed-signature': 2,
+        'no-unused-vars': 0,
         quotes: 0,
       },
     },
@@ -73,5 +79,17 @@ module.exports = {
         jest: true,
       },
     },
+    {
+      files: ['**/*.{ts,tsx}'],
+      parser: '@typescript-eslint/parser',
+      plugins: ['@typescript-eslint/eslint-plugin'],
+      rules: {
+        '@typescript-eslint/no-unused-vars': 'off',
+        'react-native/no-inline-styles': 'off',
+        '@typescript-eslint/no-shadow': 'off',
+        'no-self-compare': 'off',
+        'react/self-closing-comp': 'off',
+      },
+    },
   ],
 };
diff --git a/.flowconfig b/.flowconfig
index c2d114b4f676..9862b98d35db 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -6,7 +6,7 @@
 <PROJECT_ROOT>/template/.*
 
 ; Ignore the Dangerfile
-<PROJECT_ROOT>/bots/dangerfile.js
+<PROJECT_ROOT>/packages/react-native-bots/dangerfile.js
 
 ; Ignore "BUCK" generated dirs
 <PROJECT_ROOT>/\.buckd/
@@ -32,7 +32,6 @@ flow/
 emoji=true
 
 exact_by_default=true
-exact_empty_objects=true
 
 format.bracket_spacing=false
 
@@ -52,7 +51,7 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
-experimental.env_mode=ssa
+inference_mode=constrain_writes
 
 [lints]
 sketchy-null-number=warn
@@ -74,4 +73,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.182.0
+^0.191.0
diff --git a/.flowconfig.android b/.flowconfig.android
index dc9d12aba7e9..ba1090d54053 100644
--- a/.flowconfig.android
+++ b/.flowconfig.android
@@ -6,7 +6,7 @@
 <PROJECT_ROOT>/template/.*
 
 ; Ignore the Dangerfile
-<PROJECT_ROOT>/bots/dangerfile.js
+<PROJECT_ROOT>/packages/react-native-bots/dangerfile.js
 
 ; Ignore "BUCK" generated dirs
 <PROJECT_ROOT>/\.buckd/
@@ -32,7 +32,6 @@ flow/
 emoji=true
 
 exact_by_default=true
-exact_empty_objects=true
 
 format.bracket_spacing=false
 
@@ -52,7 +51,7 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
-experimental.env_mode=ssa
+inference_mode=constrain_writes
 
 [lints]
 sketchy-null-number=warn
@@ -74,4 +73,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.182.0
+^0.191.0
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 38dbd76f893b..113169229179 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -9,7 +9,7 @@
 
 # GitHub Settings, Bots
 /.github/ @hramos
-/bots @hramos
+/packages/react-native-bots @hramos
 
 # Continuous Integration
 /.circleci/ @hramos
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 9c245257bf1e..5188c39c86ea 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -40,7 +40,7 @@ body:
     attributes:
       label: Snack, code example, screenshot, or link to a repository
       description: |
-        Please provide a Snack (https://snack.expo.io/), a link to a repository on GitHub, or provide a minimal code example that reproduces the problem.
+        Please provide a Snack (https://snack.expo.dev/), a link to a repository on GitHub, or provide a minimal code example that reproduces the problem.
         You may provide a screenshot of the application if you think it is relevant to your bug report.
         Here are some tips for providing a minimal example: https://stackoverflow.com/help/mcve
         Please note that a reproducer is mandatory. Issues without reproducer are more likely to stall and will be closed.
diff --git a/.github/ISSUE_TEMPLATE/new_architecture_bug_report.yml b/.github/ISSUE_TEMPLATE/new_architecture_bug_report.yml
index 8f060dd42de9..7b88c23b94e2 100644
--- a/.github/ISSUE_TEMPLATE/new_architecture_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/new_architecture_bug_report.yml
@@ -45,7 +45,7 @@ body:
     attributes:
       label: Snack, code example, screenshot, or link to a repository
       description: |
-        Please provide a Snack (https://snack.expo.io/), a link to a repository on GitHub, or provide a minimal code example that reproduces the problem.
+        Please provide a Snack (https://snack.expo.dev/), a link to a repository on GitHub, or provide a minimal code example that reproduces the problem.
         You may provide a screenshot of the application if you think it is relevant to your bug report.
         Here are some tips for providing a minimal example: https://stackoverflow.com/help/mcve
         Please note that a reproducer is mandatory. Issues without reproducer are more likely to stall and will be closed.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 073b9af6d242..4b81ca2408c3 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,7 +7,7 @@
 ## Changelog
 
 <!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
-https://github.com/facebook/react-native/wiki/Changelog
+https://reactnative.dev/contributing/changelogs-in-pull-requests
 -->
 
 [CATEGORY] [TYPE] - Message
diff --git a/.github/respond-to-issue-based-on-label.yml b/.github/respond-to-issue-based-on-label.yml
index 57cc3eeb02a6..acb89311bc4f 100644
--- a/.github/respond-to-issue-based-on-label.yml
+++ b/.github/respond-to-issue-based-on-label.yml
@@ -46,7 +46,7 @@
     <table><tbody><tr><th width="50">:warning:</th><th width="100%">
     Missing Reproducible Example
     </th></tr><tr><td>:information_source:</td><td>
-    It looks like your issue is missing a reproducible example. Please provide a <a href="https://snack.expo.io">Snack</a> or a repository that demonstrates the issue you are reporting in a <a href="https://stackoverflow.com/help/minimal-reproducible-example">minimal, complete, and reproducible</a> manner.
+    It looks like your issue is missing a reproducible example. Please provide a <a href="https://snack.expo.dev">Snack</a> or a repository that demonstrates the issue you are reporting in a <a href="https://stackoverflow.com/help/minimal-reproducible-example">minimal, complete, and reproducible</a> manner.
     </td></tr></tbody></table>
   labels:
     - "Needs: Author Feedback"
diff --git a/.github/workflows/autorebase.yml b/.github/workflows/autorebase.yml
new file mode 100644
index 000000000000..78820f8fea4b
--- /dev/null
+++ b/.github/workflows/autorebase.yml
@@ -0,0 +1,24 @@
+name: Automatic Rebase
+on:
+  issue_comment:
+    types: [created]
+permissions:
+  contents: read
+jobs:
+  rebase:
+    permissions:
+      contents: write  # for cirrus-actions/rebase to push code to rebase
+      pull-requests: read  # for cirrus-actions/rebase to get info about PR
+    name: Rebase
+    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the latest code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
+      - name: Automatic Rebase
+        uses: cirrus-actions/rebase@1.7
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/danger_pr.yml b/.github/workflows/danger_pr.yml
index d3e8072065a8..06f8a2e83020 100644
--- a/.github/workflows/danger_pr.yml
+++ b/.github/workflows/danger_pr.yml
@@ -1,22 +1,27 @@
 name: Run Danger on PR
 
 on:
-  pull_request:
+  pull_request_target:
     types: [opened, edited, reopened, synchronize]
 
 permissions:
-  contents: read
+  actions: write
+  checks: write
+  contents: write
+  issues: write
+  pull-requests: write
+  statuses: write
 
 jobs:
   danger:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - run: yarn install
-        working-directory: bots
+      - name: Run Yarn Install on Root
+        run: yarn install
+        working-directory: .
       - name: Danger
-        run: DANGER_GITHUB_API_TOKEN="$PUBLIC_PULLBOT_GITHUB_TOKEN_A""$PUBLIC_PULLBOT_GITHUB_TOKEN_B" yarn danger ci --use-github-checks --failOnErrors --id danger_pr
-        working-directory: bots
+        run: yarn danger ci --use-github-checks --failOnErrors
+        working-directory: packages/react-native-bots
         env:
-          PUBLIC_PULLBOT_GITHUB_TOKEN_A: a6edf8e8d40ce4e8b11a
-          PUBLIC_PULLBOT_GITHUB_TOKEN_B: 150e1341f4dd9c944d2a
+          DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index c954afb75a0f..01027b3802ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,8 @@ project.xcworkspace
 /ReactAndroid/gradle/
 /ReactAndroid/gradlew
 /ReactAndroid/gradlew.bat
+/ReactAndroid/external-artifacts/build/
+/ReactAndroid/external-artifacts/artifacts/
 /ReactAndroid/hermes-engine/build/
 /ReactAndroid/hermes-engine/.cxx/
 /template/android/app/build/
@@ -62,13 +64,13 @@ buck-out
 .gradle
 local.properties
 *.iml
-/android/
+/android/*
+!/android/README.md
 
 # Node
 node_modules
 *.log
 .nvm
-/bots/node_modules/
 package-lock.json
 
 # OS X
@@ -106,18 +108,22 @@ package-lock.json
 
 # Ignore RNTester specific Pods, but keep the __offline_mirrors__ here.
 /packages/rn-tester/Pods/*
-!/packages/rn-tester/Pods/__offline_mirrors__
+!/packages/rn-tester/Pods/__offline_mirrors_hermes__
+!/packages/rn-tester/Pods/__offline_mirrors_jsc__
 
 # react-native-codegen
 /React/FBReactNativeSpec/FBReactNativeSpec
 /packages/react-native-codegen/lib
+/packages/react-native-codegen/tmp/
 /ReactCommon/react/renderer/components/rncore/
 /packages/rn-tester/NativeModuleExample/ScreenshotManagerSpec*
 
+
 # Additional SDKs
 /sdks/download
 /sdks/hermes
 /sdks/hermesc
+/sdks/hermes-engine/build_host_hermesc
 
 # Visual studio
 .vscode
@@ -125,3 +131,6 @@ package-lock.json
 
 # Android memory profiler files
 *.hprof
+
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
diff --git a/.ruby-version b/.ruby-version
index a603bb50a29e..49cdd668e1c8 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.5
+2.7.6
diff --git a/BUCK b/BUCK
index 69a9a077041b..4325eaa291ea 100644
--- a/BUCK
+++ b/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",
@@ -57,9 +60,9 @@ fb_native.genrule(
     ) + [
         react_native_root_target("packages/rn-tester:nativecomponent-srcs"),
     ],
-    labels = ["uses_hg"],
-    cmd = "$(exe {}) $OUT $SRCS".format(react_native_root_target("packages/react-native-codegen:write_to_json")),
     out = "schema-rncore.json",
+    cmd = "$(exe {}) $OUT $SRCS".format(react_native_root_target("packages/react-native-codegen:write_to_json")),
+    labels = ["uses_hg"],
 )
 
 rn_codegen_components(
@@ -98,7 +101,6 @@ rn_xplat_cxx_library2(
     labels = [
         "depslint_never_remove",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + [
         "-DWITH_FBSYSTRACE=1",
@@ -110,11 +112,10 @@ rn_xplat_cxx_library2(
         ":RCTCxxUtils",
         ":ReactInternal",
         "//fbobjc/Libraries/FBReactKit:RCTFBSystrace",
-        "//xplat/folly:molly",
         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"),
     ],
@@ -156,7 +157,6 @@ rn_xplat_cxx_library2(
     ],
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode() + ["-DWITH_FBSYSTRACE=1"],
     visibility = ["PUBLIC"],
@@ -164,7 +164,6 @@ rn_xplat_cxx_library2(
         ":RCTCxxUtils",
         ":ReactInternal",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
         react_native_xplat_target("cxxreact:module"),
         react_native_xplat_target("cxxreact:bridge"),
         react_native_xplat_target("reactperflogger:reactperflogger"),
@@ -196,12 +195,11 @@ rn_xplat_cxx_library2(
     ],
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
     visibility = ["PUBLIC"],
     deps = [
-        "//xplat/folly:molly",
+        "//xplat/folly:dynamic",
     ],
 )
 
@@ -224,7 +222,6 @@ rn_xplat_cxx_library2(
     fbobjc_enable_exceptions = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
     visibility = ["PUBLIC"],
@@ -248,14 +245,17 @@ REACT_PUBLIC_HEADERS = {
     "React/RCTAnimationType.h": RCTVIEWS_PATH + "RCTAnimationType.h",
     "React/RCTAssert.h": RCTBASE_PATH + "RCTAssert.h",
     "React/RCTAutoInsetsProtocol.h": RCTVIEWS_PATH + "RCTAutoInsetsProtocol.h",
+    "React/RCTBorderCurve.h": RCTVIEWS_PATH + "RCTBorderCurve.h",
     "React/RCTBorderDrawing.h": RCTVIEWS_PATH + "RCTBorderDrawing.h",
     "React/RCTBorderStyle.h": RCTVIEWS_PATH + "RCTBorderStyle.h",
     "React/RCTBridge+Private.h": RCTBASE_PATH + "RCTBridge+Private.h",
     "React/RCTBridge.h": RCTBASE_PATH + "RCTBridge.h",
+    "React/RCTBridgeConstants.h": RCTBASE_PATH + "RCTBridgeConstants.h",
     "React/RCTBridgeDelegate.h": RCTBASE_PATH + "RCTBridgeDelegate.h",
     "React/RCTBridgeMethod.h": RCTBASE_PATH + "RCTBridgeMethod.h",
     "React/RCTBridgeModule.h": RCTBASE_PATH + "RCTBridgeModule.h",
     "React/RCTBridgeModuleDecorator.h": RCTBASE_PATH + "RCTBridgeModuleDecorator.h",
+    "React/RCTBundleManager.h": RCTBASE_PATH + "RCTBundleManager.h",
     "React/RCTBundleURLProvider.h": RCTBASE_PATH + "RCTBundleURLProvider.h",
     "React/RCTComponent.h": RCTVIEWS_PATH + "RCTComponent.h",
     "React/RCTComponentData.h": RCTVIEWS_PATH + "RCTComponentData.h",
@@ -267,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
@@ -338,6 +339,7 @@ REACT_PUBLIC_HEADERS = {
     "React/RCTSurfaceView.h": RCTBASE_PATH + "Surface/RCTSurfaceView.h",
     "React/RCTTextDecorationLineType.h": RCTVIEWS_PATH + "RCTTextDecorationLineType.h",
     "React/RCTTouchHandler.h": RCTBASE_PATH + "RCTTouchHandler.h",
+    "React/RCTTurboModuleRegistry.h": RCTBASE_PATH + "RCTTurboModuleRegistry.h",
     "React/RCTUIManager.h": RCTMODULES_PATH + "RCTUIManager.h",
     "React/RCTUIManagerObserverCoordinator.h": RCTMODULES_PATH + "RCTUIManagerObserverCoordinator.h",
     "React/RCTUIManagerUtils.h": RCTMODULES_PATH + "RCTUIManagerUtils.h",
@@ -429,7 +431,6 @@ rn_xplat_cxx_library2(
         "depslint_never_add",
         "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platform_preprocessor_flags = [(
         "linux",
@@ -520,7 +521,6 @@ rn_xplat_cxx_library2(
     labels = [
         "disable_plugins_only_validation",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     plugins = [
         react_fabric_component_plugin_provider("SafeAreaView", "RCTSafeAreaViewCls"),
@@ -599,12 +599,13 @@ rn_apple_library(
     contacts = ["oncall+react_native@xmail.facebook.com"],
     extension_api_only = True,
     frameworks = [
-        "$PLATFORM_DIR/Developer/Library/Frameworks/Foundation.framework",
+        "Foundation",
     ],
     inherited_buck_flags = get_static_library_ios_flags(),
     labels = [
+        "fbios_link_group:xplat/default/public.react_native.infra",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
+        "talkios_link_group:xplat/default/public.react_native.infra",
     ],
     preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
     reexport_all_header_dependencies = True,
@@ -676,7 +677,6 @@ rn_apple_library(
     labels = [
         "disable_plugins_only_validation",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     plugins = [react_fabric_component_plugin_provider("Image", "RCTImageCls")],
     visibility = ["PUBLIC"],
@@ -708,7 +708,6 @@ rn_xplat_cxx_library2(
     contacts = ["oncall+react_native@xmail.facebook.com"],
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     visibility = ["PUBLIC"],
     deps = [
@@ -741,13 +740,13 @@ rn_library(
     ),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.core",
     ],
     visibility = ["PUBLIC"],
     deps = [
         "//xplat/js:node_modules__abort_19controller",
         "//xplat/js:node_modules__anser",
         "//xplat/js:node_modules__base64_19js",
+        "//xplat/js:node_modules__deprecated_19react_19native_19prop_19types",
         "//xplat/js:node_modules__event_19target_19shim",
         "//xplat/js:node_modules__invariant",
         "//xplat/js:node_modules__memoize_19one",
@@ -762,6 +761,7 @@ rn_library(
         "//xplat/js:node_modules__use_19sync_19external_19store",
         "//xplat/js:node_modules__whatwg_19fetch",
         "//xplat/js/RKJSModules/Libraries/Polyfills:Polyfills",
+        "//xplat/js/RKJSModules/Libraries/React:React",
         "//xplat/js/RKJSModules/vendor/react:react",
         "//xplat/js/RKJSModules/vendor/react-test-renderer:react-test-renderer",
         "//xplat/js/RKJSModules/vendor/scheduler:scheduler",
@@ -779,7 +779,6 @@ rn_codegen(
     codegen_modules = True,
     ios_assume_nonnull = False,
     library_labels = [
-        "supermodule:xplat/default/public.react_native.infra",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
     ],
     native_module_spec_name = "FBReactNativeSpec",
@@ -792,7 +791,6 @@ rn_codegen(
     codegen_components = True,
     ios_assume_nonnull = False,
     library_labels = [
-        "supermodule:xplat/default/public.react_native.infra",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
     ],
     src_prefix = "Libraries/",
@@ -828,8 +826,9 @@ rn_apple_library(
         "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
         "disable_plugins_only_validation",
         "extension_api_allow_unsafe_unavailable_usages",
+        "fbios_link_group:xplat/default/public.react_native.infra",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
+        "talkios_link_group:xplat/default/public.react_native.infra",
     ],
     plugins =
         react_module_plugin_providers(
@@ -878,8 +877,8 @@ rn_apple_library(
     labels = [
         "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
         "disable_plugins_only_validation",
+        "fbios_link_group:xplat/default/public.react_native.infra",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     plugins =
         react_module_plugin_providers(
@@ -937,8 +936,9 @@ rn_apple_library(
         "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
         "disable_plugins_only_validation",
         "extension_api_allow_unsafe_unavailable_usages",
+        "fbios_link_group:xplat/default/public.react_native.infra",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
+        "talkios_link_group:xplat/default/public.react_native.infra",
     ],
     plugins =
         react_module_plugin_providers(
@@ -985,8 +985,9 @@ rn_apple_library(
         "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
         "disable_plugins_only_validation",
         "extension_api_allow_unsafe_unavailable_usages",
+        "fbios_link_group:xplat/default/public.react_native.infra",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
+        "talkios_link_group:xplat/default/public.react_native.infra",
     ],
     plugins =
         react_module_plugin_providers(
@@ -1037,8 +1038,9 @@ rn_apple_library(
         "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
         "disable_plugins_only_validation",
         "extension_api_allow_unsafe_unavailable_usages",
+        "fbios_link_group:xplat/default/public.react_native.infra",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
+        "talkios_link_group:xplat/default/public.react_native.infra",
     ],
     plugins =
         react_module_plugin_providers(
@@ -1118,8 +1120,9 @@ rn_apple_library(
         "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
         "disable_plugins_only_validation",
         "extension_api_allow_unsafe_unavailable_usages",
+        "fbios_link_group:xplat/default/public.react_native.infra",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
+        "talkios_link_group:xplat/default/public.react_native.infra",
     ],
     plugins =
         react_module_plugin_providers(
@@ -1253,7 +1256,6 @@ rn_xplat_cxx_library2(
     labels = [
         "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
     visibility = ["PUBLIC"],
@@ -1285,8 +1287,8 @@ rn_apple_library(
     labels = [
         "depslint_never_remove",
         "disable_plugins_only_validation",
+        "fbios_link_group:xplat/default/public.react_native.infra",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     plugins = react_module_plugin_providers(
         name = "Vibration",
@@ -1327,7 +1329,6 @@ rn_xplat_cxx_library2(
     labels = [
         "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
     visibility = ["PUBLIC"],
@@ -1360,7 +1361,6 @@ rn_xplat_cxx_library2(
     labels = [
         "depslint_never_remove",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
     visibility = ["PUBLIC"],
@@ -1395,7 +1395,6 @@ rn_xplat_cxx_library2(
     labels = [
         "depslint_never_remove",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
     visibility = ["PUBLIC"],
@@ -1431,7 +1430,6 @@ rn_xplat_cxx_library2(
     labels = [
         "depslint_never_remove",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     preprocessor_flags = get_objc_arc_preprocessor_flags() + get_preprocessor_flags_for_build_mode(),
     visibility = ["PUBLIC"],
@@ -1453,10 +1451,34 @@ rn_xplat_cxx_library2(
     },
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     visibility = [
         "//fbobjc/Libraries/FBReactKit:RCTMapView",
         "//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",
+    ],
+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 255539250f8b..6b190ae10648 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,320 @@
 # Changelog
 
+## v0.70.3
+
+### Fixed
+
+- Stop styles from being reset when detaching Animated.Values in old renderer ([2f58e52006](https://github.com/facebook/react-native/commit/2f58e520061a31ab90f7bbeef59e2bf723605106) by [@javache](https://github.com/javache))
+- Revert "Fix TextInput dropping text when used as uncontrolled component with `defaultValue`" to fix TextInputs not being settable to undefined programmatically ([e2645a5](https://github.com/facebook/react-native/commit/e2645a59f6211116d2069967443502910c167d6f)) by Garrett Forbes Monroe
+
+#### Android specific
+
+- Use NMake generator for Hermes build on Windows ([9d08d55bbe](https://github.com/facebook/react-native/commit/9d08d55bbef4e79a8843deef90bef828f7b9a6ef) by [@mganandraj](https://github.com/mganandraj))
+- Fixing failure building RN codegen CLI on Windows ([85c0c0f21f](https://github.com/facebook/react-native/commit/85c0c0f21fdb52543e603687a3c42dc40dff572b) by [@mganandraj](https://github.com/mganandraj))
+
+#### iOS specific
+
+- Add xcode 14 workaround (turn off signing resource bundles) for `React-Core` ([967de03f30](https://github.com/facebook/react-native/commit/967de03f304404ac8817936da37ca39514a09e33) by [@kelset](https://github.com/kelset))
+
+## v0.70.2
+
+### Added
+
+#### iOS specific
+
+- Add support for "Prefer Cross-Fade Transitions" into AccessibilityInfo ([be7c50fefd](https://github.com/facebook/react-native/commit/be7c50fefd7f13201fb538ded93d91b374341173) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
+### Changed
+
+- Bump CLI to 9.1.3 and Metro to 0.72.3 ([f164556037](https://github.com/facebook/react-native/commit/f1645560376b734a87f0eba1fef69f6cba312cc1) by [@kelset](https://github.com/kelset))
+
+### Fixed
+
+- Inform ScrollView of Keyboard Events Before Mount ([26d148029c](https://github.com/facebook/react-native/commit/26d148029c7fde117f33b0d6c8b34286c45a0ef2) by [@NickGerleman](https://github.com/NickGerleman))
+
+#### Android specific
+
+- Fix port as -1 if dev server without specifying port on Android ([3d7e1380b4](https://github.com/facebook/react-native/commit/3d7e1380b4e609f5340ee80c19d566b17e620427) by [@Kudo](https://github.com/Kudo))
+
+## v0.70.1
+
+### Added
+
+- Add more debugging settings for *HermesExecutorFactory* ([32d12e89f8](https://github.com/facebook/react-native/commit/32d12e89f864a106433c8e54c10691d7876333ee) by [@Kudo](https://github.com/Kudo))
+- Support TypeScript array types for turbo module (component only) ([33d1291e1a](https://github.com/facebook/react-native/commit/33d1291e1a96497a4f994e9d622248a745ee1ea6) by [@ZihanChen-MSFT](https://github.com/ZihanChen-MSFT))
+
+### Changed
+
+- Accept TypeScript type `T | null | undefined` as a maybe type of T in turbo module. ([9ecd203eec](https://github.com/facebook/react-native/commit/9ecd203eec97e7d21d10311d950c9f8f30c7a4b1) by [@ZihanChen-MSFT](https://github.com/ZihanChen-MSFT))
+- Bump react-native-gradle-plugin to 0.70.3 ([e33633644c](https://github.com/facebook/react-native/commit/e33633644c70ea39af6e450fcf31d9458051fd5f) by [@dmytrorykun](https://github.com/dmytrorykun))
+- Bump react-native-codegen to 0.70.5 ([6a8c38eef2](https://github.com/facebook/react-native/commit/6a8c38eef272e79e52a35941afa9c3fe9e8fc191) by [@dmytrorykun](https://github.com/dmytrorykun))
+- Hermes version bump for 0.70.1 ([5132211228](https://github.com/facebook/react-native/commit/5132211228a5b9e36d58c1f7e2c99ccaabe1ba3d) by [@dmytrorykun](https://github.com/dmytrorykun))
+
+### Fixed
+
+- Fix hermes profiler ([81564c1a3d](https://github.com/facebook/react-native/commit/81564c1a3dae4222858de2a9a34089097f665e82) by [@janicduplessis](https://github.com/janicduplessis))
+
+#### Android specific
+
+- Support PlatformColor in borderColor ([2d5db284b0](https://github.com/facebook/react-native/commit/2d5db284b061aec33af671b25065632e20217f62) by [@danilobuerger](https://github.com/danilobuerger))
+- Avoid crash in ForwardingCookieHandler if webview is disabled ([5451cd48bd](https://github.com/facebook/react-native/commit/5451cd48bd0166ba70d516e3a11c6786bc22171a) by [@Pajn](https://github.com/Pajn))
+- Correctly resolve classes with FindClass(..) ([361b310bcc](https://github.com/facebook/react-native/commit/361b310bcc8dddbff42cf63495649291c894d661) by [@evancharlton](https://github.com/evancharlton))
+
+#### iOS specific
+
+- Fix KeyboardAvoidingView height when "Prefer Cross-Fade Transitions" is enabled ([4b9382c250](https://github.com/facebook/react-native/commit/4b9382c250261aab89b271618f8b68083ba01785) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- Fix React module build error with swift integration on new architecture mode ([3afef3c167](https://github.com/facebook/react-native/commit/3afef3c16702cefa5115b059a08741fba255b2db) by [@Kudo](https://github.com/Kudo))
+- Fix ios pod install error ([0cae4959b7](https://github.com/facebook/react-native/commit/0cae4959b750ea051dcd04e4c9374e02b1de6e7a) by [@Romick2005](https://github.com/Romick2005))
+
+## 0.70.0
+
+### Breaking
+
+- Remove jest/preprocessor from the react-native package ([0301cb285b](https://github.com/facebook/react-native/commit/0301cb285b2e85b48a397fe58d565196654d9754) by [@motiz88](https://github.com/motiz88))
+- Remove nonstandard Promise.prototype.done ([018d5cf985](https://github.com/facebook/react-native/commit/018d5cf985497273dd700b56168cf1cf64f498d5) by [@motiz88](https://github.com/motiz88))
+
+### Added
+
+- Support TypeScript array types for turbo module (module only) ([f0c4c291e1](https://github.com/facebook/react-native/commit/f0c4c291e12a8e76f91d3841d65291f0f1f16714) by [@ZihanChen-MSFT](https://github.com/ZihanChen-MSFT))
+- Added files for `avn`, `nodenv`, and other managers that set the node.js version in reactive native project including testing ([933fbb1b2b](https://github.com/facebook/react-native/commit/933fbb1b2b4d2b7c802bf1f2be4c47e5b442a850) by [@ramonmedel](https://github.com/ramonmedel))
+- Support BigInt in Hermes ([11bae63bb1](https://github.com/facebook/react-native/commit/11bae63bb1f833802ec6ce01342ebdd1d61e9252) by [@jpporto](https://github.com/jpporto))
+- The old Hermes instrumented stats migrated to the new one ([c37f719567](https://github.com/facebook/react-native/commit/c37f7195675df67d23c3c008ec5ab5fd7b8d0394) by [@jpporto](https://github.com/jpporto))
+- Modified **getDefaultJSExecutorFactory** method ([87cfd386cb](https://github.com/facebook/react-native/commit/87cfd386cb2e02bfa440c94706d9d0274f83070c) by [@KunalFarmah98](https://github.com/KunalFarmah98))
+- `EventEmitter#emit` now freezes the set of listeners before iterating over them, meaning listeners that are added or removed will not affect that iteration. ([e5c5dcd9e2](https://github.com/facebook/react-native/commit/e5c5dcd9e26e9443f59864d9763b049e0bda98e7) by [@yungsters](https://github.com/yungsters))
+- Added File and Blob globals to eslint community config ([d881c87231](https://github.com/facebook/react-native/commit/d881c872314e55e17b198a41c86528d79092d222) by [@shamilovtim](https://github.com/shamilovtim))
+- C++ TurboModule methods can now use mixed types ([3c569f546c](https://github.com/facebook/react-native/commit/3c569f546ca78b23fbcb9773a1273dd9710f8c60) by [@appden](https://github.com/appden))
+- Add useNativeDriver as a param for setValue for Animated ([73191edb72](https://github.com/facebook/react-native/commit/73191edb7255b1ba5e9a0955a25c14250186a676) by [@genkikondo](https://github.com/genkikondo))
+- Add `Animated.Numeric` Flow type ([9eb7629ac6](https://github.com/facebook/react-native/commit/9eb7629ac66abc23b91b81d420891d68bbd4f578) by [@motiz88](https://github.com/motiz88))
+- Add LTI annotations to function params ([c940eb0c49](https://github.com/facebook/react-native/commit/c940eb0c49518b82a3999dcac3027aa70018c763), [e7a4dbcefc](https://github.com/facebook/react-native/commit/e7a4dbcefc9e393c41f4a796d522211bc1e60b6f), [d96744e277](https://github.com/facebook/react-native/commit/d96744e27711c4fa4dfad1b5a796283a232e60af) by [@pieterv](https://github.com/pieterv))
+
+#### Android specific
+
+- Accessibility announcement for list and grid in FlatList ([2d5882132f](https://github.com/facebook/react-native/commit/2d5882132fb2c533fe9bbba83576b8fac4aca727), [105a2397b6](https://github.com/facebook/react-native/commit/105a2397b6b187a9669ba1c028508a7bb9664009) by [@fabriziobertoglio1987](https://github.com/fabriziobertoglio1987))
+- Add READ_VOICEMAIL and WRITE_VOICEMAIL permissions to PermisionsAndroid library. ([8a2be3e143](https://github.com/facebook/react-native/commit/8a2be3e1438dd145ccb5374d6ef60811047d23aa) by [@zolbooo](https://github.com/zolbooo))
+- Add POST_NOTIFICATIONS, NEARBY_WIFI_DEVICES permission ([0a854c7c8b](https://github.com/facebook/react-native/commit/0a854c7c8b7ffc382c43fa460651a4b4de34c3c7) by [@vincent-paing](https://github.com/vincent-paing))
+- Extend the React Native Gradle plugin to accept a config from package.json ([5f3c5aa529](https://github.com/facebook/react-native/commit/5f3c5aa529ed75414eb339c3d8fd2c9628534621) by [@cortinico](https://github.com/cortinico))
+- Ability to pass a Typeface object to ReactFontManager in addition to a font resource ID ([e2dd2e2a6e](https://github.com/facebook/react-native/commit/e2dd2e2a6ed17b366a3e2ec0942ea1d82a404c5d) by [@thurn](https://github.com/thurn))
+- Option to enable lazyViewManager support with `ViewManagerOnDemandReactPackage` ([d4b59cd9d0](https://github.com/facebook/react-native/commit/d4b59cd9d02a8c4eda3ac4bf89cfe8161847adf0) by [@javache](https://github.com/javache))
+- Support for dataUri in form data ([c663c0ec9d](https://github.com/facebook/react-native/commit/c663c0ec9deee7281f819f222bb29ad79e99f3b8) by [@hetanthakkar1](https://github.com/hetanthakkar1))
+- Add android-only prop documentation at the TextInput js level. ([f2e23215ca](https://github.com/facebook/react-native/commit/f2e23215ca14c3c630aa931cdd114187589ac0fb))
+- Update template to gitignore `android/app/.cxx` ([542d43df9d](https://github.com/facebook/react-native/commit/542d43df9d84a88f742c273391f2596546b4c804) by [@leotm](https://github.com/leotm))
+
+#### iOS specific
+
+- Add Mac Catalyst compatibility (can be enabled in Podfile) ([2fb6a3393d](https://github.com/facebook/react-native/commit/2fb6a3393d545a93518d1b2906bd9453458660a0) by [@Arkkeeper](https://github.com/Arkkeeper))
+- Enabled Hermes Intl ([3fa3aeba93](https://github.com/facebook/react-native/commit/3fa3aeba93f226b97e324f3643b98382947e5985) by [@neildhar](https://github.com/neildhar))
+- HTTP Response headers added to the error object passed to JS code. ([9eb2826f9b](https://github.com/facebook/react-native/commit/9eb2826f9beac5b7476f33e68803ca5a024867db))
+- Add userInterfaceStyle to Alert to override user interface style for iOS 13+ ([47bd78f64f](https://github.com/facebook/react-native/commit/47bd78f64f334b770edc7fabd4b9cceb07a7a503) by [@luoxuhai](https://github.com/luoxuhai))
+- Add function to cleanup codegen folders ([71692889b0](https://github.com/facebook/react-native/commit/71692889b0d89b033c07ef87ee3dbf6d62d79235) by [@cipolleschi](https://github.com/cipolleschi))
+- Cocoapods function to add the `CLANG_CXX_LANGUAGE_STANDARD` to all the targets if needed ([ca8174e15f](https://github.com/facebook/react-native/commit/ca8174e15f77cbeecb7ff7a5a583abb668817777) by [@f-meloni](https://github.com/f-meloni))
+- Support codegen from a single folder ([05aaba9514](https://github.com/facebook/react-native/commit/05aaba95145df0b7f541e391a9f64ba3402cac35) by [@cipolleschi](https://github.com/cipolleschi))
+- Run script phases tests in CI ([c171a6e157](https://github.com/facebook/react-native/commit/c171a6e1572f64b2ab9b26d431c07581d4ae832b) by [@cipolleschi](https://github.com/cipolleschi))
+
+### Changed
+
+- Bump React Native Codegen to 0.70.0 ([a22ceecc84](https://github.com/facebook/react-native/commit/a22ceecc849fc62c926643f4d121cf1e4575c693) by [@dmytrorykun](https://github.com/dmytrorykun), [2a274c1a08](https://github.com/facebook/react-native/commit/2a274c1a082c3291d2df1a4b960bf654e217a4dd) by [@cortinico](https://github.com/cortinico), [ce4246a05c](https://github.com/facebook/react-native/commit/ce4246a05c96cd6fe805499960b105267ac044bb) by [@dmytrorykun](https://github.com/dmytrorykun))
+- Upgrade RN CLI to v9.0.0, Metro to 0.72.1 ([0c2fe96998](https://github.com/facebook/react-native/commit/0c2fe969984fff0676f99fe034b3e49d38ed7db6) by [@thymikee](https://github.com/thymikee), [7e580b97bf](https://github.com/facebook/react-native/commit/7e580b97bf63436978d053926e04adeb9ae6f75f) by [@kelset](https://github.com/kelset), [c504d038c4](https://github.com/facebook/react-native/commit/c504d038c470f7a13fb345f57261172c7c85248c) by [@thymikee](https://github.com/thymikee), [f1d624823f](https://github.com/facebook/react-native/commit/f1d624823fe23eb3d30de00cf78beb71dc1b8413) by [@kelset](https://github.com/kelset), [2b49ac6f8b](https://github.com/facebook/react-native/commit/2b49ac6f8b04953be4cd5bf0b1325986b117763c) by [@thymikee](https://github.com/thymikee))
+- Doc: fix minimum iOS version in requirements section ([ec3c8f4380](https://github.com/facebook/react-native/commit/ec3c8f43800a027a0a717367360421089e7293fd) by [@Simon-TechForm](https://github.com/Simon-TechForm))
+- Remove "Early" in Js error reporting pipeline ([0646551d76](https://github.com/facebook/react-native/commit/0646551d7690cd54847eb468f8e43d71ebebdda9) by [@sshic](https://github.com/sshic))
+- Update @react-native/eslint-plugin-specs to 0.70.0 ([d07fae9b23](https://github.com/facebook/react-native/commit/d07fae9b23c258a60045b666167efd5259b962ce), [afd76f69c7](https://github.com/facebook/react-native/commit/afd76f69c7d2408654ba67ac2ed4d612abfbe0ce) by [@dmytrorykun](https://github.com/dmytrorykun), [ea8d8e2f49](https://github.com/facebook/react-native/commit/ea8d8e2f49ea3ce15faeab500b661a1cacacf8a8) by [@cortinico](https://github.com/cortinico))
+- Do not depend on hermes-engine NPM package anymore ([78cd689f9a](https://github.com/facebook/react-native/commit/78cd689f9a634b152ea09ed6cb4fa858ee26e653) by [@cortinico](https://github.com/cortinico))
+- Add ability to pass `ItemSeparatorComponent` as React Element ([5854b11bf9](https://github.com/facebook/react-native/commit/5854b11bf9d42bab9dbe62b9152a3d3a94e42c13) by [@retyui](https://github.com/retyui))
+- Hermes version bump. ([0b4b7774e2](https://github.com/facebook/react-native/commit/0b4b7774e2d71259962ed36b7acb5c3989c3be9c) by [@dmytrorykun](https://github.com/dmytrorykun), [8c682ddd59](https://github.com/facebook/react-native/commit/8c682ddd599b75a547975104cb6f90eec8753daf) by [@dmytrorykun](https://github.com/dmytrorykun), [eb6767813a](https://github.com/facebook/react-native/commit/eb6767813a0efe04a9e79955b8f6ee909a4a76bf) by [@cortinico](https://github.com/cortinico))
+- Codemod `{...null}` to `{}` in xplat/js ([f392ba6725](https://github.com/facebook/react-native/commit/f392ba67254e95126974fafabf3e4ef0300e24e8) by [@gkz](https://github.com/gkz))
+- Fix TextInput dropping text when used as uncontrolled component with `defaultValue` ([51f49ca998](https://github.com/facebook/react-native/commit/51f49ca9982f24de08f5a5654a5210e547bb5b86))
+- Suppress errors ahead of launch ([67e12a19cb](https://github.com/facebook/react-native/commit/67e12a19cb236fbe0809fbbc9e516b37a5848a6a) by [@gkz](https://github.com/gkz))
+- Suppress missing 'this' annotations ([6c563a507f](https://github.com/facebook/react-native/commit/6c563a507fd8c41e04a1e62e2ba87993c6eb1e2f) by [@pieterv](https://github.com/pieterv))
+- Suppress missing annotations ([66c6a75650](https://github.com/facebook/react-native/commit/66c6a75650f91d61e7e87a8e661d87101e26cf9c) by [@pieterv](https://github.com/pieterv))
+- Use RuntimeConfig instead of VM Experiment Flag to set up the micro task queue. ([753038cf34](https://github.com/facebook/react-native/commit/753038cf345a45d95ab9b9343447f524e1b36840) by [@fbmal7](https://github.com/fbmal7))
+- Update direct Metro dependencies to 0.72.0 ([05dcebc211](https://github.com/facebook/react-native/commit/05dcebc21175a78c6533a8856aed644c45276169) by [@kelset](https://github.com/kelset), [64788cc9fe](https://github.com/facebook/react-native/commit/64788cc9fe42fbedc3e3b1c9c516a079cfa71cd1) by [@huntie](https://github.com/huntie), [bdeb4e0655](https://github.com/facebook/react-native/commit/bdeb4e065532dfb1bb4c9c1e87e8a869a737e48a) by [@jacdebug](https://github.com/jacdebug), [894f652639](https://github.com/facebook/react-native/commit/894f6526399098d825ef32c02eb201cd8ba41873) by [@robhogan](https://github.com/robhogan), [08ebc1cfd8](https://github.com/facebook/react-native/commit/08ebc1cfd88a629389c43abf23b40a2bdf1b1579) by [@arushikesarwani94](https://github.com/arushikesarwani94))
+- ECOSYSTEM.md: update Partner entries ([5471afeebf](https://github.com/facebook/react-native/commit/5471afeebf59853ce31df1ade6a4591414b6aa2f) by [@Simek](https://github.com/Simek))
+- Move ScrollView's contentOffset to common props ([7c581f3d30](https://github.com/facebook/react-native/commit/7c581f3d3007954413d68daf2e868ce93e120615) by [@genkikondo](https://github.com/genkikondo))
+- Upgrade react-native-gradle-plugin to 0.70.2 ([1518f838b7](https://github.com/facebook/react-native/commit/1518f838b70951882f7b414c90407d3eb584cab4), [2176173dcc](https://github.com/facebook/react-native/commit/2176173dcc029ab21bfcdfe5c9e150581db47409) by [@dmytrorykun](https://github.com/dmytrorykun))
+- Update a few metro deps as follow up from the commit from main ([7c7ba1babd](https://github.com/facebook/react-native/commit/7c7ba1babd41b6b60f0dc9f48c34d00235d2fef5) by [@kelset](https://github.com/kelset))
+
+#### Android specific
+
+- Bump Android Gradle Plugin to 7.2.1 ([53c8fc9488](https://github.com/facebook/react-native/commit/53c8fc94882893dd8c337fd29543ae11fd467267) by [@leotm](https://github.com/leotm), [c274456e5b](https://github.com/facebook/react-native/commit/c274456e5b635825560852baa5787e96640800d8) by [@dulmandakh](https://github.com/dulmandakh))
+- Rename NativeModuleCallExceptionHandler to JSExceptionHandler for broader usage ([b6f7689d70](https://github.com/facebook/react-native/commit/b6f7689d701d0409c23ab364356aeb95710c20fa) by [@sshic](https://github.com/sshic))
+- Simplify the Android.mk file in the App Template ([7fb0bb40d2](https://github.com/facebook/react-native/commit/7fb0bb40d2206c734a1feb6b555c22d6d5f2436e) by [@cortinico](https://github.com/cortinico))
+- Make Hermes the default engine on Android ([a7db8df207](https://github.com/facebook/react-native/commit/a7db8df2076f68ae9451ce1c77d7eb09d8cfeb14) by [@cortinico](https://github.com/cortinico))
+- Revamp touch event dispatching methods ([089ff4555a](https://github.com/facebook/react-native/commit/089ff4555af27eec4561b1627298702b4ecee482) by [@sshic](https://github.com/sshic))
+- Demonstrating Dark Mode correctly in the `StatusBar` for the starter template App. ([763dc52387](https://github.com/facebook/react-native/commit/763dc5238721a21847b6d6670b5fa268e3bf2ed4) by [@mrbrentkelly](https://github.com/mrbrentkelly))
+- Bump Gradle to 7.5.0 ([5c8186623a](https://github.com/facebook/react-native/commit/5c8186623ae15388949cfc4143edae86863a447b) by [@leotm](https://github.com/leotm), [99e7373dd2](https://github.com/facebook/react-native/commit/99e7373dd2f20184153377109e0e8e48b5bf46f7) by [@dulmandakh](https://github.com/dulmandakh))
+- Generalized the return type of ViewManagerOnDemandReactPackage.getViewManagerNames ([51e029ec3c](https://github.com/facebook/react-native/commit/51e029ec3ce42ae8df3d367d8f553ec2148eeafc) by [@javache](https://github.com/javache))
+- Don't assert on current activity when call startActivityForResult ([bf6884dc90](https://github.com/facebook/react-native/commit/bf6884dc903154ae32daa50ce7983a9f014be781) by [@sshic](https://github.com/sshic))
+- Adapt template to new architecture autolinking on Android ([9ad7cbc3eb](https://github.com/facebook/react-native/commit/9ad7cbc3eb365190e0bfe290e1025553a807b298) by [@thymikee](https://github.com/thymikee))
+- Replaced reactnativeutilsjni with reactnativejni in the build process to reduce size ([54a4fcbfdc](https://github.com/facebook/react-native/commit/54a4fcbfdcc8111b3010b2c31ed3c1d48632ce4c) by [@SparshaSaha](https://github.com/SparshaSaha))
+- Bump Soloader to 0.10.4 ([b9adf2db20](https://github.com/facebook/react-native/commit/b9adf2db20bf9e1436fa58182d886fd9461df9af) by [@mikehardy](https://github.com/mikehardy))
+- Update the new app template to use CMake instead of Android.mk ([dfd7f70eff](https://github.com/facebook/react-native/commit/dfd7f70effeacfeb06d9c2d4762a279a079ee004) by [@cortinico](https://github.com/cortinico))
+- Refactored usage of kotlin plugin ([be35c6dafb](https://github.com/facebook/react-native/commit/be35c6dafbdb46d2ec165460d4bb12f34de6e878) by [@hurali97](https://github.com/hurali97))
+- Bump Gradle to 7.5.1 ([7a911e0730](https://github.com/facebook/react-native/commit/7a911e073094b533cb5a7ce76932c02f83f4fe5d) by [@AlexanderEggers](https://github.com/AlexanderEggers))
+- Fix error of release builds with Hermes enabled for Windows users ([7fcdb9d9d8](https://github.com/facebook/react-native/commit/7fcdb9d9d8f964d24a5ec3d423c67f49b7650ed8) by [@JoseLion](https://github.com/JoseLion))
+
+#### iOS specific
+
+- Move and test Hermes setup from react_native_pods script into a dedicated file ([468b86bd37](https://github.com/facebook/react-native/commit/468b86bd3710b1d43a492c94fb314cc472f03b86) by [@cipolleschi](https://github.com/cipolleschi))
+- Use the correct operator to decide whether Hermes is enabled or not. ([61488449b9](https://github.com/facebook/react-native/commit/61488449b996da5881e4711e0813e9c90b6e57a1) by [@cipolleschi](https://github.com/cipolleschi))
+- Hermes is now the default engine on iOS. This setting is controlled via `flags[:hermes_enabled]` in the Podfile. ([1115bc77db](https://github.com/facebook/react-native/commit/1115bc77db1090042effc021837f70b28694fa09) by [@hramos](https://github.com/hramos))
+- Move LocalPodspecPatch to dedicated file ([8fe2b591c7](https://github.com/facebook/react-native/commit/8fe2b591c7e073d629e95cd7b67aa1dfa96ece38) by [@cipolleschi](https://github.com/cipolleschi))
+- Move the `modify_flags_for_new_architecture` method to separate ruby file ([71da21243c](https://github.com/facebook/react-native/commit/71da21243c85283445c6cefa64d1ace13823ab69) by [@cipolleschi](https://github.com/cipolleschi))
+- Refactoring part of the react_native_pods.rb script ([4f732ba9ee](https://github.com/facebook/react-native/commit/4f732ba9ee2a1e162729c97d5c12ea771b3a424a), [7a2704455f](https://github.com/facebook/react-native/commit/7a2704455f3edf203d2ecc8135fabf2667f718d8) by [@cipolleschi](https://github.com/cipolleschi))
+- When Hermes is enabled, it will use the same copy of JSI as React Native ([340612a200](https://github.com/facebook/react-native/commit/340612a200505ca829bae1f9bce800d3673dac04) by [@hramos](https://github.com/hramos))
+- Move `use_flipper` logic inside `use_react_native` and simplify the Flipper dependencies logic ([0bd5239553](https://github.com/facebook/react-native/commit/0bd523955385a3b1e622077b7ee4ea0df3c5c158) by [@f-meloni](https://github.com/f-meloni))
+- Export `flipper.rb` script file ([e07a7eb16b](https://github.com/facebook/react-native/commit/e07a7eb16b97e1222e23f935a3d4bb3dac848ef2) by [@cipolleschi](https://github.com/cipolleschi))
+- Use `outputDir` as base directory for the codegen and remove the possibility to customize the intermediate path. The generated code requires specific paths in the `#include` directive. ([e4d0153a67](https://github.com/facebook/react-native/commit/e4d0153a675fbdd8718f433b2e9f8bfdccec4b2f) by [@cipolleschi](https://github.com/cipolleschi))
+- Refactor part of the codegen scripts and add tests. ([0465c3fd10](https://github.com/facebook/react-native/commit/0465c3fd102525b005826f3c68923d7e9851d6b8), [305a054865](https://github.com/facebook/react-native/commit/305a0548652a405d9f638fb2c054781951dfc996) by [@cipolleschi](https://github.com/cipolleschi))
+- CodeGen now supports the `"all"` library type. ([6718500eaa](https://github.com/facebook/react-native/commit/6718500eaaeb92b8a74320dcee961ac96f6f12fa) by [@cipolleschi](https://github.com/cipolleschi))
+- Fix the test_ios_unit test ([fdbe4719e2](https://github.com/facebook/react-native/commit/fdbe4719e2e2b599e86d42c49d42c4da97ef431a) by [@cipolleschi](https://github.com/cipolleschi))
+- Update Podfile to allow `PRODUCTION=1 pod install` ([77752fc403](https://github.com/facebook/react-native/commit/77752fc4037e66d5b0a5851bae79c4d3285ed334) by [@leotm](https://github.com/leotm))
+- Destruct use_reactnative parameters and ad ddocumentation ([79a37e5a88](https://github.com/facebook/react-native/commit/79a37e5a88e179090ade7145a453a46719c87b3f) by [@cipolleschi](https://github.com/cipolleschi))
+- Move codegen in separate files ([7d069b2583](https://github.com/facebook/react-native/commit/7d069b25835ad20654a46ebb1e09631d826598e0) by [@cipolleschi](https://github.com/cipolleschi))
+- Silence warning due to react-native internal details. ([a4599225f5](https://github.com/facebook/react-native/commit/a4599225f5a6a2d6801dd80b7728c1bbe5b2ec3a) by [@cipolleschi](https://github.com/cipolleschi))
+
+### Removed
+
+- Remove previously deprecated Transform style-attribute props ([7cfd77debd](https://github.com/facebook/react-native/commit/7cfd77debd36f867f5ddfdb9cc44fbe6137aaeba) by [@Zachinquarantine](https://github.com/Zachinquarantine))
+- Remove deprecated `isTVOS` constant. ([6075d64acf](https://github.com/facebook/react-native/commit/6075d64acf6f8d74e18ef6568c9438f73fe56d44) by [@Zachinquarantine](https://github.com/Zachinquarantine))
+- The diffs renames the required variable which was causing conflicts in names with Apple core SDK's ([086c13dd5f](https://github.com/facebook/react-native/commit/086c13dd5fba3f77acbc70c9bdedc9299118b526) by [@arinjay](https://github.com/arinjay))
+- Removed `EventEmitter.prototype.removeSubscription` method. ([870755fa7e](https://github.com/facebook/react-native/commit/870755fa7e7011ac46d269d5fb66d2a1d1543442) by [@yungsters](https://github.com/yungsters))
+- Remove deprecated removeListener methods ([2596b2f695](https://github.com/facebook/react-native/commit/2596b2f6954362d2cd34a1be870810ab90cbb916) by [@matinzd](https://github.com/matinzd))
+- Remove APPLETVOS variants from BUCk targets. ([cf2e27c388](https://github.com/facebook/react-native/commit/cf2e27c3888ded6f851ba267597ef13f1d0cfd8c) by [@d16r](https://github.com/d16r))
+
+#### iOS specific
+
+- Remove `emulateUnlessSupported` ([c73e021a4b](https://github.com/facebook/react-native/commit/c73e021a4b11bbae3a7868670d140fe3d5dac6ae) by [@ken0nek](https://github.com/ken0nek))
+- Remove USE_CODEGEN_DISCOVERY flag ([2e720c3610](https://github.com/facebook/react-native/commit/2e720c361001d996ed35d8bfbf4dc67c31fb895d) by [@cipolleschi](https://github.com/cipolleschi))
+
+### Fixed
+
+- Throw JSINativeException from asHostObject ([ef6ab3f5ca](https://github.com/facebook/react-native/commit/ef6ab3f5cad968d7b2c9127d834429b0f4e1b2cf) by [@neildhar](https://github.com/neildhar))
+- Use new Babel parser instead of deprecated one ([97291bfa31](https://github.com/facebook/react-native/commit/97291bfa3157ac171a2754e19a52d006040961fb) by [@Kerumen](https://github.com/Kerumen))
+- Fixed a crash on deserialization of props when using 'px'/'em' units. ([70788313fe](https://github.com/facebook/react-native/commit/70788313fedd40fe2e6d1cf15980ce3cca5adaac) by [@nlutsenko](https://github.com/nlutsenko))
+- Fix nullability lost on readonly types in TurboModule specs ([c006722e6c](https://github.com/facebook/react-native/commit/c006722e6cdbe02711cb50ea7a739e0d4d81c7e7) by [@appden](https://github.com/appden))
+- Make tests pass for windows ([9596bf045d](https://github.com/facebook/react-native/commit/9596bf045d527e27608ac4b7b2990a4e6846fdeb) by [@cipolleschi](https://github.com/cipolleschi))
+- Handle possible null exception on ReactEditText with AppCompat 1.4.0 ([24a1f5c66c](https://github.com/facebook/react-native/commit/24a1f5c66c8633f9b41eef45df3297ffc1d2b606) by [@mikemasam](https://github.com/mikemasam))
+- Fixed the disappearance of items when scrolling after zooming VirtualizedList. ([13a72e0ccc](https://github.com/facebook/react-native/commit/13a72e0ccceb2db6aeacd03b4f429d200392c17b) by [@islandryu](https://github.com/islandryu))
+- Improved Flow type inference in Animated `.interpolate()` ([7b86fa2b79](https://github.com/facebook/react-native/commit/7b86fa2b795647f5c89e04e4c3ee4b83bc27ef77) by [@motiz88](https://github.com/motiz88))
+- Add Jest mock for Vibration module ([79529a1c77](https://github.com/facebook/react-native/commit/79529a1c77e7e1b174fdbe8103a2199c9ac924ff) by [@hduprat](https://github.com/hduprat))
+- Allow ReactInstrumentationTest to use custom JSIModules ([eb2a83b0be](https://github.com/facebook/react-native/commit/eb2a83b0be4658654fc6ca6f4671e45f1898798d) by [@christophpurrer](https://github.com/christophpurrer))
+- Working around Long paths limitation on Windows ([883a93871c](https://github.com/facebook/react-native/commit/883a93871cb1fbca4434600a322f63afbba333da) by [@mganandraj](https://github.com/mganandraj))
+- Fix eslint-plugin-specs prepack npm lifecycle hook now that we use npm 8 ([8441c4a6f7](https://github.com/facebook/react-native/commit/8441c4a6f7bfeda73f89f076fe7d8d1132e4b9be) by [@kelset](https://github.com/kelset))
+- Codegen should ignore `.d.ts` files ([0f0d52067c](https://github.com/facebook/react-native/commit/0f0d52067cb89fdb39a99021f0745282ce087fc2) by [@tido64](https://github.com/tido64))
+- Avoid full copy of large folly::dynamic objects in JSIExecutor#defaultTimeoutInvoker ([521011d4cc](https://github.com/facebook/react-native/commit/521011d4cc713dfce97dc8872fd0f5171e587b5d) by [@christophpurrer](https://github.com/christophpurrer))
+
+#### Android specific
+
+- Fixed HorizontalScrollView API scrollToEnd causing NPE in side-effects. ([e5ba6ab7b4](https://github.com/facebook/react-native/commit/e5ba6ab7b482c380e35765b898e522e9d4e1d3b0) by [@ryancat](https://github.com/ryancat))
+- Fix InputAccessoryView crash on Android ([afa5df1764](https://github.com/facebook/react-native/commit/afa5df1764324f2574d102abeae7199d4b02d183) by [@hduprat](https://github.com/hduprat))
+- Bring back non-rootview touch handling based on reactTag ([8b837268b4](https://github.com/facebook/react-native/commit/8b837268b49fd4e72a05f955c20702c457a68fab) by [@fkgozali](https://github.com/fkgozali))
+- Make Text not focusable by default ([8ced165e53](https://github.com/facebook/react-native/commit/8ced165e53135d9d33cfdc55a9d4660f8eb5b3c5) by [@kacieb](https://github.com/kacieb))
+- Revert [PR 33924](https://github.com/facebook/react-native/pull/33924) because of issues with TextInputs with numeric keyboard types not respecting the secureTextEntry prop ([edb27e3aa1](https://github.com/facebook/react-native/commit/edb27e3aa1210ef33d55c1840065457c31b19cb0) by [@charlesbdudley](https://github.com/charlesbdudley))
+- Fix edge case when we enqueue a pending event to views on stopped surface ([ea7c9f2ad9](https://github.com/facebook/react-native/commit/ea7c9f2ad9a78b16234306932edc1d78b783ac27) by [@ryancat](https://github.com/ryancat))
+- Fix a bug where the keyboard, once set as email, won't change back to default. ([ec307e0167](https://github.com/facebook/react-native/commit/ec307e0167deca7f17640cd3c5a60f6be5f47b62) by [@larkox](https://github.com/larkox))
+- NPE in `ReactEditText.setInputType` when React Native is used with some versions of a AppCompat 1.4.x. (and possibly others) ([92ebb298e2](https://github.com/facebook/react-native/commit/92ebb298e2e5ad640754e09ce3a37d3de1d28f58))
+- Fix NPE on `ReactEditText` due to null mFabricViewStateManager ([ba6bf5a3ce](https://github.com/facebook/react-native/commit/ba6bf5a3ce7039a7e407a6632ee41aa3d504f833) by [@cortinico](https://github.com/cortinico))
+- Scroll views would still receive scroll events when nested in a view with `pointer-events: "none"` ([fced96bf52](https://github.com/facebook/react-native/commit/fced96bf5202e8b89b804ccc1004abacc9f91660) by [@javache](https://github.com/javache))
+- Fixed an edge case that event dispatching is failed after pre-allocation of a view and before the view is mounted. ([a093fe5f2f](https://github.com/facebook/react-native/commit/a093fe5f2fae4e9996b0cbffdfccdce8e58e8cf1) by [@ryancat](https://github.com/ryancat))
+- Avoid crash by handling missing views in dispatchViewManagerCommand ([ee1a191cb1](https://github.com/facebook/react-native/commit/ee1a191cb1c10085722d57fc276734f83e86a4f3) by [@hsource](https://github.com/hsource))
+- Pass react build dir to cmake ([6ab7a99518](https://github.com/facebook/react-native/commit/6ab7a99518f8ba0d53e62e35d230ebec78e50217) by [@janicduplessis](https://github.com/janicduplessis))
+- Fix missing space in ReactPropertyException message ([24560b6718](https://github.com/facebook/react-native/commit/24560b67184da00e05491af38289865c4b934ee8) by [@markv](https://github.com/markv))
+- Fix import path breakage ([2e1e62f2bf](https://github.com/facebook/react-native/commit/2e1e62f2bf043ea0bf9926e1f5786ca54a22005e) by [@aniketmathur](https://github.com/aniketmathur))
+- When `onEndReachedThreshold` is set to 0 `onEndReached` function on `VirtualizedList` properly fires once the user scrolls to the bottom of the list. ([b869680c11](https://github.com/facebook/react-native/commit/b869680c1196a6549154a4b9cb7ffa10eab1989c))
+- Fix rendering of transparent borders in RN Android ([a9659ce86d](https://github.com/facebook/react-native/commit/a9659ce86d94dd34768b067763740a5c41917e42) by [@mdvacca](https://github.com/mdvacca))
+- Exception with `Cannot load WebView` message will initialising WebView (along with existing checks) ([9e0d8696cc](https://github.com/facebook/react-native/commit/9e0d8696cc68436a0d309cafde252c55fc337be4) by [@rachitmishra](https://github.com/rachitmishra))
+- Fix accessibilityState overwriting view's disabled state on Android ([f35d18caa3](https://github.com/facebook/react-native/commit/f35d18caa302351319840ec85337182f4f148e5e) by [@okwasniewski](https://github.com/okwasniewski))
+- Make sure *.ts files are considered for task avoidance in the Gradle Plugin ([1a9fb6cb68](https://github.com/facebook/react-native/commit/1a9fb6cb682aa5ff83462e1e2869eb99f3b873fd) by [@cortinico](https://github.com/cortinico))
+- Fix missing import on New Architecture build script in template ([a22f30d2ce](https://github.com/facebook/react-native/commit/a22f30d2ce866cb1488b26bb18eee0620a0ac259) by [@cortinico](https://github.com/cortinico))
+
+#### iOS specific
+
+- Use `NODE_BINARY` from `.xcode.env` when running packager from Xcode ([ff785dbcf5](https://github.com/facebook/react-native/commit/ff785dbcf5c464a4d850fa738e977702efd8abd3) by [@elsurudo](https://github.com/elsurudo))
+- Bug with error message formatting when bundle is missing ([f501979f3d](https://github.com/facebook/react-native/commit/f501979f3d1e5c053eed16967a3d3385eab8e15f) by [@BenLorantfy](https://github.com/BenLorantfy))
+- Fix the race condition when calling readAsDataURL after new Blob(blobs) ([bd12e41188](https://github.com/facebook/react-native/commit/bd12e41188c8d85c0acbd713f10f0bd34ea0edca) by [@wood1986](https://github.com/wood1986))
+- Fix the way the orientation events are published, to avoid false publish on orientation change when app changes state to inactive ([7d42106d4c](https://github.com/facebook/react-native/commit/7d42106d4ce20c644bda4d928fb0abc163580cee) by [@lbaldy](https://github.com/lbaldy))
+- Fix sed error when installing `glog` ([4a7e4b9ca6](https://github.com/facebook/react-native/commit/4a7e4b9ca6ef4fb52611b6c3cb788f624d1f81a4) by [@alphashuro](https://github.com/alphashuro))
+- Don't validate ENTRY_FILE in react-native-xcode.sh ([780fe80fca](https://github.com/facebook/react-native/commit/780fe80fcaf213d84d9d087132af933bd02d1349) by [@janicduplessis](https://github.com/janicduplessis))
+- `_scrollViewComponentView` is set to `RCTPullToRefreshViewComponentView's` superview ([4e4b9e2111](https://github.com/facebook/react-native/commit/4e4b9e2111faaf5652ae1f5b885730b378f3de98) by [@dmytrorykun](https://github.com/dmytrorykun))
+- Use `GCC_PREPROCESSOR_DEFINITIONS` to set `FB_SONARKIT_ENABLED` ([77e6bff629](https://github.com/facebook/react-native/commit/77e6bff629312f20cdacb1e798cd2464ac50db9e) by [@janicduplessis](https://github.com/janicduplessis))
+- Fix Hermes not being properly downloaded during pod install ([d5e0659fcc](https://github.com/facebook/react-native/commit/d5e0659fccf2767beb7aae55461e9690ba335c81) by [@cortinico](https://github.com/cortinico))
+- Typo in the documation for the `automaticallyAdjustKeyboardInsets` prop ([927b43d47c](https://github.com/facebook/react-native/commit/927b43d47c2cd42538265cb06154b12cb0be6816) by [@jeremybarbet](https://github.com/jeremybarbet))
+- Deprecate iOS/tvOS SDK 11.0 support now that 12.4+ is required ([f56d701e56](https://github.com/facebook/react-native/commit/f56d701e567af0c252a2e297bf81cd4add59378a) by [@leotm](https://github.com/leotm))
+- Fix blank spaces that don't recover as you scroll when in an RTL locale and e.nativeEvent.zoomScale is -1. ([bc7b5c3011](https://github.com/facebook/react-native/commit/bc7b5c3011460935614a47a03cd077cd1059de72), [2f491bfa9f](https://github.com/facebook/react-native/commit/2f491bfa9f86c3db2e459e331f39bc3cf12e7239))
+- Fixed paddingTop not being applied when using padding and paddingVertical in multiline textinput ([2fb107c9a6](https://github.com/facebook/react-native/commit/2fb107c9a63aacd2c880ad6abedaad67ffb6022b) by [@hetanthakkar1](https://github.com/hetanthakkar1))
+- Fixed the ability to pass the port to use for Metro when running `react-native run-ios --port <port>`. ([7dc0b5153e](https://github.com/facebook/react-native/commit/7dc0b5153e4eb91c333238a58fe8c75a47cb5f81) by [@lindboe](https://github.com/lindboe))
+- Fix missing imports ([c78babac39](https://github.com/facebook/react-native/commit/c78babac39b7c64e03e137d8fddd91e783303426))
+- Fix React-bridging headers import not found ([c4b51e8d76](https://github.com/facebook/react-native/commit/c4b51e8d7679c3c20b843072581acd23a931fc83) by [@Kudo](https://github.com/Kudo))
+- Fix Hermes executor not available when `use_frameworks` is enabled ([88b7b640a7](https://github.com/facebook/react-native/commit/88b7b640a74bafd918b8b1cd5d58e1f5ddfb730a) by [@Kudo](https://github.com/Kudo))
+
+### Security
+
+- Add GitHub token permissions for workflows ([3da3d82320](https://github.com/facebook/react-native/commit/3da3d82320bd035c6bd361a82ea12a70dba4e851) by [@varunsh-coder](https://github.com/varunsh-coder))
+- Bump RCT-Folly to 2021-07-22 ([68f3a42fc7](https://github.com/facebook/react-native/commit/68f3a42fc7380051714253f43b42175de361f8bd) by [@luissantana](https://github.com/luissantana))
+
+## v0.69.6
+
+### Changed
+
+- Bump version of `promise` from 8.0.3 to 8.2.0, enabling `Promise.allSettled` ([951538c080](https://github.com/facebook/react-native/commit/951538c080ef745da304fb308fa91d597e0dd98a) by [@retyui](https://github.com/retyui))
+
+### Fixed
+
+- Fix hermes profiler ([81564c1a3d](https://github.com/facebook/react-native/commit/81564c1a3dae4222858de2a9a34089097f665e82) by [@janicduplessis](https://github.com/janicduplessis))
+
+#### Android specific
+
+- Correctly resolve classes with FindClass(..) ([361b310bcc](https://github.com/facebook/react-native/commit/361b310bcc8dddbff42cf63495649291c894d661) by [@evancharlton](https://github.com/evancharlton))
+
+#### iOS specific
+
+- Fix the way the orientation events are published, to avoid false publish on orientation change when app changes state to inactive ([7d42106d4c](https://github.com/facebook/react-native/commit/7d42106d4ce20c644bda4d928fb0abc163580cee) by [@lbaldy](https://github.com/lbaldy))
+- Fix React module build error with swift integration on new architecture mode ([3afef3c167](https://github.com/facebook/react-native/commit/3afef3c16702cefa5115b059a08741fba255b2db) by [@Kudo](https://github.com/Kudo))
+
+## v0.69.5
+
+### Changed
+
+- Bump react-native-codegen to 0.69.2 ([df3d52bfbf](https://github.com/facebook/react-native/commit/df3d52bfbf4254cd16e1dc0ca0af2743cd7e11c1) by [@dmytrorykun](https://github.com/dmytrorykun))
+
+#### Android specific
+
+- Replaced reactnativeutilsjni with reactnativejni in the build process to reduce size ([54a4fcbfdc](https://github.com/facebook/react-native/commit/54a4fcbfdcc8111b3010b2c31ed3c1d48632ce4c) by [@SparshaSaha](https://github.com/SparshaSaha))
+
+### Fixed
+
+- Codegen should ignore `.d.ts` files ([0f0d52067c](https://github.com/facebook/react-native/commit/0f0d52067cb89fdb39a99021f0745282ce087fc2) by [@tido64](https://github.com/tido64))
+
+## v0.69.4
+
+### Changed
+
+- Upgrade RN CLI to v8.0.4 ([66c68c37ce](https://github.com/facebook/react-native/commit/66c68c37ce94f6c1160e7f260c0d1887539c6605) by [@thymikee](https://github.com/thymikee))
+
+#### Android specific
+
+- Modified **getDefaultJSExecutorFactory** method ([87cfd386cb](https://github.com/facebook/react-native/commit/87cfd386cb2e02bfa440c94706d9d0274f83070c) by [@KunalFarmah98](https://github.com/KunalFarmah98))
+
+## v0.69.3
+
+### Fixed
+
+#### iOS specific
+
+- Fix React-bridging header not found for third party modules ([fa2acc32d1](https://github.com/facebook/react-native/commit/fa2acc32d1490f6e418689dec321f8bd4ef7bb28) by [@Kudo](https://github.com/Kudo))
+
+## v0.69.2
+
+### Changed
+
+- Set react-shallow-renderer v16.15.0 for react v18 compat ([a39a7c453d](https://github.com/facebook/react-native/commit/a39a7c453d87086935ff07d549ba8220cbcf30bd) by [@mikehardy](https://github.com/mikehardy))
+- Upgrade RN CLI to v8.0.3 ([28cbd21d21](https://github.com/facebook/react-native/commit/28cbd21d21f2ffb3f38b2449a4983f013947ce0a) by [@thymikee](https://github.com/thymikee))
+
+#### iOS specific
+
+- Hermes pod: change logic to use the hermes tag to set the pod source correctly ([46a9edc854](https://github.com/facebook/react-native/commit/46a9edc8544ae070149a97ea3d919b88dd6e2942) by [@kelset](https://github.com/kelset))
+- Fix the race condition when calling readAsDataURL after new Blob(blobs) ([bd12e41188](https://github.com/facebook/react-native/commit/bd12e41188c8d85c0acbd713f10f0bd34ea0edca) by [@wood1986](https://github.com/wood1986))
+- Make sure that Flipper pods are not installed when creating a release build ([23accbf58d](https://github.com/facebook/react-native/commit/23accbf58d2fa03ad020e07f00012a32609c7218) by [@cipolleschi](https://github.com/cipolleschi))
+
 ## v0.69.1
 
 ### Changed
@@ -90,6 +405,7 @@
 - Type the argument of Animated.interpolate as read-only ([6584304c10](https://github.com/facebook/react-native/commit/6584304c100ce4d51a5c4d606170a6ad0dc00875) by [@motiz88](https://github.com/motiz88))
 - Update gradle-download-task to 5.0.1 to support concurrent downloads ([a86cae7aac](https://github.com/facebook/react-native/commit/a86cae7aacc9837536e7d679870a57dcd0f45475) by [@michel-kraemer](https://github.com/michel-kraemer))
 - Logging a soft error when ReactRootView has an id other than -1 instead of crashing the app in hybrid apps ([1ca2c24930](https://github.com/facebook/react-native/commit/1ca2c2493027c1b027146cd41e17dd8a4fc33a41) by [@Kunal-Airtel2022](https://github.com/Kunal-Airtel2022))
+- Upgrade to React 18 ([41cbccd98d](https://github.com/facebook/react-native/commit/41cbccd98dd6c98d1f662674164cf455105a1359) by [@rickhanlonii](https://github.com/rickhanlonii))
 
 #### Android specific
 
@@ -229,6 +545,41 @@
 
 - Encode URL params in URLSearchParams.toString() ([1042a8012f](https://github.com/facebook/react-native/commit/1042a8012fb472bd5c882b469fe507dd6279d562) by [@sshic](https://github.com/sshic))
 
+## v0.68.4
+
+### Changed
+
+- Bump version of `promise` from 8.0.3 to 8.2.0, enabling `Promise.allSettled` ([951538c080](https://github.com/facebook/react-native/commit/951538c080ef745da304fb308fa91d597e0dd98a) by [@retyui](https://github.com/retyui))
+- Bump react-native-codegen to 0.0.18 ([40a3ae3613](https://github.com/facebook/react-native/commit/40a3ae3613394fe5f0d728bada538d2d5b78a8a4) by [@dmytrorykun](https://github.com/dmytrorykun))
+
+#### Android specific
+
+- Correctly resolve classes with FindClass(..) ([361b310bcc](https://github.com/facebook/react-native/commit/361b310bcc8dddbff42cf63495649291c894d661) by [@evancharlton](https://github.com/evancharlton))
+
+### Fixed
+
+- Codegen should ignore `.d.ts` files ([0f0d52067c](https://github.com/facebook/react-native/commit/0f0d52067cb89fdb39a99021f0745282ce087fc2) by [@tido64](https://github.com/tido64))
+
+#### iOS specific
+
+- Fix the way the orientation events are published ([7d42106d4c](https://github.com/facebook/react-native/commit/7d42106d4ce20c644bda4d928fb0abc163580cee) by [lbaldy](https://github.com/lbaldy))
+
+## v0.68.3
+
+### Changed
+
+#### Android specific
+
+- Let's not build reactnativeutilsjni shared library ([af9225ec5f](https://github.com/facebook/react-native/commit/af9225ec5fd22da802e3da4d786fa7f6ec956b0f) by [@SparshaSaha](https://github.com/SparshaSaha))
+- Modified **getDefaultJSExecutorFactory** method ([87cfd386cb](https://github.com/facebook/react-native/commit/87cfd386cb2e02bfa440c94706d9d0274f83070c) by [@KunalFarmah98](https://github.com/KunalFarmah98))
+
+### Fixed
+
+- Use monotonic clock for performance.now() ([114d31feee](https://github.com/facebook/react-native/commit/114d31feeeb47f5a57419e5088c3cbe9340f757a))
+
+#### Android specific
+
+- Logging a soft error when ReactRootView has an id other than -1 instead of crashing the app in hybrid apps ([1ca2c24930](https://github.com/facebook/react-native/commit/1ca2c2493027c1b027146cd41e17dd8a4fc33a41) by [@Kunal-Airtel2022](https://github.com/Kunal-Airtel2022))
 
 ## v0.68.2
 
diff --git a/ECOSYSTEM.md b/ECOSYSTEM.md
index 2505baabf0cc..4adef0816a8a 100644
--- a/ECOSYSTEM.md
+++ b/ECOSYSTEM.md
@@ -1,27 +1,36 @@
 # The React Native Ecosystem
 
-We aim to build a vibrant and inclusive ecosystem of partners, core contributors, and community that goes beyond the main React Native GitHub repository. This document explains the roles and responsibilities of various stakeholders and provides guidelines for the community organization. The structure outlined in this document has been in place for a while but hadn't been written down before.
+We aim to build a vibrant and inclusive ecosystem of partners, core contributors, and community that goes beyond the main React Native GitHub repository. This document explains the roles and responsibilities of various stakeholders and provides guidelines for the community organization. The structure outlined in this document has been in place for a while but had not been written down before.
 
 There are three types of stakeholders:
 
-* **Partners:** Companies that are significantly invested in React Native and have been for years.
+* **Partners:** Companies significantly invested in React Native and take responsibility for the React Native vision and community.
 * **Core Contributors:** Individual people who contribute to the React Native project.
 * **Community Contributors:** Individuals who support projects in the [react-native-community](https://github.com/react-native-community) organization.
 
 ## Partners
 
-Partners are companies that are significantly invested in React Native and have been for years. Informed by their use of React Native, they push for improvements of the core and/or the ecosystem around it. Partners think of React Native as a product: they understand the trade offs that the project makes as well as future plans and goals. Together we shape the vision for React Native to make it the best way to build applications.
+Partners are companies that are significantly invested in React Native and demonstrate ownership. Informed by their use of React Native, they push for improvements of the core and/or the ecosystem around it. Examples of this may include large scale contributions to `react-native` or owning essential tools or libraries.
 
-React Native's current set of partners include Callstack, Expo, Infinite Red, Meta, Microsoft and Software Mansion. Many engineers from these companies are core contributors, and their partner responsibilities also include:
+Partners think of React Native as a product; they understand the trade offs that the project makes as well as future plans and goals. Together we shape the vision for React Native to make it the best way to build applications.
 
-* **[Callstack](https://callstack.com/):** Manages releases, maintains the [React Native CLI](https://github.com/react-native-community/react-native-cli) and organizes [React Native EU](https://react-native.eu/)
-* **[Expo](https://expo.dev/):** Builds [expo](https://github.com/expo/expo) and [EAS](https://expo.dev/eas) on top of React Native to simplify app development
-* **[Infinite Red](https://infinite.red/):** Maintains the [ignite cli/boilerplate](https://github.com/infinitered/ignite), organizes [Chain React Conf](https://cr.infinite.red/)
+Baseline responsibilities of partners include:
+* Attending monthly meeting
+* Contributing to the release process. Examples include being a [community releaser](https://reactnative.dev/contributing/release-roles-responsibilities#release-role-2-community-releaser), testing new releases, technical support for release issues.
+* Engage on the core contributor Discord
+
+Our current partners and other areas of ownership:
+* **[Coinbase](https://www.coinbase.com/):** Publishes [posts](https://blog.coinbase.com/tagged/react-native) advocating React Native usage. Supports `@react-native-community/datetimepicker` and other community modules to migrate to the new architecture. Supports releases in testing and feedback.
+* **[Callstack](https://callstack.com/):** Maintains the [React Native CLI](https://github.com/react-native-community/react-native-cli) and [other community libraries](https://github.com/callstack), organizes [React Native EU](https://react-native.eu/) and hosts [The React Native Show podcast](https://www.callstack.com/podcast-react-native-show)
+* **[Expo](https://expo.dev/):** Builds [Expo Go and SDK](https://github.com/expo/expo), [Snack](https://snack.expo.dev/), and [Expo Application Services](https://expo.dev/eas). Maintains [React Native Directory](https://reactnative.directory/), stewards [React Navigation](https://reactnavigation.org/) along with other partners.
+* **[Infinite Red](https://infinite.red/):** Maintains the [ignite cli/boilerplate](https://github.com/infinitered/ignite), organizes [Chain React Conf](https://cr.infinite.red/), hosts the [React Native Radio podcast](https://reactnativeradio.com), publishes the [React Native Newsletter](https://reactnativenewsletter.com)
 * **[Meta](https://opensource.fb.com/):** Oversees the React Native product and maintains the [React Native core repo](https://reactnative.dev/) 
-* **[Microsoft](http://aka.ms/reactnative):** Develops [React Native Windows](https://github.com/Microsoft/react-native-windows) and [React Native macOS](https://github.com/microsoft/react-native-macos) for building apps that target Windows and macOS
+* **[Microsoft](https://twitter.com/ReactNativeMSFT):** Develops [React Native Windows](https://github.com/Microsoft/react-native-windows) and [React Native macOS](https://github.com/microsoft/react-native-macos) for building apps that target Windows and macOS; maintains [rnx-kit](https://github.com/microsoft/rnx-kit), [react-native-test-app](https://github.com/microsoft/react-native-test-app) and coordinates cross-companies efforts such as the [bundle working group](https://github.com/microsoft/rnx-kit/discussions/categories/bundle-working-group).
+* **[Shopify](https://www.shopify.com/):** Maintains React Native open source libraries such as [flash-list](https://github.com/Shopify/flash-list) or [@shopify/react-native-skia](https://github.com/Shopify/react-native-skia) and sponsors Software Mansion.
 * **[Software Mansion](https://swmansion.com/):** Maintain core infrastructure including JSC, Animated, and other popular third-party plugins and organizes [App.js Conf](https://appjs.co/)
+* **[Wix.com](https://wix.engineering/open-source):** Maintains a variety of React Native open source projects ([see all](https://github.com/orgs/wix/repositories?q=react-native)), including:  [Detox](https://wix.github.io/Detox/) end-to-end testing library for React Native apps, [RN UILib](https://wix.github.io/react-native-ui-lib/), [RN Navigation](https://wix.github.io/react-native-navigation/), [RN Calendars](https://wix.github.io/react-native-calendars/) and [RN Notifications](https://github.com/wix/react-native-notifications).
 
-In terms of open source work, pull requests from partners are commonly prioritized. When you are contributing to React Native, you'll most likely meet somebody who works at one of the partner companies and who is a core contributor:
+This list may fluctuate in response to newcomers who meet our partner definition. In terms of open source work, pull requests from partners are commonly prioritized. When you are contributing to React Native, you'll most likely meet somebody who works at one of the partner companies and who is a core contributor:
 
 ## Core Contributors
 
@@ -38,9 +47,15 @@ Core contributors are individuals who contribute to the React Native project. A
 
 These are behaviors we have observed in our existing core contributors. They aren't strict rules but rather outline their usual responsibilities. We do not expect every core contributor to do all of the above things all the time. Most importantly, we want to create a supportive and friendly environment that fosters collaboration. Above all else, **we are always polite and friendly.**
 
-Core contributor status is attained after consistently contributing and taking on the responsibilities outlined above and granted by other core contributors. Similarly, after a long period of inactivity, a core contributor may be removed.
+Core contributor status is attained after consistently contributing and taking on the responsibilities outlined above and granted by other core contributors. Similarly, after a long period of inactivity (~6 months or more), a core contributor may be contacted to understand if they’re still interested in being part of the program.
+
+You can use this [form](https://forms.gle/4jpA4QeNUvAUDnNe8) to either:
+* Apply yourself to become a Core Contributor. Make sure to include a list of valuable contributions you did to the React Native repository and ecosystem.
+* Nominate someone to become a Core Contributor.
+
+As a core contributor, you will have access to the core contributor Discord which is used for light-weight coordination and discussion.
 
-We aim to make contributing to React Native as easy and transparent as possible. All important topics are handled through a [discussion or RFC process on GitHub](https://github.com/react-native-community/discussions-and-proposals). We are always looking for active, enthusiastic members of the React Native community to become core contributors.
+**We aim to make contributing to React Native as easy and transparent as possible.** We have discussion groups dedicated to the [new architecture rollout](https://github.com/reactwg/react-native-new-architecture), [releases](https://github.com/reactwg/react-native-releases), and [general questions and proposals](https://github.com/react-native-community/discussions-and-proposals). We are always looking for active, enthusiastic members of the React Native community to become core contributors.
 
 ## Community Contributors
 
diff --git a/Gemfile b/Gemfile
index 5efda89f4525..567e59805c4a 100644
--- a/Gemfile
+++ b/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.5'
+ruby File.read(File.join(__dir__, '.ruby-version')).strip
 
-gem 'cocoapods', '~> 1.11', '>= 1.11.2'
+gem 'cocoapods', '~> 1.11', '>= 1.11.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index fd7c2f3b8469..5e3ce4aca5c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,14 +3,14 @@ GEM
   specs:
     CFPropertyList (3.0.5)
       rexml
-    activesupport (6.1.5)
+    activesupport (6.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
@@ -45,7 +45,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.6.1)
+    cocoapods-downloader (1.6.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -56,45 +56,45 @@ 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)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.1)
-    minitest (5.15.0)
+    json (2.6.3)
+    minitest (5.16.3)
     molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rexml (3.2.5)
     ruby-macho (2.5.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
-    zeitwerk (2.5.4)
+    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.10
+   2.3.22
diff --git a/IntegrationTests/AccessibilityManagerTest.js b/IntegrationTests/AccessibilityManagerTest.js
index f23972f25da1..e68cd5bb6826 100644
--- a/IntegrationTests/AccessibilityManagerTest.js
+++ b/IntegrationTests/AccessibilityManagerTest.js
@@ -16,7 +16,7 @@ import * as React from 'react';
 const {TestModule} = NativeModules;
 
 class AccessibilityManagerTest extends React.Component<{...}> {
-  componentDidMount() {
+  componentDidMount(): void {
     invariant(
       NativeAccessibilityManager,
       "NativeAccessibilityManager doesn't exist",
diff --git a/IntegrationTests/AppEventsTest.js b/IntegrationTests/AppEventsTest.js
index 5ff829b20c5a..e1736962006f 100644
--- a/IntegrationTests/AppEventsTest.js
+++ b/IntegrationTests/AppEventsTest.js
@@ -38,7 +38,6 @@ class AppEventsTest extends React.Component<{...}, State> {
     NativeAppEventEmitter.addListener('testEvent', this.receiveEvent);
     const event = {data: TEST_PAYLOAD, ts: Date.now()};
     TestModule.sendAppEvent('testEvent', event);
-    // eslint-disable-next-line react/no-did-mount-set-state
     this.setState({sent: event});
   }
 
diff --git a/IntegrationTests/AsyncStorageTest.js b/IntegrationTests/AsyncStorageTest.js
deleted file mode 100644
index 42bdbd629654..000000000000
--- a/IntegrationTests/AsyncStorageTest.js
+++ /dev/null
@@ -1,261 +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
- */
-
-'use strict';
-
-const React = require('react');
-const ReactNative = require('react-native');
-const {AsyncStorage, Text, View, StyleSheet} = ReactNative;
-const {TestModule} = ReactNative.NativeModules;
-
-const deepDiffer = require('react-native/Libraries/Utilities/differ/deepDiffer');
-const nullthrows = require('nullthrows');
-
-const DEBUG = false;
-
-const KEY_1 = 'key_1';
-const VAL_1 = 'val_1';
-const KEY_2 = 'key_2';
-const VAL_2 = 'val_2';
-const KEY_MERGE = 'key_merge';
-const VAL_MERGE_1 = {foo: 1, bar: {hoo: 1, boo: 1}, moo: {a: 3}};
-const VAL_MERGE_2 = {bar: {hoo: 2}, baz: 2, moo: {a: 3}};
-const VAL_MERGE_EXPECT = {foo: 1, bar: {hoo: 2, boo: 1}, baz: 2, moo: {a: 3}};
-
-// setup in componentDidMount
-let done = (result: ?boolean) => {};
-let updateMessage = (message: string) => {};
-
-function runTestCase(description: string, fn: () => void) {
-  updateMessage(description);
-  fn();
-}
-
-function expectTrue(condition: boolean, message: string) {
-  if (!condition) {
-    throw new Error(message);
-  }
-}
-
-// Type-safe wrapper around JSON.stringify
-function stringify(
-  value:
-    | void
-    | null
-    | string
-    | number
-    | boolean
-    | {...}
-    | $ReadOnlyArray<mixed>,
-): string {
-  if (typeof value === 'undefined') {
-    return 'undefined';
-  }
-  return JSON.stringify(value);
-}
-
-function expectEqual(
-  lhs: ?(any | string | Array<Array<string>>),
-  rhs:
-    | null
-    | string
-    | {
-        bar: {boo: number, hoo: number},
-        baz: number,
-        foo: number,
-        moo: {a: number},
-      }
-    | Array<Array<string>>,
-  testname: string,
-) {
-  expectTrue(
-    !deepDiffer(lhs, rhs),
-    'Error in test ' +
-      testname +
-      ': expected\n' +
-      stringify(rhs) +
-      '\ngot\n' +
-      stringify(lhs),
-  );
-}
-
-function expectAsyncNoError(
-  place: string,
-  err: ?(Error | string | Array<Error>),
-) {
-  if (err instanceof Error) {
-    err = err.message;
-  }
-  expectTrue(
-    err === null,
-    'Unexpected error in ' + place + ': ' + stringify(err),
-  );
-}
-
-function testSetAndGet() {
-  AsyncStorage.setItem(KEY_1, VAL_1, err1 => {
-    expectAsyncNoError('testSetAndGet/setItem', err1);
-    AsyncStorage.getItem(KEY_1, (err2, result) => {
-      expectAsyncNoError('testSetAndGet/getItem', err2);
-      expectEqual(result, VAL_1, 'testSetAndGet setItem');
-      updateMessage('get(key_1) correctly returned ' + String(result));
-      runTestCase('should get null for missing key', testMissingGet);
-    });
-  });
-}
-
-function testMissingGet() {
-  AsyncStorage.getItem(KEY_2, (err, result) => {
-    expectAsyncNoError('testMissingGet/setItem', err);
-    expectEqual(result, null, 'testMissingGet');
-    updateMessage('missing get(key_2) correctly returned ' + String(result));
-    runTestCase('check set twice results in a single key', testSetTwice);
-  });
-}
-
-function testSetTwice() {
-  AsyncStorage.setItem(KEY_1, VAL_1, () => {
-    AsyncStorage.setItem(KEY_1, VAL_1, () => {
-      AsyncStorage.getItem(KEY_1, (err, result) => {
-        expectAsyncNoError('testSetTwice/setItem', err);
-        expectEqual(result, VAL_1, 'testSetTwice');
-        updateMessage('setTwice worked as expected');
-        runTestCase('test removeItem', testRemoveItem);
-      });
-    });
-  });
-}
-
-function testRemoveItem() {
-  AsyncStorage.setItem(KEY_1, VAL_1, () => {
-    AsyncStorage.setItem(KEY_2, VAL_2, () => {
-      AsyncStorage.getAllKeys((err, result) => {
-        expectAsyncNoError('testRemoveItem/getAllKeys', err);
-        expectTrue(
-          nullthrows(result).indexOf(KEY_1) >= 0 &&
-            nullthrows(result).indexOf(KEY_2) >= 0,
-          'Missing KEY_1 or KEY_2 in ' + '(' + nullthrows(result).join() + ')',
-        );
-        updateMessage('testRemoveItem - add two items');
-        AsyncStorage.removeItem(KEY_1, err2 => {
-          expectAsyncNoError('testRemoveItem/removeItem', err2);
-          updateMessage('delete successful ');
-          AsyncStorage.getItem(KEY_1, (err3, result2) => {
-            expectAsyncNoError('testRemoveItem/getItem', err3);
-            expectEqual(
-              result2,
-              null,
-              'testRemoveItem: key_1 present after delete',
-            );
-            updateMessage('key properly removed ');
-            AsyncStorage.getAllKeys((err4, result3) => {
-              expectAsyncNoError('testRemoveItem/getAllKeys', err4);
-              expectTrue(
-                nullthrows(result3).indexOf(KEY_1) === -1,
-                'Unexpected: KEY_1 present in ' + nullthrows(result3).join(),
-              );
-              updateMessage('proper length returned.');
-              runTestCase('should merge values', testMerge);
-            });
-          });
-        });
-      });
-    });
-  });
-}
-
-function testMerge() {
-  AsyncStorage.setItem(KEY_MERGE, stringify(VAL_MERGE_1), err1 => {
-    expectAsyncNoError('testMerge/setItem', err1);
-    AsyncStorage.mergeItem(KEY_MERGE, stringify(VAL_MERGE_2), err2 => {
-      expectAsyncNoError('testMerge/mergeItem', err2);
-      AsyncStorage.getItem(KEY_MERGE, (err3, result) => {
-        expectAsyncNoError('testMerge/setItem', err3);
-        expectEqual(
-          JSON.parse(nullthrows(result)),
-          VAL_MERGE_EXPECT,
-          'testMerge',
-        );
-        updateMessage('objects deeply merged\nDone!');
-        runTestCase('multi set and get', testOptimizedMultiGet);
-      });
-    });
-  });
-}
-
-function testOptimizedMultiGet() {
-  let batch = [
-    [KEY_1, VAL_1],
-    [KEY_2, VAL_2],
-  ];
-  let keys = batch.map(([key, value]) => key);
-  AsyncStorage.multiSet(batch, err1 => {
-    // yes, twice on purpose
-    [1, 2].forEach(i => {
-      expectAsyncNoError(`${i} testOptimizedMultiGet/multiSet`, err1);
-      AsyncStorage.multiGet(keys, (err2, result) => {
-        expectAsyncNoError(`${i} testOptimizedMultiGet/multiGet`, err2);
-        expectEqual(result, batch, `${i} testOptimizedMultiGet multiGet`);
-        updateMessage(
-          'multiGet([key_1, key_2]) correctly returned ' + stringify(result),
-        );
-        done();
-      });
-    });
-  });
-}
-
-class AsyncStorageTest extends React.Component<{...}, $FlowFixMeState> {
-  state: any | {|done: boolean, messages: string|} = {
-    messages: 'Initializing...',
-    done: false,
-  };
-
-  componentDidMount() {
-    done = () =>
-      this.setState({done: true}, () => {
-        TestModule.markTestCompleted();
-      });
-    updateMessage = (msg: string) => {
-      this.setState({messages: this.state.messages.concat('\n' + msg)});
-      DEBUG && console.log(msg);
-    };
-    AsyncStorage.clear(testSetAndGet);
-  }
-
-  render(): React.Node {
-    return (
-      <View style={styles.container}>
-        <Text>
-          {
-            /* $FlowFixMe[incompatible-type] (>=0.54.0 site=react_native_fb,react_
-             * native_oss) This comment suppresses an error found when Flow v0.54
-             * was deployed. To see the error delete this comment and run Flow.
-             */
-            this.constructor.displayName + ': '
-          }
-          {this.state.done ? 'Done' : 'Testing...'}
-          {'\n\n' + this.state.messages}
-        </Text>
-      </View>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  container: {
-    backgroundColor: 'white',
-    padding: 40,
-  },
-});
-
-AsyncStorageTest.displayName = 'AsyncStorageTest';
-
-module.exports = AsyncStorageTest;
diff --git a/IntegrationTests/BUCK b/IntegrationTests/BUCK
index fa6fe51a3c53..0ac92a5c69e3 100644
--- a/IntegrationTests/BUCK
+++ b/IntegrationTests/BUCK
@@ -19,7 +19,6 @@ rn_library(
     ),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.tests",
     ],
     skip_processors = True,
     visibility = ["PUBLIC"],
diff --git a/IntegrationTests/GlobalEvalWithSourceUrlTest.js b/IntegrationTests/GlobalEvalWithSourceUrlTest.js
index dd3206f3c9a3..6b1d83ed765a 100644
--- a/IntegrationTests/GlobalEvalWithSourceUrlTest.js
+++ b/IntegrationTests/GlobalEvalWithSourceUrlTest.js
@@ -20,7 +20,7 @@ const {View} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;
 
 class GlobalEvalWithSourceUrlTest extends React.Component<{...}> {
-  componentDidMount() {
+  componentDidMount(): void {
     if (typeof global.globalEvalWithSourceUrl !== 'function') {
       throw new Error(
         'Expected to find globalEvalWithSourceUrl function on global object but found ' +
diff --git a/IntegrationTests/ImageSnapshotTest.js b/IntegrationTests/ImageSnapshotTest.js
index 0d6aa3bb67f6..62895ae33e77 100644
--- a/IntegrationTests/ImageSnapshotTest.js
+++ b/IntegrationTests/ImageSnapshotTest.js
@@ -16,7 +16,7 @@ const {Image} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;
 
 class ImageSnapshotTest extends React.Component<{...}> {
-  componentDidMount() {
+  componentDidMount(): void {
     if (!TestModule.verifySnapshot) {
       throw new Error('TestModule.verifySnapshot not defined.');
     }
diff --git a/IntegrationTests/IntegrationTestsApp.js b/IntegrationTests/IntegrationTestsApp.js
index bb8efcbcd497..442e70327482 100644
--- a/IntegrationTests/IntegrationTestsApp.js
+++ b/IntegrationTests/IntegrationTestsApp.js
@@ -20,7 +20,6 @@ const {AppRegistry, ScrollView, StyleSheet, Text, TouchableOpacity, View} =
 const TESTS = [
   require('./IntegrationTestHarnessTest'),
   require('./TimersTest'),
-  require('./AsyncStorageTest'),
   require('./LayoutEventsTest'),
   require('./AppEventsTest'),
   require('./SimpleSnapshotTest'),
@@ -46,11 +45,11 @@ require('./LoggingTestModule');
 type Test = any;
 
 class IntegrationTestsApp extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state: {test: ?Test} = {
     test: (null: ?Test),
   };
 
-  render() {
+  render(): React.Node {
     if (this.state.test) {
       return (
         <ScrollView>
diff --git a/IntegrationTests/SimpleSnapshotTest.js b/IntegrationTests/SimpleSnapshotTest.js
index 27e5d2c12d54..347de5c815d3 100644
--- a/IntegrationTests/SimpleSnapshotTest.js
+++ b/IntegrationTests/SimpleSnapshotTest.js
@@ -17,7 +17,7 @@ const {StyleSheet, View} = ReactNative;
 const {TestModule} = ReactNative.NativeModules;
 
 class SimpleSnapshotTest extends React.Component<{...}> {
-  componentDidMount() {
+  componentDidMount(): void {
     if (!TestModule.verifySnapshot) {
       throw new Error('TestModule.verifySnapshot not defined.');
     }
diff --git a/IntegrationTests/SyncMethodTest.js b/IntegrationTests/SyncMethodTest.js
index febe02154375..ab5166c057e4 100644
--- a/IntegrationTests/SyncMethodTest.js
+++ b/IntegrationTests/SyncMethodTest.js
@@ -17,7 +17,7 @@ const {View} = ReactNative;
 const {TestModule, RNTesterTestModule} = ReactNative.NativeModules;
 
 class SyncMethodTest extends React.Component<{...}> {
-  componentDidMount() {
+  componentDidMount(): void {
     if (
       RNTesterTestModule.echoString('test string value') !== 'test string value'
     ) {
diff --git a/IntegrationTests/TimersTest.js b/IntegrationTests/TimersTest.js
index 64b3f1233b6a..3a74f97edf31 100644
--- a/IntegrationTests/TimersTest.js
+++ b/IntegrationTests/TimersTest.js
@@ -39,7 +39,7 @@ class TimersTest extends React.Component<Props, State> {
   };
 
   setTimeout(fn: () => void, time: number): TimeoutID {
-    const id = setTimeout(() => {
+    const id: TimeoutID = setTimeout(() => {
       this._timeoutIDs.delete(id);
       fn();
     }, time);
@@ -70,7 +70,7 @@ class TimersTest extends React.Component<Props, State> {
   }
 
   setImmediate(fn: () => void): ImmediateID {
-    const id = setImmediate(() => {
+    const id: any = setImmediate(() => {
       this._immediateIDs.delete(id);
       fn();
     });
@@ -81,7 +81,7 @@ class TimersTest extends React.Component<Props, State> {
   }
 
   requestAnimationFrame(fn: () => void): AnimationFrameID {
-    const id = requestAnimationFrame(() => {
+    const id: AnimationFrameID = requestAnimationFrame(() => {
       this._animationFrameIDs.delete(id);
       fn();
     });
@@ -253,7 +253,7 @@ class TimersTest extends React.Component<Props, State> {
     );
   }
 
-  _incrementInterval() {
+  _incrementInterval(): void {
     if (this.state.count > 3) {
       throw new Error('interval incremented past end.');
     }
diff --git a/IntegrationTests/WebSocketTest.js b/IntegrationTests/WebSocketTest.js
index 6fbcbfb6cd8f..648478bacf10 100644
--- a/IntegrationTests/WebSocketTest.js
+++ b/IntegrationTests/WebSocketTest.js
@@ -69,11 +69,11 @@ class WebSocketTest extends React.Component<{...}, State> {
     });
   };
 
-  _socketIsConnected = () => {
+  _socketIsConnected = (): boolean => {
     return this.state.socketState === 1; //'OPEN'
   };
 
-  _socketIsDisconnected = () => {
+  _socketIsDisconnected = (): boolean => {
     return this.state.socketState === 3; //'CLOSED'
   };
 
@@ -106,7 +106,7 @@ class WebSocketTest extends React.Component<{...}, State> {
     this._sendText(this.state.testMessage);
   };
 
-  _receivedTestExpectedResponse = () => {
+  _receivedTestExpectedResponse = (): boolean => {
     return this.state.lastMessage === this.state.testExpectedResponse;
   };
 
diff --git a/Libraries/ActionSheetIOS/ActionSheetIOS.d.ts b/Libraries/ActionSheetIOS/ActionSheetIOS.d.ts
new file mode 100644
index 000000000000..89bdd3732399
--- /dev/null
+++ b/Libraries/ActionSheetIOS/ActionSheetIOS.d.ts
@@ -0,0 +1,80 @@
+/**
+ * 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
+ */
+
+import {ProcessedColorValue} from '../StyleSheet/processColor';
+import {ColorValue} from '../StyleSheet/StyleSheet';
+
+/**
+ * @see: https://reactnative.dev/docs/actionsheetios#content
+ */
+export interface ActionSheetIOSOptions {
+  title?: string | undefined;
+  options: string[];
+  cancelButtonIndex?: number | undefined;
+  destructiveButtonIndex?: number | number[] | undefined | null;
+  message?: string | undefined;
+  anchor?: number | undefined;
+  tintColor?: ColorValue | ProcessedColorValue | undefined;
+  cancelButtonTintColor?: ColorValue | ProcessedColorValue | undefined;
+  userInterfaceStyle?: 'light' | 'dark' | undefined;
+  disabledButtonIndices?: number[] | undefined;
+}
+
+export interface ShareActionSheetIOSOptions {
+  message?: string | undefined;
+  url?: string | undefined;
+  subject?: string | undefined;
+  anchor?: number | undefined;
+  /** The activities to exclude from the ActionSheet.
+   * For example: ['com.apple.UIKit.activity.PostToTwitter']
+   */
+  excludedActivityTypes?: string[] | undefined;
+}
+
+/**
+ * @see https://reactnative.dev/docs/actionsheetios#content
+ */
+export interface ActionSheetIOSStatic {
+  /**
+   * Display an iOS action sheet. The `options` object must contain one or more
+   * of:
+   * - `options` (array of strings) - a list of button titles (required)
+   * - `cancelButtonIndex` (int) - index of cancel button in `options`
+   * - `destructiveButtonIndex` (int) - index of destructive button in `options`
+   * - `title` (string) - a title to show above the action sheet
+   * - `message` (string) - a message to show below the title
+   */
+  showActionSheetWithOptions: (
+    options: ActionSheetIOSOptions,
+    callback: (buttonIndex: number) => void,
+  ) => void;
+
+  /**
+   * Display the iOS share sheet. The `options` object should contain
+   * one or both of `message` and `url` and can additionally have
+   * a `subject` or `excludedActivityTypes`:
+   *
+   * - `url` (string) - a URL to share
+   * - `message` (string) - a message to share
+   * - `subject` (string) - a subject for the message
+   * - `excludedActivityTypes` (array) - the activities to exclude from the ActionSheet
+   *
+   * NOTE: if `url` points to a local file, or is a base64-encoded
+   * uri, the file it points to will be loaded and shared directly.
+   * In this way, you can share images, videos, PDF files, etc.
+   */
+  showShareActionSheetWithOptions: (
+    options: ShareActionSheetIOSOptions,
+    failureCallback: (error: Error) => void,
+    successCallback: (success: boolean, method: string) => void,
+  ) => void;
+}
+
+export const ActionSheetIOS: ActionSheetIOSStatic;
+export type ActionSheetIOS = ActionSheetIOSStatic;
diff --git a/Libraries/ActionSheetIOS/ActionSheetIOS.js b/Libraries/ActionSheetIOS/ActionSheetIOS.js
index 0904d14024f2..c9aaca1e3ad5 100644
--- a/Libraries/ActionSheetIOS/ActionSheetIOS.js
+++ b/Libraries/ActionSheetIOS/ActionSheetIOS.js
@@ -8,12 +8,13 @@
  * @format
  */
 
+import type {ProcessedColorValue} from '../StyleSheet/processColor';
+import type {ColorValue} from '../StyleSheet/StyleSheet';
+
 import RCTActionSheetManager from './NativeActionSheetManager';
 
-const invariant = require('invariant');
 const processColor = require('../StyleSheet/processColor');
-import type {ColorValue} from '../StyleSheet/StyleSheet';
-import type {ProcessedColorValue} from '../StyleSheet/processColor';
+const invariant = require('invariant');
 
 /**
  * Display action sheets and share sheets on iOS.
diff --git a/Libraries/ActionSheetIOS/NativeActionSheetManager.js b/Libraries/ActionSheetIOS/NativeActionSheetManager.js
index 1f9ead0bdd8f..8247ac260aff 100644
--- a/Libraries/ActionSheetIOS/NativeActionSheetManager.js
+++ b/Libraries/ActionSheetIOS/NativeActionSheetManager.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Alert/Alert.d.ts b/Libraries/Alert/Alert.d.ts
new file mode 100644
index 000000000000..a05fe55a877f
--- /dev/null
+++ b/Libraries/Alert/Alert.d.ts
@@ -0,0 +1,90 @@
+/**
+ * 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
+ */
+
+/**
+ * @see https://reactnative.dev/docs/alert#content
+ */
+export interface AlertButton {
+  text?: string | undefined;
+  onPress?: ((value?: string) => void) | undefined;
+  isPreferred?: boolean;
+  style?: 'default' | 'cancel' | 'destructive' | undefined;
+}
+
+interface AlertOptions {
+  /** @platform android */
+  cancelable?: boolean | undefined;
+  userInterfaceStyle?: 'unspecified' | 'light' | 'dark';
+  /** @platform android */
+  onDismiss?: (() => void) | undefined;
+}
+
+/**
+ * Launches an alert dialog with the specified title and message.
+ *
+ * Optionally provide a list of buttons. Tapping any button will fire the
+ * respective onPress callback and dismiss the alert. By default, the only
+ * button will be an 'OK' button.
+ *
+ * This is an API that works both on iOS and Android and can show static
+ * alerts. To show an alert that prompts the user to enter some information,
+ * see `AlertIOS`; entering text in an alert is common on iOS only.
+ *
+ * ## iOS
+ *
+ * On iOS you can specify any number of buttons. Each button can optionally
+ * specify a style, which is one of 'default', 'cancel' or 'destructive'.
+ *
+ * ## Android
+ *
+ * On Android at most three buttons can be specified. Android has a concept
+ * of a neutral, negative and a positive button:
+ *
+ *   - If you specify one button, it will be the 'positive' one (such as 'OK')
+ *   - Two buttons mean 'negative', 'positive' (such as 'Cancel', 'OK')
+ *   - Three buttons mean 'neutral', 'negative', 'positive' (such as 'Later', 'Cancel', 'OK')
+ *
+ * ```
+ * // Works on both iOS and Android
+ * Alert.alert(
+ *   'Alert Title',
+ *   'My Alert Msg',
+ *   [
+ *     {text: 'Ask me later', onPress: () => console.log('Ask me later pressed')},
+ *     {text: 'Cancel', onPress: () => console.log('Cancel Pressed'), style: 'cancel'},
+ *     {text: 'OK', onPress: () => console.log('OK Pressed')},
+ *   ]
+ * )
+ * ```
+ */
+export interface AlertStatic {
+  alert: (
+    title: string,
+    message?: string,
+    buttons?: AlertButton[],
+    options?: AlertOptions,
+  ) => void;
+  prompt: (
+    title: string,
+    message?: string,
+    callbackOrButtons?: ((text: string) => void) | AlertButton[],
+    type?: AlertType,
+    defaultValue?: string,
+    keyboardType?: string,
+  ) => void;
+}
+
+export type AlertType =
+  | 'default'
+  | 'plain-text'
+  | 'secure-text'
+  | 'login-password';
+
+export const Alert: AlertStatic;
+export type Alert = AlertStatic;
diff --git a/Libraries/Alert/Alert.js b/Libraries/Alert/Alert.js
index 1a943e1bbd7b..a6a0ccbfecc5 100644
--- a/Libraries/Alert/Alert.js
+++ b/Libraries/Alert/Alert.js
@@ -22,6 +22,7 @@ export type AlertButtonStyle = 'default' | 'cancel' | 'destructive';
 export type Buttons = Array<{
   text?: string,
   onPress?: ?Function,
+  isPreferred?: boolean,
   style?: AlertButtonStyle,
   ...
 }>;
@@ -122,10 +123,11 @@ class Alert {
     options?: Options,
   ): void {
     if (Platform.OS === 'ios') {
-      let callbacks = [];
+      let callbacks: Array<?any> = [];
       const buttons = [];
       let cancelButtonKey;
       let destructiveButtonKey;
+      let preferredButtonKey;
       if (typeof callbackOrButtons === 'function') {
         callbacks = [callbackOrButtons];
       } else if (Array.isArray(callbackOrButtons)) {
@@ -136,6 +138,9 @@ class Alert {
           } else if (btn.style === 'destructive') {
             destructiveButtonKey = String(index);
           }
+          if (btn.isPreferred) {
+            preferredButtonKey = String(index);
+          }
           if (btn.text || index < (callbackOrButtons || []).length - 1) {
             const btnDef: {[number]: string} = {};
             btnDef[index] = btn.text || '';
@@ -153,6 +158,7 @@ class Alert {
           defaultValue,
           cancelButtonKey,
           destructiveButtonKey,
+          preferredButtonKey,
           keyboardType,
           userInterfaceStyle: options?.userInterfaceStyle || undefined,
         },
diff --git a/Libraries/Alert/Alert.js.flow b/Libraries/Alert/Alert.js.flow
new file mode 100644
index 000000000000..be6f948f557a
--- /dev/null
+++ b/Libraries/Alert/Alert.js.flow
@@ -0,0 +1,49 @@
+/**
+ * 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
+ */
+
+export type AlertType =
+  | 'default'
+  | 'plain-text'
+  | 'secure-text'
+  | 'login-password';
+export type AlertButtonStyle = 'default' | 'cancel' | 'destructive';
+export type Buttons = Array<{
+  text?: string,
+  onPress?: ?Function,
+  isPreferred?: boolean,
+  style?: AlertButtonStyle,
+  ...
+}>;
+type Options = {
+  cancelable?: ?boolean,
+  userInterfaceStyle?: 'unspecified' | 'light' | 'dark',
+  onDismiss?: ?() => void,
+  ...
+};
+
+declare class Alert {
+  static alert(
+    title: ?string,
+    message?: ?string,
+    buttons?: Buttons,
+    options?: Options,
+  ): void;
+  static prompt(
+    title: ?string,
+    message?: ?string,
+    callbackOrButtons?: ?(((text: string) => void) | Buttons),
+    type?: ?AlertType,
+    defaultValue?: string,
+    keyboardType?: string,
+    options?: Options,
+  ): void;
+}
+
+module.exports = Alert;
diff --git a/Libraries/Alert/NativeAlertManager.js b/Libraries/Alert/NativeAlertManager.js
index 9597ef155a52..7f7b1cf6a9b6 100644
--- a/Libraries/Alert/NativeAlertManager.js
+++ b/Libraries/Alert/NativeAlertManager.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export type Args = {|
@@ -19,6 +20,7 @@ export type Args = {|
   defaultValue?: string,
   cancelButtonKey?: string,
   destructiveButtonKey?: string,
+  preferredButtonKey?: string,
   keyboardType?: string,
   userInterfaceStyle?: string,
 |};
diff --git a/Libraries/Alert/RCTAlertManager.ios.js b/Libraries/Alert/RCTAlertManager.ios.js
index 01f055da53d4..d4e9eab97ff6 100644
--- a/Libraries/Alert/RCTAlertManager.ios.js
+++ b/Libraries/Alert/RCTAlertManager.ios.js
@@ -8,9 +8,10 @@
  * @flow strict-local
  */
 
-import NativeAlertManager from './NativeAlertManager';
 import type {Args} from './NativeAlertManager';
 
+import NativeAlertManager from './NativeAlertManager';
+
 module.exports = {
   alertWithArgs(
     args: Args,
diff --git a/Libraries/Animated/Animated.d.ts b/Libraries/Animated/Animated.d.ts
new file mode 100644
index 000000000000..3301ff377246
--- /dev/null
+++ b/Libraries/Animated/Animated.d.ts
@@ -0,0 +1,615 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {ScrollView} from '../Components/ScrollView/ScrollView';
+import {View} from '../Components/View/View';
+import {Image} from '../Image/Image';
+import {FlatListProps} from '../Lists/FlatList';
+import {DefaultSectionT, SectionListProps} from '../Lists/SectionList';
+import {ColorValue} from '../StyleSheet/StyleSheet';
+import {Text} from '../Text/Text';
+import {NativeSyntheticEvent} from '../Types/CoreEventTypes';
+
+export namespace Animated {
+  type AnimatedValue = Value;
+  type AnimatedValueXY = ValueXY;
+
+  class Animated {
+    // Internal class, no public API.
+  }
+
+  class AnimatedNode {
+    /**
+     * Adds an asynchronous listener to the value so you can observe updates from
+     * animations.  This is useful because there is no way to
+     * synchronously read the value because it might be driven natively.
+     *
+     * See https://reactnative.dev/docs/animatedvalue.html#addlistener
+     */
+    addListener(callback: (value: any) => any): string;
+    /**
+     * Unregister a listener. The `id` param shall match the identifier
+     * previously returned by `addListener()`.
+     *
+     * See https://reactnative.dev/docs/animatedvalue.html#removelistener
+     */
+    removeListener(id: string): void;
+    /**
+     * Remove all registered listeners.
+     *
+     * See https://reactnative.dev/docs/animatedvalue.html#removealllisteners
+     */
+    removeAllListeners(): void;
+
+    hasListeners(): boolean;
+  }
+
+  class AnimatedWithChildren extends AnimatedNode {
+    // Internal class, no public API.
+  }
+
+  type RgbaValue = {
+    readonly r: number;
+    readonly g: number;
+    readonly b: number;
+    readonly a: number;
+  };
+
+  type RgbaAnimatedValue = {
+    readonly r: AnimatedValue;
+    readonly g: AnimatedValue;
+    readonly b: AnimatedValue;
+    readonly a: AnimatedValue;
+  };
+
+  type AnimatedConfig = {
+    readonly useNativeDriver: boolean;
+  };
+
+  class AnimatedColor extends AnimatedWithChildren {
+    r: AnimatedValue;
+    g: AnimatedValue;
+    b: AnimatedValue;
+    a: AnimatedValue;
+
+    constructor(
+      valueIn?: RgbaValue | RgbaAnimatedValue | ColorValue | null,
+      config?: AnimatedConfig | null,
+    );
+    nativeColor: unknown; // Unsure what to do here
+    setValue: (value: RgbaValue | ColorValue) => void;
+    setOffset: (offset: RgbaValue) => void;
+    flattenOffset: () => void;
+    extractOffset: () => void;
+    addListener: (callback: (value: ColorValue) => unknown) => string;
+    removeListener: (id: string) => void;
+    removeAllListeners: () => void;
+    stopAnimation: (callback: (value: ColorValue) => unknown) => void;
+    resetAnimation: (callback: (value: ColorValue) => unknown) => void;
+  }
+
+  class AnimatedInterpolation<
+    OutputT extends number | string,
+  > extends AnimatedWithChildren {
+    interpolate(
+      config: InterpolationConfigType,
+    ): AnimatedInterpolation<OutputT>;
+  }
+
+  type ExtrapolateType = 'extend' | 'identity' | 'clamp';
+
+  type InterpolationConfigType = {
+    inputRange: number[];
+    outputRange: number[] | string[];
+    easing?: ((input: number) => number) | undefined;
+    extrapolate?: ExtrapolateType | undefined;
+    extrapolateLeft?: ExtrapolateType | undefined;
+    extrapolateRight?: ExtrapolateType | undefined;
+  };
+
+  type ValueListenerCallback = (state: {value: number}) => void;
+
+  type Animation = {
+    start(
+      fromValue: number,
+      onUpdate: (value: number) => void,
+      onEnd: EndCallback | null,
+      previousAnimation: Animation | null,
+      animatedValue: AnimatedValue,
+    ): void;
+    stop(): void;
+  };
+
+  /**
+   * Standard value for driving animations.  One `Animated.Value` can drive
+   * multiple properties in a synchronized fashion, but can only be driven by one
+   * mechanism at a time.  Using a new mechanism (e.g. starting a new animation,
+   * or calling `setValue`) will stop any previous ones.
+   */
+  export class Value extends AnimatedWithChildren {
+    constructor(value: number, config?: AnimatedConfig | null);
+
+    /**
+     * Directly set the value.  This will stop any animations running on the value
+     * and update all the bound properties.
+     */
+    setValue(value: number): void;
+
+    /**
+     * Sets an offset that is applied on top of whatever value is set, whether via
+     * `setValue`, an animation, or `Animated.event`.  Useful for compensating
+     * things like the start of a pan gesture.
+     */
+    setOffset(offset: number): void;
+
+    /**
+     * Merges the offset value into the base value and resets the offset to zero.
+     * The final output of the value is unchanged.
+     */
+    flattenOffset(): void;
+
+    /**
+     * Sets the offset value to the base value, and resets the base value to zero.
+     * The final output of the value is unchanged.
+     */
+    extractOffset(): void;
+
+    /**
+     * Adds an asynchronous listener to the value so you can observe updates from
+     * animations.  This is useful because there is no way to
+     * synchronously read the value because it might be driven natively.
+     */
+    addListener(callback: ValueListenerCallback): string;
+
+    removeListener(id: string): void;
+
+    removeAllListeners(): void;
+
+    /**
+     * Stops any running animation or tracking.  `callback` is invoked with the
+     * final value after stopping the animation, which is useful for updating
+     * state to match the animation position with layout.
+     */
+    stopAnimation(callback?: (value: number) => void): void;
+
+    /**
+     * Stops any animation and resets the value to its original.
+     *
+     * See https://reactnative.dev/docs/animatedvalue#resetanimation
+     */
+    resetAnimation(callback?: (value: number) => void): void;
+
+    /**
+     * Interpolates the value before updating the property, e.g. mapping 0-1 to
+     * 0-10.
+     */
+    interpolate<OutputT extends number | string>(
+      config: InterpolationConfigType,
+    ): AnimatedInterpolation<OutputT>;
+
+    /**
+     * Typically only used internally, but could be used by a custom Animation
+     * class.
+     *
+     * See https://reactnative.dev/docs/animatedvalue#animate
+     */
+    animate(animation: Animation, callback?: EndCallback | null): void;
+  }
+
+  type ValueXYListenerCallback = (value: {x: number; y: number}) => void;
+
+  /**
+   * 2D Value for driving 2D animations, such as pan gestures.  Almost identical
+   * API to normal `Animated.Value`, but multiplexed.  Contains two regular
+   * `Animated.Value`s under the hood.
+   */
+  export class ValueXY extends AnimatedWithChildren {
+    x: AnimatedValue;
+    y: AnimatedValue;
+
+    constructor(
+      valueIn?: {x: number | AnimatedValue; y: number | AnimatedValue},
+      config?: AnimatedConfig | null,
+    );
+
+    setValue(value: {x: number; y: number}): void;
+
+    setOffset(offset: {x: number; y: number}): void;
+
+    flattenOffset(): void;
+
+    extractOffset(): void;
+
+    resetAnimation(callback?: (value: {x: number; y: number}) => void): void;
+
+    stopAnimation(callback?: (value: {x: number; y: number}) => void): void;
+
+    addListener(callback: ValueXYListenerCallback): string;
+
+    removeListener(id: string): void;
+
+    /**
+     * Converts `{x, y}` into `{left, top}` for use in style, e.g.
+     *
+     *```javascript
+     *  style={this.state.anim.getLayout()}
+     *```
+     */
+    getLayout(): {[key: string]: AnimatedValue};
+
+    /**
+     * Converts `{x, y}` into a useable translation transform, e.g.
+     *
+     *```javascript
+     *  style={{
+     *    transform: this.state.anim.getTranslateTransform()
+     *  }}
+     *```
+     */
+    getTranslateTransform(): [
+      {translateX: AnimatedValue},
+      {translateY: AnimatedValue},
+    ];
+  }
+
+  type EndResult = {finished: boolean};
+  type EndCallback = (result: EndResult) => void;
+
+  export interface CompositeAnimation {
+    /**
+     * Animations are started by calling start() on your animation.
+     * start() takes a completion callback that will be called when the
+     * animation is done or when the animation is done because stop() was
+     * called on it before it could finish.
+     *
+     * @param callback - Optional function that will be called
+     *      after the animation finished running normally or when the animation
+     *      is done because stop() was called on it before it could finish
+     *
+     * @example
+     *   Animated.timing({}).start(({ finished }) => {
+     *    // completion callback
+     *   });
+     */
+    start: (callback?: EndCallback) => void;
+    /**
+     * Stops any running animation.
+     */
+    stop: () => void;
+    /**
+     * Stops any running animation and resets the value to its original.
+     */
+    reset: () => void;
+  }
+
+  interface AnimationConfig {
+    isInteraction?: boolean | undefined;
+    useNativeDriver: boolean;
+  }
+
+  /**
+   * Animates a value from an initial velocity to zero based on a decay
+   * coefficient.
+   */
+  export function decay(
+    value: AnimatedValue | AnimatedValueXY,
+    config: DecayAnimationConfig,
+  ): CompositeAnimation;
+
+  interface DecayAnimationConfig extends AnimationConfig {
+    velocity: number | {x: number; y: number};
+    deceleration?: number | undefined;
+  }
+
+  /**
+   * Animates a value along a timed easing curve.  The `Easing` module has tons
+   * of pre-defined curves, or you can use your own function.
+   */
+  export const timing: (
+    value: AnimatedValue | AnimatedValueXY,
+    config: TimingAnimationConfig,
+  ) => CompositeAnimation;
+
+  interface TimingAnimationConfig extends AnimationConfig {
+    toValue:
+      | number
+      | AnimatedValue
+      | {x: number; y: number}
+      | AnimatedValueXY
+      | AnimatedInterpolation<number>;
+    easing?: ((value: number) => number) | undefined;
+    duration?: number | undefined;
+    delay?: number | undefined;
+  }
+
+  interface SpringAnimationConfig extends AnimationConfig {
+    toValue:
+      | number
+      | AnimatedValue
+      | {x: number; y: number}
+      | AnimatedValueXY
+      | RgbaValue
+      | AnimatedColor
+      | AnimatedInterpolation<number>;
+    overshootClamping?: boolean | undefined;
+    restDisplacementThreshold?: number | undefined;
+    restSpeedThreshold?: number | undefined;
+    velocity?: number | {x: number; y: number} | undefined;
+    bounciness?: number | undefined;
+    speed?: number | undefined;
+    tension?: number | undefined;
+    friction?: number | undefined;
+    stiffness?: number | undefined;
+    mass?: number | undefined;
+    damping?: number | undefined;
+    delay?: number | undefined;
+  }
+
+  interface LoopAnimationConfig {
+    iterations?: number | undefined; // default -1 for infinite
+    /**
+     * Defaults to `true`
+     */
+    resetBeforeIteration?: boolean | undefined;
+  }
+
+  /**
+   * Creates a new Animated value composed from two Animated values added
+   * together.
+   */
+  export function add<OutputT extends number | string>(
+    a: Animated,
+    b: Animated,
+  ): AnimatedAddition<OutputT>;
+
+  class AnimatedAddition<
+    OutputT extends number | string,
+  > extends AnimatedInterpolation<OutputT> {}
+
+  /**
+   * Creates a new Animated value composed by subtracting the second Animated
+   * value from the first Animated value.
+   */
+  export function subtract<OutputT extends number | string>(
+    a: Animated,
+    b: Animated,
+  ): AnimatedSubtraction<OutputT>;
+
+  class AnimatedSubtraction<
+    OutputT extends number | string,
+  > extends AnimatedInterpolation<OutputT> {}
+
+  /**
+   * Creates a new Animated value composed by dividing the first Animated
+   * value by the second Animated value.
+   */
+  export function divide<OutputT extends number | string>(
+    a: Animated,
+    b: Animated,
+  ): AnimatedDivision<OutputT>;
+
+  class AnimatedDivision<
+    OutputT extends number | string,
+  > extends AnimatedInterpolation<OutputT> {}
+
+  /**
+   * Creates a new Animated value composed from two Animated values multiplied
+   * together.
+   */
+  export function multiply<OutputT extends number | string>(
+    a: Animated,
+    b: Animated,
+  ): AnimatedMultiplication<OutputT>;
+
+  class AnimatedMultiplication<
+    OutputT extends number | string,
+  > extends AnimatedInterpolation<OutputT> {}
+
+  /**
+   * Creates a new Animated value that is the (non-negative) modulo of the
+   * provided Animated value
+   */
+  export function modulo<OutputT extends number | string>(
+    a: Animated,
+    modulus: number,
+  ): AnimatedModulo<OutputT>;
+
+  class AnimatedModulo<
+    OutputT extends number | string,
+  > extends AnimatedInterpolation<OutputT> {}
+
+  /**
+   * Create a new Animated value that is limited between 2 values. It uses the
+   * difference between the last value so even if the value is far from the bounds
+   * it will start changing when the value starts getting closer again.
+   * (`value = clamp(value + diff, min, max)`).
+   *
+   * This is useful with scroll events, for example, to show the navbar when
+   * scrolling up and to hide it when scrolling down.
+   */
+  export function diffClamp<OutputT extends number | string>(
+    a: Animated,
+    min: number,
+    max: number,
+  ): AnimatedDiffClamp<OutputT>;
+
+  class AnimatedDiffClamp<
+    OutputT extends number | string,
+  > extends AnimatedInterpolation<OutputT> {}
+
+  /**
+   * Starts an animation after the given delay.
+   */
+  export function delay(time: number): CompositeAnimation;
+
+  /**
+   * Starts an array of animations in order, waiting for each to complete
+   * before starting the next.  If the current running animation is stopped, no
+   * following animations will be started.
+   */
+  export function sequence(
+    animations: Array<CompositeAnimation>,
+  ): CompositeAnimation;
+
+  /**
+   * Array of animations may run in parallel (overlap), but are started in
+   * sequence with successive delays.  Nice for doing trailing effects.
+   */
+
+  export function stagger(
+    time: number,
+    animations: Array<CompositeAnimation>,
+  ): CompositeAnimation;
+
+  /**
+   * Loops a given animation continuously, so that each time it reaches the end,
+   * it resets and begins again from the start. Can specify number of times to
+   * loop using the key 'iterations' in the config. Will loop without blocking
+   * the UI thread if the child animation is set to 'useNativeDriver'.
+   */
+
+  export function loop(
+    animation: CompositeAnimation,
+    config?: LoopAnimationConfig,
+  ): CompositeAnimation;
+
+  /**
+   * Spring animation based on Rebound and Origami.  Tracks velocity state to
+   * create fluid motions as the `toValue` updates, and can be chained together.
+   */
+  export function spring(
+    value: AnimatedValue | AnimatedValueXY,
+    config: SpringAnimationConfig,
+  ): CompositeAnimation;
+
+  type ParallelConfig = {
+    stopTogether?: boolean | undefined; // If one is stopped, stop all.  default: true
+  };
+
+  /**
+   * Starts an array of animations all at the same time.  By default, if one
+   * of the animations is stopped, they will all be stopped.  You can override
+   * this with the `stopTogether` flag.
+   */
+  export function parallel(
+    animations: Array<CompositeAnimation>,
+    config?: ParallelConfig,
+  ): CompositeAnimation;
+
+  type Mapping = {[key: string]: Mapping} | AnimatedValue;
+  interface EventConfig<T> {
+    listener?: ((event: NativeSyntheticEvent<T>) => void) | undefined;
+    useNativeDriver: boolean;
+  }
+
+  /**
+   *  Takes an array of mappings and extracts values from each arg accordingly,
+   *  then calls `setValue` on the mapped outputs.  e.g.
+   *
+   *```javascript
+   *  onScroll={Animated.event(
+   *    [{nativeEvent: {contentOffset: {x: this._scrollX}}}]
+   *    {listener},          // Optional async listener
+   *  )
+   *  ...
+   *  onPanResponderMove: Animated.event([
+   *    null,                // raw event arg ignored
+   *    {dx: this._panX},    // gestureState arg
+   *  ]),
+   *```
+   */
+  export function event<T>(
+    argMapping: Array<Mapping | null>,
+    config?: EventConfig<T>,
+  ): (...args: any[]) => void;
+
+  export type ComponentProps<T> = T extends
+    | React.ComponentType<infer P>
+    | React.Component<infer P>
+    ? P
+    : never;
+
+  export type LegacyRef<C> = {getNode(): C};
+
+  type Nullable = undefined | null;
+  type Primitive = string | number | boolean | symbol;
+  type Builtin = Function | Date | Error | RegExp;
+
+  interface WithAnimatedArray<P> extends Array<WithAnimatedValue<P>> {}
+  type WithAnimatedObject<T> = {
+    [K in keyof T]: WithAnimatedValue<T[K]>;
+  };
+
+  export type WithAnimatedValue<T> = T extends Builtin | Nullable
+    ? T
+    : T extends Primitive
+    ? T | Value | AnimatedInterpolation<number | string> // add `Value` and `AnimatedInterpolation` but also preserve original T
+    : T extends Array<infer P>
+    ? WithAnimatedArray<P>
+    : T extends {}
+    ? WithAnimatedObject<T>
+    : T; // in case it's something we don't yet know about (for .e.g bigint)
+
+  type NonAnimatedProps = 'key' | 'ref';
+
+  type TAugmentRef<T> = T extends React.Ref<infer R>
+    ? React.Ref<R | LegacyRef<R>>
+    : never;
+
+  export type AnimatedProps<T> = {
+    [key in keyof T]: key extends NonAnimatedProps
+      ? key extends 'ref'
+        ? TAugmentRef<T[key]>
+        : T[key]
+      : WithAnimatedValue<T[key]>;
+  };
+
+  export interface AnimatedComponent<T extends React.ComponentType<any>>
+    extends React.FC<AnimatedProps<React.ComponentPropsWithRef<T>>> {}
+
+  export type AnimatedComponentOptions = {
+    collapsable?: boolean;
+  };
+
+  /**
+   * Make any React component Animatable.  Used to create `Animated.View`, etc.
+   */
+  export function createAnimatedComponent<T extends React.ComponentType<any>>(
+    component: T,
+    options?: AnimatedComponentOptions,
+  ): AnimatedComponent<T>;
+
+  /**
+   * Animated variants of the basic native views. Accepts Animated.Value for
+   * props and style.
+   */
+  export const View: AnimatedComponent<typeof _View>;
+  export const Image: AnimatedComponent<typeof _Image>;
+  export const Text: AnimatedComponent<typeof _Text>;
+  export const ScrollView: AnimatedComponent<typeof _ScrollView>;
+
+  /**
+   * FlatList and SectionList infer generic Type defined under their `data` and `section` props.
+   */
+  export class FlatList<ItemT = any> extends React.Component<
+    AnimatedProps<FlatListProps<ItemT>>
+  > {}
+  export class SectionList<
+    ItemT = any,
+    SectionT = DefaultSectionT,
+  > extends React.Component<AnimatedProps<SectionListProps<ItemT, SectionT>>> {}
+}
+
+// We need to alias these views so we can reference them in the Animated
+// namespace where their names are shadowed.
+declare const _View: typeof View;
+declare const _Image: typeof Image;
+declare const _Text: typeof Text;
+declare const _ScrollView: typeof ScrollView;
diff --git a/Libraries/Animated/Animated.js b/Libraries/Animated/Animated.js
index 88fd9dbb188d..ec17ef764543 100644
--- a/Libraries/Animated/Animated.js
+++ b/Libraries/Animated/Animated.js
@@ -8,7 +8,8 @@
  * @format
  */
 
-import Platform from '../Utilities/Platform';
+export type {CompositeAnimation, Numeric} from './AnimatedImplementation';
+
 import typeof AnimatedFlatList from './components/AnimatedFlatList';
 import typeof AnimatedImage from './components/AnimatedImage';
 import typeof AnimatedScrollView from './components/AnimatedScrollView';
@@ -16,31 +17,32 @@ import typeof AnimatedSectionList from './components/AnimatedSectionList';
 import typeof AnimatedText from './components/AnimatedText';
 import typeof AnimatedView from './components/AnimatedView';
 
-import * as AnimatedMock from './AnimatedMock';
-import * as AnimatedImplementation from './AnimatedImplementation';
+import Platform from '../Utilities/Platform';
+import AnimatedImplementation from './AnimatedImplementation';
+import AnimatedMock from './AnimatedMock';
 
 const Animated = ((Platform.isTesting
   ? AnimatedMock
-  : AnimatedImplementation): typeof AnimatedMock);
+  : AnimatedImplementation): typeof AnimatedImplementation);
 
-module.exports = {
+export default {
   get FlatList(): AnimatedFlatList {
-    return require('./components/AnimatedFlatList');
+    return require('./components/AnimatedFlatList').default;
   },
   get Image(): AnimatedImage {
-    return require('./components/AnimatedImage');
+    return require('./components/AnimatedImage').default;
   },
   get ScrollView(): AnimatedScrollView {
-    return require('./components/AnimatedScrollView');
+    return require('./components/AnimatedScrollView').default;
   },
   get SectionList(): AnimatedSectionList {
-    return require('./components/AnimatedSectionList');
+    return require('./components/AnimatedSectionList').default;
   },
   get Text(): AnimatedText {
-    return require('./components/AnimatedText');
+    return require('./components/AnimatedText').default;
   },
   get View(): AnimatedView {
-    return require('./components/AnimatedView');
+    return require('./components/AnimatedView').default;
   },
   ...Animated,
 };
diff --git a/Libraries/Animated/AnimatedEvent.js b/Libraries/Animated/AnimatedEvent.js
index af1d660a8de7..7279c2af4dea 100644
--- a/Libraries/Animated/AnimatedEvent.js
+++ b/Libraries/Animated/AnimatedEvent.js
@@ -10,17 +10,14 @@
 
 'use strict';
 
-const AnimatedValue = require('./nodes/AnimatedValue');
-const AnimatedValueXY = require('./nodes/AnimatedValueXY');
-const NativeAnimatedHelper = require('./NativeAnimatedHelper');
-const ReactNative = require('../Renderer/shims/ReactNative');
-
-const invariant = require('invariant');
-
-const {shouldUseNativeDriver} = require('./NativeAnimatedHelper');
-
 import type {PlatformConfig} from './AnimatedPlatformConfig';
 
+import {findNodeHandle} from '../ReactNative/RendererProxy';
+import NativeAnimatedHelper from './NativeAnimatedHelper';
+import AnimatedValue from './nodes/AnimatedValue';
+import AnimatedValueXY from './nodes/AnimatedValueXY';
+import invariant from 'invariant';
+
 export type Mapping =
   | {[key: string]: Mapping, ...}
   | AnimatedValue
@@ -31,7 +28,7 @@ export type EventConfig = {
   platformConfig?: PlatformConfig,
 };
 
-function attachNativeEvent(
+export function attachNativeEvent(
   viewRef: any,
   eventName: string,
   argMapping: $ReadOnlyArray<?Mapping>,
@@ -67,7 +64,7 @@ function attachNativeEvent(
   // Assume that the event containing `nativeEvent` is always the first argument.
   traverse(argMapping[0].nativeEvent, []);
 
-  const viewTag = ReactNative.findNodeHandle(viewRef);
+  const viewTag = findNodeHandle(viewRef);
   if (viewTag != null) {
     eventMappings.forEach(mapping => {
       NativeAnimatedHelper.API.addAnimatedEventToView(
@@ -146,7 +143,7 @@ function validateMapping(argMapping: $ReadOnlyArray<?Mapping>, args: any) {
   });
 }
 
-class AnimatedEvent {
+export class AnimatedEvent {
   _argMapping: $ReadOnlyArray<?Mapping>;
   _listeners: Array<Function> = [];
   _attachedEvent: ?{detach: () => void, ...};
@@ -165,7 +162,7 @@ class AnimatedEvent {
       this.__addListener(config.listener);
     }
     this._attachedEvent = null;
-    this.__isNative = shouldUseNativeDriver(config);
+    this.__isNative = NativeAnimatedHelper.shouldUseNativeDriver(config);
     this.__platformConfig = config.platformConfig;
   }
 
@@ -177,7 +174,7 @@ class AnimatedEvent {
     this._listeners = this._listeners.filter(listener => listener !== callback);
   }
 
-  __attach(viewRef: any, eventName: string) {
+  __attach(viewRef: any, eventName: string): void {
     invariant(
       this.__isNative,
       'Only native driven events need to be attached.',
@@ -191,7 +188,7 @@ class AnimatedEvent {
     );
   }
 
-  __detach(viewTag: any, eventName: string) {
+  __detach(viewTag: any, eventName: string): void {
     invariant(
       this.__isNative,
       'Only native driven events need to be detached.',
@@ -257,5 +254,3 @@ class AnimatedEvent {
     this._listeners.forEach(listener => listener(...args));
   };
 }
-
-module.exports = {AnimatedEvent, attachNativeEvent};
diff --git a/Libraries/Animated/AnimatedImplementation.js b/Libraries/Animated/AnimatedImplementation.js
index 5aaa29f33653..7e25c65f2a46 100644
--- a/Libraries/Animated/AnimatedImplementation.js
+++ b/Libraries/Animated/AnimatedImplementation.js
@@ -10,35 +10,33 @@
 
 'use strict';
 
-const {AnimatedEvent, attachNativeEvent} = require('./AnimatedEvent');
-const AnimatedAddition = require('./nodes/AnimatedAddition');
-const AnimatedDiffClamp = require('./nodes/AnimatedDiffClamp');
-const AnimatedDivision = require('./nodes/AnimatedDivision');
-const AnimatedInterpolation = require('./nodes/AnimatedInterpolation');
-const AnimatedModulo = require('./nodes/AnimatedModulo');
-const AnimatedMultiplication = require('./nodes/AnimatedMultiplication');
-const AnimatedNode = require('./nodes/AnimatedNode');
-const AnimatedSubtraction = require('./nodes/AnimatedSubtraction');
-const AnimatedTracking = require('./nodes/AnimatedTracking');
-const AnimatedValue = require('./nodes/AnimatedValue');
-const AnimatedValueXY = require('./nodes/AnimatedValueXY');
-const DecayAnimation = require('./animations/DecayAnimation');
-const SpringAnimation = require('./animations/SpringAnimation');
-const TimingAnimation = require('./animations/TimingAnimation');
-
-const createAnimatedComponent = require('./createAnimatedComponent');
-
+import type {EventConfig, Mapping} from './AnimatedEvent';
 import type {
   AnimationConfig,
   EndCallback,
   EndResult,
 } from './animations/Animation';
-import type {TimingAnimationConfig} from './animations/TimingAnimation';
 import type {DecayAnimationConfig} from './animations/DecayAnimation';
 import type {SpringAnimationConfig} from './animations/SpringAnimation';
-import type {Mapping, EventConfig} from './AnimatedEvent';
+import type {TimingAnimationConfig} from './animations/TimingAnimation';
 
+import {AnimatedEvent, attachNativeEvent} from './AnimatedEvent';
+import DecayAnimation from './animations/DecayAnimation';
+import SpringAnimation from './animations/SpringAnimation';
+import TimingAnimation from './animations/TimingAnimation';
+import createAnimatedComponent from './createAnimatedComponent';
+import AnimatedAddition from './nodes/AnimatedAddition';
 import AnimatedColor from './nodes/AnimatedColor';
+import AnimatedDiffClamp from './nodes/AnimatedDiffClamp';
+import AnimatedDivision from './nodes/AnimatedDivision';
+import AnimatedInterpolation from './nodes/AnimatedInterpolation';
+import AnimatedModulo from './nodes/AnimatedModulo';
+import AnimatedMultiplication from './nodes/AnimatedMultiplication';
+import AnimatedNode from './nodes/AnimatedNode';
+import AnimatedSubtraction from './nodes/AnimatedSubtraction';
+import AnimatedTracking from './nodes/AnimatedTracking';
+import AnimatedValue from './nodes/AnimatedValue';
+import AnimatedValueXY from './nodes/AnimatedValueXY';
 
 export type CompositeAnimation = {
   start: (callback?: ?EndCallback) => void,
@@ -369,7 +367,7 @@ const parallel = function (
 ): CompositeAnimation {
   let doneCount = 0;
   // Make sure we only call stop() at most once for each animation
-  const hasEnded = {};
+  const hasEnded: {[number]: boolean} = {};
   const stopTogether = !(config && config.stopTogether === false);
 
   const result = {
@@ -417,7 +415,7 @@ const parallel = function (
       });
     },
 
-    _startNativeLoop: function () {
+    _startNativeLoop: function (): empty {
       throw new Error(
         'Loops run using the native driver cannot contain Animated.parallel animations',
       );
@@ -575,7 +573,7 @@ export type {AnimatedNumeric as Numeric};
  *
  * See https://reactnative.dev/docs/animated
  */
-module.exports = {
+export default {
   /**
    * Standard value class for driving animations.  Typically initialized with
    * `new Animated.Value(0);`
diff --git a/Libraries/Animated/AnimatedMock.js b/Libraries/Animated/AnimatedMock.js
index b7af8042fb90..c509c830f7d0 100644
--- a/Libraries/Animated/AnimatedMock.js
+++ b/Libraries/Animated/AnimatedMock.js
@@ -10,23 +10,21 @@
 
 'use strict';
 
+import type {Numeric as AnimatedNumeric} from './AnimatedImplementation';
 import type {EndResult} from './animations/Animation';
-
-const {AnimatedEvent, attachNativeEvent} = require('./AnimatedEvent');
-const AnimatedImplementation = require('./AnimatedImplementation');
-const AnimatedInterpolation = require('./nodes/AnimatedInterpolation');
-const AnimatedNode = require('./nodes/AnimatedNode');
-const AnimatedValue = require('./nodes/AnimatedValue');
-const AnimatedValueXY = require('./nodes/AnimatedValueXY');
-
-const createAnimatedComponent = require('./createAnimatedComponent');
-
 import type {EndCallback} from './animations/Animation';
-import type {TimingAnimationConfig} from './animations/TimingAnimation';
 import type {DecayAnimationConfig} from './animations/DecayAnimation';
 import type {SpringAnimationConfig} from './animations/SpringAnimation';
-import type {Numeric as AnimatedNumeric} from './AnimatedImplementation';
+import type {TimingAnimationConfig} from './animations/TimingAnimation';
+
+import {AnimatedEvent, attachNativeEvent} from './AnimatedEvent';
+import AnimatedImplementation from './AnimatedImplementation';
+import createAnimatedComponent from './createAnimatedComponent';
 import AnimatedColor from './nodes/AnimatedColor';
+import AnimatedInterpolation from './nodes/AnimatedInterpolation';
+import AnimatedNode from './nodes/AnimatedNode';
+import AnimatedValue from './nodes/AnimatedValue';
+import AnimatedValueXY from './nodes/AnimatedValueXY';
 
 /**
  * Animations are a source of flakiness in snapshot testing. This mock replaces
@@ -168,7 +166,7 @@ const loop = function (
 
 export type {AnimatedNumeric as Numeric};
 
-module.exports = {
+export default {
   Value: AnimatedValue,
   ValueXY: AnimatedValueXY,
   Color: AnimatedColor,
diff --git a/Libraries/Animated/AnimatedWeb.js b/Libraries/Animated/AnimatedWeb.js
index e1c016b75324..e23a04587a70 100644
--- a/Libraries/Animated/AnimatedWeb.js
+++ b/Libraries/Animated/AnimatedWeb.js
@@ -10,9 +10,9 @@
 
 'use strict';
 
-const AnimatedImplementation = require('./AnimatedImplementation');
+import AnimatedImplementation from './AnimatedImplementation';
 
-module.exports = {
+export default {
   ...AnimatedImplementation,
   /* $FlowFixMe[incompatible-call] createAnimatedComponent expects to receive
    * types. Plain intrinsic components can't be typed like this */
diff --git a/Libraries/Animated/Easing.d.ts b/Libraries/Animated/Easing.d.ts
new file mode 100644
index 000000000000..bb496f0cd776
--- /dev/null
+++ b/Libraries/Animated/Easing.d.ts
@@ -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.
+ *
+ * @format
+ */
+
+/**
+ * This class implements common easing functions. The math is pretty obscure,
+ * but this cool website has nice visual illustrations of what they represent:
+ * http://xaedes.de/dev/transitions/
+ */
+export type EasingFunction = (value: number) => number;
+export interface EasingStatic {
+  step0: EasingFunction;
+  step1: EasingFunction;
+  linear: EasingFunction;
+  ease: EasingFunction;
+  quad: EasingFunction;
+  cubic: EasingFunction;
+  poly(n: number): EasingFunction;
+  sin: EasingFunction;
+  circle: EasingFunction;
+  exp: EasingFunction;
+  elastic(bounciness: number): EasingFunction;
+  back(s: number): EasingFunction;
+  bounce: EasingFunction;
+  bezier(x1: number, y1: number, x2: number, y2: number): EasingFunction;
+  in(easing: EasingFunction): EasingFunction;
+  out(easing: EasingFunction): EasingFunction;
+  inOut(easing: EasingFunction): EasingFunction;
+}
+
+export type Easing = EasingStatic;
+export const Easing: EasingStatic;
diff --git a/Libraries/Animated/Easing.js b/Libraries/Animated/Easing.js
index f8b5bac2f304..32819708a11d 100644
--- a/Libraries/Animated/Easing.js
+++ b/Libraries/Animated/Easing.js
@@ -214,7 +214,7 @@ const Easing = {
     x2: number,
     y2: number,
   ): (t: number) => number {
-    const _bezier = require('./bezier');
+    const _bezier = require('./bezier').default;
     return _bezier(x1, y1, x2, y2);
   },
 
@@ -247,4 +247,4 @@ const Easing = {
   },
 };
 
-module.exports = Easing;
+export default Easing;
diff --git a/Libraries/Animated/NativeAnimatedHelper.js b/Libraries/Animated/NativeAnimatedHelper.js
index 255f6a3ee9ff..e0c91788c4b8 100644
--- a/Libraries/Animated/NativeAnimatedHelper.js
+++ b/Libraries/Animated/NativeAnimatedHelper.js
@@ -8,22 +8,23 @@
  * @format
  */
 
-import NativeAnimatedNonTurboModule from './NativeAnimatedModule';
-import NativeAnimatedTurboModule from './NativeAnimatedTurboModule';
-import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
-import Platform from '../Utilities/Platform';
+import type {EventSubscription} from '../vendor/emitter/EventEmitter';
 import type {EventConfig} from './AnimatedEvent';
+import type {AnimationConfig, EndCallback} from './animations/Animation';
 import type {
-  EventMapping,
   AnimatedNodeConfig,
   AnimatingNodeConfig,
+  EventMapping,
 } from './NativeAnimatedModule';
-import type {AnimationConfig, EndCallback} from './animations/Animation';
 import type {InterpolationConfigType} from './nodes/AnimatedInterpolation';
+
+import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
+import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
 import ReactNativeFeatureFlags from '../ReactNative/ReactNativeFeatureFlags';
+import Platform from '../Utilities/Platform';
+import NativeAnimatedNonTurboModule from './NativeAnimatedModule';
+import NativeAnimatedTurboModule from './NativeAnimatedTurboModule';
 import invariant from 'invariant';
-import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
-import type {EventSubscription} from '../vendor/emitter/EventEmitter';
 
 // TODO T69437152 @petetheheat - Delete this fork when Fabric ships to 100%.
 const NativeAnimatedModule =
@@ -36,7 +37,7 @@ let __nativeAnimationIdCount = 1; /* used for started animations */
 
 let nativeEventEmitter;
 
-let waitingForQueuedOperations = new Set();
+let waitingForQueuedOperations = new Set<string>();
 let queueOperations = false;
 let queue: Array<() => void> = [];
 // $FlowFixMe
@@ -48,8 +49,12 @@ const useSingleOpBatching =
   ReactNativeFeatureFlags.animatedShouldUseSingleOp();
 let flushQueueTimeout = null;
 
-const eventListenerGetValueCallbacks = {};
-const eventListenerAnimationFinishedCallbacks = {};
+const eventListenerGetValueCallbacks: {
+  [$FlowFixMe | number]: ((value: number) => void) | void,
+} = {};
+const eventListenerAnimationFinishedCallbacks: {
+  [$FlowFixMe | number]: EndCallback | void,
+} = {};
 let globalEventEmitterGetValueListener: ?EventSubscription = null;
 let globalEventEmitterAnimationFinishedListener: ?EventSubscription = null;
 
@@ -78,7 +83,7 @@ const nativeOps: ?typeof NativeAnimatedModule = useSingleOpBatching
         'addListener', // 20
         'removeListener', // 21
       ];
-      return apis.reduce((acc, functionName, i) => {
+      return apis.reduce<{[string]: number}>((acc, functionName, i) => {
         // These indices need to be kept in sync with the indices in native (see NativeAnimatedModule in Java, or the equivalent for any other native platform).
         // $FlowFixMe[prop-missing]
         acc[functionName] = i + 1;
@@ -420,14 +425,17 @@ const SUPPORTED_INTERPOLATION_PARAMS = {
 };
 
 function addWhitelistedStyleProp(prop: string): void {
+  // $FlowFixMe[prop-missing]
   SUPPORTED_STYLES[prop] = true;
 }
 
 function addWhitelistedTransformProp(prop: string): void {
+  // $FlowFixMe[prop-missing]
   SUPPORTED_TRANSFORMS[prop] = true;
 }
 
 function addWhitelistedInterpolationParam(param: string): void {
+  // $FlowFixMe[prop-missing]
   SUPPORTED_INTERPOLATION_PARAMS[param] = true;
 }
 
@@ -519,15 +527,17 @@ function shouldUseNativeDriver(
   }
 
   if (config.useNativeDriver === true && !NativeAnimatedModule) {
-    if (!_warnedMissingNativeAnimated) {
-      console.warn(
-        'Animated: `useNativeDriver` is not supported because the native ' +
-          'animated module is missing. Falling back to JS-based animation. To ' +
-          'resolve this, add `RCTAnimation` module to this app, or remove ' +
-          '`useNativeDriver`. ' +
-          'Make sure to run `bundle exec pod install` first. Read more about autolinking: https://github.com/react-native-community/cli/blob/master/docs/autolinking.md',
-      );
-      _warnedMissingNativeAnimated = true;
+    if (process.env.NODE_ENV !== 'test') {
+      if (!_warnedMissingNativeAnimated) {
+        console.warn(
+          'Animated: `useNativeDriver` is not supported because the native ' +
+            'animated module is missing. Falling back to JS-based animation. To ' +
+            'resolve this, add `RCTAnimation` module to this app, or remove ' +
+            '`useNativeDriver`. ' +
+            'Make sure to run `bundle exec pod install` first. Read more about autolinking: https://github.com/react-native-community/cli/blob/master/docs/autolinking.md',
+        );
+        _warnedMissingNativeAnimated = true;
+      }
     }
     return false;
   }
@@ -550,7 +560,7 @@ function transformDataType(value: number | string): number | string {
   }
 }
 
-module.exports = {
+export default {
   API,
   isSupportedColorStyleProp,
   isSupportedStyleProp,
diff --git a/Libraries/Animated/NativeAnimatedModule.js b/Libraries/Animated/NativeAnimatedModule.js
index 73f3bb76f90c..9fc932e6b509 100644
--- a/Libraries/Animated/NativeAnimatedModule.js
+++ b/Libraries/Animated/NativeAnimatedModule.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 type EndResult = {finished: boolean, ...};
diff --git a/Libraries/Animated/NativeAnimatedTurboModule.js b/Libraries/Animated/NativeAnimatedTurboModule.js
index 3adac4237dae..58664ca87421 100644
--- a/Libraries/Animated/NativeAnimatedTurboModule.js
+++ b/Libraries/Animated/NativeAnimatedTurboModule.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 type EndResult = {finished: boolean, ...};
diff --git a/Libraries/Animated/SpringConfig.js b/Libraries/Animated/SpringConfig.js
index c687f6b97126..2ed616eb87e6 100644
--- a/Libraries/Animated/SpringConfig.js
+++ b/Libraries/Animated/SpringConfig.js
@@ -24,7 +24,7 @@ function dampingFromOrigamiValue(oValue: number) {
   return (oValue - 8) * 3 + 25;
 }
 
-function fromOrigamiTensionAndFriction(
+export function fromOrigamiTensionAndFriction(
   tension: number,
   friction: number,
 ): SpringConfigType {
@@ -34,7 +34,7 @@ function fromOrigamiTensionAndFriction(
   };
 }
 
-function fromBouncinessAndSpeed(
+export function fromBouncinessAndSpeed(
   bounciness: number,
   speed: number,
 ): SpringConfigType {
@@ -96,8 +96,3 @@ function fromBouncinessAndSpeed(
     damping: dampingFromOrigamiValue(bouncyFriction),
   };
 }
-
-module.exports = {
-  fromOrigamiTensionAndFriction,
-  fromBouncinessAndSpeed,
-};
diff --git a/Libraries/Animated/__tests__/Animated-test.js b/Libraries/Animated/__tests__/Animated-test.js
index 8f62804c73b7..698dee83e999 100644
--- a/Libraries/Animated/__tests__/Animated-test.js
+++ b/Libraries/Animated/__tests__/Animated-test.js
@@ -5,12 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
-import AnimatedProps from '../nodes/AnimatedProps';
-import TestRenderer from 'react-test-renderer';
 import * as React from 'react';
+import TestRenderer from 'react-test-renderer';
+
+let Animated = require('../Animated').default;
+let AnimatedProps = require('../nodes/AnimatedProps').default;
 
 jest.mock('../../BatchedBridge/NativeModules', () => ({
   NativeAnimatedModule: {},
@@ -21,8 +23,6 @@ jest.mock('../../BatchedBridge/NativeModules', () => ({
   },
 }));
 
-let Animated = require('../Animated');
-
 describe('Animated tests', () => {
   beforeEach(() => {
     jest.resetModules();
@@ -31,6 +31,10 @@ describe('Animated tests', () => {
   describe('Animated', () => {
     it('works end to end', () => {
       const anim = new Animated.Value(0);
+      const translateAnim = anim.interpolate({
+        inputRange: [0, 1],
+        outputRange: [100, 200],
+      });
 
       const callback = jest.fn();
 
@@ -41,10 +45,10 @@ describe('Animated tests', () => {
             opacity: anim,
             transform: [
               {
-                translateX: anim.interpolate({
-                  inputRange: [0, 1],
-                  outputRange: [100, 200],
-                }),
+                translate: [translateAnim, translateAnim],
+              },
+              {
+                translateX: translateAnim,
               },
               {scale: anim},
             ],
@@ -61,7 +65,7 @@ describe('Animated tests', () => {
         style: {
           backgroundColor: 'red',
           opacity: 0,
-          transform: [{translateX: 100}, {scale: 0}],
+          transform: [{translate: [100, 100]}, {translateX: 100}, {scale: 0}],
           shadowOffset: {
             width: 0,
             height: 0,
@@ -83,7 +87,7 @@ describe('Animated tests', () => {
         style: {
           backgroundColor: 'red',
           opacity: 0.5,
-          transform: [{translateX: 150}, {scale: 0.5}],
+          transform: [{translate: [150, 150]}, {translateX: 150}, {scale: 0.5}],
           shadowOffset: {
             width: 0.5,
             height: 0.5,
@@ -692,7 +696,7 @@ describe('Animated tests', () => {
 
     beforeEach(() => {
       jest.mock('../../Interaction/InteractionManager');
-      Animated = require('../Animated');
+      Animated = require('../Animated').default;
       InteractionManager = require('../../Interaction/InteractionManager');
     });
 
diff --git a/Libraries/Animated/__tests__/AnimatedMock-test.js b/Libraries/Animated/__tests__/AnimatedMock-test.js
index cc510feefefb..d08a5ecc38f7 100644
--- a/Libraries/Animated/__tests__/AnimatedMock-test.js
+++ b/Libraries/Animated/__tests__/AnimatedMock-test.js
@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
-const AnimatedMock = require('../AnimatedMock');
-const AnimatedImplementation = require('../AnimatedImplementation');
+import AnimatedImplementation from '../AnimatedImplementation';
+import AnimatedMock from '../AnimatedMock';
 
 describe('Animated Mock', () => {
   it('matches implementation keys', () => {
diff --git a/Libraries/Animated/__tests__/AnimatedNative-test.js b/Libraries/Animated/__tests__/AnimatedNative-test.js
index 677527e22c9d..2f7b10af0526 100644
--- a/Libraries/Animated/__tests__/AnimatedNative-test.js
+++ b/Libraries/Animated/__tests__/AnimatedNative-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 jest
@@ -20,14 +20,14 @@ jest
   }))
   .mock('../NativeAnimatedModule')
   .mock('../../EventEmitter/NativeEventEmitter')
-  // findNodeHandle is imported from ReactNative so mock that whole module.
-  .setMock('../../Renderer/shims/ReactNative', {findNodeHandle: () => 1});
+  // findNodeHandle is imported from RendererProxy so mock that whole module.
+  .setMock('../../ReactNative/RendererProxy', {findNodeHandle: () => 1});
 
-import TestRenderer from 'react-test-renderer';
 import * as React from 'react';
+import TestRenderer from 'react-test-renderer';
 
-const Animated = require('../Animated');
-const NativeAnimatedHelper = require('../NativeAnimatedHelper');
+const Animated = require('../Animated').default;
+const NativeAnimatedHelper = require('../NativeAnimatedHelper').default;
 
 describe('Native Animated', () => {
   const NativeAnimatedModule = require('../NativeAnimatedModule').default;
diff --git a/Libraries/Animated/__tests__/Easing-test.js b/Libraries/Animated/__tests__/Easing-test.js
index 8efeed00037d..1447c0c60edd 100644
--- a/Libraries/Animated/__tests__/Easing-test.js
+++ b/Libraries/Animated/__tests__/Easing-test.js
@@ -5,12 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
-const Easing = require('../Easing');
+import Easing from '../Easing';
 describe('Easing', () => {
   it('should work with linear', () => {
     const easing = Easing.linear;
diff --git a/Libraries/Animated/__tests__/Interpolation-test.js b/Libraries/Animated/__tests__/Interpolation-test.js
index 64585ac683bd..2893cdd39399 100644
--- a/Libraries/Animated/__tests__/Interpolation-test.js
+++ b/Libraries/Animated/__tests__/Interpolation-test.js
@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
-const AnimatedInterpolation = require('../nodes/AnimatedInterpolation');
-const Easing = require('../Easing');
+import Easing from '../Easing';
+import AnimatedInterpolation from '../nodes/AnimatedInterpolation';
 
 describe('Interpolation', () => {
   it('should work with defaults', () => {
diff --git a/Libraries/Animated/__tests__/TimingAnimation-test.js b/Libraries/Animated/__tests__/TimingAnimation-test.js
index e82407876a2d..b05a2ff3c76e 100644
--- a/Libraries/Animated/__tests__/TimingAnimation-test.js
+++ b/Libraries/Animated/__tests__/TimingAnimation-test.js
@@ -5,12 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
-const TimingAnimation = require('../animations/TimingAnimation');
+import TimingAnimation from '../animations/TimingAnimation';
 
 describe('Timing Animation', () => {
   it('should return array of 61 items', () => {
diff --git a/Libraries/Animated/__tests__/bezier-test.js b/Libraries/Animated/__tests__/bezier-test.js
index 48bfdef0f2d6..da5303f9c5e8 100644
--- a/Libraries/Animated/__tests__/bezier-test.js
+++ b/Libraries/Animated/__tests__/bezier-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow
  * @format
+ * @oncall react_native
  */
 
 /**
@@ -17,7 +17,7 @@
 
 'use strict';
 
-const bezier = require('../bezier');
+import bezier from '../bezier';
 
 const identity = function (x: number) {
   return x;
diff --git a/Libraries/Animated/__tests__/createAnimatedComponentInjection-test.js b/Libraries/Animated/__tests__/createAnimatedComponentInjection-test.js
index 9d8fa9b1869d..15936f7b675a 100644
--- a/Libraries/Animated/__tests__/createAnimatedComponentInjection-test.js
+++ b/Libraries/Animated/__tests__/createAnimatedComponentInjection-test.js
@@ -4,16 +4,17 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const createAnimatedComponent = require('../createAnimatedComponent');
+import * as React from 'react';
+
+const createAnimatedComponent = require('../createAnimatedComponent').default;
 const createAnimatedComponentInjection = require('../createAnimatedComponentInjection');
-const React = require('react');
 
 function injected<TProps: {...}, TInstance>(
   Component: React.AbstractComponent<TProps, TInstance>,
diff --git a/Libraries/Animated/animations/Animation.js b/Libraries/Animated/animations/Animation.js
index f22c5e9e4ada..f3d2ac6d3ac2 100644
--- a/Libraries/Animated/animations/Animation.js
+++ b/Libraries/Animated/animations/Animation.js
@@ -10,10 +10,11 @@
 
 'use strict';
 
-const NativeAnimatedHelper = require('../NativeAnimatedHelper');
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
 import type AnimatedValue from '../nodes/AnimatedValue';
 
+import NativeAnimatedHelper from '../NativeAnimatedHelper';
+
 export type EndResult = {finished: boolean, ...};
 export type EndCallback = (result: EndResult) => void;
 
@@ -30,7 +31,7 @@ let startNativeAnimationNextId = 1;
 // Important note: start() and stop() will only be called at most once.
 // Once an animation has been stopped or finished its course, it will
 // not be reused.
-class Animation {
+export default class Animation {
   __active: boolean;
   __isInteraction: boolean;
   __nativeId: number;
@@ -85,5 +86,3 @@ class Animation {
     }
   }
 }
-
-module.exports = Animation;
diff --git a/Libraries/Animated/animations/DecayAnimation.js b/Libraries/Animated/animations/DecayAnimation.js
index c53ff08ac0fe..f0042c5881de 100644
--- a/Libraries/Animated/animations/DecayAnimation.js
+++ b/Libraries/Animated/animations/DecayAnimation.js
@@ -10,14 +10,13 @@
 
 'use strict';
 
-const Animation = require('./Animation');
-
-const {shouldUseNativeDriver} = require('../NativeAnimatedHelper');
-
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
 import type AnimatedValue from '../nodes/AnimatedValue';
 import type {AnimationConfig, EndCallback} from './Animation';
 
+import NativeAnimatedHelper from '../NativeAnimatedHelper';
+import Animation from './Animation';
+
 export type DecayAnimationConfig = {
   ...AnimationConfig,
   velocity:
@@ -36,7 +35,7 @@ export type DecayAnimationConfigSingle = {
   deceleration?: number,
 };
 
-class DecayAnimation extends Animation {
+export default class DecayAnimation extends Animation {
   _startTime: number;
   _lastValue: number;
   _fromValue: number;
@@ -51,7 +50,7 @@ class DecayAnimation extends Animation {
     super();
     this._deceleration = config.deceleration ?? 0.998;
     this._velocity = config.velocity;
-    this._useNativeDriver = shouldUseNativeDriver(config);
+    this._useNativeDriver = NativeAnimatedHelper.shouldUseNativeDriver(config);
     this._platformConfig = config.platformConfig;
     this.__isInteraction = config.isInteraction ?? !this._useNativeDriver;
     this.__iterations = config.iterations ?? 1;
@@ -123,5 +122,3 @@ class DecayAnimation extends Animation {
     this.__debouncedOnEnd({finished: false});
   }
 }
-
-module.exports = DecayAnimation;
diff --git a/Libraries/Animated/animations/SpringAnimation.js b/Libraries/Animated/animations/SpringAnimation.js
index e02ed31872da..69101dab030e 100644
--- a/Libraries/Animated/animations/SpringAnimation.js
+++ b/Libraries/Animated/animations/SpringAnimation.js
@@ -10,20 +10,17 @@
 
 'use strict';
 
-const AnimatedValue = require('../nodes/AnimatedValue');
-const AnimatedValueXY = require('../nodes/AnimatedValueXY');
-const AnimatedInterpolation = require('../nodes/AnimatedInterpolation');
-const Animation = require('./Animation');
-const SpringConfig = require('../SpringConfig');
-
-const invariant = require('invariant');
-
-const {shouldUseNativeDriver} = require('../NativeAnimatedHelper');
-
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
+import type AnimatedInterpolation from '../nodes/AnimatedInterpolation';
+import type AnimatedValue from '../nodes/AnimatedValue';
+import type AnimatedValueXY from '../nodes/AnimatedValueXY';
 import type {AnimationConfig, EndCallback} from './Animation';
 
+import NativeAnimatedHelper from '../NativeAnimatedHelper';
 import AnimatedColor from '../nodes/AnimatedColor';
+import * as SpringConfig from '../SpringConfig';
+import Animation from './Animation';
+import invariant from 'invariant';
 
 export type SpringAnimationConfig = {
   ...AnimationConfig,
@@ -82,7 +79,7 @@ export type SpringAnimationConfigSingle = {
   delay?: number,
 };
 
-class SpringAnimation extends Animation {
+export default class SpringAnimation extends Animation {
   _overshootClamping: boolean;
   _restDisplacementThreshold: number;
   _restSpeedThreshold: number;
@@ -115,7 +112,7 @@ class SpringAnimation extends Animation {
     this._lastVelocity = config.velocity ?? 0;
     this._toValue = config.toValue;
     this._delay = config.delay ?? 0;
-    this._useNativeDriver = shouldUseNativeDriver(config);
+    this._useNativeDriver = NativeAnimatedHelper.shouldUseNativeDriver(config);
     this._platformConfig = config.platformConfig;
     this.__isInteraction = config.isInteraction ?? !this._useNativeDriver;
     this.__iterations = config.iterations ?? 1;
@@ -371,5 +368,3 @@ class SpringAnimation extends Animation {
     this.__debouncedOnEnd({finished: false});
   }
 }
-
-module.exports = SpringAnimation;
diff --git a/Libraries/Animated/animations/TimingAnimation.js b/Libraries/Animated/animations/TimingAnimation.js
index 94c4b3a4b836..5c0c3ce38144 100644
--- a/Libraries/Animated/animations/TimingAnimation.js
+++ b/Libraries/Animated/animations/TimingAnimation.js
@@ -10,18 +10,16 @@
 
 'use strict';
 
-const AnimatedValue = require('../nodes/AnimatedValue');
-const AnimatedValueXY = require('../nodes/AnimatedValueXY');
-const AnimatedInterpolation = require('../nodes/AnimatedInterpolation');
-const Animation = require('./Animation');
-
-const {shouldUseNativeDriver} = require('../NativeAnimatedHelper');
-
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
-import type {AnimationConfig, EndCallback} from './Animation';
 import type {RgbaValue} from '../nodes/AnimatedColor';
+import type AnimatedInterpolation from '../nodes/AnimatedInterpolation';
+import type AnimatedValue from '../nodes/AnimatedValue';
+import type AnimatedValueXY from '../nodes/AnimatedValueXY';
+import type {AnimationConfig, EndCallback} from './Animation';
 
+import NativeAnimatedHelper from '../NativeAnimatedHelper';
 import AnimatedColor from '../nodes/AnimatedColor';
+import Animation from './Animation';
 
 export type TimingAnimationConfig = $ReadOnly<{
   ...AnimationConfig,
@@ -53,13 +51,13 @@ export type TimingAnimationConfigSingle = $ReadOnly<{
 let _easeInOut;
 function easeInOut() {
   if (!_easeInOut) {
-    const Easing = require('../Easing');
+    const Easing = require('../Easing').default;
     _easeInOut = Easing.inOut(Easing.ease);
   }
   return _easeInOut;
 }
 
-class TimingAnimation extends Animation {
+export default class TimingAnimation extends Animation {
   _startTime: number;
   _fromValue: number;
   _toValue: number;
@@ -79,7 +77,7 @@ class TimingAnimation extends Animation {
     this._duration = config.duration ?? 500;
     this._delay = config.delay ?? 0;
     this.__iterations = config.iterations ?? 1;
-    this._useNativeDriver = shouldUseNativeDriver(config);
+    this._useNativeDriver = NativeAnimatedHelper.shouldUseNativeDriver(config);
     this._platformConfig = config.platformConfig;
     this.__isInteraction = config.isInteraction ?? !this._useNativeDriver;
   }
@@ -172,5 +170,3 @@ class TimingAnimation extends Animation {
     this.__debouncedOnEnd({finished: false});
   }
 }
-
-module.exports = TimingAnimation;
diff --git a/Libraries/Animated/bezier.js b/Libraries/Animated/bezier.js
index da60afa0ec32..f18cef48e2da 100644
--- a/Libraries/Animated/bezier.js
+++ b/Libraries/Animated/bezier.js
@@ -92,7 +92,7 @@ function newtonRaphsonIterate(
   return aGuessT;
 }
 
-module.exports = function bezier(
+export default function bezier(
   mX1: number,
   mY1: number,
   mX2: number,
@@ -161,4 +161,4 @@ module.exports = function bezier(
     }
     return calcBezier(getTForX(x), mY1, mY2);
   };
-};
+}
diff --git a/Libraries/Animated/components/AnimatedFlatList.js b/Libraries/Animated/components/AnimatedFlatList.js
index ebe160f12e75..afe8bd88061c 100644
--- a/Libraries/Animated/components/AnimatedFlatList.js
+++ b/Libraries/Animated/components/AnimatedFlatList.js
@@ -8,13 +8,12 @@
  * @format
  */
 
-import * as React from 'react';
-
-const FlatList = require('../../Lists/FlatList');
-const createAnimatedComponent = require('../createAnimatedComponent');
-
 import type {AnimatedComponentType} from '../createAnimatedComponent';
 
+import FlatList from '../../Lists/FlatList';
+import createAnimatedComponent from '../createAnimatedComponent';
+import * as React from 'react';
+
 /**
  * @see https://github.com/facebook/react-native/commit/b8c8562
  */
@@ -22,7 +21,7 @@ const FlatListWithEventThrottle = React.forwardRef((props, ref) => (
   <FlatList scrollEventThrottle={0.0001} {...props} ref={ref} />
 ));
 
-module.exports = (createAnimatedComponent(
+export default (createAnimatedComponent(
   FlatListWithEventThrottle,
 ): AnimatedComponentType<
   React.ElementConfig<typeof FlatList>,
diff --git a/Libraries/Animated/components/AnimatedImage.js b/Libraries/Animated/components/AnimatedImage.js
index b0e7b9042020..c178480fe73a 100644
--- a/Libraries/Animated/components/AnimatedImage.js
+++ b/Libraries/Animated/components/AnimatedImage.js
@@ -8,14 +8,13 @@
  * @format
  */
 
-import * as React from 'react';
-
-const Image = require('../../Image/Image');
-const createAnimatedComponent = require('../createAnimatedComponent');
-
 import type {AnimatedComponentType} from '../createAnimatedComponent';
 
-module.exports = (createAnimatedComponent(
+import Image from '../../Image/Image';
+import createAnimatedComponent from '../createAnimatedComponent';
+import * as React from 'react';
+
+export default (createAnimatedComponent(
   (Image: $FlowFixMe),
 ): AnimatedComponentType<
   React.ElementConfig<typeof Image>,
diff --git a/Libraries/Animated/components/AnimatedScrollView.js b/Libraries/Animated/components/AnimatedScrollView.js
index 887948366ac8..a3ba2d272cae 100644
--- a/Libraries/Animated/components/AnimatedScrollView.js
+++ b/Libraries/Animated/components/AnimatedScrollView.js
@@ -8,23 +8,119 @@
  * @format
  */
 
+import type {____ViewStyle_Internal} from '../../StyleSheet/StyleSheetTypes';
+import type {AnimatedComponentType} from '../createAnimatedComponent';
+
+import RefreshControl from '../../Components/RefreshControl/RefreshControl';
+import ScrollView from '../../Components/ScrollView/ScrollView';
+import flattenStyle from '../../StyleSheet/flattenStyle';
+import splitLayoutProps from '../../StyleSheet/splitLayoutProps';
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import Platform from '../../Utilities/Platform';
+import useMergeRefs from '../../Utilities/useMergeRefs';
+import createAnimatedComponent from '../createAnimatedComponent';
+import useAnimatedProps from '../useAnimatedProps';
 import * as React from 'react';
+import {useMemo} from 'react';
 
-const ScrollView = require('../../Components/ScrollView/ScrollView');
-const createAnimatedComponent = require('../createAnimatedComponent');
-
-import type {AnimatedComponentType} from '../createAnimatedComponent';
+type Props = React.ElementConfig<typeof ScrollView>;
+type Instance = React.ElementRef<typeof ScrollView>;
 
 /**
  * @see https://github.com/facebook/react-native/commit/b8c8562
  */
-const ScrollViewWithEventThrottle = React.forwardRef((props, ref) => (
-  <ScrollView scrollEventThrottle={0.0001} {...props} ref={ref} />
-));
-
-module.exports = (createAnimatedComponent(
-  ScrollViewWithEventThrottle,
-): AnimatedComponentType<
-  React.ElementConfig<typeof ScrollView>,
-  React.ElementRef<typeof ScrollView>,
->);
+const AnimatedScrollView: AnimatedComponentType<Props, Instance> =
+  React.forwardRef((props, forwardedRef) => {
+    // (Android only) When a ScrollView has a RefreshControl and
+    // any `style` property set with an Animated.Value, the CSS
+    // gets incorrectly applied twice. This is because ScrollView
+    // swaps the parent/child relationship of itself and the
+    // RefreshControl component (see ScrollView.js for more details).
+    if (
+      Platform.OS === 'android' &&
+      props.refreshControl != null &&
+      props.style != null
+    ) {
+      return (
+        <AnimatedScrollViewWithInvertedRefreshControl
+          scrollEventThrottle={0.0001}
+          {...props}
+          ref={forwardedRef}
+          refreshControl={props.refreshControl}
+        />
+      );
+    } else {
+      return (
+        <AnimatedScrollViewWithoutInvertedRefreshControl
+          scrollEventThrottle={0.0001}
+          {...props}
+          ref={forwardedRef}
+        />
+      );
+    }
+  });
+
+const AnimatedScrollViewWithInvertedRefreshControl = React.forwardRef(
+  (
+    props: {
+      ...React.ElementConfig<typeof ScrollView>,
+      // $FlowFixMe[unclear-type] Same Flow type as `refreshControl` in ScrollView
+      refreshControl: React.Element<any>,
+    },
+    forwardedRef,
+  ) => {
+    // Split `props` into the animate-able props for the parent (RefreshControl)
+    // and child (ScrollView).
+    const {intermediatePropsForRefreshControl, intermediatePropsForScrollView} =
+      useMemo(() => {
+        const {outer, inner} = splitLayoutProps(flattenStyle(props.style));
+        return {
+          intermediatePropsForRefreshControl: {style: outer},
+          intermediatePropsForScrollView: {...props, style: inner},
+        };
+      }, [props]);
+
+    // Handle animated props on `refreshControl`.
+    const [refreshControlAnimatedProps, refreshControlRef] = useAnimatedProps<
+      {style: ?____ViewStyle_Internal},
+      $FlowFixMe,
+    >(intermediatePropsForRefreshControl);
+    // NOTE: Assumes that refreshControl.ref` and `refreshControl.style` can be
+    // safely clobbered.
+    const refreshControl: React.Element<typeof RefreshControl> =
+      React.cloneElement(props.refreshControl, {
+        ...refreshControlAnimatedProps,
+        ref: refreshControlRef,
+      });
+
+    // Handle animated props on `NativeDirectionalScrollView`.
+    const [scrollViewAnimatedProps, scrollViewRef] = useAnimatedProps<
+      Props,
+      Instance,
+    >(intermediatePropsForScrollView);
+    const ref = useMergeRefs<Instance | null>(scrollViewRef, forwardedRef);
+
+    return (
+      // $FlowFixMe[incompatible-use] Investigate useAnimatedProps return value
+      <ScrollView
+        {...scrollViewAnimatedProps}
+        ref={ref}
+        refreshControl={refreshControl}
+        // Because `refreshControl` is a clone of `props.refreshControl` with
+        // `refreshControlAnimatedProps` added, we need to pass ScrollView.js
+        // the combined styles since it also splits the outer/inner styles for
+        // its parent/child, respectively. Without this, the refreshControl
+        // styles would be ignored.
+        style={StyleSheet.compose(
+          scrollViewAnimatedProps.style,
+          refreshControlAnimatedProps.style,
+        )}
+      />
+    );
+  },
+);
+
+const AnimatedScrollViewWithoutInvertedRefreshControl =
+  createAnimatedComponent(ScrollView);
+
+export default AnimatedScrollView;
diff --git a/Libraries/Animated/components/AnimatedSectionList.js b/Libraries/Animated/components/AnimatedSectionList.js
index 2c467a669982..955691f6e2b2 100644
--- a/Libraries/Animated/components/AnimatedSectionList.js
+++ b/Libraries/Animated/components/AnimatedSectionList.js
@@ -8,12 +8,11 @@
  * @format
  */
 
-import * as React from 'react';
+import type {AnimatedComponentType} from '../createAnimatedComponent';
 
 import SectionList from '../../Lists/SectionList';
-const createAnimatedComponent = require('../createAnimatedComponent');
-
-import type {AnimatedComponentType} from '../createAnimatedComponent';
+import createAnimatedComponent from '../createAnimatedComponent';
+import * as React from 'react';
 
 /**
  * @see https://github.com/facebook/react-native/commit/b8c8562
@@ -22,7 +21,7 @@ const SectionListWithEventThrottle = React.forwardRef((props, ref) => (
   <SectionList scrollEventThrottle={0.0001} {...props} ref={ref} />
 ));
 
-module.exports = (createAnimatedComponent(
+export default (createAnimatedComponent(
   SectionListWithEventThrottle,
 ): AnimatedComponentType<
   React.ElementConfig<typeof SectionList>,
diff --git a/Libraries/Animated/components/AnimatedText.js b/Libraries/Animated/components/AnimatedText.js
index 0cd6cd5245d3..02679f1a8013 100644
--- a/Libraries/Animated/components/AnimatedText.js
+++ b/Libraries/Animated/components/AnimatedText.js
@@ -8,14 +8,13 @@
  * @format
  */
 
-import * as React from 'react';
-
-const Text = require('../../Text/Text');
-const createAnimatedComponent = require('../createAnimatedComponent');
-
 import type {AnimatedComponentType} from '../createAnimatedComponent';
 
-module.exports = (createAnimatedComponent(
+import Text from '../../Text/Text';
+import createAnimatedComponent from '../createAnimatedComponent';
+import * as React from 'react';
+
+export default (createAnimatedComponent(
   (Text: $FlowFixMe),
 ): AnimatedComponentType<
   React.ElementConfig<typeof Text>,
diff --git a/Libraries/Animated/components/AnimatedView.js b/Libraries/Animated/components/AnimatedView.js
index 75358b003d5d..5eca94417e67 100644
--- a/Libraries/Animated/components/AnimatedView.js
+++ b/Libraries/Animated/components/AnimatedView.js
@@ -8,14 +8,13 @@
  * @format
  */
 
-import * as React from 'react';
-
-const View = require('../../Components/View/View');
-const createAnimatedComponent = require('../createAnimatedComponent');
-
 import type {AnimatedComponentType} from '../createAnimatedComponent';
 
-module.exports = (createAnimatedComponent(View): AnimatedComponentType<
+import View from '../../Components/View/View';
+import createAnimatedComponent from '../createAnimatedComponent';
+import * as React from 'react';
+
+export default (createAnimatedComponent(View): AnimatedComponentType<
   React.ElementConfig<typeof View>,
   React.ElementRef<typeof View>,
 >);
diff --git a/Libraries/Animated/createAnimatedComponent.js b/Libraries/Animated/createAnimatedComponent.js
index c9dbe808ed71..fb64ba05ffd3 100644
--- a/Libraries/Animated/createAnimatedComponent.js
+++ b/Libraries/Animated/createAnimatedComponent.js
@@ -10,16 +10,14 @@
 
 'use strict';
 
+import View from '../Components/View/View';
+import setAndForwardRef from '../Utilities/setAndForwardRef';
+import {AnimatedEvent} from './AnimatedEvent';
 import * as createAnimatedComponentInjection from './createAnimatedComponentInjection';
-
-const View = require('../Components/View/View');
-const {AnimatedEvent} = require('./AnimatedEvent');
-const AnimatedProps = require('./nodes/AnimatedProps');
-const React = require('react');
-const NativeAnimatedHelper = require('./NativeAnimatedHelper');
-
-const invariant = require('invariant');
-const setAndForwardRef = require('../Utilities/setAndForwardRef');
+import NativeAnimatedHelper from './NativeAnimatedHelper';
+import AnimatedProps from './nodes/AnimatedProps';
+import invariant from 'invariant';
+import * as React from 'react';
 
 let animatedComponentNextId = 1;
 
@@ -55,7 +53,6 @@ function createAnimatedComponent<Props: {+[string]: mixed, ...}, Instance>(
     _prevComponent: any;
     _propsAnimated: AnimatedProps;
     _eventDetachers: Array<Function> = [];
-    _initialAnimatedProps: Object;
 
     // Only to be used in this file, and only in Fabric.
     _animatedComponentId: string = `${animatedComponentNextId++}:animatedComponent`;
@@ -140,7 +137,7 @@ function createAnimatedComponent<Props: {+[string]: mixed, ...}, Instance>(
     // components. If you want to animate a composite component, you need to
     // re-render it. In this case, we have a fallback that uses forceUpdate.
     // This fallback is also called in Fabric.
-    _animatedPropsCallback = () => {
+    _animatedPropsCallback = (): void => {
       if (this._component == null) {
         // AnimatedProps is created in will-mount because it's used in render.
         // But this callback may be invoked before mount in async mode,
@@ -192,7 +189,7 @@ function createAnimatedComponent<Props: {+[string]: mixed, ...}, Instance>(
       }
     }
 
-    _setComponentRef = setAndForwardRef({
+    _setComponentRef: (ref: React.ElementRef<any>) => void = setAndForwardRef({
       getForwardedRef: () => this.props.forwardedRef,
       setLocalRef: ref => {
         this._prevComponent = this._component;
@@ -200,18 +197,14 @@ function createAnimatedComponent<Props: {+[string]: mixed, ...}, Instance>(
       },
     });
 
-    render() {
-      const animatedProps =
-        this._propsAnimated.__getValue(this._initialAnimatedProps) || {};
+    render(): React.Node {
+      const animatedProps = this._propsAnimated.__getValue() || {};
+
       const {style = {}, ...props} = animatedProps;
       const {style: passthruStyle = {}, ...passthruProps} =
         this.props.passthroughAnimatedPropExplicitValues || {};
       const mergedStyle = {...style, ...passthruStyle};
 
-      if (!this._initialAnimatedProps) {
-        this._initialAnimatedProps = animatedProps;
-      }
-
       // Force `collapsable` to be false so that native view is not flattened.
       // Flattened views cannot be accurately referenced by a native driver.
       return (
@@ -277,5 +270,5 @@ function createAnimatedComponent<Props: {+[string]: mixed, ...}, Instance>(
 }
 
 // $FlowIgnore[incompatible-cast] - Will be compatible after refactors.
-module.exports = (createAnimatedComponentInjection.recordAndRetrieve() ??
+export default (createAnimatedComponentInjection.recordAndRetrieve() ??
   createAnimatedComponent: typeof createAnimatedComponent);
diff --git a/Libraries/Animated/createAnimatedComponent_EXPERIMENTAL.js b/Libraries/Animated/createAnimatedComponent_EXPERIMENTAL.js
index b2cd04ac56e4..eb7c78cecc81 100644
--- a/Libraries/Animated/createAnimatedComponent_EXPERIMENTAL.js
+++ b/Libraries/Animated/createAnimatedComponent_EXPERIMENTAL.js
@@ -8,9 +8,9 @@
  * @format
  */
 
-import useAnimatedProps from './useAnimatedProps';
-import useMergeRefs from '../Utilities/useMergeRefs';
 import StyleSheet from '../StyleSheet/StyleSheet';
+import useMergeRefs from '../Utilities/useMergeRefs';
+import useAnimatedProps from './useAnimatedProps';
 import * as React from 'react';
 
 /**
diff --git a/Libraries/Animated/nodes/AnimatedAddition.js b/Libraries/Animated/nodes/AnimatedAddition.js
index b311b39a6606..7a48965f5dd5 100644
--- a/Libraries/Animated/nodes/AnimatedAddition.js
+++ b/Libraries/Animated/nodes/AnimatedAddition.js
@@ -10,15 +10,15 @@
 
 'use strict';
 
-const AnimatedInterpolation = require('./AnimatedInterpolation');
-const AnimatedNode = require('./AnimatedNode');
-const AnimatedValue = require('./AnimatedValue');
-const AnimatedWithChildren = require('./AnimatedWithChildren');
-
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
 import type {InterpolationConfigType} from './AnimatedInterpolation';
+import type AnimatedNode from './AnimatedNode';
+
+import AnimatedInterpolation from './AnimatedInterpolation';
+import AnimatedValue from './AnimatedValue';
+import AnimatedWithChildren from './AnimatedWithChildren';
 
-class AnimatedAddition extends AnimatedWithChildren {
+export default class AnimatedAddition extends AnimatedWithChildren {
   _a: AnimatedNode;
   _b: AnimatedNode;
 
@@ -62,5 +62,3 @@ class AnimatedAddition extends AnimatedWithChildren {
     };
   }
 }
-
-module.exports = AnimatedAddition;
diff --git a/Libraries/Animated/nodes/AnimatedColor.js b/Libraries/Animated/nodes/AnimatedColor.js
index 16a87f528003..d6fba11337f7 100644
--- a/Libraries/Animated/nodes/AnimatedColor.js
+++ b/Libraries/Animated/nodes/AnimatedColor.js
@@ -10,16 +10,16 @@
 
 'use strict';
 
-import AnimatedValue from './AnimatedValue';
-import AnimatedWithChildren from './AnimatedWithChildren';
+import type {NativeColorValue} from '../../StyleSheet/PlatformColorValueTypes';
+import type {ProcessedColorValue} from '../../StyleSheet/processColor';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
+import type {PlatformConfig} from '../AnimatedPlatformConfig';
+
 import normalizeColor from '../../StyleSheet/normalizeColor';
 import {processColorObject} from '../../StyleSheet/PlatformColorValueTypes';
 import NativeAnimatedHelper from '../NativeAnimatedHelper';
-
-import type {PlatformConfig} from '../AnimatedPlatformConfig';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
-import type {NativeColorValue} from '../../StyleSheet/PlatformColorValueTypes';
-import type {ProcessedColorValue} from '../../StyleSheet/processColor';
+import AnimatedValue from './AnimatedValue';
+import AnimatedWithChildren from './AnimatedWithChildren';
 
 export type AnimatedColorConfig = $ReadOnly<{
   useNativeDriver: boolean,
diff --git a/Libraries/Animated/nodes/AnimatedDiffClamp.js b/Libraries/Animated/nodes/AnimatedDiffClamp.js
index 61b167c2fcba..d2ac11ae764a 100644
--- a/Libraries/Animated/nodes/AnimatedDiffClamp.js
+++ b/Libraries/Animated/nodes/AnimatedDiffClamp.js
@@ -10,14 +10,14 @@
 
 'use strict';
 
-const AnimatedInterpolation = require('./AnimatedInterpolation');
-const AnimatedNode = require('./AnimatedNode');
-const AnimatedWithChildren = require('./AnimatedWithChildren');
-
-import type {InterpolationConfigType} from './AnimatedInterpolation';
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
+import type {InterpolationConfigType} from './AnimatedInterpolation';
+import type AnimatedNode from './AnimatedNode';
 
-class AnimatedDiffClamp extends AnimatedWithChildren {
+import AnimatedInterpolation from './AnimatedInterpolation';
+import AnimatedWithChildren from './AnimatedWithChildren';
+
+export default class AnimatedDiffClamp extends AnimatedWithChildren {
   _a: AnimatedNode;
   _min: number;
   _max: number;
@@ -70,5 +70,3 @@ class AnimatedDiffClamp extends AnimatedWithChildren {
     };
   }
 }
-
-module.exports = AnimatedDiffClamp;
diff --git a/Libraries/Animated/nodes/AnimatedDivision.js b/Libraries/Animated/nodes/AnimatedDivision.js
index 3d77e2de6453..158a0f3d7805 100644
--- a/Libraries/Animated/nodes/AnimatedDivision.js
+++ b/Libraries/Animated/nodes/AnimatedDivision.js
@@ -10,15 +10,15 @@
 
 'use strict';
 
-const AnimatedInterpolation = require('./AnimatedInterpolation');
-const AnimatedNode = require('./AnimatedNode');
-const AnimatedValue = require('./AnimatedValue');
-const AnimatedWithChildren = require('./AnimatedWithChildren');
-
-import type {InterpolationConfigType} from './AnimatedInterpolation';
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
+import type {InterpolationConfigType} from './AnimatedInterpolation';
 
-class AnimatedDivision extends AnimatedWithChildren {
+import AnimatedInterpolation from './AnimatedInterpolation';
+import AnimatedNode from './AnimatedNode';
+import AnimatedValue from './AnimatedValue';
+import AnimatedWithChildren from './AnimatedWithChildren';
+
+export default class AnimatedDivision extends AnimatedWithChildren {
   _a: AnimatedNode;
   _b: AnimatedNode;
   _warnedAboutDivideByZero: boolean = false;
@@ -78,5 +78,3 @@ class AnimatedDivision extends AnimatedWithChildren {
     };
   }
 }
-
-module.exports = AnimatedDivision;
diff --git a/Libraries/Animated/nodes/AnimatedInterpolation.js b/Libraries/Animated/nodes/AnimatedInterpolation.js
index ee5ea2194624..be85be6e89d7 100644
--- a/Libraries/Animated/nodes/AnimatedInterpolation.js
+++ b/Libraries/Animated/nodes/AnimatedInterpolation.js
@@ -12,14 +12,13 @@
 
 'use strict';
 
-const AnimatedNode = require('./AnimatedNode');
-const AnimatedWithChildren = require('./AnimatedWithChildren');
-const NativeAnimatedHelper = require('../NativeAnimatedHelper');
-
-const invariant = require('invariant');
-const normalizeColor = require('../../StyleSheet/normalizeColor');
-
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
+import type AnimatedNode from './AnimatedNode';
+
+import normalizeColor from '../../StyleSheet/normalizeColor';
+import NativeAnimatedHelper from '../NativeAnimatedHelper';
+import AnimatedWithChildren from './AnimatedWithChildren';
+import invariant from 'invariant';
 
 type ExtrapolateType = 'extend' | 'identity' | 'clamp';
 
@@ -299,7 +298,7 @@ function checkInfiniteRange(name: string, arr: $ReadOnlyArray<number>) {
   );
 }
 
-class AnimatedInterpolation<
+export default class AnimatedInterpolation<
   OutputT: number | string,
 > extends AnimatedWithChildren {
   // Export for testing.
@@ -368,5 +367,3 @@ class AnimatedInterpolation<
     };
   }
 }
-
-module.exports = AnimatedInterpolation;
diff --git a/Libraries/Animated/nodes/AnimatedModulo.js b/Libraries/Animated/nodes/AnimatedModulo.js
index bc3bc1b3ad27..d5334478afd4 100644
--- a/Libraries/Animated/nodes/AnimatedModulo.js
+++ b/Libraries/Animated/nodes/AnimatedModulo.js
@@ -10,14 +10,14 @@
 
 'use strict';
 
-const AnimatedInterpolation = require('./AnimatedInterpolation');
-const AnimatedNode = require('./AnimatedNode');
-const AnimatedWithChildren = require('./AnimatedWithChildren');
-
-import type {InterpolationConfigType} from './AnimatedInterpolation';
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
+import type {InterpolationConfigType} from './AnimatedInterpolation';
+import type AnimatedNode from './AnimatedNode';
 
-class AnimatedModulo extends AnimatedWithChildren {
+import AnimatedInterpolation from './AnimatedInterpolation';
+import AnimatedWithChildren from './AnimatedWithChildren';
+
+export default class AnimatedModulo extends AnimatedWithChildren {
   _a: AnimatedNode;
   _modulus: number;
 
@@ -61,5 +61,3 @@ class AnimatedModulo extends AnimatedWithChildren {
     };
   }
 }
-
-module.exports = AnimatedModulo;
diff --git a/Libraries/Animated/nodes/AnimatedMultiplication.js b/Libraries/Animated/nodes/AnimatedMultiplication.js
index 419927b71f53..b3cfaf3aed3f 100644
--- a/Libraries/Animated/nodes/AnimatedMultiplication.js
+++ b/Libraries/Animated/nodes/AnimatedMultiplication.js
@@ -10,15 +10,15 @@
 
 'use strict';
 
-const AnimatedInterpolation = require('./AnimatedInterpolation');
-const AnimatedNode = require('./AnimatedNode');
-const AnimatedValue = require('./AnimatedValue');
-const AnimatedWithChildren = require('./AnimatedWithChildren');
-
-import type {InterpolationConfigType} from './AnimatedInterpolation';
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
+import type {InterpolationConfigType} from './AnimatedInterpolation';
+import type AnimatedNode from './AnimatedNode';
 
-class AnimatedMultiplication extends AnimatedWithChildren {
+import AnimatedInterpolation from './AnimatedInterpolation';
+import AnimatedValue from './AnimatedValue';
+import AnimatedWithChildren from './AnimatedWithChildren';
+
+export default class AnimatedMultiplication extends AnimatedWithChildren {
   _a: AnimatedNode;
   _b: AnimatedNode;
 
@@ -61,5 +61,3 @@ class AnimatedMultiplication extends AnimatedWithChildren {
     };
   }
 }
-
-module.exports = AnimatedMultiplication;
diff --git a/Libraries/Animated/nodes/AnimatedNode.js b/Libraries/Animated/nodes/AnimatedNode.js
index b4a649ff302a..890e9e865bc1 100644
--- a/Libraries/Animated/nodes/AnimatedNode.js
+++ b/Libraries/Animated/nodes/AnimatedNode.js
@@ -10,12 +10,13 @@
 
 'use strict';
 
-const NativeAnimatedHelper = require('../NativeAnimatedHelper');
+import type {PlatformConfig} from '../AnimatedPlatformConfig';
 
-const NativeAnimatedAPI = NativeAnimatedHelper.API;
-const invariant = require('invariant');
+import ReactNativeFeatureFlags from '../../ReactNative/ReactNativeFeatureFlags';
+import NativeAnimatedHelper from '../NativeAnimatedHelper';
+import invariant from 'invariant';
 
-import type {PlatformConfig} from '../AnimatedPlatformConfig';
+const NativeAnimatedAPI = NativeAnimatedHelper.API;
 
 type ValueListenerCallback = (state: {value: number, ...}) => mixed;
 
@@ -23,12 +24,15 @@ let _uniqueId = 1;
 
 // Note(vjeux): this would be better as an interface but flow doesn't
 // support them yet
-class AnimatedNode {
+export default class AnimatedNode {
   _listeners: {[key: string]: ValueListenerCallback, ...};
   _platformConfig: ?PlatformConfig;
   __nativeAnimatedValueListener: ?any;
   __attach(): void {}
   __detach(): void {
+    if (ReactNativeFeatureFlags.removeListenersOnDetach()) {
+      this.removeAllListeners();
+    }
     if (this.__isNative && this.__nativeTag != null) {
       NativeAnimatedHelper.API.dropAnimatedNode(this.__nativeTag);
       this.__nativeTag = undefined;
@@ -53,7 +57,7 @@ class AnimatedNode {
     this._listeners = {};
   }
 
-  __makeNative(platformConfig: ?PlatformConfig) {
+  __makeNative(platformConfig: ?PlatformConfig): void {
     if (!this.__isNative) {
       throw new Error('This node cannot be made a "native" animated node');
     }
@@ -193,5 +197,3 @@ class AnimatedNode {
     this._platformConfig = platformConfig;
   }
 }
-
-module.exports = AnimatedNode;
diff --git a/Libraries/Animated/nodes/AnimatedProps.js b/Libraries/Animated/nodes/AnimatedProps.js
index d4ed70da8d6e..ef15cdf13120 100644
--- a/Libraries/Animated/nodes/AnimatedProps.js
+++ b/Libraries/Animated/nodes/AnimatedProps.js
@@ -12,14 +12,14 @@
 
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
 
-const ReactNative = require('../../Renderer/shims/ReactNative');
-const {AnimatedEvent} = require('../AnimatedEvent');
-const NativeAnimatedHelper = require('../NativeAnimatedHelper');
-const AnimatedNode = require('./AnimatedNode');
-const AnimatedStyle = require('./AnimatedStyle');
-const invariant = require('invariant');
-
-class AnimatedProps extends AnimatedNode {
+import {findNodeHandle} from '../../ReactNative/RendererProxy';
+import {AnimatedEvent} from '../AnimatedEvent';
+import NativeAnimatedHelper from '../NativeAnimatedHelper';
+import AnimatedNode from './AnimatedNode';
+import AnimatedStyle from './AnimatedStyle';
+import invariant from 'invariant';
+
+export default class AnimatedProps extends AnimatedNode {
   _props: Object;
   _animatedView: any;
   _callback: () => void;
@@ -36,24 +36,12 @@ class AnimatedProps extends AnimatedNode {
     this._callback = callback;
   }
 
-  __getValue(initialProps: ?Object): Object {
+  __getValue(): Object {
     const props: {[string]: any | ((...args: any) => void)} = {};
     for (const key in this._props) {
       const value = this._props[key];
       if (value instanceof AnimatedNode) {
-        // During initial render we want to use the initial value of both natively and non-natively
-        // driven nodes. On subsequent renders, we cannot use the value of natively driven nodes
-        // as they may not be up to date, so we use the initial value to ensure that values of
-        // native animated nodes do not impact rerenders.
-        if (value instanceof AnimatedStyle) {
-          props[key] = value.__getValue(
-            initialProps ? initialProps.style : null,
-          );
-        } else if (!initialProps || !value.__isNative) {
-          props[key] = value.__getValue();
-        } else if (initialProps.hasOwnProperty(key)) {
-          props[key] = initialProps[key];
-        }
+        props[key] = value.__getValue();
       } else if (value instanceof AnimatedEvent) {
         props[key] = value.__getHandler();
       } else {
@@ -134,9 +122,7 @@ class AnimatedProps extends AnimatedNode {
 
   __connectAnimatedView(): void {
     invariant(this.__isNative, 'Expected node to be marked as "native"');
-    const nativeViewTag: ?number = ReactNative.findNodeHandle(
-      this._animatedView,
-    );
+    const nativeViewTag: ?number = findNodeHandle(this._animatedView);
     invariant(
       nativeViewTag != null,
       'Unable to locate attached view in the native tree',
@@ -149,9 +135,7 @@ class AnimatedProps extends AnimatedNode {
 
   __disconnectAnimatedView(): void {
     invariant(this.__isNative, 'Expected node to be marked as "native"');
-    const nativeViewTag: ?number = ReactNative.findNodeHandle(
-      this._animatedView,
-    );
+    const nativeViewTag: ?number = findNodeHandle(this._animatedView);
     invariant(
       nativeViewTag != null,
       'Unable to locate attached view in the native tree',
@@ -187,5 +171,3 @@ class AnimatedProps extends AnimatedNode {
     };
   }
 }
-
-module.exports = AnimatedProps;
diff --git a/Libraries/Animated/nodes/AnimatedStyle.js b/Libraries/Animated/nodes/AnimatedStyle.js
index c64706a81585..7cb11bb1b556 100644
--- a/Libraries/Animated/nodes/AnimatedStyle.js
+++ b/Libraries/Animated/nodes/AnimatedStyle.js
@@ -12,13 +12,13 @@
 
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
 
-const flattenStyle = require('../../StyleSheet/flattenStyle');
-const NativeAnimatedHelper = require('../NativeAnimatedHelper');
-const AnimatedNode = require('./AnimatedNode');
-const AnimatedTransform = require('./AnimatedTransform');
-const AnimatedWithChildren = require('./AnimatedWithChildren');
+import flattenStyle from '../../StyleSheet/flattenStyle';
+import NativeAnimatedHelper from '../NativeAnimatedHelper';
+import AnimatedNode from './AnimatedNode';
+import AnimatedTransform from './AnimatedTransform';
+import AnimatedWithChildren from './AnimatedWithChildren';
 
-class AnimatedStyle extends AnimatedWithChildren {
+export default class AnimatedStyle extends AnimatedWithChildren {
   _style: Object;
 
   constructor(style: any) {
@@ -34,23 +34,15 @@ class AnimatedStyle extends AnimatedWithChildren {
   }
 
   // Recursively get values for nested styles (like iOS's shadowOffset)
-  _walkStyleAndGetValues(style: any, initialStyle: ?Object) {
+  _walkStyleAndGetValues(style: any): {[string]: any | {...}} {
     const updatedStyle: {[string]: any | {...}} = {};
     for (const key in style) {
       const value = style[key];
       if (value instanceof AnimatedNode) {
-        // During initial render we want to use the initial value of both natively and non-natively
-        // driven nodes. On subsequent renders, we cannot use the value of natively driven nodes
-        // as they may not be up to date, so we use the initial value to ensure that values of
-        // native animated nodes do not impact rerenders.
-        if (!initialStyle || !value.__isNative) {
-          updatedStyle[key] = value.__getValue();
-        } else if (initialStyle.hasOwnProperty(key)) {
-          updatedStyle[key] = initialStyle[key];
-        }
+        updatedStyle[key] = value.__getValue();
       } else if (value && !Array.isArray(value) && typeof value === 'object') {
         // Support animating nested values (for example: shadowOffset.height)
-        updatedStyle[key] = this._walkStyleAndGetValues(value, initialStyle);
+        updatedStyle[key] = this._walkStyleAndGetValues(value);
       } else {
         updatedStyle[key] = value;
       }
@@ -58,12 +50,12 @@ class AnimatedStyle extends AnimatedWithChildren {
     return updatedStyle;
   }
 
-  __getValue(initialStyle: ?Object): Object {
-    return this._walkStyleAndGetValues(this._style, initialStyle);
+  __getValue(): Object {
+    return this._walkStyleAndGetValues(this._style);
   }
 
   // Recursively get animated values for nested styles (like iOS's shadowOffset)
-  _walkStyleAndGetAnimatedValues(style: any) {
+  _walkStyleAndGetAnimatedValues(style: any): {[string]: any | {...}} {
     const updatedStyle: {[string]: any | {...}} = {};
     for (const key in style) {
       const value = style[key];
@@ -128,5 +120,3 @@ class AnimatedStyle extends AnimatedWithChildren {
     };
   }
 }
-
-module.exports = AnimatedStyle;
diff --git a/Libraries/Animated/nodes/AnimatedSubtraction.js b/Libraries/Animated/nodes/AnimatedSubtraction.js
index b3a9198c662b..d9a423b4cbbc 100644
--- a/Libraries/Animated/nodes/AnimatedSubtraction.js
+++ b/Libraries/Animated/nodes/AnimatedSubtraction.js
@@ -10,15 +10,15 @@
 
 'use strict';
 
-const AnimatedInterpolation = require('./AnimatedInterpolation');
-const AnimatedNode = require('./AnimatedNode');
-const AnimatedValue = require('./AnimatedValue');
-const AnimatedWithChildren = require('./AnimatedWithChildren');
-
-import type {InterpolationConfigType} from './AnimatedInterpolation';
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
+import type {InterpolationConfigType} from './AnimatedInterpolation';
+import type AnimatedNode from './AnimatedNode';
 
-class AnimatedSubtraction extends AnimatedWithChildren {
+import AnimatedInterpolation from './AnimatedInterpolation';
+import AnimatedValue from './AnimatedValue';
+import AnimatedWithChildren from './AnimatedWithChildren';
+
+export default class AnimatedSubtraction extends AnimatedWithChildren {
   _a: AnimatedNode;
   _b: AnimatedNode;
 
@@ -62,5 +62,3 @@ class AnimatedSubtraction extends AnimatedWithChildren {
     };
   }
 }
-
-module.exports = AnimatedSubtraction;
diff --git a/Libraries/Animated/nodes/AnimatedTracking.js b/Libraries/Animated/nodes/AnimatedTracking.js
index e8f74eaa54ac..bfaeafed47c4 100644
--- a/Libraries/Animated/nodes/AnimatedTracking.js
+++ b/Libraries/Animated/nodes/AnimatedTracking.js
@@ -10,17 +10,14 @@
 
 'use strict';
 
-const AnimatedValue = require('./AnimatedValue');
-const AnimatedNode = require('./AnimatedNode');
-const {
-  generateNewAnimationId,
-  shouldUseNativeDriver,
-} = require('../NativeAnimatedHelper');
-
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
 import type {EndCallback} from '../animations/Animation';
+import type AnimatedValue from './AnimatedValue';
+
+import NativeAnimatedHelper from '../NativeAnimatedHelper';
+import AnimatedNode from './AnimatedNode';
 
-class AnimatedTracking extends AnimatedNode {
+export default class AnimatedTracking extends AnimatedNode {
   _value: AnimatedValue;
   _parent: AnimatedNode;
   _callback: ?EndCallback;
@@ -40,7 +37,8 @@ class AnimatedTracking extends AnimatedNode {
     this._parent = parent;
     this._animationClass = animationClass;
     this._animationConfig = animationConfig;
-    this._useNativeDriver = shouldUseNativeDriver(animationConfig);
+    this._useNativeDriver =
+      NativeAnimatedHelper.shouldUseNativeDriver(animationConfig);
     this._callback = callback;
     this.__attach();
   }
@@ -93,12 +91,10 @@ class AnimatedTracking extends AnimatedNode {
     const animationConfig = animation.__getNativeAnimationConfig();
     return {
       type: 'tracking',
-      animationId: generateNewAnimationId(),
+      animationId: NativeAnimatedHelper.generateNewAnimationId(),
       animationConfig,
       toValue: this._parent.__getNativeTag(),
       value: this._value.__getNativeTag(),
     };
   }
 }
-
-module.exports = AnimatedTracking;
diff --git a/Libraries/Animated/nodes/AnimatedTransform.js b/Libraries/Animated/nodes/AnimatedTransform.js
index c3d4175fc6f4..3b553c9a3d36 100644
--- a/Libraries/Animated/nodes/AnimatedTransform.js
+++ b/Libraries/Animated/nodes/AnimatedTransform.js
@@ -12,11 +12,11 @@
 
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
 
-const NativeAnimatedHelper = require('../NativeAnimatedHelper');
-const AnimatedNode = require('./AnimatedNode');
-const AnimatedWithChildren = require('./AnimatedWithChildren');
+import NativeAnimatedHelper from '../NativeAnimatedHelper';
+import AnimatedNode from './AnimatedNode';
+import AnimatedWithChildren from './AnimatedWithChildren';
 
-class AnimatedTransform extends AnimatedWithChildren {
+export default class AnimatedTransform extends AnimatedWithChildren {
   _transforms: $ReadOnlyArray<Object>;
 
   constructor(transforms: $ReadOnlyArray<Object>) {
@@ -37,34 +37,11 @@ class AnimatedTransform extends AnimatedWithChildren {
   }
 
   __getValue(): $ReadOnlyArray<Object> {
-    return this._transforms.map(transform => {
-      const result: {[string]: any} = {};
-      for (const key in transform) {
-        const value = transform[key];
-        if (value instanceof AnimatedNode) {
-          result[key] = value.__getValue();
-        } else {
-          result[key] = value;
-        }
-      }
-      return result;
-    });
+    return this._get(animatedNode => animatedNode.__getValue());
   }
 
   __getAnimatedValue(): $ReadOnlyArray<Object> {
-    return this._transforms.map(transform => {
-      const result: {[string]: any} = {};
-      for (const key in transform) {
-        const value = transform[key];
-        if (value instanceof AnimatedNode) {
-          result[key] = value.__getAnimatedValue();
-        } else {
-          // All transform components needed to recompose matrix
-          result[key] = value;
-        }
-      }
-      return result;
-    });
+    return this._get(animatedNode => animatedNode.__getAnimatedValue());
   }
 
   __attach(): void {
@@ -118,6 +95,36 @@ class AnimatedTransform extends AnimatedWithChildren {
       transforms: transConfigs,
     };
   }
-}
 
-module.exports = AnimatedTransform;
+  _get(getter: AnimatedNode => any): $ReadOnlyArray<Object> {
+    return this._transforms.map(transform => {
+      const result: {[string]: any} = {};
+      for (const key in transform) {
+        const value = transform[key];
+        if (value instanceof AnimatedNode) {
+          result[key] = getter(value);
+        } else if (Array.isArray(value)) {
+          result[key] = value.map(element => {
+            if (element instanceof AnimatedNode) {
+              return getter(element);
+            } else {
+              return element;
+            }
+          });
+        } else if (typeof value === 'object') {
+          result[key] = {};
+          for (const [nestedKey, nestedValue] of Object.entries(value)) {
+            if (nestedValue instanceof AnimatedNode) {
+              result[key][nestedKey] = getter(nestedValue);
+            } else {
+              result[key][nestedKey] = nestedValue;
+            }
+          }
+        } else {
+          result[key] = value;
+        }
+      }
+      return result;
+    });
+  }
+}
diff --git a/Libraries/Animated/nodes/AnimatedValue.js b/Libraries/Animated/nodes/AnimatedValue.js
index 9530e090f923..f20307b310e2 100644
--- a/Libraries/Animated/nodes/AnimatedValue.js
+++ b/Libraries/Animated/nodes/AnimatedValue.js
@@ -10,16 +10,16 @@
 
 'use strict';
 
-const AnimatedInterpolation = require('./AnimatedInterpolation');
-const AnimatedWithChildren = require('./AnimatedWithChildren');
-const InteractionManager = require('../../Interaction/InteractionManager');
-const NativeAnimatedHelper = require('../NativeAnimatedHelper');
-
-import type AnimatedNode from './AnimatedNode';
 import type Animation, {EndCallback} from '../animations/Animation';
 import type {InterpolationConfigType} from './AnimatedInterpolation';
+import type AnimatedNode from './AnimatedNode';
 import type AnimatedTracking from './AnimatedTracking';
 
+import InteractionManager from '../../Interaction/InteractionManager';
+import NativeAnimatedHelper from '../NativeAnimatedHelper';
+import AnimatedInterpolation from './AnimatedInterpolation';
+import AnimatedWithChildren from './AnimatedWithChildren';
+
 export type AnimatedValueConfig = $ReadOnly<{
   useNativeDriver: boolean,
 }>;
@@ -49,7 +49,7 @@ const NativeAnimatedAPI = NativeAnimatedHelper.API;
  * transform which can receive values from multiple parents.
  */
 function _flush(rootNode: AnimatedValue): void {
-  const animatedStyles = new Set();
+  const animatedStyles = new Set<AnimatedValue | AnimatedNode>();
   function findAnimatedStyles(node: AnimatedValue | AnimatedNode) {
     /* $FlowFixMe[prop-missing] (>=0.68.0 site=react_native_fb) This comment
      * suppresses an error found when Flow v0.68 was deployed. To see the error
@@ -84,13 +84,14 @@ function _executeAsAnimatedBatch(id: string, operation: () => void) {
  *
  * See https://reactnative.dev/docs/animatedvalue
  */
-class AnimatedValue extends AnimatedWithChildren {
+export default class AnimatedValue extends AnimatedWithChildren {
   _value: number;
   _startingValue: number;
   _offset: number;
   _animation: ?Animation;
   _tracking: ?AnimatedTracking;
 
+  // $FlowFixMe[missing-local-annot]
   constructor(value: number, config?: ?AnimatedValueConfig) {
     super();
     if (typeof value !== 'number') {
@@ -303,5 +304,3 @@ class AnimatedValue extends AnimatedWithChildren {
     };
   }
 }
-
-module.exports = AnimatedValue;
diff --git a/Libraries/Animated/nodes/AnimatedValueXY.js b/Libraries/Animated/nodes/AnimatedValueXY.js
index c54a9d9d6f55..dc24a674bba4 100644
--- a/Libraries/Animated/nodes/AnimatedValueXY.js
+++ b/Libraries/Animated/nodes/AnimatedValueXY.js
@@ -12,10 +12,9 @@
 
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
 
-const AnimatedValue = require('./AnimatedValue');
-const AnimatedWithChildren = require('./AnimatedWithChildren');
-
-const invariant = require('invariant');
+import AnimatedValue from './AnimatedValue';
+import AnimatedWithChildren from './AnimatedWithChildren';
+import invariant from 'invariant';
 
 export type AnimatedValueXYConfig = $ReadOnly<{
   useNativeDriver: boolean,
@@ -34,7 +33,7 @@ let _uniqueId = 1;
  *
  * See https://reactnative.dev/docs/animatedvaluexy
  */
-class AnimatedValueXY extends AnimatedWithChildren {
+export default class AnimatedValueXY extends AnimatedWithChildren {
   x: AnimatedValue;
   y: AnimatedValue;
   _listeners: {
@@ -249,5 +248,3 @@ class AnimatedValueXY extends AnimatedWithChildren {
     super.__makeNative(platformConfig);
   }
 }
-
-module.exports = AnimatedValueXY;
diff --git a/Libraries/Animated/nodes/AnimatedWithChildren.js b/Libraries/Animated/nodes/AnimatedWithChildren.js
index 435365d1f6ee..ac4ade64612f 100644
--- a/Libraries/Animated/nodes/AnimatedWithChildren.js
+++ b/Libraries/Animated/nodes/AnimatedWithChildren.js
@@ -11,10 +11,11 @@
 'use strict';
 
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
-const AnimatedNode = require('./AnimatedNode');
-const NativeAnimatedHelper = require('../NativeAnimatedHelper');
 
-class AnimatedWithChildren extends AnimatedNode {
+import NativeAnimatedHelper from '../NativeAnimatedHelper';
+import AnimatedNode from './AnimatedNode';
+
+export default class AnimatedWithChildren extends AnimatedNode {
   _children: Array<AnimatedNode>;
 
   constructor() {
@@ -85,5 +86,3 @@ class AnimatedWithChildren extends AnimatedNode {
     }
   }
 }
-
-module.exports = AnimatedWithChildren;
diff --git a/Libraries/Animated/useAnimatedProps.js b/Libraries/Animated/useAnimatedProps.js
index 9ab24a99ce17..1b7d81009fd8 100644
--- a/Libraries/Animated/useAnimatedProps.js
+++ b/Libraries/Animated/useAnimatedProps.js
@@ -10,10 +10,10 @@
 
 'use strict';
 
-import AnimatedProps from './nodes/AnimatedProps';
-import {AnimatedEvent} from './AnimatedEvent';
 import useRefEffect from '../Utilities/useRefEffect';
+import {AnimatedEvent} from './AnimatedEvent';
 import NativeAnimatedHelper from './NativeAnimatedHelper';
+import AnimatedProps from './nodes/AnimatedProps';
 import {
   useCallback,
   useEffect,
@@ -21,7 +21,6 @@ import {
   useMemo,
   useReducer,
   useRef,
-  useState,
 } from 'react';
 
 type ReducedProps<TProps> = {
@@ -31,12 +30,10 @@ type ReducedProps<TProps> = {
 };
 type CallbackRef<T> = T => mixed;
 
-let animatedComponentNextId = 1;
-
 export default function useAnimatedProps<TProps: {...}, TInstance>(
   props: TProps,
 ): [ReducedProps<TProps>, CallbackRef<TInstance | null>] {
-  const [, scheduleUpdate] = useReducer(count => count + 1, 0);
+  const [, scheduleUpdate] = useReducer<number, void>(count => count + 1, 0);
   const onUpdateRef = useRef<?() => void>(null);
 
   // TODO: Only invalidate `node` if animated props or `style` change. In the
@@ -63,7 +60,7 @@ export default function useAnimatedProps<TProps: {...}, TInstance>(
   // But there is no way to transparently compose three separate callback refs,
   // so we just combine them all into one for now.
   const refEffect = useCallback(
-    instance => {
+    (instance: TInstance) => {
       // NOTE: This may be called more often than necessary (e.g. when `props`
       // changes), but `setNativeView` already optimizes for that.
       node.setNativeView(instance);
@@ -141,16 +138,11 @@ function useAnimatedPropsLifecycle(node: AnimatedProps): void {
   const prevNodeRef = useRef<?AnimatedProps>(null);
   const isUnmountingRef = useRef<boolean>(false);
 
-  const [animatedComponentId] = useState(
-    () => `${animatedComponentNextId++}:animatedComponent`,
-  );
-
-  useLayoutEffect(() => {
-    NativeAnimatedHelper.API.setWaitingForIdentifier(animatedComponentId);
-  });
-
   useEffect(() => {
-    NativeAnimatedHelper.API.unsetWaitingForIdentifier(animatedComponentId);
+    // It is ok for multiple components to call `flushQueue` because it noops
+    // if the queue is empty. When multiple animated components are mounted at
+    // the same time. Only first component flushes the queue and the others will noop.
+    NativeAnimatedHelper.API.flushQueue();
   });
 
   useLayoutEffect(() => {
diff --git a/Libraries/Animated/useAnimatedValue.d.ts b/Libraries/Animated/useAnimatedValue.d.ts
new file mode 100644
index 000000000000..69e5a59fcf09
--- /dev/null
+++ b/Libraries/Animated/useAnimatedValue.d.ts
@@ -0,0 +1,15 @@
+/**
+ * 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
+ */
+
+import type {Animated} from './Animated';
+
+export function useAnimatedValue(
+  initialValue: number,
+  config?: Animated.AnimatedConfig,
+): Animated.Value;
diff --git a/Libraries/Animated/useAnimatedValue.js b/Libraries/Animated/useAnimatedValue.js
new file mode 100644
index 000000000000..0a430ed5c3c0
--- /dev/null
+++ b/Libraries/Animated/useAnimatedValue.js
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {AnimatedValueConfig} from './nodes/AnimatedValue';
+
+import Animated from './Animated';
+import {useRef} from 'react';
+
+export default function useAnimatedValue(
+  initialValue: number,
+  config?: ?AnimatedValueConfig,
+): Animated.Value {
+  const ref = useRef<null | Animated.Value>(null);
+  if (ref.current == null) {
+    ref.current = new Animated.Value(initialValue, config);
+  }
+  return ref.current;
+}
diff --git a/Libraries/AppDelegate/RCTAppDelegate.h b/Libraries/AppDelegate/RCTAppDelegate.h
new file mode 100644
index 000000000000..b8d00bab93e7
--- /dev/null
+++ b/Libraries/AppDelegate/RCTAppDelegate.h
@@ -0,0 +1,130 @@
+/*
+ * 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/RCTBridge.h>
+#import <React/RCTBridgeDelegate.h>
+#import <UIKit/UIKit.h>
+
+#if RCT_NEW_ARCH_ENABLED
+// When the new architecture is enabled, the RCTAppDelegate imports some additional headers
+#import <React/RCTCxxBridgeDelegate.h>
+#import <React/RCTSurfacePresenterBridgeAdapter.h>
+#import <ReactCommon/RCTTurboModuleManager.h>
+
+#endif
+
+/**
+ * The RCTAppDelegate is an utility class that implements some base configurations for all the React Native apps.
+ * It is not mandatory to use it, but it could simplify your AppDelegate code.
+ *
+ * To use it, you just need to make your AppDelegate a subclass of RCTAppDelegate:
+ *
+ * ```objc
+ * #import <React/RCTAppDelegate.h>
+ * @interface AppDelegate: RCTAppDelegate
+ * @end
+ * ```
+ *
+ * All the methods implemented by the RCTAppDelegate can be overriden by your AppDelegate if you need to provide a
+ custom implementation.
+ * If you need to customize the default implementation, you can invoke `[super <method_name>]` and use the returned
+ object.
+ *
+ * Overridable methods
+ * Shared:
+ *   - (RCTBridge *)createBridgeWithDelegate:(id<RCTBridgeDelegate>)delegate launchOptions:(NSDictionary
+ *)launchOptions;
+ *   - (UIView *)createRootViewWithBridge:(RCTBridge *)bridge moduleName:(NSString*)moduleName initProps:(NSDictionary
+ *)initProps;
+ *   - (UIViewController *)createRootViewController;
+ * New Architecture:
+ *   - (BOOL)concurrentRootEnabled
+ *   - (BOOL)turboModuleEnabled;
+ *   - (BOOL)fabricEnabled;
+ *   - (NSDictionary *)prepareInitialProps
+ *   - (Class)getModuleClassFromName:(const char *)name
+ *   - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
+                                                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
+ *   - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
+                                                     initParams:
+                                                         (const facebook::react::ObjCTurboModule::InitParams &)params
+ *   - (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
+ */
+@interface RCTAppDelegate : UIResponder <UIApplicationDelegate, RCTBridgeDelegate>
+
+/// The window object, used to render the UViewControllers
+@property (nonatomic, strong) UIWindow *window;
+@property (nonatomic, strong) RCTBridge *bridge;
+@property (nonatomic, strong) NSString *moduleName;
+
+/**
+ * It creates a `RCTBridge` using a delegate and some launch options.
+ * By default, it is invoked passing `self` as a delegate.
+ * You can override this function to customize the logic that creates the RCTBridge
+ *
+ * @parameter: delegate - an object that implements the `RCTBridgeDelegate` protocol.
+ * @parameter: launchOptions - a dictionary with a set of options.
+ *
+ * @returns: a newly created instance of RCTBridge.
+ */
+- (RCTBridge *)createBridgeWithDelegate:(id<RCTBridgeDelegate>)delegate launchOptions:(NSDictionary *)launchOptions;
+
+/**
+ * It creates a `UIView` starting from a bridge, a module name and a set of initial properties.
+ * By default, it is invoked using the bridge created by `createBridgeWithDelegate:launchOptions` and
+ * the name in the `self.moduleName` variable.
+ * You can override this function to customize the logic that creates the Root View.
+ *
+ * @parameter: bridge - an instance of the `RCTBridge` object.
+ * @parameter: moduleName - the name of the app, used by Metro to resolve the module.
+ * @parameter: initProps - a set of initial properties.
+ *
+ * @returns: a UIView properly configured with a bridge for React Native.
+ */
+- (UIView *)createRootViewWithBridge:(RCTBridge *)bridge
+                          moduleName:(NSString *)moduleName
+                           initProps:(NSDictionary *)initProps;
+
+/**
+ * It creates the RootViewController.
+ * By default, it creates a new instance of a `UIViewController`.
+ * You can override it to provide your own initial ViewController.
+ *
+ * @return: an instance of `UIViewController`.
+ */
+- (UIViewController *)createRootViewController;
+
+@end
+
+#if RCT_NEW_ARCH_ENABLED
+/// Extension that makes the RCTAppDelegate conform to New Architecture delegates
+@interface RCTAppDelegate () <RCTTurboModuleManagerDelegate, RCTCxxBridgeDelegate>
+
+/// The TurboModule manager
+@property (nonatomic, strong) RCTTurboModuleManager *turboModuleManager;
+@property (nonatomic, strong) RCTSurfacePresenterBridgeAdapter *bridgeAdapter;
+
+/// This method controls whether the `concurrentRoot` feature of React18 is turned on or off.
+///
+/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
+/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
+/// @return: `true` if the `concurrentRoot` feature is enabled. Otherwise, it returns `false`.
+- (BOOL)concurrentRootEnabled;
+
+/// This method controls whether the `turboModules` feature of the New Architecture is turned on or off.
+///
+/// @note: This is required to be rendering on Fabric (i.e. on the New Architecture).
+/// @return: `true` if the Turbo Native Module are enabled. Otherwise, it returns `false`.
+- (BOOL)turboModuleEnabled;
+
+/// This method controls whether the App will use the Fabric renderer of the New Architecture or not.
+///
+/// @return: `true` if the Fabric Renderer is enabled. Otherwise, it returns `false`.
+- (BOOL)fabricEnabled;
+
+@end
+#endif
diff --git a/Libraries/AppDelegate/RCTAppDelegate.mm b/Libraries/AppDelegate/RCTAppDelegate.mm
new file mode 100644
index 000000000000..39b29792245f
--- /dev/null
+++ b/Libraries/AppDelegate/RCTAppDelegate.mm
@@ -0,0 +1,164 @@
+/*
+ * 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 "RCTAppDelegate.h"
+#import <React/RCTAppSetupUtils.h>
+#import <React/RCTRootView.h>
+
+#if RCT_NEW_ARCH_ENABLED
+#import <React/CoreModulesPlugins.h>
+#import <React/RCTFabricSurfaceHostingProxyRootView.h>
+#import <React/RCTSurfacePresenter.h>
+#import <react/config/ReactNativeConfig.h>
+
+static NSString *const kRNConcurrentRoot = @"concurrentRoot";
+
+@interface RCTAppDelegate () {
+  std::shared_ptr<const facebook::react::ReactNativeConfig> _reactNativeConfig;
+  facebook::react::ContextContainer::Shared _contextContainer;
+}
+@end
+
+#endif
+
+@implementation RCTAppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+  BOOL enableTM = NO;
+#if RCT_NEW_ARCH_ENABLED
+  enableTM = self.turboModuleEnabled;
+#endif
+
+  RCTAppSetupPrepareApp(application, enableTM);
+
+  if (!self.bridge) {
+    self.bridge = [self createBridgeWithDelegate:self launchOptions:launchOptions];
+  }
+#if RCT_NEW_ARCH_ENABLED
+  _contextContainer = std::make_shared<facebook::react::ContextContainer const>();
+  _reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
+  _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
+  self.bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:self.bridge
+                                                               contextContainer:_contextContainer];
+  self.bridge.surfacePresenter = self.bridgeAdapter.surfacePresenter;
+#endif
+
+  NSDictionary *initProps = [self prepareInitialProps];
+  UIView *rootView = [self createRootViewWithBridge:self.bridge moduleName:self.moduleName initProps:initProps];
+
+  if (@available(iOS 13.0, *)) {
+    rootView.backgroundColor = [UIColor systemBackgroundColor];
+  } else {
+    rootView.backgroundColor = [UIColor whiteColor];
+  }
+
+  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+  UIViewController *rootViewController = [self createRootViewController];
+  rootViewController.view = rootView;
+  self.window.rootViewController = rootViewController;
+  [self.window makeKeyAndVisible];
+  return YES;
+}
+
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+{
+  [NSException raise:@"RCTBridgeDelegate::sourceURLForBridge not implemented"
+              format:@"Subclasses must implement a valid sourceURLForBridge method"];
+  return nil;
+}
+
+- (BOOL)concurrentRootEnabled
+{
+  [NSException raise:@"concurrentRootEnabled not implemented"
+              format:@"Subclasses must implement a valid concurrentRootEnabled method"];
+  return true;
+}
+
+- (NSDictionary *)prepareInitialProps
+{
+  NSMutableDictionary *initProps = [NSMutableDictionary new];
+
+#ifdef RCT_NEW_ARCH_ENABLED
+  initProps[kRNConcurrentRoot] = @([self concurrentRootEnabled]);
+#endif
+
+  return initProps;
+}
+
+- (RCTBridge *)createBridgeWithDelegate:(id<RCTBridgeDelegate>)delegate launchOptions:(NSDictionary *)launchOptions
+{
+  return [[RCTBridge alloc] initWithDelegate:delegate launchOptions:launchOptions];
+}
+
+- (UIView *)createRootViewWithBridge:(RCTBridge *)bridge
+                          moduleName:(NSString *)moduleName
+                           initProps:(NSDictionary *)initProps
+{
+  BOOL enableFabric = NO;
+#if RCT_NEW_ARCH_ENABLED
+  enableFabric = self.fabricEnabled;
+#endif
+  return RCTAppSetupDefaultRootView(bridge, moduleName, initProps, enableFabric);
+}
+
+- (UIViewController *)createRootViewController
+{
+  return [UIViewController new];
+}
+
+#if RCT_NEW_ARCH_ENABLED
+#pragma mark - RCTCxxBridgeDelegate
+
+- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
+{
+  self.turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
+                                                                 delegate:self
+                                                                jsInvoker:bridge.jsCallInvoker];
+  return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager);
+}
+
+#pragma mark RCTTurboModuleManagerDelegate
+
+- (Class)getModuleClassFromName:(const char *)name
+{
+  return RCTCoreModulesClassProvider(name);
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
+                                                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
+{
+  return nullptr;
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
+                                                     initParams:
+                                                         (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return nullptr;
+}
+
+- (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
+{
+  return RCTAppSetupDefaultModuleFromClass(moduleClass);
+}
+
+#pragma mark - New Arch Enabled settings
+
+- (BOOL)turboModuleEnabled
+{
+  return YES;
+}
+
+- (BOOL)fabricEnabled
+{
+  return YES;
+}
+
+#endif
+
+@end
diff --git a/Libraries/AppDelegate/React-RCTAppDelegate.podspec b/Libraries/AppDelegate/React-RCTAppDelegate.podspec
new file mode 100644
index 000000000000..fff87118479c
--- /dev/null
+++ b/Libraries/AppDelegate/React-RCTAppDelegate.podspec
@@ -0,0 +1,73 @@
+# 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_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1'
+folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
+
+new_arch_enabled_flag="RCT_NEW_ARCH_ENABLED"
+is_new_arch_enabled = ENV[new_arch_enabled_flag] == "1"
+other_cflags = "$(inherited) -DRN_FABRIC_ENABLED " + folly_flags + (is_new_arch_enabled ? " -D"+"RCT_NEW_ARCH_ENABLED" : "")
+
+use_hermes = ENV['USE_HERMES'] == '1'
+
+header_search_paths = [
+  "$(PODS_TARGET_SRCROOT)/ReactCommon",
+  "$(PODS_ROOT)/Headers/Private/React-Core",
+  "$(PODS_ROOT)/boost",
+  "$(PODS_ROOT)/DoubleConversion",
+  "$(PODS_ROOT)/RCT-Folly",
+  "${PODS_ROOT}/Headers/Public/FlipperKit",
+  "$(PODS_ROOT)/Headers/Public/ReactCommon",
+  "$(PODS_ROOT)/Headers/Public/React-RCTFabric"
+].concat(use_hermes ? [
+  "$(PODS_ROOT)/Headers/Public/React-hermes",
+  "$(PODS_ROOT)/Headers/Public/hermes-engine"
+] : []).map{|p| "\"#{p}\""}.join(" ")
+
+Pod::Spec.new do |s|
+  s.name            = "React-RCTAppDelegate"
+  s.version                = version
+  s.summary                = "An utility library to simplify common operations for the New Architecture"
+  s.homepage               = "https://reactnative.dev/"
+  s.documentation_url      = "https://reactnative.dev/docs/actionsheetios"
+  s.license                = package["license"]
+  s.author                 = "Facebook, Inc. and its affiliates"
+  s.platforms              = { :ios => "12.4" }
+  s.source                 = source
+  s.source_files            = "**/*.{c,h,m,mm,S,cpp}"
+
+  # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
+  s.compiler_flags = other_cflags
+  s.pod_target_xcconfig    = {
+    "HEADER_SEARCH_PATHS" => header_search_paths,
+    "OTHER_CPLUSPLUSFLAGS" => other_cflags,
+    "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+  }
+  s.user_target_xcconfig   = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\""}
+
+  s.dependency "React-Core"
+  s.dependency "RCT-Folly"
+  s.dependency "RCTRequired"
+  s.dependency "RCTTypeSafety"
+  s.dependency "ReactCommon/turbomodule/core"
+
+  if is_new_arch_enabled
+    s.dependency "React-RCTFabric"
+    s.dependency "React-graphics"
+  end
+end
diff --git a/Libraries/AppState/AppState.d.ts b/Libraries/AppState/AppState.d.ts
new file mode 100644
index 000000000000..45beaca9bde9
--- /dev/null
+++ b/Libraries/AppState/AppState.d.ts
@@ -0,0 +1,58 @@
+/**
+ * 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
+ */
+
+import {NativeEventSubscription} from '../EventEmitter/RCTNativeAppEventEmitter';
+
+/**
+ * AppState can tell you if the app is in the foreground or background,
+ * and notify you when the state changes.
+ *
+ * AppState is frequently used to determine the intent and proper behavior
+ * when handling push notifications.
+ *
+ * App State Events
+ *      change - This even is received when the app state has changed.
+ *      focus [Android] - Received when the app gains focus (the user is interacting with the app).
+ *      blur [Android] - Received when the user is not actively interacting with the app.
+ *
+ * App States
+ *      active - The app is running in the foreground
+ *      background - The app is running in the background. The user is either in another app or on the home screen
+ *      inactive [iOS] - This is a transition state that currently never happens for typical React Native apps.
+ *      unknown [iOS] - Initial value until the current app state is determined
+ *      extension [iOS] - The app is running as an app extension
+ *
+ * For more information, see Apple's documentation: https://developer.apple.com/library/ios/documentation/iPhone/Conceptual/iPhoneOSProgrammingGuide/TheAppLifeCycle/TheAppLifeCycle.html
+ *
+ * @see https://reactnative.dev/docs/appstate#app-states
+ */
+export type AppStateEvent = 'change' | 'memoryWarning' | 'blur' | 'focus';
+export type AppStateStatus =
+  | 'active'
+  | 'background'
+  | 'inactive'
+  | 'unknown'
+  | 'extension';
+
+export interface AppStateStatic {
+  currentState: AppStateStatus;
+  isAvailable: boolean;
+
+  /**
+   * Add a handler to AppState changes by listening to the change event
+   * type and providing the handler
+   */
+  addEventListener(
+    type: AppStateEvent,
+    listener: (state: AppStateStatus) => void,
+  ): NativeEventSubscription;
+}
+
+export const AppState: AppStateStatic;
+export type AppState = AppStateStatic;
diff --git a/Libraries/AppState/AppState.js b/Libraries/AppState/AppState.js
index 99e731bd43fb..f82afa0f6142 100644
--- a/Libraries/AppState/AppState.js
+++ b/Libraries/AppState/AppState.js
@@ -8,11 +8,11 @@
  * @format
  */
 
-import {type EventSubscription} from '../vendor/emitter/EventEmitter';
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import logError from '../Utilities/logError';
-import NativeAppState from './NativeAppState';
 import Platform from '../Utilities/Platform';
+import {type EventSubscription} from '../vendor/emitter/EventEmitter';
+import NativeAppState from './NativeAppState';
 
 export type AppStateValues = 'inactive' | 'background' | 'active';
 
@@ -76,17 +76,13 @@ class AppState {
         // It's possible that the state will have changed here & listeners need to be notified
         if (!eventUpdated && this.currentState !== appStateData.app_state) {
           this.currentState = appStateData.app_state;
+          // $FlowFixMe[incompatible-call]
           emitter.emit('appStateDidChange', appStateData);
         }
       }, logError);
     }
   }
 
-  // TODO: now that AppState is a subclass of NativeEventEmitter, we could
-  // deprecate `addEventListener` and `removeEventListener` and just use
-  // addListener` and `listener.remove()` directly. That will be a breaking
-  // change though, as both the method and event names are different
-  // (addListener events are currently required to be globally unique).
   /**
    * Add a handler to AppState changes by listening to the `change` event type
    * and providing the handler.
diff --git a/Libraries/AppState/NativeAppState.js b/Libraries/AppState/NativeAppState.js
index d546e70051d0..177e167c6790 100644
--- a/Libraries/AppState/NativeAppState.js
+++ b/Libraries/AppState/NativeAppState.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/BatchedBridge/MessageQueue.js b/Libraries/BatchedBridge/MessageQueue.js
index 2ae720810ac9..a9810bc6f942 100644
--- a/Libraries/BatchedBridge/MessageQueue.js
+++ b/Libraries/BatchedBridge/MessageQueue.js
@@ -241,7 +241,7 @@ class MessageQueue {
     params: mixed[],
     onFail: ?(...mixed[]) => void,
     onSucc: ?(...mixed[]) => void,
-  ) {
+  ): void {
     this.processCallbacks(moduleID, methodID, params, onFail, onSucc);
 
     this._queue[MODULE_IDS].push(moduleID);
@@ -252,7 +252,7 @@ class MessageQueue {
       // folly-convertible.  As a special case, if a prop value is a
       // function it is permitted here, and special-cased in the
       // conversion.
-      const isValidArgument = (val: mixed) => {
+      const isValidArgument = (val: mixed): boolean => {
         switch (typeof val) {
           case 'undefined':
           case 'boolean':
@@ -321,6 +321,7 @@ class MessageQueue {
     }
     Systrace.counterEvent('pending_js_to_native_queue', this._queue[0].length);
     if (__DEV__ && this.__spy && isFinite(moduleID)) {
+      // $FlowFixMe[not-a-function]
       this.__spy({
         type: TO_NATIVE,
         module: this._remoteModuleTable[moduleID],
@@ -380,7 +381,7 @@ class MessageQueue {
     return (
       // $FlowFixMe[cannot-resolve-name]
       typeof DebuggerInternal !== 'undefined' &&
-      DebuggerInternal.shouldPauseOnThrow === true // eslint-disable-line no-undef
+      DebuggerInternal.shouldPauseOnThrow === true
     );
   }
 
@@ -408,9 +409,12 @@ class MessageQueue {
       const callableModuleNames = Object.keys(this._lazyCallableModules);
       const n = callableModuleNames.length;
       const callableModuleNameList = callableModuleNames.join(', ');
+
+      // TODO(T122225939): Remove after investigation: Why are we getting to this line in bridgeless mode?
+      const isBridgelessMode = global.RN$Bridgeless === true ? 'true' : 'false';
       invariant(
         false,
-        `Failed to call into JavaScript module method ${module}.${method}(). Module has not been registered as callable. Registered callable JavaScript modules (n = ${n}): ${callableModuleNameList}.
+        `Failed to call into JavaScript module method ${module}.${method}(). Module has not been registered as callable. Bridgeless Mode: ${isBridgelessMode}. Registered callable JavaScript modules (n = ${n}): ${callableModuleNameList}.
         A frequent cause of the error is that the application entry file path is incorrect. This can also happen when the JS bundle is corrupt or there is an early initialization error when loading React Native.`,
       );
     }
@@ -424,7 +428,7 @@ class MessageQueue {
     Systrace.endEvent();
   }
 
-  __invokeCallback(cbID: number, args: mixed[]) {
+  __invokeCallback(cbID: number, args: mixed[]): void {
     this._lastFlush = Date.now();
     this._eventLoopStartTime = this._lastFlush;
 
diff --git a/Libraries/BatchedBridge/NativeModules.d.ts b/Libraries/BatchedBridge/NativeModules.d.ts
new file mode 100644
index 000000000000..ba35cca1e1bc
--- /dev/null
+++ b/Libraries/BatchedBridge/NativeModules.d.ts
@@ -0,0 +1,25 @@
+/**
+ * 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
+ */
+
+/**
+ * Interface for NativeModules which allows to augment NativeModules with type informations.
+ * See react-native-sensor-manager for example.
+ */
+interface NativeModulesStatic {
+  [name: string]: any;
+}
+
+/**
+ * Native Modules written in ObjectiveC/Swift/Java exposed via the RCTBridge
+ * Define lazy getters for each module. These will return the module if already loaded, or load it if not.
+ * See https://reactnative.dev/docs/native-modules-ios
+ * @example
+ * const MyModule = NativeModules.ModuleName
+ */
+export const NativeModules: NativeModulesStatic;
diff --git a/Libraries/BatchedBridge/NativeModules.js b/Libraries/BatchedBridge/NativeModules.js
index 30259e79b9fd..0ea6b7c5c4a8 100644
--- a/Libraries/BatchedBridge/NativeModules.js
+++ b/Libraries/BatchedBridge/NativeModules.js
@@ -155,6 +155,7 @@ function genMethod(moduleID: number, methodID: number, type: MethodType) {
       }
     };
   }
+  // $FlowFixMe[prop-missing]
   fn.type = type;
   return fn;
 }
diff --git a/Libraries/BatchedBridge/__tests__/MessageQueue-test.js b/Libraries/BatchedBridge/__tests__/MessageQueue-test.js
index c94f580a1cbf..46304de89ad7 100644
--- a/Libraries/BatchedBridge/__tests__/MessageQueue-test.js
+++ b/Libraries/BatchedBridge/__tests__/MessageQueue-test.js
@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @format
+ * @oncall react_native
  */
 
 'use strict';
@@ -108,7 +108,7 @@ describe('MessageQueue', function () {
     const unknownModule = 'UnknownModule',
       unknownMethod = 'UnknownMethod';
     expect(() => queue.__callFunction(unknownModule, unknownMethod)).toThrow(
-      `Failed to call into JavaScript module method ${unknownModule}.${unknownMethod}(). Module has not been registered as callable. Registered callable JavaScript modules (n = 1): MessageQueueTestModule.
+      `Failed to call into JavaScript module method ${unknownModule}.${unknownMethod}(). Module has not been registered as callable. Bridgeless Mode: false. Registered callable JavaScript modules (n = 1): MessageQueueTestModule.
         A frequent cause of the error is that the application entry file path is incorrect. This can also happen when the JS bundle is corrupt or there is an early initialization error when loading React Native.`,
     );
   });
diff --git a/Libraries/BatchedBridge/__tests__/NativeModules-test.js b/Libraries/BatchedBridge/__tests__/NativeModules-test.js
index f4d4aa7a93a6..570c95127940 100644
--- a/Libraries/BatchedBridge/__tests__/NativeModules-test.js
+++ b/Libraries/BatchedBridge/__tests__/NativeModules-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Blob/BlobManager.js b/Libraries/Blob/BlobManager.js
index 0d4cee7282ba..98e69112957d 100644
--- a/Libraries/Blob/BlobManager.js
+++ b/Libraries/Blob/BlobManager.js
@@ -8,13 +8,14 @@
  * @format
  */
 
-const Blob = require('./Blob');
-const BlobRegistry = require('./BlobRegistry');
+import type {BlobCollector, BlobData, BlobOptions} from './BlobTypes';
 
-import type {BlobData, BlobOptions, BlobCollector} from './BlobTypes';
 import NativeBlobModule from './NativeBlobModule';
 import invariant from 'invariant';
 
+const Blob = require('./Blob');
+const BlobRegistry = require('./BlobRegistry');
+
 /*eslint-disable no-bitwise */
 /*eslint-disable eqeqeq */
 
@@ -110,6 +111,7 @@ class BlobManager {
    */
   static createFromOptions(options: BlobData): Blob {
     BlobRegistry.register(options.blobId);
+    // $FlowFixMe[prop-missing]
     return Object.assign(Object.create(Blob.prototype), {
       data:
         // Reuse the collector instance when creating from an existing blob.
diff --git a/Libraries/Blob/File.js b/Libraries/Blob/File.js
index 5aa2dd73c46f..6f643307c5d0 100644
--- a/Libraries/Blob/File.js
+++ b/Libraries/Blob/File.js
@@ -10,12 +10,11 @@
 
 'use strict';
 
-const Blob = require('./Blob');
+import type {BlobOptions} from './BlobTypes';
 
+const Blob = require('./Blob');
 const invariant = require('invariant');
 
-import type {BlobOptions} from './BlobTypes';
-
 /**
  * The File interface provides information about files.
  */
diff --git a/Libraries/Blob/FileReader.js b/Libraries/Blob/FileReader.js
index c0b7feaec713..57b3093cf6b0 100644
--- a/Libraries/Blob/FileReader.js
+++ b/Libraries/Blob/FileReader.js
@@ -8,11 +8,12 @@
  * @format
  */
 
-const Blob = require('./Blob');
-const EventTarget = require('event-target-shim');
+import type Blob from './Blob';
 
 import NativeFileReaderModule from './NativeFileReaderModule';
 
+const EventTarget = require('event-target-shim');
+
 type ReadyState =
   | 0 // EMPTY
   | 1 // LOADING
@@ -73,11 +74,11 @@ class FileReader extends (EventTarget(...READER_EVENTS): any) {
     }
   }
 
-  readAsArrayBuffer() {
+  readAsArrayBuffer(): any {
     throw new Error('FileReader.readAsArrayBuffer is not implemented');
   }
 
-  readAsDataURL(blob: ?Blob) {
+  readAsDataURL(blob: ?Blob): void {
     this._aborted = false;
 
     if (blob == null) {
@@ -104,7 +105,7 @@ class FileReader extends (EventTarget(...READER_EVENTS): any) {
     );
   }
 
-  readAsText(blob: ?Blob, encoding: string = 'UTF-8') {
+  readAsText(blob: ?Blob, encoding: string = 'UTF-8'): void {
     this._aborted = false;
 
     if (blob == null) {
diff --git a/Libraries/Blob/NativeBlobModule.js b/Libraries/Blob/NativeBlobModule.js
index 2b474d693527..00a86fae31bf 100644
--- a/Libraries/Blob/NativeBlobModule.js
+++ b/Libraries/Blob/NativeBlobModule.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Blob/NativeFileReaderModule.js b/Libraries/Blob/NativeFileReaderModule.js
index ac964b3af42e..e581aba74d17 100644
--- a/Libraries/Blob/NativeFileReaderModule.js
+++ b/Libraries/Blob/NativeFileReaderModule.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Blob/RCTBlobCollector.h b/Libraries/Blob/RCTBlobCollector.h
index fdd68112d682..4d0166aab7db 100644
--- a/Libraries/Blob/RCTBlobCollector.h
+++ b/Libraries/Blob/RCTBlobCollector.h
@@ -7,8 +7,6 @@
 
 #import <jsi/jsi.h>
 
-using namespace facebook;
-
 @class RCTBlobManager;
 
 namespace facebook {
diff --git a/Libraries/Blob/RCTBlobCollector.mm b/Libraries/Blob/RCTBlobCollector.mm
index b7387c445a50..60053c3a1403 100644
--- a/Libraries/Blob/RCTBlobCollector.mm
+++ b/Libraries/Blob/RCTBlobCollector.mm
@@ -7,16 +7,19 @@
 
 #import "RCTBlobCollector.h"
 
-#import <React/RCTBridge+Private.h>
 #import <React/RCTBlobManager.h>
+#import <React/RCTBridge+Private.h>
 
 namespace facebook {
 namespace react {
 
 RCTBlobCollector::RCTBlobCollector(RCTBlobManager *blobManager, const std::string &blobId)
-: blobId_(blobId), blobManager_(blobManager) {}
+    : blobId_(blobId), blobManager_(blobManager)
+{
+}
 
-RCTBlobCollector::~RCTBlobCollector() {
+RCTBlobCollector::~RCTBlobCollector()
+{
   RCTBlobManager *blobManager = blobManager_;
   NSString *blobId = [NSString stringWithUTF8String:blobId_.c_str()];
   dispatch_async([blobManager_ methodQueue], ^{
@@ -24,28 +27,29 @@
   });
 }
 
-void RCTBlobCollector::install(RCTBlobManager *blobManager) {
+void RCTBlobCollector::install(RCTBlobManager *blobManager)
+{
   __weak RCTCxxBridge *cxxBridge = (RCTCxxBridge *)blobManager.bridge;
-  [cxxBridge dispatchBlock:^{
-    if (!cxxBridge || cxxBridge.runtime == nullptr) {
-      return;
-    }
-    jsi::Runtime &runtime = *(jsi::Runtime *)cxxBridge.runtime;
-    runtime.global().setProperty(
-      runtime,
-      "__blobCollectorProvider",
-      jsi::Function::createFromHostFunction(
-        runtime,
-        jsi::PropNameID::forAscii(runtime, "__blobCollectorProvider"),
-        1,
-        [blobManager](jsi::Runtime& rt, const jsi::Value& thisVal, const jsi::Value* args, size_t count) {
-          auto blobId = args[0].asString(rt).utf8(rt);
-          auto blobCollector = std::make_shared<RCTBlobCollector>(blobManager, blobId);
-          return jsi::Object::createFromHostObject(rt, blobCollector);
+  [cxxBridge
+      dispatchBlock:^{
+        if (!cxxBridge || cxxBridge.runtime == nullptr) {
+          return;
         }
-      )
-    );
-  } queue:RCTJSThread];
+        jsi::Runtime &runtime = *(jsi::Runtime *)cxxBridge.runtime;
+        runtime.global().setProperty(
+            runtime,
+            "__blobCollectorProvider",
+            jsi::Function::createFromHostFunction(
+                runtime,
+                jsi::PropNameID::forAscii(runtime, "__blobCollectorProvider"),
+                1,
+                [blobManager](jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args, size_t count) {
+                  auto blobId = args[0].asString(rt).utf8(rt);
+                  auto blobCollector = std::make_shared<RCTBlobCollector>(blobManager, blobId);
+                  return jsi::Object::createFromHostObject(rt, blobCollector);
+                }));
+      }
+              queue:RCTJSThread];
 }
 
 } // namespace react
diff --git a/Libraries/Blob/RCTBlobManager.h b/Libraries/Blob/RCTBlobManager.h
index 34cd8b82cf90..317b202911df 100755
--- a/Libraries/Blob/RCTBlobManager.h
+++ b/Libraries/Blob/RCTBlobManager.h
@@ -7,8 +7,8 @@
 
 #import <React/RCTBridge.h>
 #import <React/RCTBridgeModule.h>
-#import <React/RCTURLRequestHandler.h>
 #import <React/RCTInitializing.h>
+#import <React/RCTURLRequestHandler.h>
 
 @interface RCTBlobManager : NSObject <RCTBridgeModule, RCTURLRequestHandler, RCTInitializing>
 
diff --git a/Libraries/Blob/RCTBlobManager.mm b/Libraries/Blob/RCTBlobManager.mm
index 567e16ffee56..14496f7e4910 100755
--- a/Libraries/Blob/RCTBlobManager.mm
+++ b/Libraries/Blob/RCTBlobManager.mm
@@ -15,17 +15,20 @@
 #import <React/RCTUtils.h>
 #import <React/RCTWebSocketModule.h>
 
-#import "RCTBlobPlugins.h"
 #import "RCTBlobCollector.h"
+#import "RCTBlobPlugins.h"
 
 static NSString *const kBlobURIScheme = @"blob";
 
-@interface RCTBlobManager () <RCTNetworkingRequestHandler, RCTNetworkingResponseHandler, RCTWebSocketContentHandler, NativeBlobModuleSpec>
+@interface RCTBlobManager () <
+    RCTNetworkingRequestHandler,
+    RCTNetworkingResponseHandler,
+    RCTWebSocketContentHandler,
+    NativeBlobModuleSpec>
 
 @end
 
-@implementation RCTBlobManager
-{
+@implementation RCTBlobManager {
   // Blobs should be thread safe since they are used from the websocket and networking module,
   // make sure to use proper locking when accessing this.
   NSMutableDictionary<NSString *, NSData *> *_blobs;
@@ -61,8 +64,8 @@ + (BOOL)requiresMainQueueSetup
 - (NSDictionary<NSString *, id> *)getConstants
 {
   return @{
-    @"BLOB_URI_SCHEME": kBlobURIScheme,
-    @"BLOB_URI_HOST": [NSNull null],
+    @"BLOB_URI_SCHEME" : kBlobURIScheme,
+    @"BLOB_URI_HOST" : [NSNull null],
   };
 }
 
@@ -84,9 +87,7 @@ - (NSData *)resolve:(NSDictionary<NSString *, id> *)blob
   NSString *blobId = [RCTConvert NSString:blob[@"blobId"]];
   NSNumber *offset = [RCTConvert NSNumber:blob[@"offset"]];
   NSNumber *size = [RCTConvert NSNumber:blob[@"size"]];
-  return [self resolve:blobId
-                offset:offset ? [offset integerValue] : 0
-                  size:size ? [size integerValue] : -1];
+  return [self resolve:blobId offset:offset ? [offset integerValue] : 0 size:size ? [size integerValue] : -1];
 }
 
 - (NSData *)resolve:(NSString *)blobId offset:(NSInteger)offset size:(NSInteger)size
@@ -152,29 +153,32 @@ - (void)remove:(NSString *)blobId
   });
 }
 
-RCT_EXPORT_METHOD(addWebSocketHandler:(double)socketID)
+RCT_EXPORT_METHOD(addWebSocketHandler : (double)socketID)
 {
   dispatch_async(((RCTWebSocketModule *)[_moduleRegistry moduleForName:"WebSocketModule"]).methodQueue, ^{
-    [[self->_moduleRegistry moduleForName:"WebSocketModule"] setContentHandler:self forSocketID:[NSNumber numberWithDouble:socketID]];
+    [[self->_moduleRegistry moduleForName:"WebSocketModule"] setContentHandler:self
+                                                                   forSocketID:[NSNumber numberWithDouble:socketID]];
   });
 }
 
-RCT_EXPORT_METHOD(removeWebSocketHandler:(double)socketID)
+RCT_EXPORT_METHOD(removeWebSocketHandler : (double)socketID)
 {
   dispatch_async(((RCTWebSocketModule *)[_moduleRegistry moduleForName:"WebSocketModule"]).methodQueue, ^{
-    [[self->_moduleRegistry moduleForName:"WebSocketModule"] setContentHandler:nil forSocketID:[NSNumber numberWithDouble:socketID]];
+    [[self->_moduleRegistry moduleForName:"WebSocketModule"] setContentHandler:nil
+                                                                   forSocketID:[NSNumber numberWithDouble:socketID]];
   });
 }
 
 // @lint-ignore FBOBJCUNTYPEDCOLLECTION1
-RCT_EXPORT_METHOD(sendOverSocket:(NSDictionary *)blob socketID:(double)socketID)
+RCT_EXPORT_METHOD(sendOverSocket : (NSDictionary *)blob socketID : (double)socketID)
 {
   dispatch_async(((RCTWebSocketModule *)[_moduleRegistry moduleForName:"WebSocketModule"]).methodQueue, ^{
-    [[self->_moduleRegistry moduleForName:"WebSocketModule"] sendData:[self resolve:blob] forSocketID:[NSNumber numberWithDouble:socketID]];
+    [[self->_moduleRegistry moduleForName:"WebSocketModule"] sendData:[self resolve:blob]
+                                                          forSocketID:[NSNumber numberWithDouble:socketID]];
   });
 }
 
-RCT_EXPORT_METHOD(createFromParts:(NSArray<NSDictionary<NSString *, id> *> *)parts withId:(NSString *)blobId)
+RCT_EXPORT_METHOD(createFromParts : (NSArray<NSDictionary<NSString *, id> *> *)parts withId : (NSString *)blobId)
 {
   NSMutableData *data = [NSMutableData new];
   for (NSDictionary<NSString *, id> *part in parts) {
@@ -193,7 +197,7 @@ - (void)remove:(NSString *)blobId
   [self store:data withId:blobId];
 }
 
-RCT_EXPORT_METHOD(release:(NSString *)blobId)
+RCT_EXPORT_METHOD(release : (NSString *)blobId)
 {
   [self remove:blobId];
 }
@@ -267,7 +271,7 @@ - (NSDictionary *)handleNetworkingRequest:(NSDictionary *)data
     contentType = blob[@"type"];
   }
 
-  return @{@"body": [self resolve:blob], @"contentType": contentType};
+  return @{@"body" : [self resolve:blob], @"contentType" : contentType};
 }
 
 - (BOOL)canHandleNetworkingResponse:(NSString *)responseType
@@ -281,11 +285,11 @@ - (id)handleNetworkingResponse:(NSURLResponse *)response data:(NSData *)data
   // an empty blob as per the XMLHttpRequest spec.
   data = data ?: [NSData new];
   return @{
-    @"blobId": [self store:data],
-    @"offset": @0,
-    @"size": @(data.length),
-    @"name": RCTNullIfNil([response suggestedFilename]),
-    @"type": RCTNullIfNil([response MIMEType]),
+    @"blobId" : [self store:data],
+    @"offset" : @0,
+    @"size" : @(data.length),
+    @"name" : RCTNullIfNil([response suggestedFilename]),
+    @"type" : RCTNullIfNil([response MIMEType]),
   };
 }
 
@@ -302,19 +306,21 @@ - (id)processWebsocketMessage:(id)message
 
   *type = @"blob";
   return @{
-    @"blobId": [self store:message],
-    @"offset": @0,
-    @"size": @(((NSData *)message).length),
+    @"blobId" : [self store:message],
+    @"offset" : @0,
+    @"size" : @(((NSData *)message).length),
   };
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   return std::make_shared<facebook::react::NativeBlobModuleSpecJSI>(params);
 }
 
 @end
 
-Class RCTBlobManagerCls(void) {
+Class RCTBlobManagerCls(void)
+{
   return RCTBlobManager.class;
 }
diff --git a/Libraries/Blob/RCTFileReaderModule.mm b/Libraries/Blob/RCTFileReaderModule.mm
index f52a68aba98c..685d86b48d80 100644
--- a/Libraries/Blob/RCTFileReaderModule.mm
+++ b/Libraries/Blob/RCTFileReaderModule.mm
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-
 #import <React/RCTFileReaderModule.h>
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
@@ -16,7 +15,7 @@
 
 #import "RCTBlobPlugins.h"
 
-@interface RCTFileReaderModule() <NativeFileReaderModuleSpec>
+@interface RCTFileReaderModule () <NativeFileReaderModuleSpec>
 @end
 
 @implementation RCTFileReaderModule
@@ -25,25 +24,29 @@ @implementation RCTFileReaderModule
 
 @synthesize moduleRegistry = _moduleRegistry;
 
-RCT_EXPORT_METHOD(readAsText:(NSDictionary<NSString *, id> *)blob
-                  encoding:(NSString *)encoding
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(readAsText
+                  : (NSDictionary<NSString *, id> *)blob encoding
+                  : (NSString *)encoding resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
   RCTBlobManager *blobManager = [_moduleRegistry moduleForName:"BlobModule"];
   dispatch_async(blobManager.methodQueue, ^{
     NSData *data = [blobManager resolve:blob];
 
     if (data == nil) {
-      reject(RCTErrorUnspecified,
-             [NSString stringWithFormat:@"Unable to resolve data for blob: %@", [RCTConvert NSString:blob[@"blobId"]]], nil);
+      reject(
+          RCTErrorUnspecified,
+          [NSString stringWithFormat:@"Unable to resolve data for blob: %@", [RCTConvert NSString:blob[@"blobId"]]],
+          nil);
     } else {
       NSStringEncoding stringEncoding;
 
       if (encoding == nil) {
         stringEncoding = NSUTF8StringEncoding;
       } else {
-        stringEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef) encoding));
+        stringEncoding =
+            CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef)encoding));
       }
 
       NSString *text = [[NSString alloc] initWithData:data encoding:stringEncoding];
@@ -53,29 +56,33 @@ @implementation RCTFileReaderModule
   });
 }
 
-RCT_EXPORT_METHOD(readAsDataURL:(NSDictionary<NSString *, id> *)blob
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(readAsDataURL
+                  : (NSDictionary<NSString *, id> *)blob resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
   RCTBlobManager *blobManager = [_moduleRegistry moduleForName:"BlobModule"];
   dispatch_async(blobManager.methodQueue, ^{
     NSData *data = [blobManager resolve:blob];
 
     if (data == nil) {
-      reject(RCTErrorUnspecified,
-             [NSString stringWithFormat:@"Unable to resolve data for blob: %@", [RCTConvert NSString:blob[@"blobId"]]], nil);
+      reject(
+          RCTErrorUnspecified,
+          [NSString stringWithFormat:@"Unable to resolve data for blob: %@", [RCTConvert NSString:blob[@"blobId"]]],
+          nil);
     } else {
       NSString *type = [RCTConvert NSString:blob[@"type"]];
       NSString *text = [NSString stringWithFormat:@"data:%@;base64,%@",
-                        type != nil && [type length] > 0 ? type : @"application/octet-stream",
-                        [data base64EncodedStringWithOptions:0]];
+                                                  type != nil && [type length] > 0 ? type : @"application/octet-stream",
+                                                  [data base64EncodedStringWithOptions:0]];
 
       resolve(text);
     }
   });
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   return std::make_shared<facebook::react::NativeFileReaderModuleSpecJSI>(params);
 }
diff --git a/Libraries/Blob/React-RCTBlob.podspec b/Libraries/Blob/React-RCTBlob.podspec
index ee488e04aa14..30cf7e141710 100644
--- a/Libraries/Blob/React-RCTBlob.podspec
+++ b/Libraries/Blob/React-RCTBlob.podspec
@@ -45,5 +45,4 @@ Pod::Spec.new do |s|
   s.dependency "React-Core/RCTBlobHeaders", version
   s.dependency "React-Core/RCTWebSocket", version
   s.dependency "React-RCTNetwork", version
-  s.dependency "React-jsi", version
 end
diff --git a/Libraries/Blob/URL.js b/Libraries/Blob/URL.js
index 77b4d7f94d6d..1cc3a9e8c4a2 100644
--- a/Libraries/Blob/URL.js
+++ b/Libraries/Blob/URL.js
@@ -8,7 +8,7 @@
  * @flow
  */
 
-const Blob = require('./Blob');
+import type Blob from './Blob';
 
 import NativeBlobModule from './NativeBlobModule';
 
@@ -54,7 +54,7 @@ if (
 // Small subset from whatwg-url: https://github.com/jsdom/whatwg-url/tree/master/src
 // The reference code bloat comes from Unicode issues with URLs, so those won't work here.
 export class URLSearchParams {
-  _searchParams = [];
+  _searchParams: Array<Array<string>> = [];
 
   constructor(params: any) {
     if (typeof params === 'object') {
@@ -62,35 +62,36 @@ export class URLSearchParams {
     }
   }
 
-  append(key: string, value: string) {
+  append(key: string, value: string): void {
     this._searchParams.push([key, value]);
   }
 
-  delete(name: string) {
+  delete(name: string): void {
     throw new Error('URLSearchParams.delete is not implemented');
   }
 
-  get(name: string) {
+  get(name: string): void {
     throw new Error('URLSearchParams.get is not implemented');
   }
 
-  getAll(name: string) {
+  getAll(name: string): void {
     throw new Error('URLSearchParams.getAll is not implemented');
   }
 
-  has(name: string) {
+  has(name: string): void {
     throw new Error('URLSearchParams.has is not implemented');
   }
 
-  set(name: string, value: string) {
+  set(name: string, value: string): void {
     throw new Error('URLSearchParams.set is not implemented');
   }
 
-  sort() {
+  sort(): void {
     throw new Error('URLSearchParams.sort is not implemented');
   }
 
   // $FlowFixMe[unsupported-syntax]
+  // $FlowFixMe[missing-local-annot]
   [Symbol.iterator]() {
     return this._searchParams[Symbol.iterator]();
   }
@@ -134,6 +135,7 @@ export class URL {
     // Do nothing.
   }
 
+  // $FlowFixMe[missing-local-annot]
   constructor(url: string, base: string | URL) {
     let baseUrl = null;
     if (!base || validateBaseUrl(url)) {
diff --git a/Libraries/Blob/__tests__/Blob-test.js b/Libraries/Blob/__tests__/Blob-test.js
index 5e406f024dd0..9fdabab67ef5 100644
--- a/Libraries/Blob/__tests__/Blob-test.js
+++ b/Libraries/Blob/__tests__/Blob-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Blob/__tests__/BlobManager-test.js b/Libraries/Blob/__tests__/BlobManager-test.js
index e03dd87d9d1c..856eac1ad869 100644
--- a/Libraries/Blob/__tests__/BlobManager-test.js
+++ b/Libraries/Blob/__tests__/BlobManager-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Blob/__tests__/File-test.js b/Libraries/Blob/__tests__/File-test.js
index 21b50650a998..b6d6c31ec2fe 100644
--- a/Libraries/Blob/__tests__/File-test.js
+++ b/Libraries/Blob/__tests__/File-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Blob/__tests__/FileReader-test.js b/Libraries/Blob/__tests__/FileReader-test.js
index 8ae1c81a31f8..1e1ac1ab7a4d 100644
--- a/Libraries/Blob/__tests__/FileReader-test.js
+++ b/Libraries/Blob/__tests__/FileReader-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Blob/__tests__/URL-test.js b/Libraries/Blob/__tests__/URL-test.js
index 28e89950b267..c317217c8fe7 100644
--- a/Libraries/Blob/__tests__/URL-test.js
+++ b/Libraries/Blob/__tests__/URL-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/BugReporting/NativeBugReporting.js b/Libraries/BugReporting/NativeBugReporting.js
index 13a51a585c0b..f886208de3d3 100644
--- a/Libraries/BugReporting/NativeBugReporting.js
+++ b/Libraries/BugReporting/NativeBugReporting.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/BugReporting/getReactData.js b/Libraries/BugReporting/getReactData.js
index 4440cc4e0d0e..cc988ced1098 100644
--- a/Libraries/BugReporting/getReactData.js
+++ b/Libraries/BugReporting/getReactData.js
@@ -165,7 +165,7 @@ function copyWithSetImpl(
   path: Array<string | number>,
   idx: number,
   value: any,
-) {
+): any {
   if (idx >= path.length) {
     return value;
   }
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.d.ts b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.d.ts
new file mode 100644
index 000000000000..8ac2a29819f9
--- /dev/null
+++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.d.ts
@@ -0,0 +1,157 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {HostComponent} from '../../../types/public/ReactNativeTypes';
+import {EmitterSubscription} from '../../vendor/emitter/EventEmitter';
+
+type AccessibilityChangeEventName =
+  | 'change' // deprecated, maps to screenReaderChanged
+  | 'boldTextChanged' // iOS-only Event
+  | 'grayscaleChanged' // iOS-only Event
+  | 'invertColorsChanged' // iOS-only Event
+  | 'reduceMotionChanged'
+  | 'screenReaderChanged'
+  | 'reduceTransparencyChanged'; // iOS-only Event
+
+type AccessibilityChangeEvent = boolean;
+
+type AccessibilityChangeEventHandler = (
+  event: AccessibilityChangeEvent,
+) => void;
+
+type AccessibilityAnnouncementEventName = 'announcementFinished'; // iOS-only Event
+
+type AccessibilityAnnouncementFinishedEvent = {
+  announcement: string;
+  success: boolean;
+};
+
+type AccessibilityAnnouncementFinishedEventHandler = (
+  event: AccessibilityAnnouncementFinishedEvent,
+) => void;
+
+type AccessibilityEventTypes = 'click' | 'focus';
+
+/**
+ * @see https://reactnative.dev/docs/accessibilityinfo
+ */
+export interface AccessibilityInfoStatic {
+  /**
+   * Query whether bold text is currently enabled.
+   *
+   * @platform ios
+   */
+  isBoldTextEnabled: () => Promise<boolean>;
+
+  /**
+   * Query whether grayscale is currently enabled.
+   *
+   * @platform ios
+   */
+  isGrayscaleEnabled: () => Promise<boolean>;
+
+  /**
+   * Query whether invert colors is currently enabled.
+   *
+   * @platform ios
+   */
+  isInvertColorsEnabled: () => Promise<boolean>;
+
+  /**
+   * Query whether reduce motion is currently enabled.
+   */
+  isReduceMotionEnabled: () => Promise<boolean>;
+
+  /**
+   * Query whether reduce motion and prefer cross-fade transitions settings are currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when  prefer cross-fade transitions is enabled and `false` otherwise.
+   */
+  prefersCrossFadeTransitions(): Promise<boolean>;
+
+  /**
+   * Query whether reduce transparency is currently enabled.
+   *
+   * @platform ios
+   */
+  isReduceTransparencyEnabled: () => Promise<boolean>;
+
+  /**
+   * Query whether a screen reader is currently enabled.
+   */
+  isScreenReaderEnabled: () => Promise<boolean>;
+
+  /**
+   * Query whether Accessibility Service is currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when any service is enabled and `false` otherwise.
+   *
+   * @platform android
+   */
+  isAccessibilityServiceEnabled(): Promise<boolean>;
+
+  /**
+   * Add an event handler. Supported events:
+   * - announcementFinished: iOS-only event. Fires when the screen reader has finished making an announcement.
+   *                         The argument to the event handler is a dictionary with these keys:
+   *                          - announcement: The string announced by the screen reader.
+   *                          - success: A boolean indicating whether the announcement was successfully made.
+   * - AccessibilityEventName constants other than announcementFinished: Fires on accessibility feature change.
+   *            The argument to the event handler is a boolean.
+   *            The boolean is true when the related event's feature is enabled and false otherwise.
+   *
+   */
+  addEventListener(
+    eventName: AccessibilityChangeEventName,
+    handler: AccessibilityChangeEventHandler,
+  ): EmitterSubscription;
+  addEventListener(
+    eventName: AccessibilityAnnouncementEventName,
+    handler: AccessibilityAnnouncementFinishedEventHandler,
+  ): EmitterSubscription;
+
+  /**
+   * Set accessibility focus to a react component.
+   */
+  setAccessibilityFocus: (reactTag: number) => void;
+
+  /**
+   * Post a string to be announced by the screen reader.
+   */
+  announceForAccessibility: (announcement: string) => void;
+
+  /**
+   * Post a string to be announced by the screen reader.
+   * - `announcement`: The string announced by the screen reader.
+   * - `options`: An object that configures the reading options.
+   *   - `queue`: The announcement will be queued behind existing announcements. iOS only.
+   */
+  announceForAccessibilityWithOptions(
+    announcement: string,
+    options: {queue?: boolean},
+  ): void;
+
+  /**
+   * Gets the timeout in millisecond that the user needs.
+   * This value is set in "Time to take action (Accessibility timeout)" of "Accessibility" settings.
+   *
+   * @platform android
+   */
+  getRecommendedTimeoutMillis: (originalTimeout: number) => Promise<number>;
+  sendAccessibilityEvent: (
+    handle: React.ElementRef<HostComponent<unknown>>,
+    eventType: AccessibilityEventTypes,
+  ) => void;
+}
+
+export const AccessibilityInfo: AccessibilityInfoStatic;
+export type AccessibilityInfo = AccessibilityInfoStatic;
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.flow.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.flow.js
new file mode 100644
index 000000000000..b40fd0230eef
--- /dev/null
+++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.flow.js
@@ -0,0 +1,208 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
+import type {ElementRef} from 'react';
+
+// Events that are only supported on Android.
+type AccessibilityEventDefinitionsAndroid = {
+  accessibilityServiceChanged: [boolean],
+};
+
+// Events that are only supported on iOS.
+type AccessibilityEventDefinitionsIOS = {
+  announcementFinished: [{announcement: string, success: boolean}],
+  boldTextChanged: [boolean],
+  grayscaleChanged: [boolean],
+  invertColorsChanged: [boolean],
+  reduceTransparencyChanged: [boolean],
+};
+
+type AccessibilityEventDefinitions = {
+  ...AccessibilityEventDefinitionsAndroid,
+  ...AccessibilityEventDefinitionsIOS,
+  change: [boolean], // screenReaderChanged
+  reduceMotionChanged: [boolean],
+  screenReaderChanged: [boolean],
+};
+
+type AccessibilityEventTypes = 'click' | 'focus';
+/**
+ * Sometimes it's useful to know whether or not the device has a screen reader
+ * that is currently active. The `AccessibilityInfo` API is designed for this
+ * purpose. You can use it to query the current state of the screen reader as
+ * well as to register to be notified when the state of the screen reader
+ * changes.
+ *
+ * See https://reactnative.dev/docs/accessibilityinfo
+ */
+export type AccessibilityInfoType = {
+  /**
+   * Query whether bold text is currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when bold text is enabled and `false` otherwise.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo#isBoldTextEnabled
+   */
+  isBoldTextEnabled: () => Promise<boolean>,
+
+  /**
+   * Query whether grayscale is currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when grayscale is enabled and `false` otherwise.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo#isGrayscaleEnabled
+   */
+  isGrayscaleEnabled: () => Promise<boolean>,
+
+  /**
+   * Query whether inverted colors are currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when invert color is enabled and `false` otherwise.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo#isInvertColorsEnabled
+   */
+  isInvertColorsEnabled: () => Promise<boolean>,
+
+  /**
+   * Query whether reduced motion is currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when a reduce motion is enabled and `false` otherwise.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo#isReduceMotionEnabled
+   */
+  isReduceMotionEnabled: () => Promise<boolean>,
+
+  /**
+   * Query whether reduce motion and prefer cross-fade transitions settings are currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when prefer cross-fade transitions is enabled and `false` otherwise.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo#prefersCrossFadeTransitions
+   */
+  prefersCrossFadeTransitions: () => Promise<boolean>,
+
+  /**
+   * Query whether reduced transparency is currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when a reduce transparency is enabled and `false` otherwise.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo#isReduceTransparencyEnabled
+   */
+  isReduceTransparencyEnabled: () => Promise<boolean>,
+
+  /**
+   * Query whether a screen reader is currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when a screen reader is enabled and `false` otherwise.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo#isScreenReaderEnabled
+   */
+  isScreenReaderEnabled: () => Promise<boolean>,
+
+  /**
+   * Query whether Accessibility Service is currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when any service is enabled and `false` otherwise.
+   *
+   * @platform android
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo/#isaccessibilityserviceenabled-android
+   */
+  isAccessibilityServiceEnabled: () => Promise<boolean>,
+
+  /**
+   * Add an event handler. Supported events:
+   *
+   * - `reduceMotionChanged`: Fires when the state of the reduce motion toggle changes.
+   *   The argument to the event handler is a boolean. The boolean is `true` when a reduce
+   *   motion is enabled (or when "Transition Animation Scale" in "Developer options" is
+   *   "Animation off") and `false` otherwise.
+   * - `screenReaderChanged`: Fires when the state of the screen reader changes. The argument
+   *   to the event handler is a boolean. The boolean is `true` when a screen
+   *   reader is enabled and `false` otherwise.
+   *
+   * These events are only supported on iOS:
+   *
+   * - `boldTextChanged`: iOS-only event. Fires when the state of the bold text toggle changes.
+   *   The argument to the event handler is a boolean. The boolean is `true` when a bold text
+   *   is enabled and `false` otherwise.
+   * - `grayscaleChanged`: iOS-only event. Fires when the state of the gray scale toggle changes.
+   *   The argument to the event handler is a boolean. The boolean is `true` when a gray scale
+   *   is enabled and `false` otherwise.
+   * - `invertColorsChanged`: iOS-only event. Fires when the state of the invert colors toggle
+   *   changes. The argument to the event handler is a boolean. The boolean is `true` when a invert
+   *   colors is enabled and `false` otherwise.
+   * - `reduceTransparencyChanged`: iOS-only event. Fires when the state of the reduce transparency
+   *   toggle changes.  The argument to the event handler is a boolean. The boolean is `true`
+   *   when a reduce transparency is enabled and `false` otherwise.
+   * - `announcementFinished`: iOS-only event. Fires when the screen reader has
+   *   finished making an announcement. The argument to the event handler is a
+   *   dictionary with these keys:
+   *     - `announcement`: The string announced by the screen reader.
+   *     - `success`: A boolean indicating whether the announcement was
+   *       successfully made.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo#addeventlistener
+   */
+  addEventListener<K: $Keys<AccessibilityEventDefinitions>>(
+    eventName: K,
+    handler: (...$ElementType<AccessibilityEventDefinitions, K>) => void,
+  ): EventSubscription,
+
+  /**
+   * Set accessibility focus to a React component.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo#setaccessibilityfocus
+   */
+  setAccessibilityFocus: (reactTag: number) => void,
+
+  /**
+   * Send a named accessibility event to a HostComponent.
+   */
+  sendAccessibilityEvent: (
+    handle: ElementRef<HostComponent<mixed>>,
+    eventType: AccessibilityEventTypes,
+  ) => void,
+
+  /**
+   * Post a string to be announced by the screen reader.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo#announceforaccessibility
+   */
+  announceForAccessibility: (announcement: string) => void,
+
+  /**
+   * Post a string to be announced by the screen reader.
+   * - `announcement`: The string announced by the screen reader.
+   * - `options`: An object that configures the reading options.
+   *   - `queue`: The announcement will be queued behind existing announcements. iOS only.
+   */
+  announceForAccessibilityWithOptions: (
+    announcement: string,
+    options: {queue?: boolean},
+  ) => void,
+
+  /**
+   * Get the recommended timeout for changes to the UI needed by this user.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo#getrecommendedtimeoutmillis
+   */
+  getRecommendedTimeoutMillis: (originalTimeout: number) => Promise<number>,
+};
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js
index 150635d8531a..195fe7476367 100644
--- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js
+++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js
@@ -8,15 +8,17 @@
  * @format
  */
 
-import RCTDeviceEventEmitter from '../../EventEmitter/RCTDeviceEventEmitter';
-import {sendAccessibilityEvent} from '../../Renderer/shims/ReactNative';
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-import Platform from '../../Utilities/Platform';
 import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
+import type {AccessibilityInfoType} from './AccessibilityInfo.flow';
+import type {ElementRef} from 'react';
+
+import RCTDeviceEventEmitter from '../../EventEmitter/RCTDeviceEventEmitter';
+import {sendAccessibilityEvent} from '../../ReactNative/RendererProxy';
+import Platform from '../../Utilities/Platform';
+import legacySendAccessibilityEvent from './legacySendAccessibilityEvent';
 import NativeAccessibilityInfoAndroid from './NativeAccessibilityInfo';
 import NativeAccessibilityManagerIOS from './NativeAccessibilityManager';
-import legacySendAccessibilityEvent from './legacySendAccessibilityEvent';
-import type {ElementRef} from 'react';
 
 // Events that are only supported on Android.
 type AccessibilityEventDefinitionsAndroid = {
@@ -73,7 +75,7 @@ const EventNames: Map<
  *
  * See https://reactnative.dev/docs/accessibilityinfo
  */
-const AccessibilityInfo = {
+const AccessibilityInfo: AccessibilityInfoType = {
   /**
    * Query whether bold text is currently enabled.
    *
@@ -178,6 +180,34 @@ const AccessibilityInfo = {
     });
   },
 
+  /**
+   * Query whether reduce motion and prefer cross-fade transitions settings are currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
+   * The result is `true` when  prefer cross-fade transitions is enabled and `false` otherwise.
+   *
+   * See https://reactnative.dev/docs/accessibilityinfo#prefersCrossFadeTransitions
+   */
+  prefersCrossFadeTransitions(): Promise<boolean> {
+    return new Promise((resolve, reject) => {
+      if (Platform.OS === 'android') {
+        return Promise.resolve(false);
+      } else {
+        if (
+          NativeAccessibilityManagerIOS?.getCurrentPrefersCrossFadeTransitionsState !=
+          null
+        ) {
+          NativeAccessibilityManagerIOS.getCurrentPrefersCrossFadeTransitionsState(
+            resolve,
+            reject,
+          );
+        } else {
+          reject(null);
+        }
+      }
+    });
+  },
+
   /**
    * Query whether reduced transparency is currently enabled.
    *
@@ -295,12 +325,14 @@ const AccessibilityInfo = {
    */
   addEventListener<K: $Keys<AccessibilityEventDefinitions>>(
     eventName: K,
+    // $FlowIssue[incompatible-type] - Flow bug with unions and generics (T128099423)
     handler: (...$ElementType<AccessibilityEventDefinitions, K>) => void,
   ): EventSubscription {
     const deviceEventName = EventNames.get(eventName);
     return deviceEventName == null
       ? {remove(): void {}}
-      : RCTDeviceEventEmitter.addListener(deviceEventName, handler);
+      : // $FlowFixMe[incompatible-call]
+        RCTDeviceEventEmitter.addListener(deviceEventName, handler);
   },
 
   /**
@@ -315,7 +347,7 @@ const AccessibilityInfo = {
   /**
    * Send a named accessibility event to a HostComponent.
    */
-  sendAccessibilityEvent_unstable(
+  sendAccessibilityEvent(
     handle: ElementRef<HostComponent<mixed>>,
     eventType: AccessibilityEventTypes,
   ) {
diff --git a/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js b/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js
index beee9e285175..e4661589749a 100644
--- a/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js
+++ b/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager.js b/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager.js
index d4c400ac3e99..f815b18c97ba 100644
--- a/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager.js
+++ b/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
@@ -28,6 +29,10 @@ export interface Spec extends TurboModule {
     onSuccess: (isReduceMotionEnabled: boolean) => void,
     onError: (error: Object) => void,
   ) => void;
+  +getCurrentPrefersCrossFadeTransitionsState?: (
+    onSuccess: (prefersCrossFadeTransitions: boolean) => void,
+    onError: (error: Object) => void,
+  ) => void;
   +getCurrentReduceTransparencyState: (
     onSuccess: (isReduceTransparencyEnabled: boolean) => void,
     onError: (error: Object) => void,
diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.d.ts b/Libraries/Components/ActivityIndicator/ActivityIndicator.d.ts
new file mode 100644
index 000000000000..f1a4b246dd44
--- /dev/null
+++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.d.ts
@@ -0,0 +1,86 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
+import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
+import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
+import {LayoutChangeEvent} from '../../Types/CoreEventTypes';
+import {ViewProps} from '../View/ViewPropTypes';
+
+/**
+ * @see https://reactnative.dev/docs/activityindicator#props
+ */
+export interface ActivityIndicatorProps extends ViewProps {
+  /**
+   * Whether to show the indicator (true, the default) or hide it (false).
+   */
+  animating?: boolean | undefined;
+
+  /**
+   * The foreground color of the spinner (default is gray).
+   */
+  color?: ColorValue | undefined;
+
+  /**
+   * Whether the indicator should hide when not animating (true by default).
+   */
+  hidesWhenStopped?: boolean | undefined;
+
+  /**
+   * Size of the indicator.
+   * Small has a height of 20, large has a height of 36.
+   *
+   * enum('small', 'large')
+   */
+  size?: number | 'small' | 'large' | undefined;
+
+  style?: StyleProp<ViewStyle> | undefined;
+}
+
+declare class ActivityIndicatorComponent extends React.Component<ActivityIndicatorProps> {}
+declare const ActivityIndicatorBase: Constructor<NativeMethods> &
+  typeof ActivityIndicatorComponent;
+export class ActivityIndicator extends ActivityIndicatorBase {}
+
+/**
+ * @see https://reactnative.dev/docs/activityindicatorios#props
+ */
+export interface ActivityIndicatorIOSProps extends ViewProps {
+  /**
+   * Whether to show the indicator (true, the default) or hide it (false).
+   */
+  animating?: boolean | undefined;
+
+  /**
+   * The foreground color of the spinner (default is gray).
+   */
+  color?: ColorValue | undefined;
+
+  /**
+   * Whether the indicator should hide when not animating (true by default).
+   */
+  hidesWhenStopped?: boolean | undefined;
+
+  /**
+   * Invoked on mount and layout changes with
+   */
+  onLayout?: ((event: LayoutChangeEvent) => void) | undefined;
+
+  /**
+   * Size of the indicator.
+   * Small has a height of 20, large has a height of 36.
+   *
+   * enum('small', 'large')
+   */
+  size?: 'small' | 'large' | undefined;
+
+  style?: StyleProp<ViewStyle> | undefined;
+}
diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.flow.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.flow.js
new file mode 100644
index 000000000000..ebfb8272cb25
--- /dev/null
+++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.flow.js
@@ -0,0 +1,58 @@
+/**
+ * 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
+ */
+
+'use strict';
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import type {ViewProps} from '../View/ViewPropTypes';
+
+import {type ColorValue} from '../../StyleSheet/StyleSheet';
+import * as React from 'react';
+
+type IndicatorSize = number | 'small' | 'large';
+
+type IOSProps = $ReadOnly<{|
+  /**
+    Whether the indicator should hide when not animating.
+
+    @platform ios
+  */
+  hidesWhenStopped?: ?boolean,
+|}>;
+
+type Props = $ReadOnly<{|
+  ...ViewProps,
+  ...IOSProps,
+
+  /**
+   	Whether to show the indicator (`true`) or hide it (`false`).
+   */
+  animating?: ?boolean,
+
+  /**
+    The foreground color of the spinner.
+
+    @default {@platform android} `null` (system accent default color)
+    @default {@platform ios} '#999999'
+  */
+  color?: ?ColorValue,
+
+  /**
+    Size of the indicator.
+
+    @type enum(`'small'`, `'large'`)
+    @type {@platform android} number
+  */
+  size?: ?IndicatorSize,
+|}>;
+
+export type ActivityIndicator = React.AbstractComponent<
+  Props,
+  HostComponent<mixed>,
+>;
diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
index eb8b733e15a2..0b57dc1273bd 100644
--- a/Libraries/Components/ActivityIndicator/ActivityIndicator.js
+++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
@@ -10,12 +10,13 @@
  */
 
 'use strict';
-import * as React from 'react';
-import Platform from '../../Utilities/Platform';
+import type {ViewProps} from '../View/ViewPropTypes';
+import type {ActivityIndicator as ActivityIndicatorType} from './ActivityIndicator.flow';
+
 import StyleSheet, {type ColorValue} from '../../StyleSheet/StyleSheet';
+import Platform from '../../Utilities/Platform';
 import View from '../View/View';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-import type {ViewProps} from '../View/ViewPropTypes';
+import * as React from 'react';
 
 const PlatformActivityIndicator =
   Platform.OS === 'android'
@@ -183,10 +184,8 @@ const ActivityIndicator = (
   ```
 */
 
-const ActivityIndicatorWithRef: React.AbstractComponent<
-  Props,
-  HostComponent<mixed>,
-> = React.forwardRef(ActivityIndicator);
+const ActivityIndicatorWithRef: ActivityIndicatorType =
+  React.forwardRef(ActivityIndicator);
 ActivityIndicatorWithRef.displayName = 'ActivityIndicator';
 
 const styles = StyleSheet.create({
diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicatorViewNativeComponent.js b/Libraries/Components/ActivityIndicator/ActivityIndicatorViewNativeComponent.js
index 548069e885d6..7394582902dc 100644
--- a/Libraries/Components/ActivityIndicator/ActivityIndicatorViewNativeComponent.js
+++ b/Libraries/Components/ActivityIndicator/ActivityIndicatorViewNativeComponent.js
@@ -8,13 +8,12 @@
  * @flow strict-local
  */
 
-import type {WithDefault} from '../../Types/CodegenTypes';
-
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
+import type {WithDefault} from '../../Types/CodegenTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
 
 import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,
diff --git a/Libraries/Components/ActivityIndicator/__tests__/ActivityIndicator-test.js b/Libraries/Components/ActivityIndicator/__tests__/ActivityIndicator-test.js
index 91cb7bd6e292..1c1338618976 100644
--- a/Libraries/Components/ActivityIndicator/__tests__/ActivityIndicator-test.js
+++ b/Libraries/Components/ActivityIndicator/__tests__/ActivityIndicator-test.js
@@ -4,17 +4,16 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
-const ActivityIndicator = require('../ActivityIndicator');
-
 const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
+const ActivityIndicator = require('../ActivityIndicator');
+const React = require('react');
 
 describe('<ActivityIndicator />', () => {
   it('should set displayName to prevent <Component /> regressions', () => {
diff --git a/Libraries/Components/Button.d.ts b/Libraries/Components/Button.d.ts
new file mode 100644
index 000000000000..706307156b85
--- /dev/null
+++ b/Libraries/Components/Button.d.ts
@@ -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.
+ *
+ * @format
+ */
+
+import type * as React from 'react';
+import {ColorValue} from '../StyleSheet/StyleSheet';
+import {TouchableNativeFeedbackProps} from './Touchable/TouchableNativeFeedback';
+import {TouchableOpacityProps} from './Touchable/TouchableOpacity';
+
+export interface ButtonProps
+  extends Pick<
+    TouchableNativeFeedbackProps & TouchableOpacityProps,
+    | 'accessibilityLabel'
+    | 'accessibilityState'
+    | 'hasTVPreferredFocus'
+    | 'nextFocusDown'
+    | 'nextFocusForward'
+    | 'nextFocusLeft'
+    | 'nextFocusRight'
+    | 'nextFocusUp'
+    | 'testID'
+    | 'disabled'
+    | 'onPress'
+    | 'touchSoundDisabled'
+  > {
+  /**
+   * Text to display inside the button. On Android the given title will be converted to the uppercased form.
+   */
+  title: string;
+
+  /**
+   * Color of the text (iOS), or background color of the button (Android).
+   */
+  color?: ColorValue | undefined;
+}
+
+export class Button extends React.Component<ButtonProps> {}
diff --git a/Libraries/Components/Button.flow.js b/Libraries/Components/Button.flow.js
new file mode 100644
index 000000000000..777c546508d7
--- /dev/null
+++ b/Libraries/Components/Button.flow.js
@@ -0,0 +1,265 @@
+/**
+ * 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
+ * @generate-docs
+ */
+
+'use strict';
+
+import type {PressEvent} from '../Types/CoreEventTypes';
+import type {
+  AccessibilityActionEvent,
+  AccessibilityActionInfo,
+  AccessibilityState,
+} from './View/ViewAccessibility';
+
+import {type ColorValue} from '../StyleSheet/StyleSheet';
+import * as React from 'react';
+
+type ButtonProps = $ReadOnly<{|
+  /**
+    Text to display inside the button. On Android the given title will be
+    converted to the uppercased form.
+   */
+  title: string,
+
+  /**
+    Handler to be called when the user taps the button. The first function
+    argument is an event in form of [PressEvent](pressevent).
+   */
+  onPress: (event?: PressEvent) => mixed,
+
+  /**
+    If `true`, doesn't play system sound on touch.
+
+    @platform android
+
+    @default false
+   */
+  touchSoundDisabled?: ?boolean,
+
+  /**
+    Color of the text (iOS), or background color of the button (Android).
+
+    @default {@platform android} '#2196F3'
+    @default {@platform ios} '#007AFF'
+   */
+  color?: ?ColorValue,
+
+  /**
+    TV preferred focus.
+
+    @platform tv
+
+    @default false
+   */
+  hasTVPreferredFocus?: ?boolean,
+
+  /**
+    Designates the next view to receive focus when the user navigates down. See
+    the [Android documentation][android:nextFocusDown].
+
+    [android:nextFocusDown]:
+    https://developer.android.com/reference/android/view/View.html#attr_android:nextFocusDown
+
+    @platform android, tv
+   */
+  nextFocusDown?: ?number,
+
+  /**
+    Designates the next view to receive focus when the user navigates forward.
+    See the [Android documentation][android:nextFocusForward].
+
+    [android:nextFocusForward]:
+    https://developer.android.com/reference/android/view/View.html#attr_android:nextFocusForward
+
+    @platform android, tv
+   */
+  nextFocusForward?: ?number,
+
+  /**
+    Designates the next view to receive focus when the user navigates left. See
+    the [Android documentation][android:nextFocusLeft].
+
+    [android:nextFocusLeft]:
+    https://developer.android.com/reference/android/view/View.html#attr_android:nextFocusLeft
+
+    @platform android, tv
+   */
+  nextFocusLeft?: ?number,
+
+  /**
+    Designates the next view to receive focus when the user navigates right. See
+    the [Android documentation][android:nextFocusRight].
+
+    [android:nextFocusRight]:
+    https://developer.android.com/reference/android/view/View.html#attr_android:nextFocusRight
+
+    @platform android, tv
+   */
+  nextFocusRight?: ?number,
+
+  /**
+    Designates the next view to receive focus when the user navigates up. See
+    the [Android documentation][android:nextFocusUp].
+
+    [android:nextFocusUp]:
+    https://developer.android.com/reference/android/view/View.html#attr_android:nextFocusUp
+
+    @platform android, tv
+   */
+  nextFocusUp?: ?number,
+
+  /**
+    Text to display for blindness accessibility features.
+   */
+  accessibilityLabel?: ?string,
+  /**
+   * Alias for accessibilityLabel  https://reactnative.dev/docs/view#accessibilitylabel
+   * https://github.com/facebook/react-native/issues/34424
+   */
+  'aria-label'?: ?string,
+  /**
+    If `true`, disable all interactions for this component.
+
+    @default false
+   */
+  disabled?: ?boolean,
+
+  /**
+    Used to locate this view in end-to-end tests.
+   */
+  testID?: ?string,
+
+  /**
+   * Accessibility props.
+   */
+  accessible?: ?boolean,
+  accessibilityActions?: ?$ReadOnlyArray<AccessibilityActionInfo>,
+  onAccessibilityAction?: ?(event: AccessibilityActionEvent) => mixed,
+  accessibilityState?: ?AccessibilityState,
+
+  /**
+   * [Android] Controlling if a view fires accessibility events and if it is reported to accessibility services.
+   */
+  importantForAccessibility?: ?('auto' | 'yes' | 'no' | 'no-hide-descendants'),
+  accessibilityHint?: ?string,
+  accessibilityLanguage?: ?Stringish,
+|}>;
+
+/**
+  A basic button component that should render nicely on any platform. Supports a
+  minimal level of customization.
+
+  If this button doesn't look right for your app, you can build your own button
+  using [TouchableOpacity](touchableopacity) or
+  [TouchableWithoutFeedback](touchablewithoutfeedback). For inspiration, look at
+  the [source code for this button component][button:source]. Or, take a look at
+  the [wide variety of button components built by the community]
+  [button:examples].
+
+  [button:source]:
+  https://github.com/facebook/react-native/blob/HEAD/Libraries/Components/Button.js
+
+  [button:examples]:
+  https://js.coach/?menu%5Bcollections%5D=React%20Native&page=1&query=button
+
+  ```jsx
+  <Button
+    onPress={onPressLearnMore}
+    title="Learn More"
+    color="#841584"
+    accessibilityLabel="Learn more about this purple button"
+  />
+  ```
+
+  ```SnackPlayer name=Button%20Example
+  import React from 'react';
+  import { StyleSheet, Button, View, SafeAreaView, Text, Alert } from 'react-native';
+
+  const Separator = () => (
+    <View style={styles.separator} />
+  );
+
+  const App = () => (
+    <SafeAreaView style={styles.container}>
+      <View>
+        <Text style={styles.title}>
+          The title and onPress handler are required. It is recommended to set accessibilityLabel to help make your app usable by everyone.
+        </Text>
+        <Button
+          title="Press me"
+          onPress={() => Alert.alert('Simple Button pressed')}
+        />
+      </View>
+      <Separator />
+      <View>
+        <Text style={styles.title}>
+          Adjust the color in a way that looks standard on each platform. On  iOS, the color prop controls the color of the text. On Android, the color adjusts the background color of the button.
+        </Text>
+        <Button
+          title="Press me"
+          color="#f194ff"
+          onPress={() => Alert.alert('Button with adjusted color pressed')}
+        />
+      </View>
+      <Separator />
+      <View>
+        <Text style={styles.title}>
+          All interaction for the component are disabled.
+        </Text>
+        <Button
+          title="Press me"
+          disabled
+          onPress={() => Alert.alert('Cannot press this one')}
+        />
+      </View>
+      <Separator />
+      <View>
+        <Text style={styles.title}>
+          This layout strategy lets the title define the width of the button.
+        </Text>
+        <View style={styles.fixToText}>
+          <Button
+            title="Left button"
+            onPress={() => Alert.alert('Left button pressed')}
+          />
+          <Button
+            title="Right button"
+            onPress={() => Alert.alert('Right button pressed')}
+          />
+        </View>
+      </View>
+    </SafeAreaView>
+  );
+
+  const styles = StyleSheet.create({
+    container: {
+      flex: 1,
+      justifyContent: 'center',
+      marginHorizontal: 16,
+    },
+    title: {
+      textAlign: 'center',
+      marginVertical: 8,
+    },
+    fixToText: {
+      flexDirection: 'row',
+      justifyContent: 'space-between',
+    },
+    separator: {
+      marginVertical: 8,
+      borderBottomColor: '#737373',
+      borderBottomWidth: StyleSheet.hairlineWidth,
+    },
+  });
+
+  export default App;
+  ```
+ */
+export type Button = React.ComponentType<ButtonProps>;
diff --git a/Libraries/Components/Button.js b/Libraries/Components/Button.js
index 89ec384fe2c1..0395706d2608 100644
--- a/Libraries/Components/Button.js
+++ b/Libraries/Components/Button.js
@@ -11,21 +11,22 @@
 
 'use strict';
 
-import * as React from 'react';
-import Platform from '../Utilities/Platform';
+import type {PressEvent} from '../Types/CoreEventTypes';
+import type {Button as ButtonType} from './Button.flow';
+import type {
+  AccessibilityActionEvent,
+  AccessibilityActionInfo,
+  AccessibilityState,
+} from './View/ViewAccessibility';
+
 import StyleSheet, {type ColorValue} from '../StyleSheet/StyleSheet';
 import Text from '../Text/Text';
+import Platform from '../Utilities/Platform';
 import TouchableNativeFeedback from './Touchable/TouchableNativeFeedback';
 import TouchableOpacity from './Touchable/TouchableOpacity';
 import View from './View/View';
 import invariant from 'invariant';
-
-import type {
-  AccessibilityState,
-  AccessibilityActionEvent,
-  AccessibilityActionInfo,
-} from './View/ViewAccessibility';
-import type {PressEvent} from '../Types/CoreEventTypes';
+import * as React from 'react';
 
 type ButtonProps = $ReadOnly<{|
   /**
@@ -125,7 +126,11 @@ type ButtonProps = $ReadOnly<{|
     Text to display for blindness accessibility features.
    */
   accessibilityLabel?: ?string,
-
+  /**
+   * Alias for accessibilityLabel  https://reactnative.dev/docs/view#accessibilitylabel
+   * https://github.com/facebook/react-native/issues/34424
+   */
+  'aria-label'?: ?string,
   /**
     If `true`, disable all interactions for this component.
 
@@ -145,6 +150,22 @@ type ButtonProps = $ReadOnly<{|
   accessibilityActions?: ?$ReadOnlyArray<AccessibilityActionInfo>,
   onAccessibilityAction?: ?(event: AccessibilityActionEvent) => mixed,
   accessibilityState?: ?AccessibilityState,
+
+  /**
+   * alias for accessibilityState
+   *
+   * see https://reactnative.dev/docs/accessibility#accessibilitystate
+   */
+  'aria-busy'?: ?boolean,
+  'aria-checked'?: ?boolean | 'mixed',
+  'aria-disabled'?: ?boolean,
+  'aria-expanded'?: ?boolean,
+  'aria-selected'?: ?boolean,
+
+  /**
+   * [Android] Controlling if a view fires accessibility events and if it is reported to accessibility services.
+   */
+  importantForAccessibility?: ?('auto' | 'yes' | 'no' | 'no-hide-descendants'),
   accessibilityHint?: ?string,
   accessibilityLanguage?: ?Stringish,
 |}>;
@@ -264,6 +285,14 @@ class Button extends React.Component<ButtonProps> {
   render(): React.Node {
     const {
       accessibilityLabel,
+      accessibilityState,
+      'aria-busy': ariaBusy,
+      'aria-checked': ariaChecked,
+      'aria-disabled': ariaDisabled,
+      'aria-expanded': ariaExpanded,
+      'aria-label': ariaLabel,
+      'aria-selected': ariaSelected,
+      importantForAccessibility,
       color,
       onPress,
       touchSoundDisabled,
@@ -291,15 +320,23 @@ class Button extends React.Component<ButtonProps> {
       }
     }
 
+    let _accessibilityState = {
+      busy: ariaBusy ?? accessibilityState?.busy,
+      checked: ariaChecked ?? accessibilityState?.checked,
+      disabled: ariaDisabled ?? accessibilityState?.disabled,
+      expanded: ariaExpanded ?? accessibilityState?.expanded,
+      selected: ariaSelected ?? accessibilityState?.selected,
+    };
+
     const disabled =
       this.props.disabled != null
         ? this.props.disabled
-        : this.props.accessibilityState?.disabled;
+        : _accessibilityState?.disabled;
 
-    const accessibilityState =
-      disabled !== this.props.accessibilityState?.disabled
-        ? {...this.props.accessibilityState, disabled}
-        : this.props.accessibilityState;
+    _accessibilityState =
+      disabled !== _accessibilityState?.disabled
+        ? {..._accessibilityState, disabled}
+        : _accessibilityState;
 
     if (disabled) {
       buttonStyles.push(styles.buttonDisabled);
@@ -315,16 +352,23 @@ class Button extends React.Component<ButtonProps> {
     const Touchable =
       Platform.OS === 'android' ? TouchableNativeFeedback : TouchableOpacity;
 
+    // If `no` is specified for `importantForAccessibility`, it will be changed to `no-hide-descendants` because the text inside should not be focused.
+    const _importantForAccessibility =
+      importantForAccessibility === 'no'
+        ? 'no-hide-descendants'
+        : importantForAccessibility;
+
     return (
       <Touchable
         accessible={accessible}
         accessibilityActions={accessibilityActions}
         onAccessibilityAction={onAccessibilityAction}
-        accessibilityLabel={accessibilityLabel}
+        accessibilityLabel={ariaLabel || accessibilityLabel}
         accessibilityHint={accessibilityHint}
         accessibilityLanguage={accessibilityLanguage}
         accessibilityRole="button"
-        accessibilityState={accessibilityState}
+        accessibilityState={_accessibilityState}
+        importantForAccessibility={_importantForAccessibility}
         hasTVPreferredFocus={hasTVPreferredFocus}
         nextFocusDown={nextFocusDown}
         nextFocusForward={nextFocusForward}
@@ -387,4 +431,4 @@ const styles = StyleSheet.create({
   }),
 });
 
-module.exports = Button;
+module.exports = (Button: ButtonType);
diff --git a/Libraries/Components/Clipboard/Clipboard.d.ts b/Libraries/Components/Clipboard/Clipboard.d.ts
new file mode 100644
index 000000000000..b83f5a1779a8
--- /dev/null
+++ b/Libraries/Components/Clipboard/Clipboard.d.ts
@@ -0,0 +1,28 @@
+/**
+ * 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 ClipboardStatic {
+  getString(): Promise<string>;
+  setString(content: string): void;
+}
+
+/**
+ * Clipboard has been extracted from react-native core and will be removed in a future release.
+ * It can now be installed and imported from `@react-native-community/clipboard` instead of 'react-native'.
+ * @see https://github.com/react-native-community/clipboard
+ * @deprecated
+ */
+export const Clipboard: ClipboardStatic;
+/**
+ * Clipboard has been extracted from react-native core and will be removed in a future release.
+ * It can now be installed and imported from `@react-native-community/clipboard` instead of 'react-native'.
+ * @see https://github.com/react-native-community/clipboard
+ * @deprecated
+ */
+export type Clipboard = ClipboardStatic;
diff --git a/Libraries/Components/Clipboard/NativeClipboard.js b/Libraries/Components/Clipboard/NativeClipboard.js
index 9e4ee4733f47..d7f268024839 100644
--- a/Libraries/Components/Clipboard/NativeClipboard.js
+++ b/Libraries/Components/Clipboard/NativeClipboard.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.android.js b/Libraries/Components/DatePicker/DatePickerIOS.android.js
index e97edf657c20..f0b6628733a3 100644
--- a/Libraries/Components/DatePicker/DatePickerIOS.android.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.android.js
@@ -8,10 +8,12 @@
  */
 
 'use strict';
-import * as React from 'react';
+import type {DatePickerIOSType} from './DatePickerIOS.flow';
+
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
 import View from '../View/View';
+import * as React from 'react';
 
 class DummyDatePickerIOS extends React.Component {
   render() {
@@ -42,4 +44,4 @@ const styles = StyleSheet.create({
   },
 });
 
-module.exports = DummyDatePickerIOS;
+module.exports = (DummyDatePickerIOS: DatePickerIOSType);
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.d.ts b/Libraries/Components/DatePicker/DatePickerIOS.d.ts
new file mode 100644
index 000000000000..17c60b751614
--- /dev/null
+++ b/Libraries/Components/DatePicker/DatePickerIOS.d.ts
@@ -0,0 +1,92 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
+import {ViewProps} from '../View/ViewPropTypes';
+
+export interface DatePickerIOSProps extends ViewProps {
+  /**
+   * The currently selected date.
+   */
+  date?: Date | null | undefined;
+
+  /**
+   * Provides an initial value that will change when the user starts selecting
+   * a date. It is useful for simple use-cases where you do not want to deal
+   * with listening to events and updating the date prop to keep the
+   * controlled state in sync. The controlled state has known bugs which
+   * causes it to go out of sync with native. The initialDate prop is intended
+   * to allow you to have native be source of truth.
+   */
+  initialDate?: Date | null | undefined;
+
+  /**
+   * The date picker locale.
+   */
+  locale?: string | undefined;
+
+  /**
+   * Maximum date.
+   * Restricts the range of possible date/time values.
+   */
+  maximumDate?: Date | undefined;
+
+  /**
+   * Maximum date.
+   * Restricts the range of possible date/time values.
+   */
+  minimumDate?: Date | undefined;
+
+  /**
+   *  enum(1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30)
+   *  The interval at which minutes can be selected.
+   */
+  minuteInterval?: 1 | 2 | 3 | 4 | 5 | 6 | 10 | 12 | 15 | 20 | 30 | undefined;
+
+  /**
+   *  enum('date', 'time', 'datetime')
+   *  The date picker mode.
+   */
+  mode?: 'date' | 'time' | 'datetime' | undefined;
+
+  /**
+   * Date change handler.
+   * This is called when the user changes the date or time in the UI.
+   * The first and only argument is a Date object representing the new date and time.
+   */
+  onDateChange: (newDate: Date) => void;
+
+  /**
+   * Timezone offset in minutes.
+   * By default, the date picker will use the device's timezone. With this parameter, it is possible to force a certain timezone offset.
+   * For instance, to show times in Pacific Standard Time, pass -7 * 60.
+   */
+  timeZoneOffsetInMinutes?: number | undefined;
+
+  /**
+   * The date picker style
+   * This is only available on devices with iOS 14.0 and later.
+   * 'spinner' is the default style if this prop isn't set.
+   */
+  pickerStyle?: 'compact' | 'spinner' | 'inline' | undefined;
+}
+
+declare class DatePickerIOSComponent extends React.Component<DatePickerIOSProps> {}
+declare const DatePickerIOSBase: Constructor<NativeMethods> &
+  typeof DatePickerIOSComponent;
+
+/**
+ * DatePickerIOS has been merged with DatePickerAndroid and will be removed in a future release.
+ * It can now be installed and imported from `@react-native-community/datetimepicker` instead of 'react-native'.
+ * @see https://github.com/react-native-community/datetimepicker
+ * @deprecated
+ */
+export class DatePickerIOS extends DatePickerIOSBase {}
diff --git a/Libraries/Components/MaskedView/MaskedViewIOS.android.js b/Libraries/Components/DatePicker/DatePickerIOS.flow.android.js
similarity index 68%
rename from Libraries/Components/MaskedView/MaskedViewIOS.android.js
rename to Libraries/Components/DatePicker/DatePickerIOS.flow.android.js
index d9faa8e64e6b..5cf823e79c2c 100644
--- a/Libraries/Components/MaskedView/MaskedViewIOS.android.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.flow.android.js
@@ -4,10 +4,11 @@
  * 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
- * @flow strict-local
  */
 
 'use strict';
+import * as React from 'react';
 
-module.exports = require('../UnimplementedViews/UnimplementedView');
+export type DatePickerIOSType = React.ComponentType<>;
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.flow.ios.js b/Libraries/Components/DatePicker/DatePickerIOS.flow.ios.js
new file mode 100644
index 000000000000..f5671698f683
--- /dev/null
+++ b/Libraries/Components/DatePicker/DatePickerIOS.flow.ios.js
@@ -0,0 +1,113 @@
+/**
+ * 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
+ */
+
+// This is a controlled component version of RCTDatePickerIOS.
+
+import type {SyntheticEvent} from '../../Types/CoreEventTypes';
+import type {ViewProps} from '../View/ViewPropTypes';
+
+import * as React from 'react';
+
+type Event = SyntheticEvent<
+  $ReadOnly<{|
+    timestamp: number,
+  |}>,
+>;
+
+type Props = $ReadOnly<{|
+  ...ViewProps,
+
+  /**
+   * The currently selected date.
+   */
+  date?: ?Date,
+
+  /**
+   * Provides an initial value that will change when the user starts selecting
+   * a date. It is useful for simple use-cases where you do not want to deal
+   * with listening to events and updating the date prop to keep the
+   * controlled state in sync. The controlled state has known bugs which
+   * causes it to go out of sync with native. The initialDate prop is intended
+   * to allow you to have native be source of truth.
+   */
+  initialDate?: ?Date,
+
+  /**
+   * The date picker locale.
+   */
+  locale?: ?string,
+
+  /**
+   * Maximum date.
+   *
+   * Restricts the range of possible date/time values.
+   */
+  maximumDate?: ?Date,
+
+  /**
+   * Minimum date.
+   *
+   * Restricts the range of possible date/time values.
+   */
+  minimumDate?: ?Date,
+
+  /**
+   * The interval at which minutes can be selected.
+   */
+  minuteInterval?: ?(1 | 2 | 3 | 4 | 5 | 6 | 10 | 12 | 15 | 20 | 30),
+
+  /**
+   * The date picker mode.
+   */
+  mode?: ?('date' | 'time' | 'datetime'),
+
+  /**
+   * Date change handler.
+   *
+   * This is called when the user changes the date or time in the UI.
+   * The first and only argument is an Event. For getting the date the picker
+   * was changed to, use onDateChange instead.
+   */
+  onChange?: ?(event: Event) => void,
+
+  /**
+   * Date change handler.
+   *
+   * This is called when the user changes the date or time in the UI.
+   * The first and only argument is a Date object representing the new
+   * date and time.
+   */
+  onDateChange: (date: Date) => void,
+
+  /**
+   * Timezone offset in minutes.
+   *
+   * By default, the date picker will use the device's timezone. With this
+   * parameter, it is possible to force a certain timezone offset. For
+   * instance, to show times in Pacific Standard Time, pass -7 * 60.
+   */
+  timeZoneOffsetInMinutes?: ?number,
+
+  /**
+   * The date picker style
+   * This is only available on devices with iOS 14.0 and later.
+   * 'spinner' is the default style if this prop isn't set.
+   */
+  pickerStyle?: ?('compact' | 'spinner' | 'inline'),
+|}>;
+
+/**
+ * Use `DatePickerIOS` to render a date/time picker (selector) on iOS.  This is
+ * a controlled component, so you must hook in to the `onDateChange` callback
+ * and update the `date` prop in order for the component to update, otherwise
+ * the user's change will be reverted immediately to reflect `props.date` as the
+ * source of truth.
+ */
+export type DatePickerIOSType = React.ComponentType<Props>;
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.ios.js b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
index 91d5d0d6f53a..39e0e6606256 100644
--- a/Libraries/Components/DatePicker/DatePickerIOS.ios.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
@@ -10,16 +10,17 @@
 
 // This is a controlled component version of RCTDatePickerIOS.
 
-import * as React from 'react';
+import type {SyntheticEvent} from '../../Types/CoreEventTypes';
+import type {ViewProps} from '../View/ViewPropTypes';
+import type {DatePickerIOSType} from './DatePickerIOS.flow';
+
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import View from '../View/View';
 import RCTDatePickerNativeComponent, {
   Commands as DatePickerCommands,
 } from './RCTDatePickerNativeComponent';
-import StyleSheet from '../../StyleSheet/StyleSheet';
-import View from '../View/View';
 import invariant from 'invariant';
-
-import type {SyntheticEvent} from '../../Types/CoreEventTypes';
-import type {ViewProps} from '../View/ViewPropTypes';
+import * as React from 'react';
 
 type Event = SyntheticEvent<
   $ReadOnly<{|
@@ -238,4 +239,4 @@ function getHeight(
   return styles.datePickerIOS;
 }
 
-module.exports = DatePickerIOS;
+module.exports = (DatePickerIOS: DatePickerIOSType);
diff --git a/Libraries/Components/DatePicker/RCTDatePickerNativeComponent.js b/Libraries/Components/DatePicker/RCTDatePickerNativeComponent.js
index c7ae082d19b7..3f43e63f9395 100644
--- a/Libraries/Components/DatePicker/RCTDatePickerNativeComponent.js
+++ b/Libraries/Components/DatePicker/RCTDatePickerNativeComponent.js
@@ -9,15 +9,16 @@
  */
 
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-import type {ViewProps} from '../View/ViewPropTypes';
-import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import * as React from 'react';
 import type {
+  BubblingEventHandler,
   Float,
   WithDefault,
-  BubblingEventHandler,
-} from 'react-native/Libraries/Types/CodegenTypes';
+} from '../../Types/CodegenTypes';
+import type {ViewProps} from '../View/ViewPropTypes';
+
+import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
+import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
+import * as React from 'react';
 
 type Event = $ReadOnly<{|
   timestamp: Float,
diff --git a/Libraries/Components/DatePicker/__tests__/DatePickerIOS-test.js b/Libraries/Components/DatePicker/__tests__/DatePickerIOS-test.js
index 4fdcf8f8ca27..73ecf39e288b 100644
--- a/Libraries/Components/DatePicker/__tests__/DatePickerIOS-test.js
+++ b/Libraries/Components/DatePicker/__tests__/DatePickerIOS-test.js
@@ -4,17 +4,16 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
-const DatePickerIOS = require('../DatePickerIOS');
-
 const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
+const DatePickerIOS = require('../DatePickerIOS');
+const React = require('react');
 
 describe('DatePickerIOS', () => {
   it('should render as expected', () => {
diff --git a/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js b/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js
index 91241706eb3a..972e3e0aed8a 100644
--- a/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js
+++ b/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 /**
diff --git a/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js b/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js
index c0c1bf05375a..ced6d34a9abc 100644
--- a/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js
+++ b/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js
@@ -8,17 +8,18 @@
  * @flow strict-local
  */
 
-import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
-import type {ColorValue} from 'react-native/Libraries/StyleSheet/StyleSheet';
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {
-  WithDefault,
   DirectEventHandler,
-  Int32,
   Float,
-} from 'react-native/Libraries/Types/CodegenTypes';
-import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import type {HostComponent} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes';
+  Int32,
+  WithDefault,
+} from '../../Types/CodegenTypes';
+import type {ViewProps} from '../View/ViewPropTypes';
+
+import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
+import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
 import * as React from 'react';
 
 type DrawerStateEvent = $ReadOnly<{|
diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
index dd035b56a8aa..10e265c553cc 100644
--- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
+++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
@@ -8,29 +8,27 @@
  * @format
  */
 
+import type {
+  MeasureInWindowOnSuccessCallback,
+  MeasureLayoutOnSuccessCallback,
+  MeasureOnSuccessCallback,
+} from '../../Renderer/shims/ReactNativeTypes';
+import type {ColorValue, ViewStyleProp} from '../../StyleSheet/StyleSheet';
+import type {DirectEventHandler} from '../../Types/CodegenTypes';
+
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import dismissKeyboard from '../../Utilities/dismissKeyboard';
 import Platform from '../../Utilities/Platform';
-import * as React from 'react';
 import StatusBar from '../StatusBar/StatusBar';
-import StyleSheet from '../../StyleSheet/StyleSheet';
 import View from '../View/View';
-
-import dismissKeyboard from '../../Utilities/dismissKeyboard';
-import nullthrows from 'nullthrows';
-
 import AndroidDrawerLayoutNativeComponent, {
   Commands,
 } from './AndroidDrawerLayoutNativeComponent';
+import nullthrows from 'nullthrows';
+import * as React from 'react';
 
 const DRAWER_STATES = ['Idle', 'Dragging', 'Settling'];
 
-import type {ColorValue, ViewStyleProp} from '../../StyleSheet/StyleSheet';
-import type {DirectEventHandler} from '../../Types/CodegenTypes';
-import type {
-  MeasureOnSuccessCallback,
-  MeasureInWindowOnSuccessCallback,
-  MeasureLayoutOnSuccessCallback,
-} from '../../Renderer/shims/ReactNativeTypes';
-
 type DrawerStates = 'Idle' | 'Dragging' | 'Settling';
 
 type DrawerSlideEvent = $ReadOnly<{|
@@ -162,6 +160,7 @@ class DrawerLayoutAndroid extends React.Component<Props, State> {
     return {Left: 'left', Right: 'right'};
   }
 
+  // $FlowFixMe[missing-local-annot]
   _nativeRef =
     React.createRef<
       React.ElementRef<typeof AndroidDrawerLayoutNativeComponent>,
diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.d.ts b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.d.ts
new file mode 100644
index 000000000000..9f90951c8844
--- /dev/null
+++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.d.ts
@@ -0,0 +1,141 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
+import {ColorValue} from '../../StyleSheet/StyleSheet';
+import {
+  NativeSyntheticEvent,
+  NativeTouchEvent,
+} from '../../Types/CoreEventTypes';
+import {ViewProps} from '../View/ViewPropTypes';
+
+export interface DrawerSlideEvent
+  extends NativeSyntheticEvent<NativeTouchEvent> {}
+
+/**
+ * @see DrawerLayoutAndroid.android.js
+ */
+export interface DrawerLayoutAndroidProps extends ViewProps {
+  /**
+   * Specifies the background color of the drawer. The default value
+   * is white. If you want to set the opacity of the drawer, use rgba.
+   * Example:
+   * return (
+   *   <DrawerLayoutAndroid drawerBackgroundColor="rgba(0,0,0,0.5)">
+   *   </DrawerLayoutAndroid>
+   *);
+   */
+  drawerBackgroundColor?: ColorValue | undefined;
+
+  /**
+   * Specifies the lock mode of the drawer. The drawer can be locked
+   * in 3 states:
+   *
+   * - unlocked (default), meaning that the drawer will respond
+   *   (open/close) to touch gestures.
+   *
+   * - locked-closed, meaning that the drawer will stay closed and not
+   *   respond to gestures.
+   *
+   * - locked-open, meaning that the drawer will stay opened and
+   *   not respond to gestures. The drawer may still be opened and
+   *   closed programmatically (openDrawer/closeDrawer).
+   */
+  drawerLockMode?: 'unlocked' | 'locked-closed' | 'locked-open' | undefined;
+
+  /**
+   * Specifies the side of the screen from which the drawer will slide in.
+   * - 'left' (the default)
+   * - 'right'
+   */
+  drawerPosition?: 'left' | 'right' | undefined;
+
+  /**
+   * Specifies the width of the drawer, more precisely the width of the
+   * view that be pulled in from the edge of the window.
+   */
+  drawerWidth?: number | undefined;
+
+  /**
+   * Determines whether the keyboard gets dismissed in response to a drag.
+   * - 'none' (the default), drags do not dismiss the keyboard.
+   * - 'on-drag', the keyboard is dismissed when a drag begins.
+   */
+  keyboardDismissMode?: 'none' | 'on-drag' | undefined;
+
+  /**
+   * Function called whenever the navigation view has been closed.
+   */
+  onDrawerClose?: (() => void) | undefined;
+
+  /**
+   * Function called whenever the navigation view has been opened.
+   */
+  onDrawerOpen?: (() => void) | undefined;
+
+  /**
+   * Function called whenever there is an interaction with the navigation view.
+   */
+  onDrawerSlide?: ((event: DrawerSlideEvent) => void) | undefined;
+
+  /**
+   * Function called when the drawer state has changed.
+   * The drawer can be in 3 states:
+   * - idle, meaning there is no interaction with the navigation
+   *   view happening at the time
+   * - dragging, meaning there is currently an interaction with the
+   *   navigation view
+   * - settling, meaning that there was an interaction with the
+   *   navigation view, and the navigation view is now finishing
+   *   it's closing or opening animation
+   */
+  onDrawerStateChanged?:
+    | ((event: 'Idle' | 'Dragging' | 'Settling') => void)
+    | undefined;
+
+  /**
+   * The navigation view that will be rendered to the side of the
+   * screen and can be pulled in.
+   */
+  renderNavigationView: () => JSX.Element;
+
+  /**
+   * Make the drawer take the entire screen and draw the background of
+   * the status bar to allow it to open over the status bar. It will
+   * only have an effect on API 21+.
+   */
+  statusBarBackgroundColor?: ColorValue | undefined;
+}
+
+interface DrawerPosition {
+  Left: number;
+  Right: number;
+}
+
+declare class DrawerLayoutAndroidComponent extends React.Component<DrawerLayoutAndroidProps> {}
+declare const DrawerLayoutAndroidBase: Constructor<NativeMethods> &
+  typeof DrawerLayoutAndroidComponent;
+export class DrawerLayoutAndroid extends DrawerLayoutAndroidBase {
+  /**
+   * drawer's positions.
+   */
+  positions: DrawerPosition;
+
+  /**
+   * Opens the drawer.
+   */
+  openDrawer(): void;
+
+  /**
+   * Closes the drawer.
+   */
+  closeDrawer(): void;
+}
diff --git a/Libraries/Components/DrawerAndroid/__tests__/DrawerAndroid-test.js b/Libraries/Components/DrawerAndroid/__tests__/DrawerAndroid-test.js
index bc1b173de0a3..5a9896c1e05a 100644
--- a/Libraries/Components/DrawerAndroid/__tests__/DrawerAndroid-test.js
+++ b/Libraries/Components/DrawerAndroid/__tests__/DrawerAndroid-test.js
@@ -4,21 +4,20 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
+const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
+const View = require('../../View/View');
 /* $FlowFixMe[cannot-resolve-module] (>=0.99.0 site=react_native_ios_fb) This
  * comment suppresses an error found when Flow v0.99 was deployed. To see the
  * error, delete this comment and run Flow. */
 const DrawerLayoutAndroid = require('../DrawerLayoutAndroid.android');
-const View = require('../../View/View');
-
-const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
+const React = require('react');
 
 describe('<DrawerLayoutAndroid />', () => {
   it('should render as expected', () => {
diff --git a/Libraries/Components/Keyboard/Keyboard.d.ts b/Libraries/Components/Keyboard/Keyboard.d.ts
new file mode 100644
index 000000000000..062016e57ecd
--- /dev/null
+++ b/Libraries/Components/Keyboard/Keyboard.d.ts
@@ -0,0 +1,109 @@
+/**
+ * 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
+ */
+
+import {NativeEventEmitter} from '../../EventEmitter/NativeEventEmitter';
+import {EmitterSubscription} from '../../vendor/emitter/EventEmitter';
+
+export type KeyboardEventName =
+  | 'keyboardWillShow'
+  | 'keyboardDidShow'
+  | 'keyboardWillHide'
+  | 'keyboardDidHide'
+  | 'keyboardWillChangeFrame'
+  | 'keyboardDidChangeFrame';
+
+export type KeyboardEventEasing =
+  | 'easeIn'
+  | 'easeInEaseOut'
+  | 'easeOut'
+  | 'linear'
+  | 'keyboard';
+
+type KeyboardMetrics = {
+  screenX: number;
+  screenY: number;
+  width: number;
+  height: number;
+};
+
+interface KeyboardEventIOS {
+  /**
+   * @platform ios
+   */
+  startCoordinates: KeyboardMetrics;
+  /**
+   * @platform ios
+   */
+  isEventFromThisApp: boolean;
+}
+
+export interface KeyboardEvent extends Partial<KeyboardEventIOS> {
+  /**
+   * Always set to 0 on Android.
+   */
+  duration: number;
+  /**
+   * Always set to "keyboard" on Android.
+   */
+  easing: KeyboardEventEasing;
+  endCoordinates: KeyboardMetrics;
+}
+
+type KeyboardEventListener = (event: KeyboardEvent) => void;
+
+export interface KeyboardStatic extends NativeEventEmitter {
+  /**
+   * Dismisses the active keyboard and removes focus.
+   */
+  dismiss: () => void;
+  /**
+   * The `addListener` function connects a JavaScript function to an identified native
+   * keyboard notification event.
+   *
+   * This function then returns the reference to the listener.
+   *
+   * {string} eventName The `nativeEvent` is the string that identifies the event you're listening for.  This
+   *can be any of the following:
+   *
+   * - `keyboardWillShow`
+   * - `keyboardDidShow`
+   * - `keyboardWillHide`
+   * - `keyboardDidHide`
+   * - `keyboardWillChangeFrame`
+   * - `keyboardDidChangeFrame`
+   *
+   * Note that if you set `android:windowSoftInputMode` to `adjustResize`  or `adjustNothing`,
+   * only `keyboardDidShow` and `keyboardDidHide` events will be available on Android.
+   * `keyboardWillShow` as well as `keyboardWillHide` are generally not available on Android
+   * since there is no native corresponding event.
+   *
+   * {function} callback function to be called when the event fires.
+   */
+  addListener: (
+    eventType: KeyboardEventName,
+    listener: KeyboardEventListener,
+  ) => EmitterSubscription;
+  /**
+   * Useful for syncing TextInput (or other keyboard accessory view) size of
+   * position changes with keyboard movements.
+   */
+  scheduleLayoutAnimation: (event: KeyboardEvent) => void;
+
+  /**
+   * Whether the keyboard is last known to be visible.
+   */
+  isVisible(): boolean;
+
+  /**
+   * Return the metrics of the soft-keyboard if visible.
+   */
+  metrics(): KeyboardMetrics | undefined;
+}
+
+export const Keyboard: KeyboardStatic;
diff --git a/Libraries/Components/Keyboard/Keyboard.js b/Libraries/Components/Keyboard/Keyboard.js
index e7a7881742aa..8aae204e97f3 100644
--- a/Libraries/Components/Keyboard/Keyboard.js
+++ b/Libraries/Components/Keyboard/Keyboard.js
@@ -8,12 +8,13 @@
  * @flow strict-local
  */
 
+import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
+
 import NativeEventEmitter from '../../EventEmitter/NativeEventEmitter';
 import LayoutAnimation from '../../LayoutAnimation/LayoutAnimation';
 import dismissKeyboard from '../../Utilities/dismissKeyboard';
 import Platform from '../../Utilities/Platform';
 import NativeKeyboardObserver from './NativeKeyboardObserver';
-import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
 
 export type KeyboardEventName = $Keys<KeyboardEventDefinitions>;
 
@@ -24,7 +25,7 @@ export type KeyboardEventEasing =
   | 'linear'
   | 'keyboard';
 
-export type KeyboardEventCoordinates = $ReadOnly<{|
+export type KeyboardMetrics = $ReadOnly<{|
   screenX: number,
   screenY: number,
   width: number,
@@ -36,7 +37,7 @@ export type KeyboardEvent = AndroidKeyboardEvent | IOSKeyboardEvent;
 type BaseKeyboardEvent = {|
   duration: number,
   easing: KeyboardEventEasing,
-  endCoordinates: KeyboardEventCoordinates,
+  endCoordinates: KeyboardMetrics,
 |};
 
 export type AndroidKeyboardEvent = $ReadOnly<{|
@@ -47,7 +48,7 @@ export type AndroidKeyboardEvent = $ReadOnly<{|
 
 export type IOSKeyboardEvent = $ReadOnly<{|
   ...BaseKeyboardEvent,
-  startCoordinates: KeyboardEventCoordinates,
+  startCoordinates: KeyboardMetrics,
   isEventFromThisApp: boolean,
 |}>;
 
@@ -103,6 +104,8 @@ type KeyboardEventDefinitions = {
  */
 
 class Keyboard {
+  _currentlyShowing: ?KeyboardEvent;
+
   _emitter: NativeEventEmitter<KeyboardEventDefinitions> =
     new NativeEventEmitter(
       // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
@@ -110,6 +113,15 @@ class Keyboard {
       Platform.OS !== 'ios' ? null : NativeKeyboardObserver,
     );
 
+  constructor() {
+    this.addListener('keyboardDidShow', ev => {
+      this._currentlyShowing = ev;
+    });
+    this.addListener('keyboardDidHide', _ev => {
+      this._currentlyShowing = null;
+    });
+  }
+
   /**
    * The `addListener` function connects a JavaScript function to an identified native
    * keyboard notification event.
@@ -126,10 +138,11 @@ class Keyboard {
    * - `keyboardWillChangeFrame`
    * - `keyboardDidChangeFrame`
    *
-   * Note that if you set `android:windowSoftInputMode` to `adjustResize`  or `adjustNothing`,
-   * only `keyboardDidShow` and `keyboardDidHide` events will be available on Android.
-   * `keyboardWillShow` as well as `keyboardWillHide` are generally not available on Android
-   * since there is no native corresponding event.
+   * Android versions prior to API 30 rely on observing layout changes when
+   * `android:windowSoftInputMode` is set to `adjustResize` or `adjustPan`.
+   *
+   * `keyboardWillShow` as well as `keyboardWillHide` are not available on Android since there is
+   * no native corresponding event.
    *
    * @param {function} callback function to be called when the event fires.
    */
@@ -157,6 +170,20 @@ class Keyboard {
     dismissKeyboard();
   }
 
+  /**
+   * Whether the keyboard is last known to be visible.
+   */
+  isVisible(): boolean {
+    return !!this._currentlyShowing;
+  }
+
+  /**
+   * Return the metrics of the soft-keyboard if visible.
+   */
+  metrics(): ?KeyboardMetrics {
+    return this._currentlyShowing?.endCoordinates;
+  }
+
   /**
    * Useful for syncing TextInput (or other keyboard accessory view) size of
    * position changes with keyboard movements.
diff --git a/Libraries/Components/Keyboard/KeyboardAvoidingView.d.ts b/Libraries/Components/Keyboard/KeyboardAvoidingView.d.ts
new file mode 100644
index 000000000000..42bff4a51912
--- /dev/null
+++ b/Libraries/Components/Keyboard/KeyboardAvoidingView.d.ts
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {TimerMixin} from '../../../types/private/TimerMixin';
+import {StyleProp} from '../../StyleSheet/StyleSheet';
+import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
+import {ViewProps} from '../View/ViewPropTypes';
+
+/**
+ * It is a component to solve the common problem of views that need to move out of the way of the virtual keyboard.
+ * It can automatically adjust either its position or bottom padding based on the position of the keyboard.
+ */
+declare class KeyboardAvoidingViewComponent extends React.Component<KeyboardAvoidingViewProps> {}
+declare const KeyboardAvoidingViewBase: Constructor<TimerMixin> &
+  typeof KeyboardAvoidingViewComponent;
+export class KeyboardAvoidingView extends KeyboardAvoidingViewBase {}
+
+export interface KeyboardAvoidingViewProps extends ViewProps {
+  behavior?: 'height' | 'position' | 'padding' | undefined;
+
+  /**
+   * The style of the content container(View) when behavior is 'position'.
+   */
+  contentContainerStyle?: StyleProp<ViewStyle> | undefined;
+
+  /**
+   * This is the distance between the top of the user screen and the react native view,
+   * may be non-zero in some use cases.
+   */
+  keyboardVerticalOffset?: number | undefined;
+
+  /**
+   * Enables or disables the KeyboardAvoidingView.
+   *
+   * Default is true
+   */
+  enabled?: boolean | undefined;
+}
diff --git a/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/Libraries/Components/Keyboard/KeyboardAvoidingView.js
index 4536402c5104..2f48f9e677ac 100644
--- a/Libraries/Components/Keyboard/KeyboardAvoidingView.js
+++ b/Libraries/Components/Keyboard/KeyboardAvoidingView.js
@@ -8,21 +8,22 @@
  * @flow strict-local
  */
 
-import Keyboard from './Keyboard';
-import LayoutAnimation from '../../LayoutAnimation/LayoutAnimation';
-import Platform from '../../Utilities/Platform';
-import * as React from 'react';
-import StyleSheet from '../../StyleSheet/StyleSheet';
-import View from '../View/View';
-
 import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
-import {type EventSubscription} from '../../vendor/emitter/EventEmitter';
 import type {
-  ViewProps,
   ViewLayout,
   ViewLayoutEvent,
+  ViewProps,
 } from '../View/ViewPropTypes';
-import type {KeyboardEvent, KeyboardEventCoordinates} from './Keyboard';
+import type {KeyboardEvent, KeyboardMetrics} from './Keyboard';
+
+import LayoutAnimation from '../../LayoutAnimation/LayoutAnimation';
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import Platform from '../../Utilities/Platform';
+import {type EventSubscription} from '../../vendor/emitter/EventEmitter';
+import AccessibilityInfo from '../AccessibilityInfo/AccessibilityInfo';
+import View from '../View/View';
+import Keyboard from './Keyboard';
+import * as React from 'react';
 
 type Props = $ReadOnly<{|
   ...ViewProps,
@@ -71,15 +72,34 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
     this.viewRef = React.createRef();
   }
 
-  _relativeKeyboardHeight(keyboardFrame: KeyboardEventCoordinates): number {
+  async _relativeKeyboardHeight(
+    keyboardFrame: KeyboardMetrics,
+  ): Promise<number> {
     const frame = this._frame;
     if (!frame || !keyboardFrame) {
       return 0;
     }
 
+    // On iOS when Prefer Cross-Fade Transitions is enabled, the keyboard position
+    // & height is reported differently (0 instead of Y position value matching height of frame)
+    if (
+      Platform.OS === 'ios' &&
+      keyboardFrame.screenY === 0 &&
+      (await AccessibilityInfo.prefersCrossFadeTransitions())
+    ) {
+      return 0;
+    }
+
     const keyboardY =
       keyboardFrame.screenY - (this.props.keyboardVerticalOffset ?? 0);
 
+    if (this.props.behavior === 'height') {
+      return Math.max(
+        this.state.bottom + frame.y + frame.height - keyboardY,
+        0,
+      );
+    }
+
     // Calculate the displacement needed for the view such that it
     // no longer overlaps with the keyboard
     return Math.max(frame.y + frame.height - keyboardY, 0);
@@ -90,7 +110,7 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
     this._updateBottomIfNecessary();
   };
 
-  _onLayout = (event: ViewLayoutEvent) => {
+  _onLayout = async (event: ViewLayoutEvent) => {
     const wasFrameNull = this._frame == null;
     this._frame = event.nativeEvent.layout;
     if (!this._initialFrameHeight) {
@@ -99,7 +119,7 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
     }
 
     if (wasFrameNull) {
-      this._updateBottomIfNecessary();
+      await this._updateBottomIfNecessary();
     }
 
     if (this.props.onLayout) {
@@ -107,14 +127,14 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
     }
   };
 
-  _updateBottomIfNecessary = () => {
+  _updateBottomIfNecessary = async () => {
     if (this._keyboardEvent == null) {
       this.setState({bottom: 0});
       return;
     }
 
     const {duration, easing, endCoordinates} = this._keyboardEvent;
-    const height = this._relativeKeyboardHeight(endCoordinates);
+    const height = await this._relativeKeyboardHeight(endCoordinates);
 
     if (this.state.bottom === height) {
       return;
diff --git a/Libraries/Components/Keyboard/NativeKeyboardObserver.js b/Libraries/Components/Keyboard/NativeKeyboardObserver.js
index 2dfa7500e27a..2dff4a1d1d5f 100644
--- a/Libraries/Components/Keyboard/NativeKeyboardObserver.js
+++ b/Libraries/Components/Keyboard/NativeKeyboardObserver.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Components/Keyboard/__tests__/Keyboard-test.js b/Libraries/Components/Keyboard/__tests__/Keyboard-test.js
index 3094781e2cc2..d3192afc7c7d 100644
--- a/Libraries/Components/Keyboard/__tests__/Keyboard-test.js
+++ b/Libraries/Components/Keyboard/__tests__/Keyboard-test.js
@@ -4,9 +4,9 @@
  * 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
- * @emails oncall+react_native
+ * @format
+ * @oncall react_native
  */
 
 const LayoutAnimation = require('../../../LayoutAnimation/LayoutAnimation');
diff --git a/Libraries/Components/MaskedView/MaskedViewIOS.ios.js b/Libraries/Components/MaskedView/MaskedViewIOS.ios.js
deleted file mode 100644
index 9ae245ab6f35..000000000000
--- a/Libraries/Components/MaskedView/MaskedViewIOS.ios.js
+++ /dev/null
@@ -1,93 +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
- */
-
-import * as React from 'react';
-import StyleSheet from '../../StyleSheet/StyleSheet';
-import View from '../View/View';
-
-import type {ViewProps} from '../View/ViewPropTypes';
-import RCTMaskedViewNativeComponent from './RCTMaskedViewNativeComponent';
-
-type Props = $ReadOnly<{|
-  ...ViewProps,
-
-  children: React.Node,
-  /**
-   * Should be a React element to be rendered and applied as the
-   * mask for the child element.
-   */
-  maskElement: React.Element<any>,
-|}>;
-
-/**
- * Renders the child view with a mask specified in the `maskElement` prop.
- *
- * ```
- * import React from 'react';
- * import { MaskedViewIOS, Text, View } from 'react-native';
- *
- * class MyMaskedView extends React.Component {
- *   render() {
- *     return (
- *       <MaskedViewIOS
- *         style={{ flex: 1 }}
- *         maskElement={
- *           <View style={styles.maskContainerStyle}>
- *             <Text style={styles.maskTextStyle}>
- *               Basic Mask
- *             </Text>
- *           </View>
- *         }
- *       >
- *         <View style={{ flex: 1, backgroundColor: 'blue' }} />
- *       </MaskedViewIOS>
- *     );
- *   }
- * }
- * ```
- *
- * The above example will render a view with a blue background that fills its
- * parent, and then mask that view with text that says "Basic Mask".
- *
- * The alpha channel of the view rendered by the `maskElement` prop determines how
- * much of the view's content and background shows through. Fully or partially
- * opaque pixels allow the underlying content to show through but fully
- * transparent pixels block that content.
- *
- */
-class MaskedViewIOS extends React.Component<Props> {
-  _hasWarnedInvalidRenderMask = false;
-
-  render(): React.Node {
-    const {maskElement, children, ...otherViewProps} = this.props;
-
-    if (!React.isValidElement(maskElement)) {
-      if (!this._hasWarnedInvalidRenderMask) {
-        console.warn(
-          'MaskedView: Invalid `maskElement` prop was passed to MaskedView. ' +
-            'Expected a React Element. No mask will render.',
-        );
-        this._hasWarnedInvalidRenderMask = true;
-      }
-      return <View {...otherViewProps}>{children}</View>;
-    }
-
-    return (
-      <RCTMaskedViewNativeComponent {...otherViewProps}>
-        <View pointerEvents="none" style={StyleSheet.absoluteFill}>
-          {maskElement}
-        </View>
-        {children}
-      </RCTMaskedViewNativeComponent>
-    );
-  }
-}
-
-module.exports = MaskedViewIOS;
diff --git a/Libraries/Components/MaskedView/RCTMaskedViewNativeComponent.js b/Libraries/Components/MaskedView/RCTMaskedViewNativeComponent.js
deleted file mode 100644
index 73448de16c11..000000000000
--- a/Libraries/Components/MaskedView/RCTMaskedViewNativeComponent.js
+++ /dev/null
@@ -1,21 +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 type {ViewProps} from '../View/ViewPropTypes';
-import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-
-type NativeProps = $ReadOnly<{|
-  ...ViewProps,
-|}>;
-
-export default (codegenNativeComponent<NativeProps>(
-  'RCTMaskedView',
-): HostComponent<NativeProps>);
diff --git a/Libraries/Components/MaskedView/__tests__/MaskedViewIOS-test.js b/Libraries/Components/MaskedView/__tests__/MaskedViewIOS-test.js
deleted file mode 100644
index 0abfd11da654..000000000000
--- a/Libraries/Components/MaskedView/__tests__/MaskedViewIOS-test.js
+++ /dev/null
@@ -1,40 +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
- * @emails oncall+react_native
- * @flow strict-local
- */
-
-'use strict';
-
-const React = require('react');
-const Text = require('../../../Text/Text');
-const View = require('../../View/View');
-const MaskedViewIOS = require('../MaskedViewIOS');
-
-const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
-
-describe('<MaskedViewIOS />', () => {
-  it('should render as expected', () => {
-    ReactNativeTestTools.expectRendersMatchingSnapshot(
-      'MaskedViewIOS',
-      () => (
-        <MaskedViewIOS
-          maskElement={
-            <View>
-              <Text>Basic Mask</Text>
-            </View>
-          }>
-          <View />
-        </MaskedViewIOS>
-      ),
-      () => {
-        jest.dontMock('../MaskedViewIOS');
-      },
-    );
-  });
-});
diff --git a/Libraries/Components/MaskedView/__tests__/__snapshots__/MaskedViewIOS-test.js.snap b/Libraries/Components/MaskedView/__tests__/__snapshots__/MaskedViewIOS-test.js.snap
deleted file mode 100644
index 65d8046eb1a1..000000000000
--- a/Libraries/Components/MaskedView/__tests__/__snapshots__/MaskedViewIOS-test.js.snap
+++ /dev/null
@@ -1,77 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<MaskedViewIOS /> should render as expected: should deep render when mocked (please verify output manually) 1`] = `
-<RCTMaskedView>
-  <View
-    pointerEvents="none"
-    style={
-      Object {
-        "bottom": 0,
-        "left": 0,
-        "position": "absolute",
-        "right": 0,
-        "top": 0,
-      }
-    }
-  >
-    <View>
-      <Text>
-        Basic Mask
-      </Text>
-    </View>
-  </View>
-  <View />
-</RCTMaskedView>
-`;
-
-exports[`<MaskedViewIOS /> should render as expected: should deep render when not mocked (please verify output manually) 1`] = `
-<RCTMaskedView>
-  <View
-    pointerEvents="none"
-    style={
-      Object {
-        "bottom": 0,
-        "left": 0,
-        "position": "absolute",
-        "right": 0,
-        "top": 0,
-      }
-    }
-  >
-    <View>
-      <Text>
-        Basic Mask
-      </Text>
-    </View>
-  </View>
-  <View />
-</RCTMaskedView>
-`;
-
-exports[`<MaskedViewIOS /> should render as expected: should shallow render as <MaskedViewIOS /> when mocked 1`] = `
-<MaskedViewIOS
-  maskElement={
-    <View>
-      <Text>
-        Basic Mask
-      </Text>
-    </View>
-  }
->
-  <View />
-</MaskedViewIOS>
-`;
-
-exports[`<MaskedViewIOS /> should render as expected: should shallow render as <MaskedViewIOS /> when not mocked 1`] = `
-<MaskedViewIOS
-  maskElement={
-    <View>
-      <Text>
-        Basic Mask
-      </Text>
-    </View>
-  }
->
-  <View />
-</MaskedViewIOS>
-`;
diff --git a/Libraries/Components/Pressable/Pressable.d.ts b/Libraries/Components/Pressable/Pressable.d.ts
new file mode 100644
index 000000000000..640e41261110
--- /dev/null
+++ b/Libraries/Components/Pressable/Pressable.d.ts
@@ -0,0 +1,167 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Insets} from '../../../types/public/Insets';
+import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
+import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
+import {
+  GestureResponderEvent,
+  MouseEvent,
+  NativeSyntheticEvent,
+  TargetedEvent,
+} from '../../Types/CoreEventTypes';
+import {View} from '../View/View';
+import {AccessibilityProps} from '../View/ViewAccessibility';
+import {ViewProps} from '../View/ViewPropTypes';
+
+export interface PressableStateCallbackType {
+  readonly pressed: boolean;
+}
+
+export interface PressableAndroidRippleConfig {
+  color?: null | ColorValue | undefined;
+  borderless?: null | boolean | undefined;
+  radius?: null | number | undefined;
+  foreground?: null | boolean | undefined;
+}
+
+export interface PressableProps
+  extends AccessibilityProps,
+    Omit<ViewProps, 'children' | 'style' | 'hitSlop'> {
+  /**
+   * Called when the hover is activated to provide visual feedback.
+   */
+  onHoverIn?: null | ((event: MouseEvent) => void) | undefined;
+
+  /**
+   * Called when the hover is deactivated to undo visual feedback.
+   */
+  onHoverOut?: null | ((event: MouseEvent) => void) | undefined;
+
+  /**
+   * Called when a single tap gesture is detected.
+   */
+  onPress?: null | ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * Called when a touch is engaged before `onPress`.
+   */
+  onPressIn?: null | ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * Called when a touch is released before `onPress`.
+   */
+  onPressOut?: null | ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * Called when a long-tap gesture is detected.
+   */
+  onLongPress?: null | ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * Called after the element loses focus.
+   * @platform macos windows
+   */
+  onBlur?:
+    | null
+    | ((event: NativeSyntheticEvent<TargetedEvent>) => void)
+    | undefined;
+
+  /**
+   * Called after the element is focused.
+   * @platform macos windows
+   */
+  onFocus?:
+    | null
+    | ((event: NativeSyntheticEvent<TargetedEvent>) => void)
+    | undefined;
+
+  /**
+   * Either children or a render prop that receives a boolean reflecting whether
+   * the component is currently pressed.
+   */
+  children?:
+    | React.ReactNode
+    | ((state: PressableStateCallbackType) => React.ReactNode)
+    | undefined;
+
+  /**
+   * Whether a press gesture can be interrupted by a parent gesture such as a
+   * scroll event. Defaults to true.
+   */
+  cancelable?: null | boolean | undefined;
+
+  /**
+   * Duration to wait after hover in before calling `onHoverIn`.
+   * @platform macos windows
+   */
+  delayHoverIn?: number | null | undefined;
+
+  /**
+   * Duration to wait after hover out before calling `onHoverOut`.
+   * @platform macos windows
+   */
+  delayHoverOut?: number | null | undefined;
+
+  /**
+   * Duration (in milliseconds) from `onPressIn` before `onLongPress` is called.
+   */
+  delayLongPress?: null | number | undefined;
+
+  /**
+   * Whether the press behavior is disabled.
+   */
+  disabled?: null | boolean | undefined;
+
+  /**
+   * Additional distance outside of this view in which a press is detected.
+   */
+  hitSlop?: null | Insets | number | undefined;
+
+  /**
+   * Additional distance outside of this view in which a touch is considered a
+   * press before `onPressOut` is triggered.
+   */
+  pressRetentionOffset?: null | Insets | number | undefined;
+
+  /**
+   * If true, doesn't play system sound on touch.
+   */
+  android_disableSound?: null | boolean | undefined;
+
+  /**
+   * Enables the Android ripple effect and configures its color.
+   */
+  android_ripple?: null | PressableAndroidRippleConfig | undefined;
+
+  /**
+   * Used only for documentation or testing (e.g. snapshot testing).
+   */
+  testOnly_pressed?: null | boolean | undefined;
+
+  /**
+   * Either view styles or a function that receives a boolean reflecting whether
+   * the component is currently pressed and returns view styles.
+   */
+  style?:
+    | StyleProp<ViewStyle>
+    | ((state: PressableStateCallbackType) => StyleProp<ViewStyle>)
+    | undefined;
+
+  /**
+   * Duration (in milliseconds) to wait after press down before calling onPressIn.
+   */
+  unstable_pressDelay?: number;
+}
+
+// TODO use React.AbstractComponent when available
+export const Pressable: React.ForwardRefExoticComponent<
+  PressableProps & React.RefAttributes<View>
+>;
diff --git a/Libraries/Components/Pressable/Pressable.js b/Libraries/Components/Pressable/Pressable.js
index aab4f21d33ed..187b4c4a5b00 100644
--- a/Libraries/Components/Pressable/Pressable.js
+++ b/Libraries/Components/Pressable/Pressable.js
@@ -8,11 +8,11 @@
  * @format
  */
 
-import * as React from 'react';
-import {useMemo, useState, useRef, useImperativeHandle} from 'react';
-import useAndroidRippleForView, {
-  type RippleConfig,
-} from './useAndroidRippleForView';
+import type {
+  LayoutEvent,
+  MouseEvent,
+  PressEvent,
+} from '../../Types/CoreEventTypes';
 import type {
   AccessibilityActionEvent,
   AccessibilityActionInfo,
@@ -20,15 +20,16 @@ import type {
   AccessibilityState,
   AccessibilityValue,
 } from '../View/ViewAccessibility';
+
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import usePressability from '../../Pressability/usePressability';
 import {type RectOrSize} from '../../StyleSheet/Rect';
-import type {
-  LayoutEvent,
-  MouseEvent,
-  PressEvent,
-} from '../../Types/CoreEventTypes';
 import View from '../View/View';
+import useAndroidRippleForView, {
+  type RippleConfig,
+} from './useAndroidRippleForView';
+import * as React from 'react';
+import {useImperativeHandle, useMemo, useRef, useState} from 'react';
 
 type ViewStyleProp = $ElementType<React.ElementConfig<typeof View>, 'style'>;
 
@@ -50,8 +51,30 @@ type Props = $ReadOnly<{|
   accessibilityRole?: ?AccessibilityRole,
   accessibilityState?: ?AccessibilityState,
   accessibilityValue?: ?AccessibilityValue,
+  'aria-valuemax'?: AccessibilityValue['max'],
+  'aria-valuemin'?: AccessibilityValue['min'],
+  'aria-valuenow'?: AccessibilityValue['now'],
+  'aria-valuetext'?: AccessibilityValue['text'],
   accessibilityViewIsModal?: ?boolean,
+  'aria-modal'?: ?boolean,
   accessible?: ?boolean,
+
+  /**
+   * alias for accessibilityState
+   *
+   * see https://reactnative.dev/docs/accessibility#accessibilitystate
+   */
+  'aria-busy'?: ?boolean,
+  'aria-checked'?: ?boolean | 'mixed',
+  'aria-disabled'?: ?boolean,
+  'aria-expanded'?: ?boolean,
+  'aria-selected'?: ?boolean,
+  /**
+   * A value indicating whether the accessibility elements contained within
+   * this accessibility element are hidden.
+   */
+  'aria-hidden'?: ?boolean,
+  'aria-live'?: ?('polite' | 'assertive' | 'off'),
   focusable?: ?boolean,
   importantForAccessibility?: ?('auto' | 'yes' | 'no' | 'no-hide-descendants'),
   onAccessibilityAction?: ?(event: AccessibilityActionEvent) => mixed,
@@ -164,6 +187,11 @@ type Props = $ReadOnly<{|
    * Duration to wait after press down before calling `onPressIn`.
    */
   unstable_pressDelay?: ?number,
+  /**
+   * Web to Native Accessibilty props
+   * https://github.com/facebook/react-native/issues/34424
+   */
+  'aria-label'?: ?string,
 |}>;
 
 /**
@@ -175,8 +203,16 @@ type Props = $ReadOnly<{|
 function Pressable(props: Props, forwardedRef): React.Node {
   const {
     accessible,
+    accessibilityState,
+    'aria-live': ariaLive,
     android_disableSound,
     android_ripple,
+    'aria-busy': ariaBusy,
+    'aria-checked': ariaChecked,
+    'aria-disabled': ariaDisabled,
+    'aria-expanded': ariaExpanded,
+    'aria-label': ariaLabel,
+    'aria-selected': ariaSelected,
     cancelable,
     children,
     delayHoverIn,
@@ -205,17 +241,39 @@ function Pressable(props: Props, forwardedRef): React.Node {
 
   const [pressed, setPressed] = usePressState(testOnly_pressed === true);
 
-  const accessibilityState =
-    disabled != null
-      ? {...props.accessibilityState, disabled}
-      : props.accessibilityState;
+  let _accessibilityState = {
+    busy: ariaBusy ?? accessibilityState?.busy,
+    checked: ariaChecked ?? accessibilityState?.checked,
+    disabled: ariaDisabled ?? accessibilityState?.disabled,
+    expanded: ariaExpanded ?? accessibilityState?.expanded,
+    selected: ariaSelected ?? accessibilityState?.selected,
+  };
+
+  _accessibilityState =
+    disabled != null ? {..._accessibilityState, disabled} : _accessibilityState;
 
+  const accessibilityValue = {
+    max: props['aria-valuemax'] ?? props.accessibilityValue?.max,
+    min: props['aria-valuemin'] ?? props.accessibilityValue?.min,
+    now: props['aria-valuenow'] ?? props.accessibilityValue?.now,
+    text: props['aria-valuetext'] ?? props.accessibilityValue?.text,
+  };
+
+  const accessibilityLiveRegion =
+    ariaLive === 'off' ? 'none' : ariaLive ?? props.accessibilityLiveRegion;
+
+  const accessibilityLabel = ariaLabel ?? props.accessibilityLabel;
   const restPropsWithDefaults: React.ElementConfig<typeof View> = {
     ...restProps,
     ...android_rippleConfig?.viewProps,
     accessible: accessible !== false,
-    accessibilityState,
+    accessibilityViewIsModal:
+      restProps['aria-modal'] ?? restProps.accessibilityViewIsModal,
+    accessibilityLiveRegion,
+    accessibilityLabel,
+    accessibilityState: _accessibilityState,
     focusable: focusable !== false,
+    accessibilityValue,
     hitSlop,
   };
 
diff --git a/Libraries/Components/Pressable/__tests__/Pressable-test.js b/Libraries/Components/Pressable/__tests__/Pressable-test.js
index 09bb7ac8f336..4aba2feefcc0 100644
--- a/Libraries/Components/Pressable/__tests__/Pressable-test.js
+++ b/Libraries/Components/Pressable/__tests__/Pressable-test.js
@@ -4,16 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
-import * as React from 'react';
-
-import Pressable from '../Pressable';
-import View from '../../View/View';
 import {expectRendersMatchingSnapshot} from '../../../Utilities/ReactNativeTestTools';
+import View from '../../View/View';
+import Pressable from '../Pressable';
+import * as React from 'react';
 
 describe('<Pressable />', () => {
   it('should render as expected', () => {
diff --git a/Libraries/Components/Pressable/__tests__/__snapshots__/Pressable-test.js.snap b/Libraries/Components/Pressable/__tests__/__snapshots__/Pressable-test.js.snap
index 821d4f41ea56..e348e02347e5 100644
--- a/Libraries/Components/Pressable/__tests__/__snapshots__/Pressable-test.js.snap
+++ b/Libraries/Components/Pressable/__tests__/__snapshots__/Pressable-test.js.snap
@@ -2,6 +2,23 @@
 
 exports[`<Pressable /> should render as expected: should deep render when mocked (please verify output manually) 1`] = `
 <View
+  accessibilityState={
+    Object {
+      "busy": undefined,
+      "checked": undefined,
+      "disabled": undefined,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
+    }
+  }
   accessible={true}
   collapsable={false}
   focusable={true}
@@ -21,6 +38,23 @@ exports[`<Pressable /> should render as expected: should deep render when mocked
 
 exports[`<Pressable /> should render as expected: should deep render when not mocked (please verify output manually) 1`] = `
 <View
+  accessibilityState={
+    Object {
+      "busy": undefined,
+      "checked": undefined,
+      "disabled": undefined,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
+    }
+  }
   accessible={true}
   collapsable={false}
   focusable={true}
@@ -54,7 +88,19 @@ exports[`<Pressable disabled={true} /> should be disabled when disabled is true:
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -78,7 +124,19 @@ exports[`<Pressable disabled={true} /> should be disabled when disabled is true:
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -118,7 +176,19 @@ exports[`<Pressable disabled={true} accessibilityState={{}} /> should be disable
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -142,7 +212,19 @@ exports[`<Pressable disabled={true} accessibilityState={{}} /> should be disable
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -184,8 +266,19 @@ exports[`<Pressable disabled={true} accessibilityState={{checked: true}} /> shou
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
       "checked": true,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -209,8 +302,19 @@ exports[`<Pressable disabled={true} accessibilityState={{checked: true}} /> shou
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
       "checked": true,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -260,7 +364,19 @@ exports[`<Pressable disabled={true} accessibilityState={{disabled: false}} /> sh
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -284,7 +400,19 @@ exports[`<Pressable disabled={true} accessibilityState={{disabled: false}} /> sh
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
diff --git a/Libraries/Components/Pressable/useAndroidRippleForView.js b/Libraries/Components/Pressable/useAndroidRippleForView.js
index e9682d7027a1..6c4cb1e2baa6 100644
--- a/Libraries/Components/Pressable/useAndroidRippleForView.js
+++ b/Libraries/Components/Pressable/useAndroidRippleForView.js
@@ -8,11 +8,14 @@
  * @format
  */
 
-import invariant from 'invariant';
-import {Commands} from '../View/ViewNativeComponent';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {PressEvent} from '../../Types/CoreEventTypes';
-import {Platform, View, processColor} from 'react-native';
+
+import processColor from '../../StyleSheet/processColor';
+import Platform from '../../Utilities/Platform';
+import View from '../View/View';
+import {Commands} from '../View/ViewNativeComponent';
+import invariant from 'invariant';
 import * as React from 'react';
 import {useMemo} from 'react';
 
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
index cae4e4dc7dfd..a34a432a55f2 100644
--- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
+++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
@@ -8,12 +8,12 @@
  * @format
  */
 
-const React = require('react');
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
+import type {ViewProps} from '../View/ViewPropTypes';
 
 import ProgressBarAndroidNativeComponent from './ProgressBarAndroidNativeComponent';
 
-import type {ViewProps} from '../View/ViewPropTypes';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
+const React = require('react');
 
 export type ProgressBarAndroidProps = $ReadOnly<{|
   ...ViewProps,
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.d.ts b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.d.ts
new file mode 100644
index 000000000000..a368adfb0756
--- /dev/null
+++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.d.ts
@@ -0,0 +1,83 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
+import {ColorValue} from '../../StyleSheet/StyleSheet';
+import {ViewProps} from '../View/ViewPropTypes';
+
+/**
+ * ProgressBarAndroid has been extracted from react-native core and will be removed in a future release.
+ * It can now be installed and imported from `@react-native-community/progress-bar-android` instead of 'react-native'.
+ * @see https://github.com/react-native-community/progress-bar-android
+ * @deprecated
+ */
+export interface ProgressBarAndroidProps extends ViewProps {
+  /**
+     * Style of the ProgressBar. One of:
+         Horizontal
+         Normal (default)
+         Small
+         Large
+         Inverse
+         SmallInverse
+         LargeInverse
+     */
+  styleAttr?:
+    | 'Horizontal'
+    | 'Normal'
+    | 'Small'
+    | 'Large'
+    | 'Inverse'
+    | 'SmallInverse'
+    | 'LargeInverse'
+    | undefined;
+
+  /**
+   * If the progress bar will show indeterminate progress.
+   * Note that this can only be false if styleAttr is Horizontal.
+   */
+  indeterminate?: boolean | undefined;
+
+  /**
+   * The progress value (between 0 and 1).
+   */
+  progress?: number | undefined;
+
+  /**
+   * Whether to show the ProgressBar (true, the default) or hide it (false).
+   */
+  animating?: boolean | undefined;
+
+  /**
+   * Color of the progress bar.
+   */
+  color?: ColorValue | undefined;
+
+  /**
+   * Used to locate this view in end-to-end tests.
+   */
+  testID?: string | undefined;
+}
+
+/**
+ * React component that wraps the Android-only `ProgressBar`. This component is used to indicate
+ * that the app is loading or there is some activity in the app.
+ */
+declare class ProgressBarAndroidComponent extends React.Component<ProgressBarAndroidProps> {}
+declare const ProgressBarAndroidBase: Constructor<NativeMethods> &
+  typeof ProgressBarAndroidComponent;
+/**
+ * ProgressBarAndroid has been extracted from react-native core and will be removed in a future release.
+ * It can now be installed and imported from `@react-native-community/progress-bar-android` instead of 'react-native'.
+ * @see https://github.com/react-native-progress-view/progress-bar-android
+ * @deprecated
+ */
+export class ProgressBarAndroid extends ProgressBarAndroidBase {}
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidNativeComponent.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidNativeComponent.js
index 625542b05baa..2dc49e65a372 100644
--- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidNativeComponent.js
+++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidNativeComponent.js
@@ -8,12 +8,12 @@
  * @format
  */
 
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
-import type {ViewProps} from '../View/ViewPropTypes';
 import type {Double, WithDefault} from '../../Types/CodegenTypes';
+import type {ViewProps} from '../View/ViewPropTypes';
 
 import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,
diff --git a/Libraries/Components/ProgressBarAndroid/__tests__/ProgressBarAndroid-test.js b/Libraries/Components/ProgressBarAndroid/__tests__/ProgressBarAndroid-test.js
index 6d5a06d5bfe4..e293e1293141 100644
--- a/Libraries/Components/ProgressBarAndroid/__tests__/ProgressBarAndroid-test.js
+++ b/Libraries/Components/ProgressBarAndroid/__tests__/ProgressBarAndroid-test.js
@@ -4,20 +4,19 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
+const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
 /* $FlowFixMe[cannot-resolve-module] (>=0.99.0 site=react_native_ios_fb) This
  * comment suppresses an error found when Flow v0.99 was deployed. To see the
  * error, delete this comment and run Flow. */
 const ProgressBarAndroid = require('../ProgressBarAndroid.android');
-
-const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
+const React = require('react');
 
 describe('<ProgressBarAndroid />', () => {
   it('should render as expected', () => {
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
index 4150bbf20084..0dffafceeb88 100644
--- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
+++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
@@ -8,10 +8,10 @@
  */
 
 'use strict';
-import * as React from 'react';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
 import View from '../View/View';
+import * as React from 'react';
 
 class DummyProgressViewIOS extends React.Component {
   render() {
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.d.ts b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.d.ts
new file mode 100644
index 000000000000..1f38df718c1f
--- /dev/null
+++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.d.ts
@@ -0,0 +1,62 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {ImageURISource} from '../../Image/ImageSource';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
+import {ColorValue} from '../../StyleSheet/StyleSheet';
+import {ViewProps} from '../View/ViewPropTypes';
+
+/**
+ * @see https://reactnative.dev/docs/progressviewios
+ * @see ProgressViewIOS.ios.js
+ */
+export interface ProgressViewIOSProps extends ViewProps {
+  /**
+   * The progress bar style.
+   */
+  progressViewStyle?: 'default' | 'bar' | undefined;
+
+  /**
+   * The progress value (between 0 and 1).
+   */
+  progress?: number | undefined;
+
+  /**
+   * The tint color of the progress bar itself.
+   */
+  progressTintColor?: ColorValue | undefined;
+
+  /**
+   * The tint color of the progress bar track.
+   */
+  trackTintColor?: ColorValue | undefined;
+
+  /**
+   * A stretchable image to display as the progress bar.
+   */
+  progressImage?: ImageURISource | ImageURISource[] | undefined;
+
+  /**
+   * A stretchable image to display behind the progress bar.
+   */
+  trackImage?: ImageURISource | ImageURISource[] | undefined;
+}
+
+declare class ProgressViewIOSComponent extends React.Component<ProgressViewIOSProps> {}
+declare const ProgressViewIOSBase: Constructor<NativeMethods> &
+  typeof ProgressViewIOSComponent;
+/**
+ * ProgressViewIOS has been extracted from react-native core and will be removed in a future release.
+ * It can now be installed and imported from `@react-native-community/progress-view` instead of 'react-native'.
+ * @see https://github.com/react-native-community/progress-view
+ * @deprecated
+ */
+export class ProgressViewIOS extends ProgressViewIOSBase {}
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
index 2712055e6492..65750946ab0b 100644
--- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
+++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
@@ -8,13 +8,13 @@
  * @flow strict-local
  */
 
-import * as React from 'react';
-import StyleSheet, {type ColorValue} from '../../StyleSheet/StyleSheet';
-
-import RCTProgressViewNativeComponent from './RCTProgressViewNativeComponent';
 import type {ImageSource} from '../../Image/ImageSource';
 import type {ViewProps} from '../View/ViewPropTypes';
 
+import StyleSheet, {type ColorValue} from '../../StyleSheet/StyleSheet';
+import RCTProgressViewNativeComponent from './RCTProgressViewNativeComponent';
+import * as React from 'react';
+
 type Props = $ReadOnly<{|
   ...ViewProps,
 
diff --git a/Libraries/Components/ProgressViewIOS/RCTProgressViewNativeComponent.js b/Libraries/Components/ProgressViewIOS/RCTProgressViewNativeComponent.js
index cd833d0cf380..be2f70af5d41 100644
--- a/Libraries/Components/ProgressViewIOS/RCTProgressViewNativeComponent.js
+++ b/Libraries/Components/ProgressViewIOS/RCTProgressViewNativeComponent.js
@@ -8,13 +8,13 @@
  * @format
  */
 
-import type {Float, WithDefault} from '../../Types/CodegenTypes';
 import type {ImageSource} from '../../Image/ImageSource';
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
+import type {Float, WithDefault} from '../../Types/CodegenTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
 
 import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,
diff --git a/Libraries/Components/ProgressViewIOS/__tests__/ProgressViewIOS-test.js b/Libraries/Components/ProgressViewIOS/__tests__/ProgressViewIOS-test.js
index 1509c91f8ff7..0c59a614f8f0 100644
--- a/Libraries/Components/ProgressViewIOS/__tests__/ProgressViewIOS-test.js
+++ b/Libraries/Components/ProgressViewIOS/__tests__/ProgressViewIOS-test.js
@@ -4,17 +4,16 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
-const ProgressViewIOS = require('../ProgressViewIOS');
-
 const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
+const ProgressViewIOS = require('../ProgressViewIOS');
+const React = require('react');
 
 describe('<ProgressViewIOS />', () => {
   it('should render as expected', () => {
diff --git a/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js b/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js
index 0ef1fdc208c4..dd76d15d61db 100644
--- a/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js
+++ b/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js
@@ -8,20 +8,19 @@
  * @flow strict-local
  */
 
-import * as React from 'react';
-
-import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
-import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {
   DirectEventHandler,
   Float,
   WithDefault,
 } from '../../Types/CodegenTypes';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 
+import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
+import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
+import * as React from 'react';
+
 type NativeProps = $ReadOnly<{|
   ...ViewProps,
 
diff --git a/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js b/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js
index 0ebd98469e0a..f47880e111de 100644
--- a/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js
+++ b/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js
@@ -8,18 +8,18 @@
  * @flow strict-local
  */
 
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {
   DirectEventHandler,
   Float,
   WithDefault,
 } from '../../Types/CodegenTypes';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
-import * as React from 'react';
 
+import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
 import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
+import * as React from 'react';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,
diff --git a/Libraries/Components/RefreshControl/RefreshControl.d.ts b/Libraries/Components/RefreshControl/RefreshControl.d.ts
new file mode 100644
index 000000000000..81eba749c988
--- /dev/null
+++ b/Libraries/Components/RefreshControl/RefreshControl.d.ts
@@ -0,0 +1,87 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
+import {ColorValue} from '../../StyleSheet/StyleSheet';
+import {ViewProps} from '../View/ViewPropTypes';
+
+export interface RefreshControlPropsIOS extends ViewProps {
+  /**
+   * The color of the refresh indicator.
+   */
+  tintColor?: ColorValue | undefined;
+
+  /**
+   * The title displayed under the refresh indicator.
+   */
+  title?: string | undefined;
+
+  /**
+   * Title color.
+   */
+  titleColor?: ColorValue | undefined;
+}
+
+export interface RefreshControlPropsAndroid extends ViewProps {
+  /**
+   * The colors (at least one) that will be used to draw the refresh indicator.
+   */
+  colors?: ColorValue[] | undefined;
+
+  /**
+   * Whether the pull to refresh functionality is enabled.
+   */
+  enabled?: boolean | undefined;
+
+  /**
+   * The background color of the refresh indicator.
+   */
+  progressBackgroundColor?: ColorValue | undefined;
+
+  /**
+   * Size of the refresh indicator, see RefreshControl.SIZE.
+   */
+  size?: number | undefined;
+}
+
+export interface RefreshControlProps
+  extends RefreshControlPropsIOS,
+    RefreshControlPropsAndroid {
+  /**
+   * Called when the view starts refreshing.
+   */
+  onRefresh?: (() => void) | undefined;
+
+  /**
+   * Whether the view should be indicating an active refresh.
+   */
+  refreshing: boolean;
+
+  /**
+   * Progress view top offset
+   */
+  progressViewOffset?: number | undefined;
+}
+
+/**
+ * This component is used inside a ScrollView or ListView to add pull to refresh
+ * functionality. When the ScrollView is at `scrollY: 0`, swiping down
+ * triggers an `onRefresh` event.
+ *
+ * __Note:__ `refreshing` is a controlled prop, this is why it needs to be set to true
+ * in the `onRefresh` function otherwise the refresh indicator will stop immediately.
+ */
+declare class RefreshControlComponent extends React.Component<RefreshControlProps> {}
+declare const RefreshControlBase: Constructor<NativeMethods> &
+  typeof RefreshControlComponent;
+export class RefreshControl extends RefreshControlBase {
+  static SIZE: Object; // Undocumented
+}
diff --git a/Libraries/Components/RefreshControl/RefreshControl.js b/Libraries/Components/RefreshControl/RefreshControl.js
index f62a893b489f..e40344ec9690 100644
--- a/Libraries/Components/RefreshControl/RefreshControl.js
+++ b/Libraries/Components/RefreshControl/RefreshControl.js
@@ -8,11 +8,9 @@
  * @flow
  */
 
-const Platform = require('../../Utilities/Platform');
-const React = require('react');
-
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
+
 import AndroidSwipeRefreshLayoutNativeComponent, {
   Commands as AndroidSwipeRefreshLayoutCommands,
 } from './AndroidSwipeRefreshLayoutNativeComponent';
@@ -20,6 +18,9 @@ import PullToRefreshViewNativeComponent, {
   Commands as PullToRefreshCommands,
 } from './PullToRefreshViewNativeComponent';
 
+const Platform = require('../../Utilities/Platform');
+const React = require('react');
+
 type IOSProps = $ReadOnly<{|
   /**
    * The color of the refresh indicator.
diff --git a/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
index 80c6126641d6..005c7e42db2b 100644
--- a/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
+++ b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
@@ -9,11 +9,10 @@
  */
 
 'use strict';
-import * as React from 'react';
+import type {HostComponent} from '../../../Renderer/shims/ReactNativeTypes';
 
 import requireNativeComponent from '../../../ReactNative/requireNativeComponent';
-
-import type {HostComponent} from '../../../Renderer/shims/ReactNativeTypes';
+import * as React from 'react';
 
 const RCTRefreshControl: HostComponent<mixed> =
   requireNativeComponent<mixed>('RCTRefreshControl');
diff --git a/Libraries/Components/SafeAreaView/RCTSafeAreaViewNativeComponent.js b/Libraries/Components/SafeAreaView/RCTSafeAreaViewNativeComponent.js
index 8cf1333d1360..ff0d08ae5ce2 100644
--- a/Libraries/Components/SafeAreaView/RCTSafeAreaViewNativeComponent.js
+++ b/Libraries/Components/SafeAreaView/RCTSafeAreaViewNativeComponent.js
@@ -8,10 +8,10 @@
  * @flow strict-local
  */
 
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
 
 import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,
diff --git a/Libraries/Components/SafeAreaView/SafeAreaView.d.ts b/Libraries/Components/SafeAreaView/SafeAreaView.d.ts
new file mode 100644
index 000000000000..f96a1a50753e
--- /dev/null
+++ b/Libraries/Components/SafeAreaView/SafeAreaView.d.ts
@@ -0,0 +1,24 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
+import {ViewProps} from '../View/ViewPropTypes';
+
+/**
+ * Renders nested content and automatically applies paddings reflect the portion of the view
+ * that is not covered by navigation bars, tab bars, toolbars, and other ancestor views.
+ * Moreover, and most importantly, Safe Area's paddings reflect physical limitation of the screen,
+ * such as rounded corners or camera notches (aka sensor housing area on iPhone X).
+ */
+declare class SafeAreaViewComponent extends React.Component<ViewProps> {}
+declare const SafeAreaViewBase: Constructor<NativeMethods> &
+  typeof SafeAreaViewComponent;
+export class SafeAreaView extends SafeAreaViewBase {}
diff --git a/Libraries/Components/SafeAreaView/SafeAreaView.flow.js b/Libraries/Components/SafeAreaView/SafeAreaView.flow.js
new file mode 100644
index 000000000000..77d04f50ec93
--- /dev/null
+++ b/Libraries/Components/SafeAreaView/SafeAreaView.flow.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {ViewProps} from '../View/ViewPropTypes';
+
+import View from '../View/View';
+import * as React from 'react';
+
+export type SafeAreaViewType = React.AbstractComponent<
+  ViewProps,
+  React.ElementRef<typeof View>,
+>;
diff --git a/Libraries/Components/SafeAreaView/SafeAreaView.js b/Libraries/Components/SafeAreaView/SafeAreaView.js
index 1cb0004a38a7..43f1689266a2 100644
--- a/Libraries/Components/SafeAreaView/SafeAreaView.js
+++ b/Libraries/Components/SafeAreaView/SafeAreaView.js
@@ -8,11 +8,12 @@
  * @format
  */
 
+import type {ViewProps} from '../View/ViewPropTypes';
+import type {SafeAreaViewType} from './SafeAreaView.flow';
+
 import Platform from '../../Utilities/Platform';
-import * as React from 'react';
 import View from '../View/View';
-
-import type {ViewProps} from '../View/ViewPropTypes';
+import * as React from 'react';
 
 let exported: React.AbstractComponent<ViewProps, React.ElementRef<typeof View>>;
 
@@ -31,4 +32,4 @@ if (Platform.OS === 'android') {
   exported = require('./RCTSafeAreaViewNativeComponent').default;
 }
 
-export default exported;
+export default (exported: SafeAreaViewType);
diff --git a/Libraries/Components/SafeAreaView/__tests__/SafeAreaView-test.js b/Libraries/Components/SafeAreaView/__tests__/SafeAreaView-test.js
index 5c1198421509..c3dcd55e41ca 100644
--- a/Libraries/Components/SafeAreaView/__tests__/SafeAreaView-test.js
+++ b/Libraries/Components/SafeAreaView/__tests__/SafeAreaView-test.js
@@ -4,18 +4,19 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
 import SafeAreaView from '../SafeAreaView';
+
+const Text = require('../../../Text/Text');
 const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
 const View = require('../../View/View');
-const Text = require('../../../Text/Text');
+const React = require('react');
 
 describe('<SafeAreaView />', () => {
   it('should render as expected', () => {
diff --git a/Libraries/Components/ScrollView/AndroidHorizontalScrollContentViewNativeComponent.js b/Libraries/Components/ScrollView/AndroidHorizontalScrollContentViewNativeComponent.js
index 63f6e660d53d..50b814a93b90 100644
--- a/Libraries/Components/ScrollView/AndroidHorizontalScrollContentViewNativeComponent.js
+++ b/Libraries/Components/ScrollView/AndroidHorizontalScrollContentViewNativeComponent.js
@@ -8,10 +8,11 @@
  * @flow strict-local
  */
 
-import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
 
+import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
+
 type NativeProps = $ReadOnly<{|
   ...ViewProps,
 
diff --git a/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js b/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js
index 7b2ce2060d2b..e0414b9b232d 100644
--- a/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js
+++ b/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js
@@ -8,11 +8,12 @@
  * @format
  */
 
-import type {ScrollViewNativeProps as Props} from './ScrollViewNativeComponentType';
 import type {
   HostComponent,
   PartialViewConfig,
 } from '../../Renderer/shims/ReactNativeTypes';
+import type {ScrollViewNativeProps as Props} from './ScrollViewNativeComponentType';
+
 import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
 
 export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
diff --git a/Libraries/Components/ScrollView/ScrollContentViewNativeComponent.js b/Libraries/Components/ScrollView/ScrollContentViewNativeComponent.js
index 09038e84ff0e..bd7278c93d0d 100644
--- a/Libraries/Components/ScrollView/ScrollContentViewNativeComponent.js
+++ b/Libraries/Components/ScrollView/ScrollContentViewNativeComponent.js
@@ -12,9 +12,10 @@ import type {
   HostComponent,
   PartialViewConfig,
 } from '../../Renderer/shims/ReactNativeTypes';
-import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
 import type {ViewProps as Props} from '../View/ViewPropTypes';
 
+import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
+
 export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
   uiViewClassName: 'RCTScrollContentView',
   bubblingEventTypes: {},
diff --git a/Libraries/Components/ScrollView/ScrollView.d.ts b/Libraries/Components/ScrollView/ScrollView.d.ts
new file mode 100644
index 000000000000..3d1d94fa8418
--- /dev/null
+++ b/Libraries/Components/ScrollView/ScrollView.d.ts
@@ -0,0 +1,911 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {Insets} from '../../../types/public/Insets';
+import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
+import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
+import {
+  NativeSyntheticEvent,
+  NativeTouchEvent,
+} from '../../Types/CoreEventTypes';
+import {RefreshControlProps} from '../RefreshControl/RefreshControl';
+import {Touchable} from '../Touchable/Touchable';
+import {ViewProps} from '../View/ViewPropTypes';
+
+// See https://reactnative.dev/docs/scrollview#contentoffset
+export interface PointProp {
+  x: number;
+  y: number;
+}
+
+export interface ScrollResponderEvent
+  extends NativeSyntheticEvent<NativeTouchEvent> {}
+
+interface SubscribableMixin {
+  /**
+   * Special form of calling `addListener` that *guarantees* that a
+   * subscription *must* be tied to a component instance, and therefore will
+   * be cleaned up when the component is unmounted. It is impossible to create
+   * the subscription and pass it in - this method must be the one to create
+   * the subscription and therefore can guarantee it is retained in a way that
+   * will be cleaned up.
+   *
+   * @param eventEmitter emitter to subscribe to.
+   * @param eventType Type of event to listen to.
+   * @param listener Function to invoke when event occurs.
+   * @param context Object to use as listener context.
+   */
+  addListenerOn(
+    eventEmitter: any,
+    eventType: string,
+    listener: () => any,
+    context: any,
+  ): void;
+}
+
+interface ScrollResponderMixin extends SubscribableMixin {
+  /**
+   * Invoke this from an `onScroll` event.
+   */
+  scrollResponderHandleScrollShouldSetResponder(): boolean;
+
+  /**
+   * Merely touch starting is not sufficient for a scroll view to become the
+   * responder. Being the "responder" means that the very next touch move/end
+   * event will result in an action/movement.
+   *
+   * Invoke this from an `onStartShouldSetResponder` event.
+   *
+   * `onStartShouldSetResponder` is used when the next move/end will trigger
+   * some UI movement/action, but when you want to yield priority to views
+   * nested inside of the view.
+   *
+   * There may be some cases where scroll views actually should return `true`
+   * from `onStartShouldSetResponder`: Any time we are detecting a standard tap
+   * that gives priority to nested views.
+   *
+   * - If a single tap on the scroll view triggers an action such as
+   *   recentering a map style view yet wants to give priority to interaction
+   *   views inside (such as dropped pins or labels), then we would return true
+   *   from this method when there is a single touch.
+   *
+   * - Similar to the previous case, if a two finger "tap" should trigger a
+   *   zoom, we would check the `touches` count, and if `>= 2`, we would return
+   *   true.
+   *
+   */
+  scrollResponderHandleStartShouldSetResponder(): boolean;
+
+  /**
+   * There are times when the scroll view wants to become the responder
+   * (meaning respond to the next immediate `touchStart/touchEnd`), in a way
+   * that *doesn't* give priority to nested views (hence the capture phase):
+   *
+   * - Currently animating.
+   * - Tapping anywhere that is not the focused input, while the keyboard is
+   *   up (which should dismiss the keyboard).
+   *
+   * Invoke this from an `onStartShouldSetResponderCapture` event.
+   */
+  scrollResponderHandleStartShouldSetResponderCapture(
+    e: ScrollResponderEvent,
+  ): boolean;
+
+  /**
+   * Invoke this from an `onResponderReject` event.
+   *
+   * Some other element is not yielding its role as responder. Normally, we'd
+   * just disable the `UIScrollView`, but a touch has already began on it, the
+   * `UIScrollView` will not accept being disabled after that. The easiest
+   * solution for now is to accept the limitation of disallowing this
+   * altogether. To improve this, find a way to disable the `UIScrollView` after
+   * a touch has already started.
+   */
+  scrollResponderHandleResponderReject(): any;
+
+  /**
+   * We will allow the scroll view to give up its lock iff it acquired the lock
+   * during an animation. This is a very useful default that happens to satisfy
+   * many common user experiences.
+   *
+   * - Stop a scroll on the left edge, then turn that into an outer view's
+   *   backswipe.
+   * - Stop a scroll mid-bounce at the top, continue pulling to have the outer
+   *   view dismiss.
+   * - However, without catching the scroll view mid-bounce (while it is
+   *   motionless), if you drag far enough for the scroll view to become
+   *   responder (and therefore drag the scroll view a bit), any backswipe
+   *   navigation of a swipe gesture higher in the view hierarchy, should be
+   *   rejected.
+   */
+  scrollResponderHandleTerminationRequest(): boolean;
+
+  /**
+   * Invoke this from an `onTouchEnd` event.
+   *
+   * @param e Event.
+   */
+  scrollResponderHandleTouchEnd(e: ScrollResponderEvent): void;
+
+  /**
+   * Invoke this from an `onResponderRelease` event.
+   */
+  scrollResponderHandleResponderRelease(e: ScrollResponderEvent): void;
+
+  scrollResponderHandleScroll(e: ScrollResponderEvent): void;
+
+  /**
+   * Invoke this from an `onResponderGrant` event.
+   */
+  scrollResponderHandleResponderGrant(e: ScrollResponderEvent): void;
+
+  /**
+   * Unfortunately, `onScrollBeginDrag` also fires when *stopping* the scroll
+   * animation, and there's not an easy way to distinguish a drag vs. stopping
+   * momentum.
+   *
+   * Invoke this from an `onScrollBeginDrag` event.
+   */
+  scrollResponderHandleScrollBeginDrag(e: ScrollResponderEvent): void;
+
+  /**
+   * Invoke this from an `onScrollEndDrag` event.
+   */
+  scrollResponderHandleScrollEndDrag(e: ScrollResponderEvent): void;
+
+  /**
+   * Invoke this from an `onMomentumScrollBegin` event.
+   */
+  scrollResponderHandleMomentumScrollBegin(e: ScrollResponderEvent): void;
+
+  /**
+   * Invoke this from an `onMomentumScrollEnd` event.
+   */
+  scrollResponderHandleMomentumScrollEnd(e: ScrollResponderEvent): void;
+
+  /**
+   * Invoke this from an `onTouchStart` event.
+   *
+   * Since we know that the `SimpleEventPlugin` occurs later in the plugin
+   * order, after `ResponderEventPlugin`, we can detect that we were *not*
+   * permitted to be the responder (presumably because a contained view became
+   * responder). The `onResponderReject` won't fire in that case - it only
+   * fires when a *current* responder rejects our request.
+   *
+   * @param e Touch Start event.
+   */
+  scrollResponderHandleTouchStart(e: ScrollResponderEvent): void;
+
+  /**
+   * Invoke this from an `onTouchMove` event.
+   *
+   * Since we know that the `SimpleEventPlugin` occurs later in the plugin
+   * order, after `ResponderEventPlugin`, we can detect that we were *not*
+   * permitted to be the responder (presumably because a contained view became
+   * responder). The `onResponderReject` won't fire in that case - it only
+   * fires when a *current* responder rejects our request.
+   *
+   * @param e Touch Start event.
+   */
+  scrollResponderHandleTouchMove(e: ScrollResponderEvent): void;
+
+  /**
+   * A helper function for this class that lets us quickly determine if the
+   * view is currently animating. This is particularly useful to know when
+   * a touch has just started or ended.
+   */
+  scrollResponderIsAnimating(): boolean;
+
+  /**
+   * Returns the node that represents native view that can be scrolled.
+   * Components can pass what node to use by defining a `getScrollableNode`
+   * function otherwise `this` is used.
+   */
+  scrollResponderGetScrollableNode(): any;
+
+  /**
+   * A helper function to scroll to a specific point  in the scrollview.
+   * This is currently used to help focus on child textviews, but can also
+   * be used to quickly scroll to any element we want to focus. Syntax:
+   *
+   * scrollResponderScrollTo(options: {x: number = 0; y: number = 0; animated: boolean = true})
+   *
+   * Note: The weird argument signature is due to the fact that, for historical reasons,
+   * the function also accepts separate arguments as an alternative to the options object.
+   * This is deprecated due to ambiguity (y before x), and SHOULD NOT BE USED.
+   */
+  scrollResponderScrollTo(
+    x?:
+      | number
+      | {
+          x?: number | undefined;
+          y?: number | undefined;
+          animated?: boolean | undefined;
+        },
+    y?: number,
+    animated?: boolean,
+  ): void;
+
+  /**
+   * A helper function to zoom to a specific rect in the scrollview. The argument has the shape
+   * {x: number; y: number; width: number; height: number; animated: boolean = true}
+   *
+   * @platform ios
+   */
+  scrollResponderZoomTo(
+    rect: {
+      x: number;
+      y: number;
+      width: number;
+      height: number;
+      animated?: boolean | undefined;
+    },
+    animated?: boolean, // deprecated, put this inside the rect argument instead
+  ): void;
+
+  /**
+   * This method should be used as the callback to onFocus in a TextInputs'
+   * parent view. Note that any module using this mixin needs to return
+   * the parent view's ref in getScrollViewRef() in order to use this method.
+   * @param nodeHandle The TextInput node handle
+   * @param additionalOffset The scroll view's top "contentInset".
+   *        Default is 0.
+   * @param preventNegativeScrolling Whether to allow pulling the content
+   *        down to make it meet the keyboard's top. Default is false.
+   */
+  scrollResponderScrollNativeHandleToKeyboard(
+    nodeHandle: any,
+    additionalOffset?: number,
+    preventNegativeScrollOffset?: boolean,
+  ): void;
+
+  /**
+   * The calculations performed here assume the scroll view takes up the entire
+   * screen - even if has some content inset. We then measure the offsets of the
+   * keyboard, and compensate both for the scroll view's "contentInset".
+   *
+   * @param left Position of input w.r.t. table view.
+   * @param top Position of input w.r.t. table view.
+   * @param width Width of the text input.
+   * @param height Height of the text input.
+   */
+  scrollResponderInputMeasureAndScrollToKeyboard(
+    left: number,
+    top: number,
+    width: number,
+    height: number,
+  ): void;
+
+  scrollResponderTextInputFocusError(e: ScrollResponderEvent): void;
+
+  /**
+   * `componentWillMount` is the closest thing to a  standard "constructor" for
+   * React components.
+   *
+   * The `keyboardWillShow` is called before input focus.
+   */
+  componentWillMount(): void;
+
+  /**
+   * Warning, this may be called several times for a single keyboard opening.
+   * It's best to store the information in this method and then take any action
+   * at a later point (either in `keyboardDidShow` or other).
+   *
+   * Here's the order that events occur in:
+   * - focus
+   * - willShow {startCoordinates, endCoordinates} several times
+   * - didShow several times
+   * - blur
+   * - willHide {startCoordinates, endCoordinates} several times
+   * - didHide several times
+   *
+   * The `ScrollResponder` providesModule callbacks for each of these events.
+   * Even though any user could have easily listened to keyboard events
+   * themselves, using these `props` callbacks ensures that ordering of events
+   * is consistent - and not dependent on the order that the keyboard events are
+   * subscribed to. This matters when telling the scroll view to scroll to where
+   * the keyboard is headed - the scroll responder better have been notified of
+   * the keyboard destination before being instructed to scroll to where the
+   * keyboard will be. Stick to the `ScrollResponder` callbacks, and everything
+   * will work.
+   *
+   * WARNING: These callbacks will fire even if a keyboard is displayed in a
+   * different navigation pane. Filter out the events to determine if they are
+   * relevant to you. (For example, only if you receive these callbacks after
+   * you had explicitly focused a node etc).
+   */
+  scrollResponderKeyboardWillShow(e: ScrollResponderEvent): void;
+
+  scrollResponderKeyboardWillHide(e: ScrollResponderEvent): void;
+
+  scrollResponderKeyboardDidShow(e: ScrollResponderEvent): void;
+
+  scrollResponderKeyboardDidHide(e: ScrollResponderEvent): void;
+}
+
+export interface ScrollViewPropsIOS {
+  /**
+   * When true the scroll view bounces horizontally when it reaches the end
+   * even if the content is smaller than the scroll view itself. The default
+   * value is true when `horizontal={true}` and false otherwise.
+   */
+  alwaysBounceHorizontal?: boolean | undefined;
+  /**
+   * When true the scroll view bounces vertically when it reaches the end
+   * even if the content is smaller than the scroll view itself. The default
+   * value is false when `horizontal={true}` and true otherwise.
+   */
+  alwaysBounceVertical?: boolean | undefined;
+
+  /**
+   * Controls whether iOS should automatically adjust the content inset for scroll views that are placed behind a navigation bar or tab bar/ toolbar.
+   * The default value is true.
+   */
+  automaticallyAdjustContentInsets?: boolean | undefined; // true
+
+  /**
+   * Controls whether the ScrollView should automatically adjust its contentInset and
+   * scrollViewInsets when the Keyboard changes its size. The default value is false.
+   */
+  automaticallyAdjustKeyboardInsets?: boolean | undefined;
+
+  /**
+   * Controls whether iOS should automatically adjust the scroll indicator
+   * insets. The default value is true. Available on iOS 13 and later.
+   */
+  automaticallyAdjustsScrollIndicatorInsets?: boolean | undefined;
+
+  /**
+   * When true the scroll view bounces when it reaches the end of the
+   * content if the content is larger then the scroll view along the axis of
+   * the scroll direction. When false it disables all bouncing even if
+   * the `alwaysBounce*` props are true. The default value is true.
+   */
+  bounces?: boolean | undefined;
+  /**
+   * When true gestures can drive zoom past min/max and the zoom will animate
+   * to the min/max value at gesture end otherwise the zoom will not exceed
+   * the limits.
+   */
+  bouncesZoom?: boolean | undefined;
+
+  /**
+   * When false once tracking starts won't try to drag if the touch moves.
+   * The default value is true.
+   */
+  canCancelContentTouches?: boolean | undefined;
+
+  /**
+   * When true the scroll view automatically centers the content when the
+   * content is smaller than the scroll view bounds; when the content is
+   * larger than the scroll view this property has no effect. The default
+   * value is false.
+   */
+  centerContent?: boolean | undefined;
+
+  /**
+   * The amount by which the scroll view content is inset from the edges of the scroll view.
+   * Defaults to {0, 0, 0, 0}.
+   */
+  contentInset?: Insets | undefined; // zeros
+
+  /**
+   * Used to manually set the starting scroll offset.
+   * The default value is {x: 0, y: 0}
+   */
+  contentOffset?: PointProp | undefined; // zeros
+
+  /**
+   * This property specifies how the safe area insets are used to modify the content area of the scroll view.
+   * The default value of this property must be 'automatic'. But the default value is 'never' until RN@0.51.
+   */
+  contentInsetAdjustmentBehavior?:
+    | 'automatic'
+    | 'scrollableAxes'
+    | 'never'
+    | 'always'
+    | undefined;
+
+  /**
+   * When true the ScrollView will try to lock to only vertical or horizontal
+   * scrolling while dragging.  The default value is false.
+   */
+  directionalLockEnabled?: boolean | undefined;
+
+  /**
+   * The style of the scroll indicators.
+   * - default (the default), same as black.
+   * - black, scroll indicator is black. This style is good against
+   *   a white content background.
+   * - white, scroll indicator is white. This style is good against
+   *   a black content background.
+   */
+  indicatorStyle?: 'default' | 'black' | 'white' | undefined;
+
+  /**
+   * When set, the scroll view will adjust the scroll position so that the first child
+   * that is currently visible and at or beyond minIndexForVisible will not change position.
+   * This is useful for lists that are loading content in both directions, e.g. a chat thread,
+   * where new messages coming in might otherwise cause the scroll position to jump. A value
+   * of 0 is common, but other values such as 1 can be used to skip loading spinners or other
+   * content that should not maintain position.
+   *
+   * The optional autoscrollToTopThreshold can be used to make the content automatically scroll
+   * to the top after making the adjustment if the user was within the threshold of the top
+   * before the adjustment was made. This is also useful for chat-like applications where you
+   * want to see new messages scroll into place, but not if the user has scrolled up a ways and
+   * it would be disruptive to scroll a bunch.
+   *
+   * Caveat 1: Reordering elements in the scrollview with this enabled will probably cause
+   * jumpiness and jank. It can be fixed, but there are currently no plans to do so. For now,
+   * don't re-order the content of any ScrollViews or Lists that use this feature.
+   *
+   * Caveat 2: This uses contentOffset and frame.origin in native code to compute visibility.
+   * Occlusion, transforms, and other complexity won't be taken into account as to whether
+   * content is "visible" or not.
+   */
+  maintainVisibleContentPosition?:
+    | null
+    | {
+        autoscrollToTopThreshold?: number | null | undefined;
+        minIndexForVisible: number;
+      }
+    | undefined;
+  /**
+   * The maximum allowed zoom scale. The default value is 1.0.
+   */
+  maximumZoomScale?: number | undefined;
+
+  /**
+   * The minimum allowed zoom scale. The default value is 1.0.
+   */
+  minimumZoomScale?: number | undefined;
+
+  /**
+   * Called when a scrolling animation ends.
+   */
+  onScrollAnimationEnd?: (() => void) | undefined;
+
+  /**
+   * When true, ScrollView allows use of pinch gestures to zoom in and out.
+   * The default value is true.
+   */
+  pinchGestureEnabled?: boolean | undefined;
+
+  /**
+   * This controls how often the scroll event will be fired while scrolling (as a time interval in ms).
+   * A lower number yields better accuracy for code that is tracking the scroll position,
+   * but can lead to scroll performance problems due to the volume of information being sent over the bridge.
+   * The default value is zero, which means the scroll event will be sent only once each time the view is scrolled.
+   */
+  scrollEventThrottle?: number | undefined; // null
+
+  /**
+   * The amount by which the scroll view indicators are inset from the edges of the scroll view.
+   * This should normally be set to the same value as the contentInset.
+   * Defaults to {0, 0, 0, 0}.
+   */
+  scrollIndicatorInsets?: Insets | undefined; //zeroes
+
+  /**
+   * When true, the scroll view can be programmatically scrolled beyond its
+   * content size. The default value is false.
+   * @platform ios
+   */
+  scrollToOverflowEnabled?: boolean | undefined;
+
+  /**
+   * When true the scroll view scrolls to top when the status bar is tapped.
+   * The default value is true.
+   */
+  scrollsToTop?: boolean | undefined;
+
+  /**
+   * When `snapToInterval` is set, `snapToAlignment` will define the relationship of the snapping to the scroll view.
+   *      - `start` (the default) will align the snap at the left (horizontal) or top (vertical)
+   *      - `center` will align the snap in the center
+   *      - `end` will align the snap at the right (horizontal) or bottom (vertical)
+   */
+  snapToAlignment?: 'start' | 'center' | 'end' | undefined;
+
+  /**
+   * Fires when the scroll view scrolls to top after the status bar has been tapped
+   * @platform ios
+   */
+  onScrollToTop?:
+    | ((event: NativeSyntheticEvent<NativeScrollEvent>) => void)
+    | undefined;
+
+  /**
+   * The current scale of the scroll view content. The default value is 1.0.
+   */
+  zoomScale?: number | undefined;
+}
+
+export interface ScrollViewPropsAndroid {
+  /**
+   * Sometimes a scrollview takes up more space than its content fills.
+   * When this is the case, this prop will fill the rest of the
+   * scrollview with a color to avoid setting a background and creating
+   * unnecessary overdraw. This is an advanced optimization that is not
+   * needed in the general case.
+   */
+  endFillColor?: ColorValue | undefined;
+
+  /**
+   * Tag used to log scroll performance on this scroll view. Will force
+   * momentum events to be turned on (see sendMomentumEvents). This doesn't do
+   * anything out of the box and you need to implement a custom native
+   * FpsListener for it to be useful.
+   * @platform android
+   */
+  scrollPerfTag?: string | undefined;
+
+  /**
+     * Used to override default value of overScroll mode.
+
+        * Possible values:
+        *   - 'auto' - Default value, allow a user to over-scroll this view only if the content is large enough to meaningfully scroll.
+        *   - 'always' - Always allow a user to over-scroll this view.
+        *   - 'never' - Never allow a user to over-scroll this view.
+        */
+  overScrollMode?: 'auto' | 'always' | 'never' | undefined;
+
+  /**
+   * Enables nested scrolling for Android API level 21+. Nested scrolling is supported by default on iOS.
+   */
+  nestedScrollEnabled?: boolean | undefined;
+
+  /**
+   * Fades out the edges of the scroll content.
+   *
+   * If the value is greater than 0, the fading edges will be set accordingly
+   * to the current scroll direction and position,
+   * indicating if there is more content to show.
+   *
+   * The default value is 0.
+   * @platform android
+   */
+  fadingEdgeLength?: number | undefined;
+
+  /**
+   * Causes the scrollbars not to turn transparent when they are not in use. The default value is false.
+   */
+  persistentScrollbar?: boolean | undefined;
+}
+
+export interface ScrollViewProps
+  extends ViewProps,
+    ScrollViewPropsIOS,
+    ScrollViewPropsAndroid,
+    Touchable {
+  /**
+   * These styles will be applied to the scroll view content container which
+   * wraps all of the child views. Example:
+   *
+   *   return (
+   *     <ScrollView contentContainerStyle={styles.contentContainer}>
+   *     </ScrollView>
+   *   );
+   *   ...
+   *   const styles = StyleSheet.create({
+   *     contentContainer: {
+   *       paddingVertical: 20
+   *     }
+   *   });
+   */
+  contentContainerStyle?: StyleProp<ViewStyle> | undefined;
+
+  /**
+   * A floating-point number that determines how quickly the scroll view
+   * decelerates after the user lifts their finger. You may also use string
+   * shortcuts `"normal"` and `"fast"` which match the underlying iOS settings
+   * for `UIScrollViewDecelerationRateNormal` and
+   * `UIScrollViewDecelerationRateFast` respectively.
+   *
+   *  - `'normal'`: 0.998 on iOS, 0.985 on Android (the default)
+   *  - `'fast'`: 0.99 on iOS, 0.9 on Android
+   */
+  decelerationRate?: 'fast' | 'normal' | number | undefined;
+
+  /**
+   * When true the scroll view's children are arranged horizontally in a row
+   * instead of vertically in a column. The default value is false.
+   */
+  horizontal?: boolean | null | undefined;
+
+  /**
+   * If sticky headers should stick at the bottom instead of the top of the
+   * ScrollView. This is usually used with inverted ScrollViews.
+   */
+  invertStickyHeaders?: boolean | undefined;
+
+  /**
+   * Determines whether the keyboard gets dismissed in response to a drag.
+   *   - 'none' (the default) drags do not dismiss the keyboard.
+   *   - 'onDrag' the keyboard is dismissed when a drag begins.
+   *   - 'interactive' the keyboard is dismissed interactively with the drag
+   *     and moves in synchrony with the touch; dragging upwards cancels the
+   *     dismissal.
+   */
+  keyboardDismissMode?: 'none' | 'interactive' | 'on-drag' | undefined;
+
+  /**
+   * Determines when the keyboard should stay visible after a tap.
+   * - 'never' (the default), tapping outside of the focused text input when the keyboard is up dismisses the keyboard. When this happens, children won't receive the tap.
+   * - 'always', the keyboard will not dismiss automatically, and the scroll view will not catch taps, but children of the scroll view can catch taps.
+   * - 'handled', the keyboard will not dismiss automatically when the tap was handled by a children, (or captured by an ancestor).
+   * - false, deprecated, use 'never' instead
+   * - true, deprecated, use 'always' instead
+   */
+  keyboardShouldPersistTaps?:
+    | boolean
+    | 'always'
+    | 'never'
+    | 'handled'
+    | undefined;
+
+  /**
+   * Called when scrollable content view of the ScrollView changes.
+   * Handler function is passed the content width and content height as parameters: (contentWidth, contentHeight)
+   * It's implemented using onLayout handler attached to the content container which this ScrollView renders.
+   *
+   */
+  onContentSizeChange?: ((w: number, h: number) => void) | undefined;
+
+  /**
+   * Fires at most once per frame during scrolling.
+   * The frequency of the events can be contolled using the scrollEventThrottle prop.
+   */
+  onScroll?:
+    | ((event: NativeSyntheticEvent<NativeScrollEvent>) => void)
+    | undefined;
+
+  /**
+   * Fires if a user initiates a scroll gesture.
+   */
+  onScrollBeginDrag?:
+    | ((event: NativeSyntheticEvent<NativeScrollEvent>) => void)
+    | undefined;
+
+  /**
+   * Fires when a user has finished scrolling.
+   */
+  onScrollEndDrag?:
+    | ((event: NativeSyntheticEvent<NativeScrollEvent>) => void)
+    | undefined;
+
+  /**
+   * Fires when scroll view has finished moving
+   */
+  onMomentumScrollEnd?:
+    | ((event: NativeSyntheticEvent<NativeScrollEvent>) => void)
+    | undefined;
+
+  /**
+   * Fires when scroll view has begun moving
+   */
+  onMomentumScrollBegin?:
+    | ((event: NativeSyntheticEvent<NativeScrollEvent>) => void)
+    | undefined;
+
+  /**
+   * When true the scroll view stops on multiples of the scroll view's size
+   * when scrolling. This can be used for horizontal pagination. The default
+   * value is false.
+   */
+  pagingEnabled?: boolean | undefined;
+
+  /**
+   * When false, the content does not scroll. The default value is true
+   */
+  scrollEnabled?: boolean | undefined; // true
+
+  /**
+   * Experimental: When true offscreen child views (whose `overflow` value is
+   * `hidden`) are removed from their native backing superview when offscreen.
+   * This can improve scrolling performance on long lists. The default value is
+   * false.
+   */
+  removeClippedSubviews?: boolean | undefined;
+
+  /**
+   * When true, shows a horizontal scroll indicator.
+   */
+  showsHorizontalScrollIndicator?: boolean | undefined;
+
+  /**
+   * When true, shows a vertical scroll indicator.
+   */
+  showsVerticalScrollIndicator?: boolean | undefined;
+
+  /**
+   * When true, Sticky header is hidden when scrolling down, and dock at the top when scrolling up.
+   */
+  stickyHeaderHiddenOnScroll?: boolean;
+
+  /**
+   * Style
+   */
+  style?: StyleProp<ViewStyle> | undefined;
+
+  /**
+   * A RefreshControl component, used to provide pull-to-refresh
+   * functionality for the ScrollView.
+   */
+  refreshControl?: React.ReactElement<RefreshControlProps> | undefined;
+
+  /**
+   * When set, causes the scroll view to stop at multiples of the value of `snapToInterval`.
+   * This can be used for paginating through children that have lengths smaller than the scroll view.
+   * Used in combination with `snapToAlignment` and `decelerationRate="fast"`. Overrides less
+   * configurable `pagingEnabled` prop.
+   */
+  snapToInterval?: number | undefined;
+
+  /**
+   * When set, causes the scroll view to stop at the defined offsets. This can be used for
+   * paginating through variously sized children that have lengths smaller than the scroll view.
+   * Typically used in combination with `decelerationRate="fast"`. Overrides less configurable
+   * `pagingEnabled` and `snapToInterval` props.
+   */
+  snapToOffsets?: number[] | undefined;
+
+  /**
+   * Use in conjunction with `snapToOffsets`. By default, the beginning of the list counts as a
+   * snap offset. Set `snapToStart` to false to disable this behavior and allow the list to scroll
+   * freely between its start and the first `snapToOffsets` offset. The default value is true.
+   */
+  snapToStart?: boolean | undefined;
+
+  /**
+   * Use in conjunction with `snapToOffsets`. By default, the end of the list counts as a snap
+   * offset. Set `snapToEnd` to false to disable this behavior and allow the list to scroll freely
+   * between its end and the last `snapToOffsets` offset. The default value is true.
+   */
+  snapToEnd?: boolean | undefined;
+
+  /**
+   * An array of child indices determining which children get docked to the
+   * top of the screen when scrolling. For example passing
+   * `stickyHeaderIndices={[0]}` will cause the first child to be fixed to the
+   * top of the scroll view. This property is not supported in conjunction
+   * with `horizontal={true}`.
+   */
+  stickyHeaderIndices?: number[] | undefined;
+
+  /**
+   * When true, the scroll view stops on the next index (in relation to scroll position at release)
+   * regardless of how fast the gesture is. This can be used for horizontal pagination when the page
+   * is less than the width of the ScrollView. The default value is false.
+   */
+  disableIntervalMomentum?: boolean | undefined;
+
+  /**
+   * When true, the default JS pan responder on the ScrollView is disabled, and full control over
+   * touches inside the ScrollView is left to its child components. This is particularly useful
+   * if `snapToInterval` is enabled, since it does not follow typical touch patterns. Do not use
+   * this on regular ScrollView use cases without `snapToInterval` as it may cause unexpected
+   * touches to occur while scrolling. The default value is false.
+   */
+  disableScrollViewPanResponder?: boolean | undefined;
+
+  /**
+   * A React Component that will be used to render sticky headers, should be used together with
+   * stickyHeaderIndices. You may need to set this component if your sticky header uses custom
+   * transforms, for example, when you want your list to have an animated and hidable header.
+   * If component have not been provided, the default ScrollViewStickyHeader component will be used.
+   */
+  StickyHeaderComponent?: React.ComponentType<any> | undefined;
+}
+
+declare class ScrollViewComponent extends React.Component<ScrollViewProps> {}
+export declare const ScrollViewBase: Constructor<ScrollResponderMixin> &
+  typeof ScrollViewComponent;
+export class ScrollView extends ScrollViewBase {
+  /**
+   * Scrolls to a given x, y offset, either immediately or with a smooth animation.
+   * Syntax:
+   *
+   * scrollTo(options: {x: number = 0; y: number = 0; animated: boolean = true})
+   *
+   * Note: The weird argument signature is due to the fact that, for historical reasons,
+   * the function also accepts separate arguments as an alternative to the options object.
+   * This is deprecated due to ambiguity (y before x), and SHOULD NOT BE USED.
+   */
+  scrollTo(
+    y?:
+      | number
+      | {
+          x?: number | undefined;
+          y?: number | undefined;
+          animated?: boolean | undefined;
+        },
+    deprecatedX?: number,
+    deprecatedAnimated?: boolean,
+  ): void;
+
+  /**
+   * A helper function that scrolls to the end of the scrollview;
+   * If this is a vertical ScrollView, it scrolls to the bottom.
+   * If this is a horizontal ScrollView scrolls to the right.
+   *
+   * The options object has an animated prop, that enables the scrolling animation or not.
+   * The animated prop defaults to true
+   */
+  scrollToEnd(options?: {animated?: boolean}): void;
+
+  /**
+   * Displays the scroll indicators momentarily.
+   */
+  flashScrollIndicators(): void;
+
+  /**
+   * Returns a reference to the underlying scroll responder, which supports
+   * operations like `scrollTo`. All ScrollView-like components should
+   * implement this method so that they can be composed while providing access
+   * to the underlying scroll responder's methods.
+   */
+  getScrollResponder(): ScrollResponderMixin;
+
+  getScrollableNode(): any;
+
+  // Undocumented
+  getInnerViewNode(): any;
+
+  /**
+   * @deprecated Use scrollTo instead
+   */
+  scrollWithoutAnimationTo?: ((y: number, x: number) => void) | undefined;
+
+  /**
+   * This function sends props straight to native. They will not participate in
+   * future diff process - this means that if you do not include them in the
+   * next render, they will remain active (see [Direct
+   * Manipulation](https://reactnative.dev/docs/direct-manipulation)).
+   */
+  setNativeProps(nativeProps: object): void;
+}
+
+export interface NativeScrollRectangle {
+  left: number;
+  top: number;
+  bottom: number;
+  right: number;
+}
+
+export interface NativeScrollPoint {
+  x: number;
+  y: number;
+}
+
+export interface NativeScrollVelocity {
+  x: number;
+  y: number;
+}
+
+export interface NativeScrollSize {
+  height: number;
+  width: number;
+}
+
+export interface NativeScrollEvent {
+  contentInset: NativeScrollRectangle;
+  contentOffset: NativeScrollPoint;
+  contentSize: NativeScrollSize;
+  layoutMeasurement: NativeScrollSize;
+  velocity?: NativeScrollVelocity | undefined;
+  zoomScale: number;
+  /**
+   * @platform ios
+   */
+  targetContentOffset?: NativeScrollPoint | undefined;
+}
diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js
index b268c65c2b5f..0c2ecf2f1684 100644
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -8,48 +8,49 @@
  * @flow strict-local
  */
 
-import AnimatedImplementation from '../../Animated/AnimatedImplementation';
-import Dimensions from '../../Utilities/Dimensions';
-import Platform from '../../Utilities/Platform';
-import * as React from 'react';
-import ReactNative from '../../Renderer/shims/ReactNative';
-require('../../Renderer/shims/ReactNative'); // Force side effects to prevent T55744311
-import ScrollViewStickyHeader from './ScrollViewStickyHeader';
-import StyleSheet from '../../StyleSheet/StyleSheet';
-import View from '../View/View';
-import UIManager from '../../ReactNative/UIManager';
-import Keyboard from '../Keyboard/Keyboard';
-import FrameRateLogger from '../../Interaction/FrameRateLogger';
-import TextInputState from '../TextInput/TextInputState';
-
-import dismissKeyboard from '../../Utilities/dismissKeyboard';
-import flattenStyle from '../../StyleSheet/flattenStyle';
-import invariant from 'invariant';
-import processDecelerationRate from './processDecelerationRate';
-import splitLayoutProps from '../../StyleSheet/splitLayoutProps';
-import setAndForwardRef from '../../Utilities/setAndForwardRef';
-
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {EdgeInsetsProp} from '../../StyleSheet/EdgeInsetsPropType';
 import type {PointProp} from '../../StyleSheet/PointPropType';
 import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {
+  LayoutEvent,
   PressEvent,
   ScrollEvent,
-  LayoutEvent,
 } from '../../Types/CoreEventTypes';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
+import type {KeyboardEvent, KeyboardMetrics} from '../Keyboard/Keyboard';
 import type {ViewProps} from '../View/ViewPropTypes';
-import ScrollViewContext, {HORIZONTAL, VERTICAL} from './ScrollViewContext';
 import type {Props as ScrollViewStickyHeaderProps} from './ScrollViewStickyHeader';
-import type {KeyboardEvent} from '../Keyboard/Keyboard';
-import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
 
-import Commands from './ScrollViewCommands';
+import AnimatedImplementation from '../../Animated/AnimatedImplementation';
+import FrameRateLogger from '../../Interaction/FrameRateLogger';
+import {findNodeHandle} from '../../ReactNative/RendererProxy';
+import UIManager from '../../ReactNative/UIManager';
+import flattenStyle from '../../StyleSheet/flattenStyle';
+import splitLayoutProps from '../../StyleSheet/splitLayoutProps';
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import Dimensions from '../../Utilities/Dimensions';
+import dismissKeyboard from '../../Utilities/dismissKeyboard';
+import Platform from '../../Utilities/Platform';
+import setAndForwardRef from '../../Utilities/setAndForwardRef';
+import Keyboard from '../Keyboard/Keyboard';
+import TextInputState from '../TextInput/TextInputState';
+import View from '../View/View';
 import AndroidHorizontalScrollContentViewNativeComponent from './AndroidHorizontalScrollContentViewNativeComponent';
 import AndroidHorizontalScrollViewNativeComponent from './AndroidHorizontalScrollViewNativeComponent';
+import processDecelerationRate from './processDecelerationRate';
 import ScrollContentViewNativeComponent from './ScrollContentViewNativeComponent';
+import Commands from './ScrollViewCommands';
+import ScrollViewContext, {HORIZONTAL, VERTICAL} from './ScrollViewContext';
 import ScrollViewNativeComponent from './ScrollViewNativeComponent';
+import ScrollViewStickyHeader from './ScrollViewStickyHeader';
+import invariant from 'invariant';
+import * as React from 'react';
+
+if (Platform.OS === 'ios') {
+  require('../../Renderer/shims/ReactNative'); // Force side effects to prevent T55744311
+}
 
 const {NativeHorizontalScrollViewTuple, NativeVerticalScrollViewTuple} =
   Platform.OS === 'android'
@@ -410,7 +411,7 @@ type AndroidProps = $ReadOnly<{|
    */
   persistentScrollbar?: ?boolean,
   /**
-   * Fades out the edges of the the scroll content.
+   * Fades out the edges of the scroll content.
    *
    * If the value is greater than 0, the fading edges will be set accordingly
    * to the current scroll direction and position,
@@ -731,7 +732,7 @@ class ScrollView extends React.Component<Props, State> {
     new Map();
   _headerLayoutYs: Map<string, number> = new Map();
 
-  _keyboardWillOpenTo: ?KeyboardEvent = null;
+  _keyboardMetrics: ?KeyboardMetrics = null;
   _additionalScrollOffset: number = 0;
   _isTouching: boolean = false;
   _lastMomentumScrollBeginTime: number = 0;
@@ -769,7 +770,7 @@ class ScrollView extends React.Component<Props, State> {
       );
     }
 
-    this._keyboardWillOpenTo = null;
+    this._keyboardMetrics = Keyboard.metrics();
     this._additionalScrollOffset = 0;
 
     this._subscriptionKeyboardWillShow = Keyboard.addListener(
@@ -825,7 +826,7 @@ class ScrollView extends React.Component<Props, State> {
     }
   }
 
-  _setNativeRef = setAndForwardRef({
+  _setNativeRef: $FlowFixMe = setAndForwardRef({
     getForwardedRef: () => this.props.scrollViewRef,
     setLocalRef: ref => {
       this._scrollViewRef = ref;
@@ -867,11 +868,11 @@ class ScrollView extends React.Component<Props, State> {
   };
 
   getScrollableNode: () => ?number = () => {
-    return ReactNative.findNodeHandle(this._scrollViewRef);
+    return findNodeHandle(this._scrollViewRef);
   };
 
   getInnerViewNode: () => ?number = () => {
-    return ReactNative.findNodeHandle(this._innerViewRef);
+    return findNodeHandle(this._innerViewRef);
   };
 
   getInnerViewRef: () => ?React.ElementRef<typeof View> = () => {
@@ -996,7 +997,7 @@ class ScrollView extends React.Component<Props, State> {
     if (typeof nodeHandle === 'number') {
       UIManager.measureLayout(
         nodeHandle,
-        ReactNative.findNodeHandle(this),
+        findNodeHandle(this),
         // $FlowFixMe[method-unbinding] added when improving typing for this parameters
         this._textInputFocusError,
         this._inputMeasureAndScrollToKeyboard,
@@ -1075,8 +1076,8 @@ class ScrollView extends React.Component<Props, State> {
     let keyboardScreenY = Dimensions.get('window').height;
 
     const scrollTextInputIntoVisibleRect = () => {
-      if (this._keyboardWillOpenTo != null) {
-        keyboardScreenY = this._keyboardWillOpenTo.endCoordinates.screenY;
+      if (this._keyboardMetrics != null) {
+        keyboardScreenY = this._keyboardMetrics.screenY;
       }
       let scrollOffsetY =
         top - keyboardScreenY + height + this._additionalScrollOffset;
@@ -1094,8 +1095,8 @@ class ScrollView extends React.Component<Props, State> {
       this._preventNegativeScrollOffset = false;
     };
 
-    if (this._keyboardWillOpenTo == null) {
-      // `_keyboardWillOpenTo` is set inside `scrollResponderKeyboardWillShow` which
+    if (this._keyboardMetrics == null) {
+      // `_keyboardMetrics` is set inside `scrollResponderKeyboardWillShow` which
       // is not guaranteed to be called before `_inputMeasureAndScrollToKeyboard` but native has already scheduled it.
       // In case it was not called before `_inputMeasureAndScrollToKeyboard`, we postpone scrolling to
       // text input.
@@ -1107,7 +1108,7 @@ class ScrollView extends React.Component<Props, State> {
     }
   };
 
-  _getKeyForIndex(index: $FlowFixMe, childArray: $FlowFixMe) {
+  _getKeyForIndex(index: $FlowFixMe, childArray: $FlowFixMe): $FlowFixMe {
     const child = childArray[index];
     return child && child.key;
   }
@@ -1204,7 +1205,7 @@ class ScrollView extends React.Component<Props, State> {
   _scrollViewRef: ?React.ElementRef<HostComponent<mixed>> = null;
 
   _innerViewRef: ?React.ElementRef<typeof View> = null;
-  _setInnerViewRef = setAndForwardRef({
+  _setInnerViewRef: $FlowFixMe = setAndForwardRef({
     getForwardedRef: () => this.props.innerViewRef,
     setLocalRef: ref => {
       this._innerViewRef = ref;
@@ -1243,32 +1244,28 @@ class ScrollView extends React.Component<Props, State> {
   scrollResponderKeyboardWillShow: (e: KeyboardEvent) => void = (
     e: KeyboardEvent,
   ) => {
-    this._keyboardWillOpenTo = e;
+    this._keyboardMetrics = e.endCoordinates;
     this.props.onKeyboardWillShow && this.props.onKeyboardWillShow(e);
   };
 
   scrollResponderKeyboardWillHide: (e: KeyboardEvent) => void = (
     e: KeyboardEvent,
   ) => {
-    this._keyboardWillOpenTo = null;
+    this._keyboardMetrics = null;
     this.props.onKeyboardWillHide && this.props.onKeyboardWillHide(e);
   };
 
   scrollResponderKeyboardDidShow: (e: KeyboardEvent) => void = (
     e: KeyboardEvent,
   ) => {
-    // TODO(7693961): The event for DidShow is not available on iOS yet.
-    // Use the one from WillShow and do not assign.
-    if (e) {
-      this._keyboardWillOpenTo = e;
-    }
+    this._keyboardMetrics = e.endCoordinates;
     this.props.onKeyboardDidShow && this.props.onKeyboardDidShow(e);
   };
 
   scrollResponderKeyboardDidHide: (e: KeyboardEvent) => void = (
     e: KeyboardEvent,
   ) => {
-    this._keyboardWillOpenTo = null;
+    this._keyboardMetrics = null;
     this.props.onKeyboardDidHide && this.props.onKeyboardDidHide(e);
   };
 
@@ -1385,6 +1382,7 @@ class ScrollView extends React.Component<Props, State> {
     // if another touch occurs outside of it
     const currentlyFocusedTextInput = TextInputState.currentlyFocusedInput();
     if (
+      currentlyFocusedTextInput != null &&
       this.props.keyboardShouldPersistTaps !== true &&
       this.props.keyboardShouldPersistTaps !== 'always' &&
       this._keyboardIsDismissible() &&
@@ -1460,7 +1458,6 @@ class ScrollView extends React.Component<Props, State> {
     }
 
     const currentlyFocusedInput = TextInputState.currentlyFocusedInput();
-
     if (
       this.props.keyboardShouldPersistTaps === 'handled' &&
       this._keyboardIsDismissible() &&
@@ -1514,6 +1511,11 @@ class ScrollView extends React.Component<Props, State> {
       return false;
     }
 
+    // Let presses through if the soft keyboard is detached from the viewport
+    if (this._softKeyboardIsDetached()) {
+      return false;
+    }
+
     if (
       keyboardNeverPersistTaps &&
       this._keyboardIsDismissible() &&
@@ -1544,14 +1546,28 @@ class ScrollView extends React.Component<Props, State> {
 
     // Even if an input is focused, we may not have a keyboard to dismiss. E.g
     // when using a physical keyboard. Ensure we have an event for an opened
-    // keyboard, except on Android where setting windowSoftInputMode to
-    // adjustNone leads to missing keyboard events.
+    // keyboard.
     const softKeyboardMayBeOpen =
-      this._keyboardWillOpenTo != null || Platform.OS === 'android';
+      this._keyboardMetrics != null || this._keyboardEventsAreUnreliable();
 
     return hasFocusedTextInput && softKeyboardMayBeOpen;
   };
 
+  /**
+   * Whether an open soft keyboard is present which does not overlap the
+   * viewport. E.g. for a VR soft-keyboard which is detached from the app
+   * viewport.
+   */
+  _softKeyboardIsDetached: () => boolean = () => {
+    return this._keyboardMetrics != null && this._keyboardMetrics.height === 0;
+  };
+
+  _keyboardEventsAreUnreliable: () => boolean = () => {
+    // Android versions prior to API 30 rely on observing layout changes when
+    // `android:windowSoftInputMode` is set to `adjustResize` or `adjustPan`.
+    return Platform.OS === 'android' && Platform.Version < 30;
+  };
+
   /**
    * Invoke this from an `onTouchEnd` event.
    *
@@ -1560,6 +1576,25 @@ class ScrollView extends React.Component<Props, State> {
   _handleTouchEnd: (e: PressEvent) => void = (e: PressEvent) => {
     const nativeEvent = e.nativeEvent;
     this._isTouching = nativeEvent.touches.length !== 0;
+
+    const {keyboardShouldPersistTaps} = this.props;
+    const keyboardNeverPersistsTaps =
+      !keyboardShouldPersistTaps || keyboardShouldPersistTaps === 'never';
+
+    // Dismiss the keyboard now if we didn't become responder in capture phase
+    // to eat presses, but still want to dismiss on interaction.
+    // Don't do anything if the target of the touch event is the current input.
+    const currentlyFocusedTextInput = TextInputState.currentlyFocusedInput();
+    if (
+      currentlyFocusedTextInput != null &&
+      e.target !== currentlyFocusedTextInput &&
+      this._softKeyboardIsDetached() &&
+      this._keyboardIsDismissible() &&
+      keyboardNeverPersistsTaps
+    ) {
+      TextInputState.blurTextInput(currentlyFocusedTextInput);
+    }
+
     this.props.onTouchEnd && this.props.onTouchEnd(e);
   };
 
diff --git a/Libraries/Components/ScrollView/ScrollViewCommands.js b/Libraries/Components/ScrollView/ScrollViewCommands.js
index a18c4b089216..6ff89b42017f 100644
--- a/Libraries/Components/ScrollView/ScrollViewCommands.js
+++ b/Libraries/Components/ScrollView/ScrollViewCommands.js
@@ -8,11 +8,11 @@
  * @flow strict-local
  */
 
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import type {Double} from '../../Types/CodegenTypes';
+
 import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
 import * as React from 'react';
-import type {Double} from 'react-native/Libraries/Types/CodegenTypes';
-
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 
 type ScrollViewNativeComponentType = HostComponent<mixed>;
 interface NativeCommands {
diff --git a/Libraries/Components/ScrollView/ScrollViewNativeComponent.js b/Libraries/Components/ScrollView/ScrollViewNativeComponent.js
index 675ee113fd79..efe08ab4ce08 100644
--- a/Libraries/Components/ScrollView/ScrollViewNativeComponent.js
+++ b/Libraries/Components/ScrollView/ScrollViewNativeComponent.js
@@ -8,11 +8,12 @@
  * @format
  */
 
-import type {ScrollViewNativeProps as Props} from './ScrollViewNativeComponentType';
 import type {
   HostComponent,
   PartialViewConfig,
 } from '../../Renderer/shims/ReactNativeTypes';
+import type {ScrollViewNativeProps as Props} from './ScrollViewNativeComponentType';
+
 import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
 import {ConditionallyIgnoredEventHandlers} from '../../NativeComponent/ViewConfigIgnore';
 import Platform from '../../Utilities/Platform';
diff --git a/Libraries/Components/ScrollView/ScrollViewNativeComponentType.js b/Libraries/Components/ScrollView/ScrollViewNativeComponentType.js
index 956614947220..b1b2df5d84e3 100644
--- a/Libraries/Components/ScrollView/ScrollViewNativeComponentType.js
+++ b/Libraries/Components/ScrollView/ScrollViewNativeComponentType.js
@@ -10,11 +10,11 @@
 
 'use strict';
 
-import type {ViewProps} from '../View/ViewPropTypes';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {EdgeInsetsProp} from '../../StyleSheet/EdgeInsetsPropType';
-import type {ScrollEvent} from '../../Types/CoreEventTypes';
 import type {PointProp} from '../../StyleSheet/PointPropType';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
+import type {ScrollEvent} from '../../Types/CoreEventTypes';
+import type {ViewProps} from '../View/ViewPropTypes';
 
 export type ScrollViewNativeProps = $ReadOnly<{
   ...ViewProps,
diff --git a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
index f6ca3ac8e1e6..6b42d2e63dad 100644
--- a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
+++ b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
@@ -4,29 +4,24 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 
-import AnimatedImplementation from '../../Animated/AnimatedImplementation';
-import AnimatedAddition from '../../Animated/nodes/AnimatedAddition';
-import AnimatedDiffClamp from '../../Animated/nodes/AnimatedDiffClamp';
-import AnimatedNode from '../../Animated/nodes/AnimatedNode';
+import type {LayoutEvent} from '../../Types/CoreEventTypes';
 
-import * as React from 'react';
+import Animated from '../../Animated/Animated';
 import StyleSheet from '../../StyleSheet/StyleSheet';
-import View from '../View/View';
 import Platform from '../../Utilities/Platform';
-
-import type {LayoutEvent} from '../../Types/CoreEventTypes';
-
-const AnimatedView = AnimatedImplementation.createAnimatedComponent(View);
+import useMergeRefs from '../../Utilities/useMergeRefs';
+import * as React from 'react';
+import {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 
 export type Props = $ReadOnly<{
-  children?: React.Element<any>,
+  children?: React.Element<$FlowFixMe>,
   nextHeaderLayoutY: ?number,
   onLayout: (event: LayoutEvent) => void,
-  scrollAnimatedValue: AnimatedImplementation.Value,
+  scrollAnimatedValue: Animated.Value,
   // Will cause sticky headers to stick at the bottom of the ScrollView instead
   // of the top.
   inverted: ?boolean,
@@ -36,291 +31,270 @@ export type Props = $ReadOnly<{
   hiddenOnScroll?: ?boolean,
 }>;
 
-type State = {
-  measured: boolean,
-  layoutY: number,
-  layoutHeight: number,
-  nextHeaderLayoutY: ?number,
-  translateY: ?number,
+type Instance = {
+  ...React.ElementRef<typeof Animated.View>,
+  setNextHeaderY: number => void,
   ...
 };
 
-class ScrollViewStickyHeader extends React.Component<Props, State> {
-  state: State = {
-    measured: false,
-    layoutY: 0,
-    layoutHeight: 0,
-    nextHeaderLayoutY: this.props.nextHeaderLayoutY,
-    translateY: null,
-  };
-
-  _translateY: ?AnimatedNode = null;
-  _shouldRecreateTranslateY: boolean = true;
-  _haveReceivedInitialZeroTranslateY: boolean = true;
-  _ref: any; // TODO T53738161: flow type this, and the whole file
+const ScrollViewStickyHeaderWithForwardedRef: React.AbstractComponent<
+  Props,
+  Instance,
+> = React.forwardRef(function ScrollViewStickyHeader(props, forwardedRef) {
+  const {
+    inverted,
+    scrollViewHeight,
+    hiddenOnScroll,
+    scrollAnimatedValue,
+    nextHeaderLayoutY: _nextHeaderLayoutY,
+  } = props;
 
-  // Fabric-only:
-  _timer: ?TimeoutID;
-  _animatedValueListenerId: string;
-  _animatedValueListener: (valueObject: $ReadOnly<{|value: number|}>) => void;
-  _debounceTimeout: number = Platform.OS === 'android' ? 15 : 64;
+  const [measured, setMeasured] = useState<boolean>(false);
+  const [layoutY, setLayoutY] = useState<number>(0);
+  const [layoutHeight, setLayoutHeight] = useState<number>(0);
+  const [translateY, setTranslateY] = useState<?number>(null);
+  const [nextHeaderLayoutY, setNextHeaderLayoutY] =
+    useState<?number>(_nextHeaderLayoutY);
+  const [isFabric, setIsFabric] = useState<boolean>(false);
 
-  setNextHeaderY: (y: number) => void = (y: number): void => {
-    this._shouldRecreateTranslateY = true;
-    this.setState({nextHeaderLayoutY: y});
+  const callbackRef = (ref: Instance | null): void => {
+    if (ref == null) {
+      return;
+    }
+    ref.setNextHeaderY = value => {
+      setNextHeaderLayoutY(value);
+    };
+    // Avoid dot notation because at Meta, private properties are obfuscated.
+    // $FlowFixMe[prop-missing]
+    const _internalInstanceHandler = ref['_internalInstanceHandle']; // eslint-disable-line dot-notation
+    setIsFabric(Boolean(_internalInstanceHandler?.stateNode?.canonical));
   };
+  const ref: (React.ElementRef<typeof Animated.View> | null) => void =
+    // $FlowFixMe[incompatible-type] - Ref is mutated by `callbackRef`.
+    useMergeRefs<Instance | null>(callbackRef, forwardedRef);
 
-  componentWillUnmount() {
-    if (this._translateY != null && this._animatedValueListenerId != null) {
-      this._translateY.removeListener(this._animatedValueListenerId);
-    }
-    if (this._timer) {
-      clearTimeout(this._timer);
-    }
-  }
+  const offset = useMemo(
+    () =>
+      hiddenOnScroll === true
+        ? Animated.diffClamp(
+            scrollAnimatedValue
+              .interpolate({
+                extrapolateLeft: 'clamp',
+                inputRange: [layoutY, layoutY + 1],
+                outputRange: ([0, 1]: Array<number>),
+              })
+              .interpolate({
+                inputRange: [0, 1],
+                outputRange: ([0, -1]: Array<number>),
+              }),
+            -layoutHeight,
+            0,
+          )
+        : null,
+    [scrollAnimatedValue, layoutHeight, layoutY, hiddenOnScroll],
+  );
 
-  UNSAFE_componentWillReceiveProps(nextProps: Props) {
-    if (
-      nextProps.scrollViewHeight !== this.props.scrollViewHeight ||
-      nextProps.scrollAnimatedValue !== this.props.scrollAnimatedValue ||
-      nextProps.inverted !== this.props.inverted
-    ) {
-      this._shouldRecreateTranslateY = true;
-    }
-  }
+  const [animatedTranslateY, setAnimatedTranslateY] = useState<Animated.Node>(
+    () => {
+      const inputRange: Array<number> = [-1, 0];
+      const outputRange: Array<number> = [0, 0];
+      const initialTranslateY = scrollAnimatedValue.interpolate({
+        inputRange,
+        outputRange,
+      });
 
-  updateTranslateListener(
-    translateY: AnimatedNode,
-    isFabric: boolean,
-    offset: AnimatedDiffClamp | null,
-  ) {
-    if (this._translateY != null && this._animatedValueListenerId != null) {
-      this._translateY.removeListener(this._animatedValueListenerId);
-    }
-    offset
-      ? (this._translateY = new AnimatedAddition(translateY, offset))
-      : (this._translateY = translateY);
+      if (offset != null) {
+        return Animated.add(initialTranslateY, offset);
+      }
+      return initialTranslateY;
+    },
+  );
 
-    this._shouldRecreateTranslateY = false;
+  const _haveReceivedInitialZeroTranslateY = useRef<boolean>(true);
+  const _timer = useRef<?TimeoutID>(null);
 
-    if (!isFabric) {
-      return;
+  useEffect(() => {
+    if (translateY !== 0 && translateY != null) {
+      _haveReceivedInitialZeroTranslateY.current = false;
     }
+  }, [translateY]);
 
-    if (!this._animatedValueListener) {
-      // This is called whenever the (Interpolated) Animated Value
-      // updates, which is several times per frame during scrolling.
-      // To ensure that the Fabric ShadowTree has the most recent
-      // translate style of this node, we debounce the value and then
-      // pass it through to the underlying node during render.
-      // This is:
-      // 1. Only an issue in Fabric.
-      // 2. Worse in Android than iOS. In Android, but not iOS, you
-      //    can touch and move your finger slightly and still trigger
-      //    a "tap" event. In iOS, moving will cancel the tap in
-      //    both Fabric and non-Fabric. On Android when you move
-      //    your finger, the hit-detection moves from the Android
-      //    platform to JS, so we need the ShadowTree to have knowledge
-      //    of the current position.
-      this._animatedValueListener = ({value}) => {
-        // When the AnimatedInterpolation is recreated, it always initializes
-        // to a value of zero and emits a value change of 0 to its listeners.
-        if (value === 0 && !this._haveReceivedInitialZeroTranslateY) {
-          this._haveReceivedInitialZeroTranslateY = true;
-          return;
-        }
-        if (this._timer) {
-          clearTimeout(this._timer);
+  // This is called whenever the (Interpolated) Animated Value
+  // updates, which is several times per frame during scrolling.
+  // To ensure that the Fabric ShadowTree has the most recent
+  // translate style of this node, we debounce the value and then
+  // pass it through to the underlying node during render.
+  // This is:
+  // 1. Only an issue in Fabric.
+  // 2. Worse in Android than iOS. In Android, but not iOS, you
+  //    can touch and move your finger slightly and still trigger
+  //    a "tap" event. In iOS, moving will cancel the tap in
+  //    both Fabric and non-Fabric. On Android when you move
+  //    your finger, the hit-detection moves from the Android
+  //    platform to JS, so we need the ShadowTree to have knowledge
+  //    of the current position.
+  const animatedValueListener = useCallback(
+    ({value}) => {
+      const _debounceTimeout: number = Platform.OS === 'android' ? 15 : 64;
+      // When the AnimatedInterpolation is recreated, it always initializes
+      // to a value of zero and emits a value change of 0 to its listeners.
+      if (value === 0 && !_haveReceivedInitialZeroTranslateY.current) {
+        _haveReceivedInitialZeroTranslateY.current = true;
+        return;
+      }
+      if (_timer.current != null) {
+        clearTimeout(_timer.current);
+      }
+      _timer.current = setTimeout(() => {
+        if (value !== translateY) {
+          setTranslateY(value);
         }
-        this._timer = setTimeout(() => {
-          if (value !== this.state.translateY) {
-            this.setState({
-              translateY: value,
-            });
-          }
-        }, this._debounceTimeout);
-      };
-    }
-    if (this.state.translateY !== 0 && this.state.translateY != null) {
-      this._haveReceivedInitialZeroTranslateY = false;
-    }
-    this._animatedValueListenerId = translateY.addListener(
-      this._animatedValueListener,
-    );
-  }
+      }, _debounceTimeout);
+    },
+    [translateY],
+  );
 
-  _onLayout = (event: any) => {
-    const layoutY = event.nativeEvent.layout.y;
-    const layoutHeight = event.nativeEvent.layout.height;
-    const measured = true;
+  useEffect(() => {
+    const inputRange: Array<number> = [-1, 0];
+    const outputRange: Array<number> = [0, 0];
 
-    if (
-      layoutY !== this.state.layoutY ||
-      layoutHeight !== this.state.layoutHeight ||
-      measured !== this.state.measured
-    ) {
-      this._shouldRecreateTranslateY = true;
+    if (measured) {
+      if (inverted === true) {
+        // The interpolation looks like:
+        // - Negative scroll: no translation
+        // - `stickStartPoint` is the point at which the header will start sticking.
+        //   It is calculated using the ScrollView viewport height so it is a the bottom.
+        // - Headers that are in the initial viewport will never stick, `stickStartPoint`
+        //   will be negative.
+        // - From 0 to `stickStartPoint` no translation. This will cause the header
+        //   to scroll normally until it reaches the top of the scroll view.
+        // - From `stickStartPoint` to when the next header y hits the bottom edge of the header: translate
+        //   equally to scroll. This will cause the header to stay at the top of the scroll view.
+        // - Past the collision with the next header y: no more translation. This will cause the
+        //   header to continue scrolling up and make room for the next sticky header.
+        //   In the case that there is no next header just translate equally to
+        //   scroll indefinitely.
+        if (scrollViewHeight != null) {
+          const stickStartPoint = layoutY + layoutHeight - scrollViewHeight;
+          if (stickStartPoint > 0) {
+            inputRange.push(stickStartPoint);
+            outputRange.push(0);
+            inputRange.push(stickStartPoint + 1);
+            outputRange.push(1);
+            // If the next sticky header has not loaded yet (probably windowing) or is the last
+            // we can just keep it sticked forever.
+            const collisionPoint =
+              (nextHeaderLayoutY || 0) - layoutHeight - scrollViewHeight;
+            if (collisionPoint > stickStartPoint) {
+              inputRange.push(collisionPoint, collisionPoint + 1);
+              outputRange.push(
+                collisionPoint - stickStartPoint,
+                collisionPoint - stickStartPoint,
+              );
+            }
+          }
+        }
+      } else {
+        // The interpolation looks like:
+        // - Negative scroll: no translation
+        // - From 0 to the y of the header: no translation. This will cause the header
+        //   to scroll normally until it reaches the top of the scroll view.
+        // - From header y to when the next header y hits the bottom edge of the header: translate
+        //   equally to scroll. This will cause the header to stay at the top of the scroll view.
+        // - Past the collision with the next header y: no more translation. This will cause the
+        //   header to continue scrolling up and make room for the next sticky header.
+        //   In the case that there is no next header just translate equally to
+        //   scroll indefinitely.
+        inputRange.push(layoutY);
+        outputRange.push(0);
+        // If the next sticky header has not loaded yet (probably windowing) or is the last
+        // we can just keep it sticked forever.
+        const collisionPoint = (nextHeaderLayoutY || 0) - layoutHeight;
+        if (collisionPoint >= layoutY) {
+          inputRange.push(collisionPoint, collisionPoint + 1);
+          outputRange.push(collisionPoint - layoutY, collisionPoint - layoutY);
+        } else {
+          inputRange.push(layoutY + 1);
+          outputRange.push(1);
+        }
+      }
     }
 
-    this.setState({
-      measured,
-      layoutY,
-      layoutHeight,
+    let newAnimatedTranslateY: Animated.Node = scrollAnimatedValue.interpolate({
+      inputRange,
+      outputRange,
     });
 
-    this.props.onLayout(event);
-    const child = React.Children.only(this.props.children);
-    if (child.props.onCellLayout) {
-      child.props.onCellLayout(event, child.props.cellKey, child.props.index);
-    } else if (child.props.onLayout) {
-      child.props.onLayout(event);
+    if (offset != null) {
+      newAnimatedTranslateY = Animated.add(newAnimatedTranslateY, offset);
     }
-  };
 
-  /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
-   * LTI update could not be added via codemod */
-  _setComponentRef = ref => {
-    this._ref = ref;
-  };
+    // add the event listener
+    let animatedListenerId;
+    if (isFabric) {
+      animatedListenerId = newAnimatedTranslateY.addListener(
+        animatedValueListener,
+      );
+    }
 
-  render(): React.Node {
-    // Fabric Detection
-    const isFabric = !!(
-      // An internal transform mangles variables with leading "_" as private.
-      // eslint-disable-next-line dot-notation
-      (this._ref && this._ref['_internalInstanceHandle']?.stateNode?.canonical)
-    );
-    // Initially and in the case of updated props or layout, we
-    // recreate this interpolated value. Otherwise, we do not recreate
-    // when there are state changes.
-    if (this._shouldRecreateTranslateY) {
-      const {inverted, scrollViewHeight} = this.props;
-      const {measured, layoutHeight, layoutY, nextHeaderLayoutY} = this.state;
-      const inputRange: Array<number> = [-1, 0];
-      const outputRange: Array<number> = [0, 0];
+    setAnimatedTranslateY(newAnimatedTranslateY);
 
-      if (measured) {
-        if (inverted) {
-          // The interpolation looks like:
-          // - Negative scroll: no translation
-          // - `stickStartPoint` is the point at which the header will start sticking.
-          //   It is calculated using the ScrollView viewport height so it is a the bottom.
-          // - Headers that are in the initial viewport will never stick, `stickStartPoint`
-          //   will be negative.
-          // - From 0 to `stickStartPoint` no translation. This will cause the header
-          //   to scroll normally until it reaches the top of the scroll view.
-          // - From `stickStartPoint` to when the next header y hits the bottom edge of the header: translate
-          //   equally to scroll. This will cause the header to stay at the top of the scroll view.
-          // - Past the collision with the next header y: no more translation. This will cause the
-          //   header to continue scrolling up and make room for the next sticky header.
-          //   In the case that there is no next header just translate equally to
-          //   scroll indefinitely.
-          if (scrollViewHeight != null) {
-            const stickStartPoint = layoutY + layoutHeight - scrollViewHeight;
-            if (stickStartPoint > 0) {
-              inputRange.push(stickStartPoint);
-              outputRange.push(0);
-              inputRange.push(stickStartPoint + 1);
-              outputRange.push(1);
-              // If the next sticky header has not loaded yet (probably windowing) or is the last
-              // we can just keep it sticked forever.
-              const collisionPoint =
-                (nextHeaderLayoutY || 0) - layoutHeight - scrollViewHeight;
-              if (collisionPoint > stickStartPoint) {
-                inputRange.push(collisionPoint, collisionPoint + 1);
-                outputRange.push(
-                  collisionPoint - stickStartPoint,
-                  collisionPoint - stickStartPoint,
-                );
-              }
-            }
-          }
-        } else {
-          // The interpolation looks like:
-          // - Negative scroll: no translation
-          // - From 0 to the y of the header: no translation. This will cause the header
-          //   to scroll normally until it reaches the top of the scroll view.
-          // - From header y to when the next header y hits the bottom edge of the header: translate
-          //   equally to scroll. This will cause the header to stay at the top of the scroll view.
-          // - Past the collision with the next header y: no more translation. This will cause the
-          //   header to continue scrolling up and make room for the next sticky header.
-          //   In the case that there is no next header just translate equally to
-          //   scroll indefinitely.
-          inputRange.push(layoutY);
-          outputRange.push(0);
-          // If the next sticky header has not loaded yet (probably windowing) or is the last
-          // we can just keep it sticked forever.
-          const collisionPoint = (nextHeaderLayoutY || 0) - layoutHeight;
-          if (collisionPoint >= layoutY) {
-            inputRange.push(collisionPoint, collisionPoint + 1);
-            outputRange.push(
-              collisionPoint - layoutY,
-              collisionPoint - layoutY,
-            );
-          } else {
-            inputRange.push(layoutY + 1);
-            outputRange.push(1);
-          }
-        }
+    // clean up the event listener and timer
+    return () => {
+      if (animatedListenerId) {
+        newAnimatedTranslateY.removeListener(animatedListenerId);
+      }
+      if (_timer.current != null) {
+        clearTimeout(_timer.current);
       }
+    };
+  }, [nextHeaderLayoutY, measured, layoutHeight, layoutY, scrollViewHeight, scrollAnimatedValue, inverted, offset, animatedValueListener, isFabric]);
 
-      this.updateTranslateListener(
-        this.props.scrollAnimatedValue.interpolate({
-          inputRange,
-          outputRange,
-        }),
-        isFabric,
-        this.props.hiddenOnScroll
-          ? new AnimatedDiffClamp(
-              this.props.scrollAnimatedValue
-                .interpolate({
-                  extrapolateLeft: 'clamp',
-                  inputRange: [layoutY, layoutY + 1],
-                  outputRange: [0, 1],
-                })
-                .interpolate({
-                  inputRange: [0, 1],
-                  outputRange: [0, -1],
-                }),
-              -this.state.layoutHeight,
-              0,
-            )
-          : null,
-      );
+  const _onLayout = (event: LayoutEvent) => {
+    setLayoutY(event.nativeEvent.layout.y);
+    setLayoutHeight(event.nativeEvent.layout.height);
+    setMeasured(true);
+
+    props.onLayout(event);
+    const child = React.Children.only(props.children);
+    if (child.props.onLayout) {
+      child.props.onLayout(event);
     }
+  };
 
-    const child = React.Children.only(this.props.children);
+  const child = React.Children.only(props.children);
 
-    // TODO T68319535: remove this if NativeAnimated is rewritten for Fabric
-    const passthroughAnimatedPropExplicitValues =
-      isFabric && this.state.translateY != null
-        ? {
-            style: {transform: [{translateY: this.state.translateY}]},
-          }
-        : null;
+  // TODO T68319535: remove this if NativeAnimated is rewritten for Fabric
+  const passthroughAnimatedPropExplicitValues =
+    isFabric && translateY != null
+      ? {
+          style: {transform: [{translateY: translateY}]},
+        }
+      : null;
 
-    return (
-      <AnimatedView
-        collapsable={false}
-        nativeID={this.props.nativeID}
-        onLayout={this._onLayout}
-        ref={this._setComponentRef}
-        style={[
-          child.props.style,
-          styles.header,
-          {transform: [{translateY: this._translateY}]},
-        ]}
-        passthroughAnimatedPropExplicitValues={
-          passthroughAnimatedPropExplicitValues
-        }>
-        {React.cloneElement(child, {
-          style: styles.fill, // We transfer the child style to the wrapper.
-          onLayout: undefined, // we call this manually through our this._onLayout
-        })}
-      </AnimatedView>
-    );
-  }
-}
+  return (
+    /* $FlowFixMe[prop-missing] passthroughAnimatedPropExplicitValues isn't properly
+       included in the Animated.View flow type. */
+    <Animated.View
+      collapsable={false}
+      nativeID={props.nativeID}
+      onLayout={_onLayout}
+      ref={ref}
+      style={[
+        child.props.style,
+        styles.header,
+        {transform: [{translateY: animatedTranslateY}]},
+      ]}
+      passthroughAnimatedPropExplicitValues={
+        passthroughAnimatedPropExplicitValues
+      }>
+      {React.cloneElement(child, {
+        style: styles.fill, // We transfer the child style to the wrapper.
+        onLayout: undefined, // we call this manually through our this._onLayout
+      })}
+    </Animated.View>
+  );
+});
 
 const styles = StyleSheet.create({
   header: {
@@ -332,4 +306,4 @@ const styles = StyleSheet.create({
   },
 });
 
-module.exports = ScrollViewStickyHeader;
+export default ScrollViewStickyHeaderWithForwardedRef;
diff --git a/Libraries/Components/ScrollView/__tests__/ScrollView-test.js b/Libraries/Components/ScrollView/__tests__/ScrollView-test.js
index 656017185dde..6081d8db9c19 100644
--- a/Libraries/Components/ScrollView/__tests__/ScrollView-test.js
+++ b/Libraries/Components/ScrollView/__tests__/ScrollView-test.js
@@ -4,19 +4,19 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow-strict
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
-const ScrollView = require('../ScrollView');
+const Text = require('../../../Text/Text');
 const ReactNativeTestTools = require('../../../Utilities/ReactNativeTestTools');
-const ReactTestRenderer = require('react-test-renderer');
 const View = require('../../View/View');
-const Text = require('../../../Text/Text');
+const ScrollView = require('../ScrollView');
+const React = require('react');
+const ReactTestRenderer = require('react-test-renderer');
 
 describe('<ScrollView />', () => {
   it('should render as expected', () => {
diff --git a/Libraries/Components/Slider/Slider.d.ts b/Libraries/Components/Slider/Slider.d.ts
new file mode 100644
index 000000000000..33f26d069410
--- /dev/null
+++ b/Libraries/Components/Slider/Slider.d.ts
@@ -0,0 +1,132 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {ImageURISource} from '../../Image/ImageSource';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
+import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
+import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
+import {ViewProps} from '../View/ViewPropTypes';
+
+export interface SliderPropsAndroid extends ViewProps {
+  /**
+   * Color of the foreground switch grip.
+   */
+  thumbTintColor?: ColorValue | undefined;
+}
+
+export interface SliderPropsIOS extends ViewProps {
+  /**
+   * Assigns a maximum track image. Only static images are supported.
+   * The leftmost pixel of the image will be stretched to fill the track.
+   */
+  maximumTrackImage?: ImageURISource | undefined;
+
+  /**
+   * Assigns a minimum track image. Only static images are supported.
+   * The rightmost pixel of the image will be stretched to fill the track.
+   */
+  minimumTrackImage?: ImageURISource | undefined;
+
+  /**
+   * Sets an image for the thumb. Only static images are supported.
+   */
+  thumbImage?: ImageURISource | undefined;
+
+  /**
+   * Assigns a single image for the track. Only static images
+   * are supported. The center pixel of the image will be stretched
+   * to fill the track.
+   */
+  trackImage?: ImageURISource | undefined;
+}
+
+export interface SliderProps extends SliderPropsIOS, SliderPropsAndroid {
+  /**
+   * If true the user won't be able to move the slider.
+   * Default value is false.
+   */
+  disabled?: boolean | undefined;
+
+  /**
+   * The color used for the track to the right of the button.
+   * Overrides the default blue gradient image.
+   */
+  maximumTrackTintColor?: ColorValue | undefined;
+
+  /**
+   * Initial maximum value of the slider. Default value is 1.
+   */
+  maximumValue?: number | undefined;
+
+  /**
+   * The color used for the track to the left of the button.
+   * Overrides the default blue gradient image.
+   */
+  minimumTrackTintColor?: ColorValue | undefined;
+
+  /**
+   * Initial minimum value of the slider. Default value is 0.
+   */
+  minimumValue?: number | undefined;
+
+  /**
+   * Callback called when the user finishes changing the value (e.g. when the slider is released).
+   */
+  onSlidingComplete?: ((value: number) => void) | undefined;
+
+  /**
+   * Callback continuously called while the user is dragging the slider.
+   */
+  onValueChange?: ((value: number) => void) | undefined;
+
+  /**
+   * Step value of the slider. The value should be between 0 and (maximumValue - minimumValue). Default value is 0.
+   */
+  step?: number | undefined;
+
+  /**
+   * Used to style and layout the Slider. See StyleSheet.js for more info.
+   */
+  style?: StyleProp<ViewStyle> | undefined;
+
+  /**
+   * Used to locate this view in UI automation tests.
+   */
+  testID?: string | undefined;
+
+  /**
+   * Initial value of the slider. The value should be between minimumValue
+   * and maximumValue, which default to 0 and 1 respectively.
+   * Default value is 0.
+   * This is not a controlled component, you don't need to update
+   * the value during dragging.
+   */
+  value?: number | undefined;
+}
+
+/**
+ * A component used to select a single value from a range of values.
+ */
+declare class SliderComponent extends React.Component<SliderProps> {}
+declare const SliderBase: Constructor<NativeMethods> & typeof SliderComponent;
+/**
+ * Slider has been extracted from react-native core and will be removed in a future release.
+ * It can now be installed and imported from `@react-native-community/slider` instead of 'react-native'.
+ * @see https://github.com/callstack/react-native-slider
+ * @deprecated
+ */
+export class Slider extends SliderBase {}
+/**  SliderIOS has been removed from react-native.
+ * It can now be installed and imported from `@react-native-community/slider` instead of 'react-native'.
+ * @see https://github.com/callstack/react-native-slider
+ * @deprecated
+ */
+export type SliderIOS = Slider;
diff --git a/Libraries/Components/Slider/Slider.js b/Libraries/Components/Slider/Slider.js
index c3aee2d2d3dc..ad5900f0e96a 100644
--- a/Libraries/Components/Slider/Slider.js
+++ b/Libraries/Components/Slider/Slider.js
@@ -8,18 +8,18 @@
  * @flow strict-local
  */
 
-import * as React from 'react';
-import Platform from '../../Utilities/Platform';
-import SliderNativeComponent from './SliderNativeComponent';
-import StyleSheet, {
-  type ViewStyleProp,
-  type ColorValue,
-} from '../../StyleSheet/StyleSheet';
-
 import type {ImageSource} from '../../Image/ImageSource';
-import type {ViewProps} from '../View/ViewPropTypes';
 import type {SyntheticEvent} from '../../Types/CoreEventTypes';
 import type {AccessibilityState} from '../View/ViewAccessibility';
+import type {ViewProps} from '../View/ViewPropTypes';
+
+import StyleSheet, {
+  type ColorValue,
+  type ViewStyleProp,
+} from '../../StyleSheet/StyleSheet';
+import Platform from '../../Utilities/Platform';
+import SliderNativeComponent from './SliderNativeComponent';
+import * as React from 'react';
 
 type Event = SyntheticEvent<
   $ReadOnly<{|
diff --git a/Libraries/Components/Slider/SliderNativeComponent.js b/Libraries/Components/Slider/SliderNativeComponent.js
index 9846c1a9ded0..4e4e12cd8d92 100644
--- a/Libraries/Components/Slider/SliderNativeComponent.js
+++ b/Libraries/Components/Slider/SliderNativeComponent.js
@@ -8,19 +8,18 @@
  * @flow strict-local
  */
 
+import type {ImageSource} from '../../Image/ImageSource';
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {
   BubblingEventHandler,
   DirectEventHandler,
   Double,
   WithDefault,
 } from '../../Types/CodegenTypes';
+import type {ViewProps} from '../View/ViewPropTypes';
 
 import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
-import type {ImageSource} from '../../Image/ImageSource';
-import type {ViewProps} from '../View/ViewPropTypes';
 
 type Event = $ReadOnly<{|
   value: Double,
diff --git a/Libraries/Components/Sound/NativeSoundManager.js b/Libraries/Components/Sound/NativeSoundManager.js
index 1abf8c82bb3d..425a3c3b835c 100644
--- a/Libraries/Components/Sound/NativeSoundManager.js
+++ b/Libraries/Components/Sound/NativeSoundManager.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 /**
diff --git a/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js b/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js
index 4e13d10ba7b4..acebb6ca3bd1 100644
--- a/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js
+++ b/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js b/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js
index 6218a70bc5b5..4ca0011b8a42 100644
--- a/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js
+++ b/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Components/StatusBar/StatusBar.d.ts b/Libraries/Components/StatusBar/StatusBar.d.ts
new file mode 100644
index 000000000000..3dd9ab2fe2ff
--- /dev/null
+++ b/Libraries/Components/StatusBar/StatusBar.d.ts
@@ -0,0 +1,138 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {ColorValue} from '../../StyleSheet/StyleSheet';
+
+export type StatusBarStyle = 'default' | 'light-content' | 'dark-content';
+
+export type StatusBarAnimation = 'none' | 'fade' | 'slide';
+
+export interface StatusBarPropsIOS {
+  /**
+   * If the network activity indicator should be visible.
+   *
+   * @platform ios
+   */
+  networkActivityIndicatorVisible?: boolean | undefined;
+
+  /**
+   * The transition effect when showing and hiding the status bar using
+   * the hidden prop. Defaults to 'fade'.
+   *
+   * @platform ios
+   */
+  showHideTransition?: null | 'fade' | 'slide' | 'none' | undefined;
+}
+
+export interface StatusBarPropsAndroid {
+  /**
+   * The background color of the status bar.
+   *
+   * @platform android
+   */
+  backgroundColor?: ColorValue | undefined;
+
+  /**
+   * If the status bar is translucent. When translucent is set to true,
+   * the app will draw under the status bar. This is useful when using a
+   * semi transparent status bar color.
+   *
+   * @platform android
+   */
+  translucent?: boolean | undefined;
+}
+
+export interface StatusBarProps
+  extends StatusBarPropsIOS,
+    StatusBarPropsAndroid {
+  /**
+   * If the transition between status bar property changes should be
+   * animated. Supported for backgroundColor, barStyle and hidden.
+   */
+  animated?: boolean | undefined;
+
+  /**
+   * Sets the color of the status bar text.
+   */
+  barStyle?: null | StatusBarStyle | undefined;
+
+  /**
+   * If the status bar is hidden.
+   */
+  hidden?: boolean | undefined;
+}
+
+export class StatusBar extends React.Component<StatusBarProps> {
+  /**
+   * The current height of the status bar on the device.
+   * @platform android
+   */
+  static currentHeight?: number | undefined;
+
+  /**
+   * Show or hide the status bar
+   * @param hidden The dialog's title.
+   * @param animation Optional animation when
+   *    changing the status bar hidden property.
+   */
+  static setHidden: (hidden: boolean, animation?: StatusBarAnimation) => void;
+
+  /**
+   * Set the status bar style
+   * @param style Status bar style to set
+   * @param animated Animate the style change.
+   */
+  static setBarStyle: (style: StatusBarStyle, animated?: boolean) => void;
+
+  /**
+   * Control the visibility of the network activity indicator
+   * @param visible Show the indicator.
+   */
+  static setNetworkActivityIndicatorVisible: (visible: boolean) => void;
+
+  /**
+   * Set the background color for the status bar
+   * @param color Background color.
+   * @param animated Animate the style change.
+   */
+  static setBackgroundColor: (color: ColorValue, animated?: boolean) => void;
+
+  /**
+   * Control the translucency of the status bar
+   * @param translucent Set as translucent.
+   */
+  static setTranslucent: (translucent: boolean) => void;
+
+  /**
+   * Push a StatusBar entry onto the stack.
+   * The return value should be passed to `popStackEntry` when complete.
+   *
+   * @param props Object containing the StatusBar props to use in the stack entry.
+   */
+  static pushStackEntry: (props: StatusBarProps) => StatusBarProps;
+
+  /**
+   * Pop a StatusBar entry from the stack.
+   *
+   * @param entry Entry returned from `pushStackEntry`.
+   */
+  static popStackEntry: (entry: StatusBarProps) => void;
+
+  /**
+   * Replace an existing StatusBar stack entry with new props.
+   *
+   * @param entry Entry returned from `pushStackEntry` to replace.
+   * @param props Object containing the StatusBar props to use in the replacement stack entry.
+   */
+  static replaceStackEntry: (
+    entry: StatusBarProps,
+    props: StatusBarProps,
+  ) => StatusBarProps;
+}
diff --git a/Libraries/Components/StatusBar/StatusBar.js b/Libraries/Components/StatusBar/StatusBar.js
index e07389c97231..9110827229c8 100644
--- a/Libraries/Components/StatusBar/StatusBar.js
+++ b/Libraries/Components/StatusBar/StatusBar.js
@@ -8,14 +8,14 @@
  * @flow
  */
 
-import * as React from 'react';
-import Platform from '../../Utilities/Platform';
-import invariant from 'invariant';
-import processColor from '../../StyleSheet/processColor';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
 
+import processColor from '../../StyleSheet/processColor';
+import Platform from '../../Utilities/Platform';
 import NativeStatusBarManagerAndroid from './NativeStatusBarManagerAndroid';
 import NativeStatusBarManagerIOS from './NativeStatusBarManagerIOS';
+import invariant from 'invariant';
+import * as React from 'react';
 
 /**
  * Status bar style
@@ -223,9 +223,9 @@ function createStackEntry(props: any): any {
  * `currentHeight` (Android only) The height of the status bar.
  */
 class StatusBar extends React.Component<Props> {
-  static _propsStack = [];
+  static _propsStack: Array<any> = [];
 
-  static _defaultProps = createStackEntry({
+  static _defaultProps: any = createStackEntry({
     backgroundColor:
       Platform.OS === 'android'
         ? NativeStatusBarManagerAndroid.getConstants()
@@ -309,7 +309,7 @@ class StatusBar extends React.Component<Props> {
    * @param color Background color.
    * @param animated Animate the style change.
    */
-  static setBackgroundColor(color: string, animated?: boolean) {
+  static setBackgroundColor(color: string, animated?: boolean): void {
     if (Platform.OS !== 'android') {
       console.warn('`setBackgroundColor` is only available on Android');
       return;
diff --git a/Libraries/Components/StatusBar/__tests__/StatusBar-test.js b/Libraries/Components/StatusBar/__tests__/StatusBar-test.js
index 976af8aa6985..6ff15085215d 100644
--- a/Libraries/Components/StatusBar/__tests__/StatusBar-test.js
+++ b/Libraries/Components/StatusBar/__tests__/StatusBar-test.js
@@ -5,16 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
+const StatusBar = require('../StatusBar');
 const React = require('react');
 const ReactTestRenderer = require('react-test-renderer');
 
-const StatusBar = require('../StatusBar');
-
 describe('StatusBar', () => {
   it('renders the statusbar', () => {
     const component = ReactTestRenderer.create(<StatusBar />);
diff --git a/Libraries/Components/Switch/AndroidSwitchNativeComponent.js b/Libraries/Components/Switch/AndroidSwitchNativeComponent.js
index 200c5230d660..a31d7a0244ab 100644
--- a/Libraries/Components/Switch/AndroidSwitchNativeComponent.js
+++ b/Libraries/Components/Switch/AndroidSwitchNativeComponent.js
@@ -8,22 +8,22 @@
  * @format
  */
 
-import * as React from 'react';
-
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {
-  WithDefault,
   BubblingEventHandler,
-} from 'react-native/Libraries/Types/CodegenTypes';
-
-import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import type {HostComponent} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes';
-
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
+  Int32,
+  WithDefault,
+} from '../../Types/CodegenTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
 
+import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
+import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
+import * as React from 'react';
+
 type SwitchChangeEvent = $ReadOnly<{|
   value: boolean,
+  target: Int32,
 |}>;
 
 type NativeProps = $ReadOnly<{|
diff --git a/Libraries/Components/Switch/Switch.d.ts b/Libraries/Components/Switch/Switch.d.ts
new file mode 100644
index 000000000000..64a735d6648e
--- /dev/null
+++ b/Libraries/Components/Switch/Switch.d.ts
@@ -0,0 +1,115 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
+import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
+import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
+import {ViewProps} from '../View/ViewPropTypes';
+import {NativeSyntheticEvent, TargetedEvent} from '../../Types/CoreEventTypes';
+
+export interface SwitchPropsIOS extends ViewProps {
+  /**
+   * Background color when the switch is turned on.
+   *
+   * @deprecated use trackColor instead
+   */
+  onTintColor?: ColorValue | undefined;
+
+  /**
+   * Color of the foreground switch grip.
+   *
+   * @deprecated use thumbColor instead
+   */
+  thumbTintColor?: ColorValue | undefined;
+
+  /**
+   * Background color when the switch is turned off.
+   *
+   * @deprecated use trackColor instead
+   */
+  tintColor?: ColorValue | undefined;
+}
+
+export interface SwitchChangeEventData extends TargetedEvent {
+  value: boolean;
+}
+
+export interface SwitchChangeEvent
+  extends NativeSyntheticEvent<SwitchChangeEventData> {}
+
+export interface SwitchProps extends SwitchPropsIOS {
+  /**
+   * Color of the foreground switch grip.
+   */
+  thumbColor?: ColorValue | undefined;
+
+  /**
+   * Custom colors for the switch track
+   *
+   * Color when false and color when true
+   */
+  trackColor?:
+    | {
+        false?: ColorValue | null | undefined;
+        true?: ColorValue | null | undefined;
+      }
+    | undefined;
+
+  /**
+   * If true the user won't be able to toggle the switch.
+   * Default value is false.
+   */
+  disabled?: boolean | undefined;
+
+  /**
+   * Invoked with the change event as an argument when the value changes.
+   */
+  onChange?:
+    | ((event: SwitchChangeEvent) => Promise<void> | void)
+    | null
+    | undefined;
+
+  /**
+   * Invoked with the new value when the value changes.
+   */
+  onValueChange?: ((value: boolean) => Promise<void> | void) | null | undefined;
+
+  /**
+   * Used to locate this view in end-to-end tests.
+   */
+  testID?: string | undefined;
+
+  /**
+   * The value of the switch. If true the switch will be turned on.
+   * Default value is false.
+   */
+  value?: boolean | undefined;
+
+  /**
+   * On iOS, custom color for the background.
+   * Can be seen when the switch value is false or when the switch is disabled.
+   */
+  ios_backgroundColor?: ColorValue | undefined;
+
+  style?: StyleProp<ViewStyle> | undefined;
+}
+
+/**
+ * Renders a boolean input.
+ *
+ * This is a controlled component that requires an `onValueChange` callback that
+ * updates the `value` prop in order for the component to reflect user actions.
+ * If the `value` prop is not updated, the component will continue to render
+ * the supplied `value` prop instead of the expected result of any user actions.
+ */
+declare class SwitchComponent extends React.Component<SwitchProps> {}
+declare const SwitchBase: Constructor<NativeMethods> & typeof SwitchComponent;
+export class Switch extends SwitchBase {}
diff --git a/Libraries/Components/Switch/Switch.js b/Libraries/Components/Switch/Switch.js
index a87a4a3fe940..ea89d7aeee17 100644
--- a/Libraries/Components/Switch/Switch.js
+++ b/Libraries/Components/Switch/Switch.js
@@ -9,25 +9,25 @@
  * @generate-docs
  */
 
-import Platform from '../../Utilities/Platform';
-import * as React from 'react';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
+import type {SyntheticEvent} from '../../Types/CoreEventTypes';
+import type {ViewProps} from '../View/ViewPropTypes';
+
 import StyleSheet from '../../StyleSheet/StyleSheet';
+import Platform from '../../Utilities/Platform';
 import useMergeRefs from '../../Utilities/useMergeRefs';
-
 import AndroidSwitchNativeComponent, {
   Commands as AndroidSwitchCommands,
 } from './AndroidSwitchNativeComponent';
 import SwitchNativeComponent, {
   Commands as SwitchCommands,
 } from './SwitchNativeComponent';
-
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
-import type {SyntheticEvent} from '../../Types/CoreEventTypes';
-import type {ViewProps} from '../View/ViewPropTypes';
+import * as React from 'react';
 
 type SwitchChangeEvent = SyntheticEvent<
   $ReadOnly<{|
     value: boolean,
+    target: number,
   |}>,
 >;
 
diff --git a/Libraries/Components/Switch/SwitchNativeComponent.js b/Libraries/Components/Switch/SwitchNativeComponent.js
index 5187656915de..71bf14fb833f 100644
--- a/Libraries/Components/Switch/SwitchNativeComponent.js
+++ b/Libraries/Components/Switch/SwitchNativeComponent.js
@@ -8,17 +8,22 @@
  * @format
  */
 
-import type {BubblingEventHandler, WithDefault} from '../../Types/CodegenTypes';
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
+import type {
+  BubblingEventHandler,
+  Int32,
+  WithDefault,
+} from '../../Types/CodegenTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
-import * as React from 'react';
 
+import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
 import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
-import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import * as React from 'react';
 
 type SwitchChangeEvent = $ReadOnly<{|
   value: boolean,
+  target: Int32,
 |}>;
 
 type NativeProps = $ReadOnly<{|
diff --git a/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js b/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
index e896a77f810f..faec7943692d 100644
--- a/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
+++ b/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
@@ -8,27 +8,28 @@
  * @format
  */
 
-import type {ViewProps} from '../View/ViewPropTypes';
-import type {
-  BubblingEventHandler,
-  DirectEventHandler,
-  Double,
-  Float,
-  Int32,
-  WithDefault,
-} from '../../Types/CodegenTypes';
 import type {
   HostComponent,
   PartialViewConfig,
 } from '../../Renderer/shims/ReactNativeTypes';
 import type {
+  ColorValue,
   TextStyleProp,
   ViewStyleProp,
-  ColorValue,
 } from '../../StyleSheet/StyleSheet';
-import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
+import type {
+  BubblingEventHandler,
+  DirectEventHandler,
+  Double,
+  Float,
+  Int32,
+  WithDefault,
+} from '../../Types/CodegenTypes';
+import type {ViewProps} from '../View/ViewPropTypes';
 import type {TextInputNativeCommands} from './TextInputNativeCommands';
+
 import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
+import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
 
 export type KeyboardType =
   // Cross Platform
@@ -66,6 +67,8 @@ export type ReturnKeyType =
   | 'route'
   | 'yahoo';
 
+export type SubmitBehavior = 'submit' | 'blurAndSubmit' | 'newline';
+
 export type NativeProps = $ReadOnly<{|
   // This allows us to inherit everything from ViewProps except for style (see below)
   // This must be commented for Fabric codegen to work.
@@ -520,9 +523,34 @@ export type NativeProps = $ReadOnly<{|
    * multiline fields. Note that for multiline fields, setting `blurOnSubmit`
    * to `true` means that pressing return will blur the field and trigger the
    * `onSubmitEditing` event instead of inserting a newline into the field.
+   *
+   * @deprecated
+   * Note that `submitBehavior` now takes the place of `blurOnSubmit` and will
+   * override any behavior defined by `blurOnSubmit`.
+   * @see submitBehavior
    */
   blurOnSubmit?: ?boolean,
 
+  /**
+   * When the return key is pressed,
+   *
+   * For single line inputs:
+   *
+   * - `'newline`' defaults to `'blurAndSubmit'`
+   * - `undefined` defaults to `'blurAndSubmit'`
+   *
+   * For multiline inputs:
+   *
+   * - `'newline'` adds a newline
+   * - `undefined` defaults to `'newline'`
+   *
+   * For both single line and multiline inputs:
+   *
+   * - `'submit'` will only send a submit event and not blur the input
+   * - `'blurAndSubmit`' will both blur the input and send a submit event
+   */
+  submitBehavior?: ?SubmitBehavior,
+
   /**
    * Note that not all Text styles are supported, an incomplete list of what is not supported includes:
    *
@@ -657,7 +685,7 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
       process: require('../../StyleSheet/processColor'),
     },
     textDecorationLine: true,
-    blurOnSubmit: true,
+    submitBehavior: true,
     textAlignVertical: true,
     fontStyle: true,
     textShadowOffset: true,
diff --git a/Libraries/Components/TextInput/InputAccessoryView.d.ts b/Libraries/Components/TextInput/InputAccessoryView.d.ts
new file mode 100644
index 000000000000..00edf5aaf8ad
--- /dev/null
+++ b/Libraries/Components/TextInput/InputAccessoryView.d.ts
@@ -0,0 +1,34 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
+import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
+
+/**
+ * A component which enables customization of the keyboard input accessory view on iOS. The input accessory view is
+ * displayed above the keyboard whenever a TextInput has focus. This component can be used to create custom toolbars.
+ *
+ * To use this component wrap your custom toolbar with the InputAccessoryView component, and set a nativeID. Then, pass
+ * that nativeID as the inputAccessoryViewID of whatever TextInput you desire.
+ */
+export class InputAccessoryView extends React.Component<InputAccessoryViewProps> {}
+
+export interface InputAccessoryViewProps {
+  backgroundColor?: ColorValue | undefined;
+
+  children?: React.ReactNode;
+
+  /**
+   * An ID which is used to associate this InputAccessoryView to specified TextInput(s).
+   */
+  nativeID?: string | undefined;
+
+  style?: StyleProp<ViewStyle> | undefined;
+}
diff --git a/Libraries/Components/TextInput/InputAccessoryView.js b/Libraries/Components/TextInput/InputAccessoryView.js
index 598155f2a3d6..792474779f4f 100644
--- a/Libraries/Components/TextInput/InputAccessoryView.js
+++ b/Libraries/Components/TextInput/InputAccessoryView.js
@@ -8,14 +8,13 @@
  * @format
  */
 
-import * as React from 'react';
-import Platform from '../../Utilities/Platform';
 import StyleSheet, {
-  type ViewStyleProp,
   type ColorValue,
+  type ViewStyleProp,
 } from '../../StyleSheet/StyleSheet';
-
+import Platform from '../../Utilities/Platform';
 import RCTInputAccessoryViewNativeComponent from './RCTInputAccessoryViewNativeComponent';
+import * as React from 'react';
 
 /**
  * Note: iOS only
diff --git a/Libraries/Components/TextInput/InputAccessoryView.js.flow b/Libraries/Components/TextInput/InputAccessoryView.js.flow
new file mode 100644
index 000000000000..e2245cb84d76
--- /dev/null
+++ b/Libraries/Components/TextInput/InputAccessoryView.js.flow
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+import * as React from 'react';
+import Platform from '../../Utilities/Platform';
+import StyleSheet, {
+  type ViewStyleProp,
+  type ColorValue,
+} from '../../StyleSheet/StyleSheet';
+
+type Props = $ReadOnly<{|
+  +children: React.Node,
+  nativeID?: ?string,
+  style?: ?ViewStyleProp,
+  backgroundColor?: ?ColorValue,
+|}>;
+
+module.exports = class InputAccessoryView extends React.Component<Props> {};
diff --git a/Libraries/Components/TextInput/RCTInputAccessoryViewNativeComponent.js b/Libraries/Components/TextInput/RCTInputAccessoryViewNativeComponent.js
index f9e7508501c6..48432dbdd2c6 100644
--- a/Libraries/Components/TextInput/RCTInputAccessoryViewNativeComponent.js
+++ b/Libraries/Components/TextInput/RCTInputAccessoryViewNativeComponent.js
@@ -8,11 +8,11 @@
  * @format
  */
 
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {ViewProps} from '../View/ViewPropTypes';
 
 import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,
diff --git a/Libraries/Components/TextInput/RCTMultilineTextInputNativeComponent.js b/Libraries/Components/TextInput/RCTMultilineTextInputNativeComponent.js
index 9c42d59cacb9..ccccc928a05c 100644
--- a/Libraries/Components/TextInput/RCTMultilineTextInputNativeComponent.js
+++ b/Libraries/Components/TextInput/RCTMultilineTextInputNativeComponent.js
@@ -12,10 +12,11 @@ import type {
   HostComponent,
   PartialViewConfig,
 } from '../../Renderer/shims/ReactNativeTypes';
-import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
 import type {TextInputNativeCommands} from './TextInputNativeCommands';
-import RCTTextInputViewConfig from './RCTTextInputViewConfig';
+
 import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
+import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
+import RCTTextInputViewConfig from './RCTTextInputViewConfig';
 
 type NativeType = HostComponent<mixed>;
 
diff --git a/Libraries/Components/TextInput/RCTSingelineTextInputNativeComponent.js b/Libraries/Components/TextInput/RCTSingelineTextInputNativeComponent.js
index dfc01c34c541..8ec1f49441c4 100644
--- a/Libraries/Components/TextInput/RCTSingelineTextInputNativeComponent.js
+++ b/Libraries/Components/TextInput/RCTSingelineTextInputNativeComponent.js
@@ -12,10 +12,11 @@ import type {
   HostComponent,
   PartialViewConfig,
 } from '../../Renderer/shims/ReactNativeTypes';
-import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
 import type {TextInputNativeCommands} from './TextInputNativeCommands';
-import RCTTextInputViewConfig from './RCTTextInputViewConfig';
+
 import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
+import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
+import RCTTextInputViewConfig from './RCTTextInputViewConfig';
 
 type NativeType = HostComponent<mixed>;
 
diff --git a/Libraries/Components/TextInput/RCTTextInputViewConfig.js b/Libraries/Components/TextInput/RCTTextInputViewConfig.js
index 52134db4419f..6af9cd331c18 100644
--- a/Libraries/Components/TextInput/RCTTextInputViewConfig.js
+++ b/Libraries/Components/TextInput/RCTTextInputViewConfig.js
@@ -9,6 +9,7 @@
  */
 
 import type {PartialViewConfig} from '../../Renderer/shims/ReactNativeTypes';
+
 import {ConditionallyIgnoredEventHandlers} from '../../NativeComponent/ViewConfigIgnore';
 
 type PartialViewConfigWithoutName = $Rest<
@@ -128,7 +129,7 @@ const RCTTextInputViewConfig = {
     keyboardType: true,
     selection: true,
     returnKeyType: true,
-    blurOnSubmit: true,
+    submitBehavior: true,
     mostRecentEventCount: true,
     scrollEnabled: true,
     selectionColor: {process: require('../../StyleSheet/processColor')},
@@ -148,6 +149,7 @@ const RCTTextInputViewConfig = {
     clearTextOnFocus: true,
     showSoftInputOnFocus: true,
     autoFocus: true,
+    lineBreakStrategyIOS: true,
     ...ConditionallyIgnoredEventHandlers({
       onChange: true,
       onSelectionChange: true,
diff --git a/Libraries/Components/TextInput/TextInput.d.ts b/Libraries/Components/TextInput/TextInput.d.ts
new file mode 100644
index 000000000000..12cfec2987cb
--- /dev/null
+++ b/Libraries/Components/TextInput/TextInput.d.ts
@@ -0,0 +1,840 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {TimerMixin} from '../../../types/private/TimerMixin';
+import {
+  HostComponent,
+  NativeMethods,
+} from '../../../types/public/ReactNativeTypes';
+import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
+import {TextStyle} from '../../StyleSheet/StyleSheetTypes';
+import {
+  NativeSyntheticEvent,
+  NativeTouchEvent,
+  TargetedEvent,
+} from '../../Types/CoreEventTypes';
+import {EventEmitter} from '../../vendor/emitter/EventEmitter';
+import {AccessibilityProps} from '../View/ViewAccessibility';
+import {ViewProps} from '../View/ViewPropTypes';
+
+export type KeyboardType =
+  | 'default'
+  | 'email-address'
+  | 'numeric'
+  | 'phone-pad'
+  | 'number-pad'
+  | 'decimal-pad';
+export type KeyboardTypeIOS =
+  | 'ascii-capable'
+  | 'numbers-and-punctuation'
+  | 'url'
+  | 'name-phone-pad'
+  | 'twitter'
+  | 'web-search';
+export type KeyboardTypeAndroid = 'visible-password';
+export type KeyboardTypeOptions =
+  | KeyboardType
+  | KeyboardTypeAndroid
+  | KeyboardTypeIOS;
+
+export type ReturnKeyType = 'done' | 'go' | 'next' | 'search' | 'send';
+export type ReturnKeyTypeAndroid = 'none' | 'previous';
+export type ReturnKeyTypeIOS =
+  | 'default'
+  | 'google'
+  | 'join'
+  | 'route'
+  | 'yahoo'
+  | 'emergency-call';
+
+export type ReturnKeyTypeOptions =
+  | ReturnKeyType
+  | ReturnKeyTypeAndroid
+  | ReturnKeyTypeIOS;
+
+type DataDetectorTypes =
+  | 'phoneNumber'
+  | 'link'
+  | 'address'
+  | 'calendarEvent'
+  | 'none'
+  | 'all';
+
+/**
+ * DocumentSelectionState is responsible for maintaining selection information
+ * for a document.
+ *
+ * It is intended for use by AbstractTextEditor-based components for
+ * identifying the appropriate start/end positions to modify the
+ * DocumentContent, and for programmatically setting browser selection when
+ * components re-render.
+ */
+export interface DocumentSelectionState extends EventEmitter {
+  new (anchor: number, focus: number): DocumentSelectionState;
+
+  /**
+   * Apply an update to the state. If either offset value has changed,
+   * set the values and emit the `change` event. Otherwise no-op.
+   *
+   */
+  update(anchor: number, focus: number): void;
+
+  /**
+   * Given a max text length, constrain our selection offsets to ensure
+   * that the selection remains strictly within the text range.
+   *
+   */
+  constrainLength(maxLength: number): void;
+
+  focus(): void;
+  blur(): void;
+  hasFocus(): boolean;
+  isCollapsed(): boolean;
+  isBackward(): boolean;
+
+  getAnchorOffset(): number;
+  getFocusOffset(): number;
+  getStartOffset(): number;
+  getEndOffset(): number;
+  overlaps(start: number, end: number): boolean;
+}
+
+/**
+ * IOS Specific properties for TextInput
+ * @see https://reactnative.dev/docs/textinput#props
+ */
+export interface TextInputIOSProps {
+  /**
+   * enum('never', 'while-editing', 'unless-editing', 'always')
+   * When the clear button should appear on the right side of the text view
+   */
+  clearButtonMode?:
+    | 'never'
+    | 'while-editing'
+    | 'unless-editing'
+    | 'always'
+    | undefined;
+
+  /**
+   * If true, clears the text field automatically when editing begins
+   */
+  clearTextOnFocus?: boolean | undefined;
+
+  /**
+   * Determines the types of data converted to clickable URLs in the text input.
+   * Only valid if `multiline={true}` and `editable={false}`.
+   * By default no data types are detected.
+   *
+   * You can provide one type or an array of many types.
+   *
+   * Possible values for `dataDetectorTypes` are:
+   *
+   * - `'phoneNumber'`
+   * - `'link'`
+   * - `'address'`
+   * - `'calendarEvent'`
+   * - `'none'`
+   * - `'all'`
+   */
+  dataDetectorTypes?: DataDetectorTypes | DataDetectorTypes[] | undefined;
+
+  /**
+   * If true, the keyboard disables the return key when there is no text and automatically enables it when there is text.
+   * The default value is false.
+   */
+  enablesReturnKeyAutomatically?: boolean | undefined;
+
+  /**
+   * Determines the color of the keyboard.
+   */
+  keyboardAppearance?: 'default' | 'light' | 'dark' | undefined;
+
+  /**
+   * Provide rules for your password.
+   * For example, say you want to require a password with at least eight characters consisting of a mix of uppercase and lowercase letters, at least one number, and at most two consecutive characters.
+   * "required: upper; required: lower; required: digit; max-consecutive: 2; minlength: 8;"
+   */
+  passwordRules?: string | null | undefined;
+
+  /**
+   * If `true`, allows TextInput to pass touch events to the parent component.
+   * This allows components to be swipeable from the TextInput on iOS,
+   * as is the case on Android by default.
+   * If `false`, TextInput always asks to handle the input (except when disabled).
+   */
+  rejectResponderTermination?: boolean | null | undefined;
+
+  /**
+   * See DocumentSelectionState.js, some state that is responsible for maintaining selection information for a document
+   */
+  selectionState?: DocumentSelectionState | undefined;
+
+  /**
+   * If false, disables spell-check style (i.e. red underlines). The default value is inherited from autoCorrect
+   */
+  spellCheck?: boolean | undefined;
+
+  /**
+   * Give the keyboard and the system information about the expected
+   * semantic meaning for the content that users enter.
+   *
+   * For iOS 11+ you can set `textContentType` to `username` or `password` to
+   * enable autofill of login details from the device keychain.
+   *
+   * For iOS 12+ `newPassword` can be used to indicate a new password input the
+   * user may want to save in the keychain, and `oneTimeCode` can be used to indicate
+   * that a field can be autofilled by a code arriving in an SMS.
+   *
+   * To disable autofill, set textContentType to `none`.
+   *
+   * Possible values for `textContentType` are:
+   *
+   *  - `'none'`
+   *  - `'URL'`
+   *  - `'addressCity'`
+   *  - `'addressCityAndState'`
+   *  - `'addressState'`
+   *  - `'countryName'`
+   *  - `'creditCardNumber'`
+   *  - `'emailAddress'`
+   *  - `'familyName'`
+   *  - `'fullStreetAddress'`
+   *  - `'givenName'`
+   *  - `'jobTitle'`
+   *  - `'location'`
+   *  - `'middleName'`
+   *  - `'name'`
+   *  - `'namePrefix'`
+   *  - `'nameSuffix'`
+   *  - `'nickname'`
+   *  - `'organizationName'`
+   *  - `'postalCode'`
+   *  - `'streetAddressLine1'`
+   *  - `'streetAddressLine2'`
+   *  - `'sublocality'`
+   *  - `'telephoneNumber'`
+   *  - `'username'`
+   *  - `'password'`
+   *  - `'newPassword'`
+   *  - `'oneTimeCode'`
+   *
+   */
+  textContentType?:
+    | 'none'
+    | 'URL'
+    | 'addressCity'
+    | 'addressCityAndState'
+    | 'addressState'
+    | 'countryName'
+    | 'creditCardNumber'
+    | 'emailAddress'
+    | 'familyName'
+    | 'fullStreetAddress'
+    | 'givenName'
+    | 'jobTitle'
+    | 'location'
+    | 'middleName'
+    | 'name'
+    | 'namePrefix'
+    | 'nameSuffix'
+    | 'nickname'
+    | 'organizationName'
+    | 'postalCode'
+    | 'streetAddressLine1'
+    | 'streetAddressLine2'
+    | 'sublocality'
+    | 'telephoneNumber'
+    | 'username'
+    | 'password'
+    | 'newPassword'
+    | 'oneTimeCode'
+    | undefined;
+
+  /**
+   * If false, scrolling of the text view will be disabled. The default value is true. Only works with multiline={true}
+   */
+  scrollEnabled?: boolean | undefined;
+}
+
+/**
+ * Android Specific properties for TextInput
+ * @see https://reactnative.dev/docs/textinput#props
+ */
+export interface TextInputAndroidProps {
+  /**
+   * Specifies autocomplete hints for the system, so it can provide autofill. On Android, the system will always attempt to offer autofill by using heuristics to identify the type of content.
+   * To disable autocomplete, set `autoComplete` to `off`.
+   *
+   * *Android Only*
+   *
+   * Possible values for `autoComplete` are:
+   *
+   * - `birthdate-day`
+   * - `birthdate-full`
+   * - `birthdate-month`
+   * - `birthdate-year`
+   * - `cc-csc`
+   * - `cc-exp`
+   * - `cc-exp-day`
+   * - `cc-exp-month`
+   * - `cc-exp-year`
+   * - `cc-number`
+   * - `email`
+   * - `gender`
+   * - `name`
+   * - `name-family`
+   * - `name-given`
+   * - `name-middle`
+   * - `name-middle-initial`
+   * - `name-prefix`
+   * - `name-suffix`
+   * - `password`
+   * - `password-new`
+   * - `postal-address`
+   * - `postal-address-country`
+   * - `postal-address-extended`
+   * - `postal-address-extended-postal-code`
+   * - `postal-address-locality`
+   * - `postal-address-region`
+   * - `postal-code`
+   * - `street-address`
+   * - `sms-otp`
+   * - `tel`
+   * - `tel-country-code`
+   * - `tel-national`
+   * - `tel-device`
+   * - `username`
+   * - `username-new`
+   * - `off`
+   */
+  autoComplete?:
+    | 'birthdate-day'
+    | 'birthdate-full'
+    | 'birthdate-month'
+    | 'birthdate-year'
+    | 'cc-csc'
+    | 'cc-exp'
+    | 'cc-exp-day'
+    | 'cc-exp-month'
+    | 'cc-exp-year'
+    | 'cc-number'
+    | 'email'
+    | 'gender'
+    | 'name'
+    | 'name-family'
+    | 'name-given'
+    | 'name-middle'
+    | 'name-middle-initial'
+    | 'name-prefix'
+    | 'name-suffix'
+    | 'password'
+    | 'password-new'
+    | 'postal-address'
+    | 'postal-address-country'
+    | 'postal-address-extended'
+    | 'postal-address-extended-postal-code'
+    | 'postal-address-locality'
+    | 'postal-address-region'
+    | 'postal-code'
+    | 'street-address'
+    | 'sms-otp'
+    | 'tel'
+    | 'tel-country-code'
+    | 'tel-national'
+    | 'tel-device'
+    | 'username'
+    | 'username-new'
+    | 'off'
+    | undefined;
+
+  /**
+   * When provided it will set the color of the cursor (or "caret") in the component.
+   * Unlike the behavior of `selectionColor` the cursor color will be set independently
+   * from the color of the text selection box.
+   * @platform android
+   */
+  cursorColor?: ColorValue | null | undefined;
+
+  /**
+   * Determines whether the individual fields in your app should be included in a
+   * view structure for autofill purposes on Android API Level 26+. Defaults to auto.
+   * To disable auto complete, use `off`.
+   *
+   * *Android Only*
+   *
+   * The following values work on Android only:
+   *
+   * - `auto` - let Android decide
+   * - `no` - not important for autofill
+   * - `noExcludeDescendants` - this view and its children aren't important for autofill
+   * - `yes` - is important for autofill
+   * - `yesExcludeDescendants` - this view is important for autofill but its children aren't
+   */
+  importantForAutofill?:
+    | 'auto'
+    | 'no'
+    | 'noExcludeDescendants'
+    | 'yes'
+    | 'yesExcludeDescendants'
+    | undefined;
+
+  /**
+   * When false, if there is a small amount of space available around a text input (e.g. landscape orientation on a phone),
+   *   the OS may choose to have the user edit the text inside of a full screen text input mode.
+   * When true, this feature is disabled and users will always edit the text directly inside of the text input.
+   * Defaults to false.
+   */
+  disableFullscreenUI?: boolean | undefined;
+
+  /**
+   * If defined, the provided image resource will be rendered on the left.
+   */
+  inlineImageLeft?: string | undefined;
+
+  /**
+   * Padding between the inline image, if any, and the text input itself.
+   */
+  inlineImagePadding?: number | undefined;
+
+  /**
+   * Sets the number of lines for a TextInput.
+   * Use it with multiline set to true to be able to fill the lines.
+   */
+  numberOfLines?: number | undefined;
+
+  /**
+   * Sets the return key to the label. Use it instead of `returnKeyType`.
+   * @platform android
+   */
+  returnKeyLabel?: string | undefined;
+
+  /**
+   * Set text break strategy on Android API Level 23+, possible values are simple, highQuality, balanced
+   * The default value is simple.
+   */
+  textBreakStrategy?: 'simple' | 'highQuality' | 'balanced' | undefined;
+
+  /**
+   * The color of the textInput underline.
+   */
+  underlineColorAndroid?: ColorValue | undefined;
+
+  /**
+   * Vertically align text when `multiline` is set to true
+   */
+  textAlignVertical?: 'auto' | 'top' | 'bottom' | 'center' | undefined;
+
+  /**
+   * When false, it will prevent the soft keyboard from showing when the field is focused. The default value is true
+   */
+  showSoftInputOnFocus?: boolean | undefined;
+
+  /**
+   * Vertically align text when `multiline` is set to true
+   */
+  verticalAlign?: 'auto' | 'top' | 'bottom' | 'middle' | undefined;
+}
+
+/**
+ * @see TextInputProps.onFocus
+ */
+export interface TextInputFocusEventData extends TargetedEvent {
+  text: string;
+  eventCount: number;
+}
+
+/**
+ * @see TextInputProps.onScroll
+ */
+export interface TextInputScrollEventData {
+  contentOffset: {x: number; y: number};
+}
+
+/**
+ * @see TextInputProps.onSelectionChange
+ */
+export interface TextInputSelectionChangeEventData extends TargetedEvent {
+  selection: {
+    start: number;
+    end: number;
+  };
+}
+
+/**
+ * @see TextInputProps.onKeyPress
+ */
+export interface TextInputKeyPressEventData {
+  key: string;
+}
+
+/**
+ * @see TextInputProps.onChange
+ */
+export interface TextInputChangeEventData extends TargetedEvent {
+  eventCount: number;
+  text: string;
+}
+
+/**
+ * @see TextInputProps.onContentSizeChange
+ */
+export interface TextInputContentSizeChangeEventData {
+  contentSize: {width: number; height: number};
+}
+
+/**
+ * @see TextInputProps.onEndEditing
+ */
+export interface TextInputEndEditingEventData {
+  text: string;
+}
+
+/**
+ * @see TextInputProps.onSubmitEditing
+ */
+export interface TextInputSubmitEditingEventData {
+  text: string;
+}
+
+/**
+ * @see TextInputProps.onTextInput
+ */
+export interface TextInputTextInputEventData {
+  text: string;
+  previousText: string;
+  range: {start: number; end: number};
+}
+
+/**
+ * @see https://reactnative.dev/docs/textinput#props
+ */
+export interface TextInputProps
+  extends ViewProps,
+    TextInputIOSProps,
+    TextInputAndroidProps,
+    AccessibilityProps {
+  /**
+   * Specifies whether fonts should scale to respect Text Size accessibility settings.
+   * The default is `true`.
+   */
+  allowFontScaling?: boolean | undefined;
+
+  /**
+   * Can tell TextInput to automatically capitalize certain characters.
+   *      characters: all characters,
+   *      words: first letter of each word
+   *      sentences: first letter of each sentence (default)
+   *      none: don't auto capitalize anything
+   *
+   * https://reactnative.dev/docs/textinput#autocapitalize
+   */
+  autoCapitalize?: 'none' | 'sentences' | 'words' | 'characters' | undefined;
+
+  /**
+   * If false, disables auto-correct.
+   * The default value is true.
+   */
+  autoCorrect?: boolean | undefined;
+
+  /**
+   * If true, focuses the input on componentDidMount.
+   * The default value is false.
+   */
+  autoFocus?: boolean | undefined;
+
+  /**
+   * If true, the text field will blur when submitted.
+   * The default value is true.
+   */
+  blurOnSubmit?: boolean | undefined;
+
+  /**
+   * If true, caret is hidden. The default value is false.
+   */
+  caretHidden?: boolean | undefined;
+
+  /**
+   * If true, context menu is hidden. The default value is false.
+   */
+  contextMenuHidden?: boolean | undefined;
+
+  /**
+   * Provides an initial value that will change when the user starts typing.
+   * Useful for simple use-cases where you don't want to deal with listening to events
+   * and updating the value prop to keep the controlled state in sync.
+   */
+  defaultValue?: string | undefined;
+
+  /**
+   * If false, text is not editable. The default value is true.
+   */
+  editable?: boolean | undefined;
+
+  /**
+   * enum("default", 'numeric', 'email-address', "ascii-capable", 'numbers-and-punctuation', 'url', 'number-pad', 'phone-pad', 'name-phone-pad',
+   * 'decimal-pad', 'twitter', 'web-search', 'visible-password')
+   * Determines which keyboard to open, e.g.numeric.
+   * The following values work across platforms: - default - numeric - email-address - phone-pad
+   * The following values work on iOS: - ascii-capable - numbers-and-punctuation - url - number-pad - name-phone-pad - decimal-pad - twitter - web-search
+   * The following values work on Android: - visible-password
+   */
+  keyboardType?: KeyboardTypeOptions | undefined;
+
+  /**
+   * Limits the maximum number of characters that can be entered.
+   * Use this instead of implementing the logic in JS to avoid flicker.
+   */
+  maxLength?: number | undefined;
+
+  /**
+   * If true, the text input can be multiple lines. The default value is false.
+   */
+  multiline?: boolean | undefined;
+
+  /**
+   * Callback that is called when the text input is blurred
+   */
+  onBlur?:
+    | ((e: NativeSyntheticEvent<TextInputFocusEventData>) => void)
+    | undefined;
+
+  /**
+   * Callback that is called when the text input's text changes.
+   */
+  onChange?:
+    | ((e: NativeSyntheticEvent<TextInputChangeEventData>) => void)
+    | undefined;
+
+  /**
+   * Callback that is called when the text input's text changes.
+   * Changed text is passed as an argument to the callback handler.
+   */
+  onChangeText?: ((text: string) => void) | undefined;
+
+  /**
+   * Callback that is called when the text input's content size changes.
+   * This will be called with
+   * `{ nativeEvent: { contentSize: { width, height } } }`.
+   *
+   * Only called for multiline text inputs.
+   */
+  onContentSizeChange?:
+    | ((e: NativeSyntheticEvent<TextInputContentSizeChangeEventData>) => void)
+    | undefined;
+
+  /**
+   * Callback that is called when text input ends.
+   */
+  onEndEditing?:
+    | ((e: NativeSyntheticEvent<TextInputEndEditingEventData>) => void)
+    | undefined;
+
+  /**
+   * Callback that is called when a touch is engaged.
+   */
+  onPressIn?: ((e: NativeSyntheticEvent<NativeTouchEvent>) => void) | undefined;
+
+  /**
+   * Callback that is called when a touch is released.
+   */
+  onPressOut?:
+    | ((e: NativeSyntheticEvent<NativeTouchEvent>) => void)
+    | undefined;
+
+  /**
+   * Callback that is called when the text input is focused
+   */
+  onFocus?:
+    | ((e: NativeSyntheticEvent<TextInputFocusEventData>) => void)
+    | undefined;
+
+  /**
+   * Callback that is called when the text input selection is changed.
+   */
+  onSelectionChange?:
+    | ((e: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => void)
+    | undefined;
+
+  /**
+   * Callback that is called when the text input's submit button is pressed.
+   */
+  onSubmitEditing?:
+    | ((e: NativeSyntheticEvent<TextInputSubmitEditingEventData>) => void)
+    | undefined;
+
+  /**
+   * Callback that is called on new text input with the argument
+   *  `{ nativeEvent: { text, previousText, range: { start, end } } }`.
+   *
+   * This prop requires multiline={true} to be set.
+   */
+  onTextInput?:
+    | ((e: NativeSyntheticEvent<TextInputTextInputEventData>) => void)
+    | undefined;
+
+  /**
+   * Invoked on content scroll with
+   *  `{ nativeEvent: { contentOffset: { x, y } } }`.
+   *
+   * May also contain other properties from ScrollEvent but on Android contentSize is not provided for performance reasons.
+   */
+  onScroll?:
+    | ((e: NativeSyntheticEvent<TextInputScrollEventData>) => void)
+    | undefined;
+
+  /**
+   * Callback that is called when a key is pressed.
+   * This will be called with
+   *  `{ nativeEvent: { key: keyValue } }`
+   * where keyValue is 'Enter' or 'Backspace' for respective keys and the typed-in character otherwise including ' ' for space.
+   *
+   * Fires before onChange callbacks.
+   * Note: on Android only the inputs from soft keyboard are handled, not the hardware keyboard inputs.
+   */
+  onKeyPress?:
+    | ((e: NativeSyntheticEvent<TextInputKeyPressEventData>) => void)
+    | undefined;
+
+  /**
+   * The string that will be rendered before text input has been entered
+   */
+  placeholder?: string | undefined;
+
+  /**
+   * The text color of the placeholder string
+   */
+  placeholderTextColor?: ColorValue | undefined;
+
+  /**
+   * enum('default', 'go', 'google', 'join', 'next', 'route', 'search', 'send', 'yahoo', 'done', 'emergency-call')
+   * Determines how the return key should look.
+   */
+  returnKeyType?: ReturnKeyTypeOptions | undefined;
+
+  /**
+   * If true, the text input obscures the text entered so that sensitive text like passwords stay secure.
+   * The default value is false.
+   */
+  secureTextEntry?: boolean | undefined;
+
+  /**
+   * If true, all text will automatically be selected on focus
+   */
+  selectTextOnFocus?: boolean | undefined;
+
+  /**
+   * The start and end of the text input's selection. Set start and end to
+   * the same value to position the cursor.
+   */
+  selection?: {start: number; end?: number | undefined} | undefined;
+
+  /**
+   * The highlight (and cursor on ios) color of the text input
+   */
+  selectionColor?: ColorValue | undefined;
+
+  /**
+   * Styles
+   */
+  style?: StyleProp<TextStyle> | undefined;
+
+  /**
+   * Align the input text to the left, center, or right sides of the input field.
+   */
+  textAlign?: 'left' | 'center' | 'right' | undefined;
+
+  /**
+   * Used to locate this view in end-to-end tests
+   */
+  testID?: string | undefined;
+
+  /**
+   * Used to connect to an InputAccessoryView. Not part of react-natives documentation, but present in examples and
+   * code.
+   * See https://reactnative.dev/docs/inputaccessoryview for more information.
+   */
+  inputAccessoryViewID?: string | undefined;
+
+  /**
+   * The value to show for the text input. TextInput is a controlled component,
+   * which means the native value will be forced to match this value prop if provided.
+   * For most uses this works great, but in some cases this may cause flickering - one common cause is preventing edits by keeping value the same.
+   * In addition to simply setting the same value, either set editable={false},
+   * or set/update maxLength to prevent unwanted edits without flicker.
+   */
+  value?: string | undefined;
+
+  /**
+   * Specifies largest possible scale a font can reach when allowFontScaling is enabled. Possible values:
+   * - null/undefined (default): inherit from the parent node or the global default (0)
+   * - 0: no max, ignore parent/global default
+   * - >= 1: sets the maxFontSizeMultiplier of this node to this value
+   */
+  maxFontSizeMultiplier?: number | null | undefined;
+}
+
+/**
+ * This class is responsible for coordinating the "focused"
+ * state for TextInputs. All calls relating to the keyboard
+ * should be funneled through here
+ */
+interface TextInputState {
+  /**
+   * @deprecated Use currentlyFocusedInput
+   * Returns the ID of the currently focused text field, if one exists
+   * If no text field is focused it returns null
+   */
+  currentlyFocusedField(): number;
+
+  /**
+   * Returns the ref of the currently focused text field, if one exists
+   * If no text field is focused it returns null
+   */
+  currentlyFocusedInput(): React.ElementRef<HostComponent<unknown>>;
+
+  /**
+   * @param textField ref of the text field to focus
+   * Focuses the specified text field
+   * noop if the text field was already focused
+   */
+  focusTextInput(textField?: React.ElementRef<HostComponent<unknown>>): void;
+
+  /**
+   * @param textField ref of the text field to focus
+   * Unfocuses the specified text field
+   * noop if it wasn't focused
+   */
+  blurTextInput(textField?: React.ElementRef<HostComponent<unknown>>): void;
+}
+
+/**
+ * @see https://reactnative.dev/docs/textinput#methods
+ */
+declare class TextInputComponent extends React.Component<TextInputProps> {}
+declare const TextInputBase: Constructor<NativeMethods> &
+  Constructor<TimerMixin> &
+  typeof TextInputComponent;
+export class TextInput extends TextInputBase {
+  /**
+   * Access the current focus state.
+   */
+  static State: TextInputState;
+
+  /**
+   * Returns if the input is currently focused.
+   */
+  isFocused: () => boolean;
+
+  /**
+   * Removes all text from the input.
+   */
+  clear: () => void;
+}
diff --git a/Libraries/Components/TextInput/TextInput.flow.js b/Libraries/Components/TextInput/TextInput.flow.js
new file mode 100644
index 000000000000..57259190f1a4
--- /dev/null
+++ b/Libraries/Components/TextInput/TextInput.flow.js
@@ -0,0 +1,1057 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import type {
+  PressEvent,
+  ScrollEvent,
+  SyntheticEvent,
+} from '../../Types/CoreEventTypes';
+import type {ViewProps} from '../View/ViewPropTypes';
+
+import {
+  type ColorValue,
+  type TextStyleProp,
+  type ViewStyleProp,
+} from '../../StyleSheet/StyleSheet';
+import * as React from 'react';
+type ComponentRef = React.ElementRef<HostComponent<mixed>>;
+
+type ReactRefSetter<T> = {current: null | T, ...} | ((ref: null | T) => mixed);
+
+export type ChangeEvent = SyntheticEvent<
+  $ReadOnly<{|
+    eventCount: number,
+    target: number,
+    text: string,
+  |}>,
+>;
+
+export type TextInputEvent = SyntheticEvent<
+  $ReadOnly<{|
+    eventCount: number,
+    previousText: string,
+    range: $ReadOnly<{|
+      start: number,
+      end: number,
+    |}>,
+    target: number,
+    text: string,
+  |}>,
+>;
+
+export type ContentSizeChangeEvent = SyntheticEvent<
+  $ReadOnly<{|
+    target: number,
+    contentSize: $ReadOnly<{|
+      width: number,
+      height: number,
+    |}>,
+  |}>,
+>;
+
+type TargetEvent = SyntheticEvent<
+  $ReadOnly<{|
+    target: number,
+  |}>,
+>;
+
+export type BlurEvent = TargetEvent;
+export type FocusEvent = TargetEvent;
+
+type Selection = $ReadOnly<{|
+  start: number,
+  end: number,
+|}>;
+
+export type SelectionChangeEvent = SyntheticEvent<
+  $ReadOnly<{|
+    selection: Selection,
+    target: number,
+  |}>,
+>;
+
+export type KeyPressEvent = SyntheticEvent<
+  $ReadOnly<{|
+    key: string,
+    target?: ?number,
+    eventCount?: ?number,
+  |}>,
+>;
+
+export type EditingEvent = SyntheticEvent<
+  $ReadOnly<{|
+    eventCount: number,
+    text: string,
+    target: number,
+  |}>,
+>;
+
+type DataDetectorTypesType =
+  | 'phoneNumber'
+  | 'link'
+  | 'address'
+  | 'calendarEvent'
+  | 'none'
+  | 'all';
+
+export type KeyboardType =
+  // Cross Platform
+  | 'default'
+  | 'email-address'
+  | 'numeric'
+  | 'phone-pad'
+  | 'number-pad'
+  | 'decimal-pad'
+  | 'url'
+  // iOS-only
+  | 'ascii-capable'
+  | 'numbers-and-punctuation'
+  | 'name-phone-pad'
+  | 'twitter'
+  | 'web-search'
+  // iOS 10+ only
+  | 'ascii-capable-number-pad'
+  // Android-only
+  | 'visible-password';
+
+export type InputMode =
+  | 'none'
+  | 'text'
+  | 'decimal'
+  | 'numeric'
+  | 'tel'
+  | 'search'
+  | 'email'
+  | 'url';
+
+export type ReturnKeyType =
+  // Cross Platform
+  | 'done'
+  | 'go'
+  | 'next'
+  | 'search'
+  | 'send'
+  // Android-only
+  | 'none'
+  | 'previous'
+  // iOS-only
+  | 'default'
+  | 'emergency-call'
+  | 'google'
+  | 'join'
+  | 'route'
+  | 'yahoo';
+
+export type SubmitBehavior = 'submit' | 'blurAndSubmit' | 'newline';
+
+export type AutoCapitalize = 'none' | 'sentences' | 'words' | 'characters';
+
+export type TextContentType =
+  | 'none'
+  | 'URL'
+  | 'addressCity'
+  | 'addressCityAndState'
+  | 'addressState'
+  | 'countryName'
+  | 'creditCardNumber'
+  | 'emailAddress'
+  | 'familyName'
+  | 'fullStreetAddress'
+  | 'givenName'
+  | 'jobTitle'
+  | 'location'
+  | 'middleName'
+  | 'name'
+  | 'namePrefix'
+  | 'nameSuffix'
+  | 'nickname'
+  | 'organizationName'
+  | 'postalCode'
+  | 'streetAddressLine1'
+  | 'streetAddressLine2'
+  | 'sublocality'
+  | 'telephoneNumber'
+  | 'username'
+  | 'password'
+  | 'newPassword'
+  | 'oneTimeCode';
+
+export type enterKeyHintType =
+  | 'enter'
+  | 'done'
+  | 'go'
+  | 'next'
+  | 'previous'
+  | 'search'
+  | 'send';
+
+type PasswordRules = string;
+
+type IOSProps = $ReadOnly<{|
+  /**
+   * Give the keyboard and the system information about the
+   * expected semantic meaning for the content that users enter.
+   * @platform ios
+   */
+  autoComplete?: ?(
+    | 'address-line1'
+    | 'address-line2'
+    | 'cc-number'
+    | 'current-password'
+    | 'country'
+    | 'email'
+    | 'name'
+    | 'additional-name'
+    | 'family-name'
+    | 'given-name'
+    | 'nickname'
+    | 'honorific-prefix'
+    | 'honorific-suffix'
+    | 'new-password'
+    | 'off'
+    | 'one-time-code'
+    | 'organization'
+    | 'organization-title'
+    | 'postal-code'
+    | 'street-address'
+    | 'tel'
+    | 'url'
+    | 'username'
+  ),
+  /**
+   * When the clear button should appear on the right side of the text view.
+   * This property is supported only for single-line TextInput component.
+   * @platform ios
+   */
+  clearButtonMode?: ?('never' | 'while-editing' | 'unless-editing' | 'always'),
+
+  /**
+   * If `true`, clears the text field automatically when editing begins.
+   * @platform ios
+   */
+  clearTextOnFocus?: ?boolean,
+
+  /**
+   * Determines the types of data converted to clickable URLs in the text input.
+   * Only valid if `multiline={true}` and `editable={false}`.
+   * By default no data types are detected.
+   *
+   * You can provide one type or an array of many types.
+   *
+   * Possible values for `dataDetectorTypes` are:
+   *
+   * - `'phoneNumber'`
+   * - `'link'`
+   * - `'address'`
+   * - `'calendarEvent'`
+   * - `'none'`
+   * - `'all'`
+   *
+   * @platform ios
+   */
+  dataDetectorTypes?:
+    | ?DataDetectorTypesType
+    | $ReadOnlyArray<DataDetectorTypesType>,
+
+  /**
+   * If `true`, the keyboard disables the return key when there is no text and
+   * automatically enables it when there is text. The default value is `false`.
+   * @platform ios
+   */
+  enablesReturnKeyAutomatically?: ?boolean,
+
+  /**
+   * An optional identifier which links a custom InputAccessoryView to
+   * this text input. The InputAccessoryView is rendered above the
+   * keyboard when this text input is focused.
+   * @platform ios
+   */
+  inputAccessoryViewID?: ?string,
+
+  /**
+   * Determines the color of the keyboard.
+   * @platform ios
+   */
+  keyboardAppearance?: ?('default' | 'light' | 'dark'),
+
+  /**
+   * Provide rules for your password.
+   * For example, say you want to require a password with at least eight characters consisting of a mix of uppercase and lowercase letters, at least one number, and at most two consecutive characters.
+   * "required: upper; required: lower; required: digit; max-consecutive: 2; minlength: 8;"
+   * @platform ios
+   */
+  passwordRules?: ?PasswordRules,
+
+  /*
+   * If `true`, allows TextInput to pass touch events to the parent component.
+   * This allows components to be swipeable from the TextInput on iOS,
+   * as is the case on Android by default.
+   * If `false`, TextInput always asks to handle the input (except when disabled).
+   * @platform ios
+   */
+  rejectResponderTermination?: ?boolean,
+
+  /**
+   * If `false`, scrolling of the text view will be disabled.
+   * The default value is `true`. Does only work with 'multiline={true}'.
+   * @platform ios
+   */
+  scrollEnabled?: ?boolean,
+
+  /**
+   * If `false`, disables spell-check style (i.e. red underlines).
+   * The default value is inherited from `autoCorrect`.
+   * @platform ios
+   */
+  spellCheck?: ?boolean,
+
+  /**
+   * Give the keyboard and the system information about the
+   * expected semantic meaning for the content that users enter.
+   * @platform ios
+   */
+  textContentType?: ?TextContentType,
+
+  /**
+   * Set line break strategy on iOS.
+   * @platform ios
+   */
+  lineBreakStrategyIOS?: ?('none' | 'standard' | 'hangul-word' | 'push-out'),
+|}>;
+
+type AndroidProps = $ReadOnly<{|
+  /**
+   * Specifies autocomplete hints for the system, so it can provide autofill. On Android, the system will always attempt to offer autofill by using heuristics to identify the type of content.
+   * To disable autocomplete, set `autoComplete` to `off`.
+   *
+   * *Android Only*
+   *
+   * Possible values for `autoComplete` are:
+   *
+   * - `birthdate-day`
+   * - `birthdate-full`
+   * - `birthdate-month`
+   * - `birthdate-year`
+   * - `cc-csc`
+   * - `cc-exp`
+   * - `cc-exp-day`
+   * - `cc-exp-month`
+   * - `cc-exp-year`
+   * - `cc-number`
+   * - `email`
+   * - `gender`
+   * - `name`
+   * - `name-family`
+   * - `name-given`
+   * - `name-middle`
+   * - `name-middle-initial`
+   * - `name-prefix`
+   * - `name-suffix`
+   * - `password`
+   * - `password-new`
+   * - `postal-address`
+   * - `postal-address-country`
+   * - `postal-address-extended`
+   * - `postal-address-extended-postal-code`
+   * - `postal-address-locality`
+   * - `postal-address-region`
+   * - `postal-code`
+   * - `street-address`
+   * - `sms-otp`
+   * - `tel`
+   * - `tel-country-code`
+   * - `tel-national`
+   * - `tel-device`
+   * - `username`
+   * - `username-new`
+   * - `off`
+   *
+   * @platform android
+   */
+  autoComplete?: ?(
+    | 'birthdate-day'
+    | 'birthdate-full'
+    | 'birthdate-month'
+    | 'birthdate-year'
+    | 'cc-csc'
+    | 'cc-exp'
+    | 'cc-exp-day'
+    | 'cc-exp-month'
+    | 'cc-exp-year'
+    | 'cc-number'
+    | 'email'
+    | 'gender'
+    | 'name'
+    | 'name-family'
+    | 'name-given'
+    | 'name-middle'
+    | 'name-middle-initial'
+    | 'name-prefix'
+    | 'name-suffix'
+    | 'password'
+    | 'password-new'
+    | 'postal-address'
+    | 'postal-address-country'
+    | 'postal-address-extended'
+    | 'postal-address-extended-postal-code'
+    | 'postal-address-locality'
+    | 'postal-address-region'
+    | 'postal-code'
+    | 'street-address'
+    | 'sms-otp'
+    | 'tel'
+    | 'tel-country-code'
+    | 'tel-national'
+    | 'tel-device'
+    | 'username'
+    | 'username-new'
+    | 'off'
+    // additional HTML autocomplete values
+    | 'address-line1'
+    | 'address-line2'
+    | 'bday'
+    | 'bday-day'
+    | 'bday-month'
+    | 'bday-year'
+    | 'country'
+    | 'current-password'
+    | 'honorific-prefix'
+    | 'honorific-suffix'
+    | 'additional-name'
+    | 'family-name'
+    | 'given-name'
+    | 'new-password'
+    | 'one-time-code'
+    | 'sex'
+  ),
+
+  /**
+   * When provided it will set the color of the cursor (or "caret") in the component.
+   * Unlike the behavior of `selectionColor` the cursor color will be set independently
+   * from the color of the text selection box.
+   * @platform android
+   */
+  cursorColor?: ?ColorValue,
+
+  /**
+   * When `false`, if there is a small amount of space available around a text input
+   * (e.g. landscape orientation on a phone), the OS may choose to have the user edit
+   * the text inside of a full screen text input mode. When `true`, this feature is
+   * disabled and users will always edit the text directly inside of the text input.
+   * Defaults to `false`.
+   * @platform android
+   */
+  disableFullscreenUI?: ?boolean,
+
+  importantForAutofill?: ?(
+    | 'auto'
+    | 'no'
+    | 'noExcludeDescendants'
+    | 'yes'
+    | 'yesExcludeDescendants'
+  ),
+
+  /**
+   * If defined, the provided image resource will be rendered on the left.
+   * The image resource must be inside `/android/app/src/main/res/drawable` and referenced
+   * like
+   * ```
+   * <TextInput
+   *  inlineImageLeft='search_icon'
+   * />
+   * ```
+   * @platform android
+   */
+  inlineImageLeft?: ?string,
+
+  /**
+   * Padding between the inline image, if any, and the text input itself.
+   * @platform android
+   */
+  inlineImagePadding?: ?number,
+
+  /**
+   * Sets the number of lines for a `TextInput`. Use it with multiline set to
+   * `true` to be able to fill the lines.
+   * @platform android
+   */
+  numberOfLines?: ?number,
+
+  /**
+   * Sets the return key to the label. Use it instead of `returnKeyType`.
+   * @platform android
+   */
+  returnKeyLabel?: ?string,
+
+  /**
+   * Sets the number of rows for a `TextInput`. Use it with multiline set to
+   * `true` to be able to fill the lines.
+   * @platform android
+   */
+  rows?: ?number,
+
+  /**
+   * When `false`, it will prevent the soft keyboard from showing when the field is focused.
+   * Defaults to `true`.
+   */
+  showSoftInputOnFocus?: ?boolean,
+
+  /**
+   * Set text break strategy on Android API Level 23+, possible values are `simple`, `highQuality`, `balanced`
+   * The default value is `simple`.
+   * @platform android
+   */
+  textBreakStrategy?: ?('simple' | 'highQuality' | 'balanced'),
+
+  /**
+   * The color of the `TextInput` underline.
+   * @platform android
+   */
+  underlineColorAndroid?: ?ColorValue,
+|}>;
+
+export type Props = $ReadOnly<{|
+  ...$Diff<ViewProps, $ReadOnly<{|style: ?ViewStyleProp|}>>,
+  ...IOSProps,
+  ...AndroidProps,
+
+  /**
+   * Can tell `TextInput` to automatically capitalize certain characters.
+   *
+   * - `characters`: all characters.
+   * - `words`: first letter of each word.
+   * - `sentences`: first letter of each sentence (*default*).
+   * - `none`: don't auto capitalize anything.
+   */
+  autoCapitalize?: ?AutoCapitalize,
+
+  /**
+   * If `false`, disables auto-correct. The default value is `true`.
+   */
+  autoCorrect?: ?boolean,
+
+  /**
+   * If `true`, focuses the input on `componentDidMount`.
+   * The default value is `false`.
+   */
+  autoFocus?: ?boolean,
+
+  /**
+   * Specifies whether fonts should scale to respect Text Size accessibility settings. The
+   * default is `true`.
+   */
+  allowFontScaling?: ?boolean,
+
+  /**
+   * If `true`, caret is hidden. The default value is `false`.
+   *
+   * On Android devices manufactured by Xiaomi with Android Q,
+   * when keyboardType equals 'email-address'this will be set
+   * in native to 'true' to prevent a system related crash. This
+   * will cause cursor to be diabled as a side-effect.
+   *
+   */
+  caretHidden?: ?boolean,
+
+  /*
+   * If `true`, contextMenuHidden is hidden. The default value is `false`.
+   */
+  contextMenuHidden?: ?boolean,
+
+  /**
+   * Provides an initial value that will change when the user starts typing.
+   * Useful for simple use-cases where you do not want to deal with listening
+   * to events and updating the value prop to keep the controlled state in sync.
+   */
+  defaultValue?: ?Stringish,
+
+  /**
+   * If `false`, text is not editable. The default value is `true`.
+   */
+  editable?: ?boolean,
+
+  forwardedRef?: ?ReactRefSetter<
+    React.ElementRef<HostComponent<mixed>> & ImperativeMethods,
+  >,
+
+  /**
+   * `enterKeyHint` defines what action label (or icon) to present for the enter key on virtual keyboards.
+   *
+   * The following values is supported:
+   *
+   * - `enter`
+   * - `done`
+   * - `go`
+   * - `next`
+   * - `previous`
+   * - `search`
+   * - `send`
+   */
+  enterKeyHint?: ?enterKeyHintType,
+
+  /**
+   * `inputMode` works like the `inputmode` attribute in HTML, it determines which
+   * keyboard to open, e.g.`numeric` and has precedence over keyboardType
+   *
+   * Support the following values:
+   *
+   * - `none`
+   * - `text`
+   * - `decimal`
+   * - `numeric`
+   * - `tel`
+   * - `search`
+   * - `email`
+   * - `url`
+   */
+  inputMode?: ?InputMode,
+
+  /**
+   * Determines which keyboard to open, e.g.`numeric`.
+   *
+   * The following values work across platforms:
+   *
+   * - `default`
+   * - `numeric`
+   * - `number-pad`
+   * - `decimal-pad`
+   * - `email-address`
+   * - `phone-pad`
+   * - `url`
+   *
+   * *iOS Only*
+   *
+   * The following values work on iOS only:
+   *
+   * - `ascii-capable`
+   * - `numbers-and-punctuation`
+   * - `name-phone-pad`
+   * - `twitter`
+   * - `web-search`
+   *
+   * *Android Only*
+   *
+   * The following values work on Android only:
+   *
+   * - `visible-password`
+   *
+   */
+  keyboardType?: ?KeyboardType,
+
+  /**
+   * Specifies largest possible scale a font can reach when `allowFontScaling` is enabled.
+   * Possible values:
+   * `null/undefined` (default): inherit from the parent node or the global default (0)
+   * `0`: no max, ignore parent/global default
+   * `>= 1`: sets the maxFontSizeMultiplier of this node to this value
+   */
+  maxFontSizeMultiplier?: ?number,
+
+  /**
+   * Limits the maximum number of characters that can be entered. Use this
+   * instead of implementing the logic in JS to avoid flicker.
+   */
+  maxLength?: ?number,
+
+  /**
+   * If `true`, the text input can be multiple lines.
+   * The default value is `false`.
+   */
+  multiline?: ?boolean,
+
+  /**
+   * Callback that is called when the text input is blurred.
+   */
+  onBlur?: ?(e: BlurEvent) => mixed,
+
+  /**
+   * Callback that is called when the text input's text changes.
+   */
+  onChange?: ?(e: ChangeEvent) => mixed,
+
+  /**
+   * DANGER: this API is not stable and will change in the future.
+   *
+   * Callback will be called on the main thread and may result in dropped frames.
+   * Callback that is called when the text input's text changes.
+   *
+   * @platform ios
+   */
+  unstable_onChangeSync?: ?(e: ChangeEvent) => mixed,
+
+  /**
+   * Callback that is called when the text input's text changes.
+   * Changed text is passed as an argument to the callback handler.
+   */
+  onChangeText?: ?(text: string) => mixed,
+
+  /**
+   * DANGER: this API is not stable and will change in the future.
+   *
+   * Callback will be called on the main thread and may result in dropped frames.
+   * Callback that is called when the text input's text changes.
+   * Changed text is passed as an argument to the callback handler.
+   *
+   * @platform ios
+   */
+  unstable_onChangeTextSync?: ?(text: string) => mixed,
+
+  /**
+   * Callback that is called when the text input's content size changes.
+   * This will be called with
+   * `{ nativeEvent: { contentSize: { width, height } } }`.
+   *
+   * Only called for multiline text inputs.
+   */
+  onContentSizeChange?: ?(e: ContentSizeChangeEvent) => mixed,
+
+  /**
+   * Callback that is called when text input ends.
+   */
+  onEndEditing?: ?(e: EditingEvent) => mixed,
+
+  /**
+   * Callback that is called when the text input is focused.
+   */
+  onFocus?: ?(e: FocusEvent) => mixed,
+
+  /**
+   * Callback that is called when a key is pressed.
+   * This will be called with `{ nativeEvent: { key: keyValue } }`
+   * where `keyValue` is `'Enter'` or `'Backspace'` for respective keys and
+   * the typed-in character otherwise including `' '` for space.
+   * Fires before `onChange` callbacks.
+   */
+  onKeyPress?: ?(e: KeyPressEvent) => mixed,
+
+  /**
+   * DANGER: this API is not stable and will change in the future.
+   *
+   * Callback will be called on the main thread and may result in dropped frames.
+   *
+   * Callback that is called when a key is pressed.
+   * This will be called with `{ nativeEvent: { key: keyValue } }`
+   * where `keyValue` is `'Enter'` or `'Backspace'` for respective keys and
+   * the typed-in character otherwise including `' '` for space.
+   * Fires before `onChange` callbacks.
+   *
+   * @platform ios
+   */
+  unstable_onKeyPressSync?: ?(e: KeyPressEvent) => mixed,
+
+  /**
+   * Called when a touch is engaged.
+   */
+  onPressIn?: ?(event: PressEvent) => mixed,
+
+  /**
+   * Called when a touch is released.
+   */
+  onPressOut?: ?(event: PressEvent) => mixed,
+
+  /**
+   * Callback that is called when the text input selection is changed.
+   * This will be called with
+   * `{ nativeEvent: { selection: { start, end } } }`.
+   */
+  onSelectionChange?: ?(e: SelectionChangeEvent) => mixed,
+
+  /**
+   * Callback that is called when the text input's submit button is pressed.
+   * Invalid if `multiline={true}` is specified.
+   */
+  onSubmitEditing?: ?(e: EditingEvent) => mixed,
+
+  /**
+   * Invoked on content scroll with `{ nativeEvent: { contentOffset: { x, y } } }`.
+   * May also contain other properties from ScrollEvent but on Android contentSize
+   * is not provided for performance reasons.
+   */
+  onScroll?: ?(e: ScrollEvent) => mixed,
+
+  /**
+   * The string that will be rendered before text input has been entered.
+   */
+  placeholder?: ?Stringish,
+
+  /**
+   * The text color of the placeholder string.
+   */
+  placeholderTextColor?: ?ColorValue,
+
+  /** `readOnly` works like the `readonly` attribute in HTML.
+   *  If `true`, text is not editable. The default value is `false`.
+   *  See https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/readonly
+   *  for more details.
+   */
+  readOnly?: ?boolean,
+
+  /**
+   * Determines how the return key should look. On Android you can also use
+   * `returnKeyLabel`.
+   *
+   * *Cross platform*
+   *
+   * The following values work across platforms:
+   *
+   * - `done`
+   * - `go`
+   * - `next`
+   * - `search`
+   * - `send`
+   *
+   * *Android Only*
+   *
+   * The following values work on Android only:
+   *
+   * - `none`
+   * - `previous`
+   *
+   * *iOS Only*
+   *
+   * The following values work on iOS only:
+   *
+   * - `default`
+   * - `emergency-call`
+   * - `google`
+   * - `join`
+   * - `route`
+   * - `yahoo`
+   */
+  returnKeyType?: ?ReturnKeyType,
+
+  /**
+   * If `true`, the text input obscures the text entered so that sensitive text
+   * like passwords stay secure. The default value is `false`. Does not work with 'multiline={true}'.
+   */
+  secureTextEntry?: ?boolean,
+
+  /**
+   * The start and end of the text input's selection. Set start and end to
+   * the same value to position the cursor.
+   */
+  selection?: ?$ReadOnly<{|
+    start: number,
+    end?: ?number,
+  |}>,
+
+  /**
+   * The highlight and cursor color of the text input.
+   */
+  selectionColor?: ?ColorValue,
+
+  /**
+   * If `true`, all text will automatically be selected on focus.
+   */
+  selectTextOnFocus?: ?boolean,
+
+  /**
+   * If `true`, the text field will blur when submitted.
+   * The default value is true for single-line fields and false for
+   * multiline fields. Note that for multiline fields, setting `blurOnSubmit`
+   * to `true` means that pressing return will blur the field and trigger the
+   * `onSubmitEditing` event instead of inserting a newline into the field.
+   *
+   * @deprecated
+   * Note that `submitBehavior` now takes the place of `blurOnSubmit` and will
+   * override any behavior defined by `blurOnSubmit`.
+   * @see submitBehavior
+   */
+  blurOnSubmit?: ?boolean,
+
+  /**
+   * When the return key is pressed,
+   *
+   * For single line inputs:
+   *
+   * - `'newline`' defaults to `'blurAndSubmit'`
+   * - `undefined` defaults to `'blurAndSubmit'`
+   *
+   * For multiline inputs:
+   *
+   * - `'newline'` adds a newline
+   * - `undefined` defaults to `'newline'`
+   *
+   * For both single line and multiline inputs:
+   *
+   * - `'submit'` will only send a submit event and not blur the input
+   * - `'blurAndSubmit`' will both blur the input and send a submit event
+   */
+  submitBehavior?: ?SubmitBehavior,
+
+  /**
+   * Note that not all Text styles are supported, an incomplete list of what is not supported includes:
+   *
+   * - `borderLeftWidth`
+   * - `borderTopWidth`
+   * - `borderRightWidth`
+   * - `borderBottomWidth`
+   * - `borderTopLeftRadius`
+   * - `borderTopRightRadius`
+   * - `borderBottomRightRadius`
+   * - `borderBottomLeftRadius`
+   *
+   * see [Issue#7070](https://github.com/facebook/react-native/issues/7070)
+   * for more detail.
+   *
+   * [Styles](docs/style.html)
+   */
+  style?: ?TextStyleProp,
+
+  /**
+   * The value to show for the text input. `TextInput` is a controlled
+   * component, which means the native value will be forced to match this
+   * value prop if provided. For most uses, this works great, but in some
+   * cases this may cause flickering - one common cause is preventing edits
+   * by keeping value the same. In addition to simply setting the same value,
+   * either set `editable={false}`, or set/update `maxLength` to prevent
+   * unwanted edits without flicker.
+   */
+  value?: ?Stringish,
+|}>;
+
+type ImperativeMethods = $ReadOnly<{|
+  clear: () => void,
+  isFocused: () => boolean,
+  getNativeRef: () => ?React.ElementRef<HostComponent<mixed>>,
+  setSelection: (start: number, end: number) => void,
+|}>;
+
+/**
+ * A foundational component for inputting text into the app via a
+ * keyboard. Props provide configurability for several features, such as
+ * auto-correction, auto-capitalization, placeholder text, and different keyboard
+ * types, such as a numeric keypad.
+ *
+ * The simplest use case is to plop down a `TextInput` and subscribe to the
+ * `onChangeText` events to read the user input. There are also other events,
+ * such as `onSubmitEditing` and `onFocus` that can be subscribed to. A simple
+ * example:
+ *
+ * ```ReactNativeWebPlayer
+ * import React, { Component } from 'react';
+ * import { AppRegistry, TextInput } from 'react-native';
+ *
+ * export default class UselessTextInput extends Component {
+ *   constructor(props) {
+ *     super(props);
+ *     this.state = { text: 'Useless Placeholder' };
+ *   }
+ *
+ *   render() {
+ *     return (
+ *       <TextInput
+ *         style={{height: 40, borderColor: 'gray', borderWidth: 1}}
+ *         onChangeText={(text) => this.setState({text})}
+ *         value={this.state.text}
+ *       />
+ *     );
+ *   }
+ * }
+ *
+ * // skip this line if using Create React Native App
+ * AppRegistry.registerComponent('AwesomeProject', () => UselessTextInput);
+ * ```
+ *
+ * Two methods exposed via the native element are .focus() and .blur() that
+ * will focus or blur the TextInput programmatically.
+ *
+ * Note that some props are only available with `multiline={true/false}`.
+ * Additionally, border styles that apply to only one side of the element
+ * (e.g., `borderBottomColor`, `borderLeftWidth`, etc.) will not be applied if
+ * `multiline=false`. To achieve the same effect, you can wrap your `TextInput`
+ * in a `View`:
+ *
+ * ```ReactNativeWebPlayer
+ * import React, { Component } from 'react';
+ * import { AppRegistry, View, TextInput } from 'react-native';
+ *
+ * class UselessTextInput extends Component {
+ *   render() {
+ *     return (
+ *       <TextInput
+ *         {...this.props} // Inherit any props passed to it; e.g., multiline, numberOfLines below
+ *         editable = {true}
+ *         maxLength = {40}
+ *       />
+ *     );
+ *   }
+ * }
+ *
+ * export default class UselessTextInputMultiline extends Component {
+ *   constructor(props) {
+ *     super(props);
+ *     this.state = {
+ *       text: 'Useless Multiline Placeholder',
+ *     };
+ *   }
+ *
+ *   // If you type something in the text box that is a color, the background will change to that
+ *   // color.
+ *   render() {
+ *     return (
+ *      <View style={{
+ *        backgroundColor: this.state.text,
+ *        borderBottomColor: '#000000',
+ *        borderBottomWidth: 1 }}
+ *      >
+ *        <UselessTextInput
+ *          multiline = {true}
+ *          numberOfLines = {4}
+ *          onChangeText={(text) => this.setState({text})}
+ *          value={this.state.text}
+ *        />
+ *      </View>
+ *     );
+ *   }
+ * }
+ *
+ * // skip these lines if using Create React Native App
+ * AppRegistry.registerComponent(
+ *  'AwesomeProject',
+ *  () => UselessTextInputMultiline
+ * );
+ * ```
+ *
+ * `TextInput` has by default a border at the bottom of its view. This border
+ * has its padding set by the background image provided by the system, and it
+ * cannot be changed. Solutions to avoid this is to either not set height
+ * explicitly, case in which the system will take care of displaying the border
+ * in the correct position, or to not display the border by setting
+ * `underlineColorAndroid` to transparent.
+ *
+ * Note that on Android performing text selection in input can change
+ * app's activity `windowSoftInputMode` param to `adjustResize`.
+ * This may cause issues with components that have position: 'absolute'
+ * while keyboard is active. To avoid this behavior either specify `windowSoftInputMode`
+ * in AndroidManifest.xml ( https://developer.android.com/guide/topics/manifest/activity-element.html )
+ * or control this param programmatically with native code.
+ *
+ */
+type InternalTextInput = (props: Props) => React.Node;
+
+export type TextInputComponentStatics = $ReadOnly<{|
+  State: $ReadOnly<{|
+    currentlyFocusedInput: () => ?ComponentRef,
+    currentlyFocusedField: () => ?number,
+    focusTextInput: (textField: ?ComponentRef) => void,
+    blurTextInput: (textField: ?ComponentRef) => void,
+  |}>,
+|}>;
+
+export type TextInputType = React.AbstractComponent<
+  React.ElementConfig<InternalTextInput>,
+  $ReadOnly<{|
+    ...React.ElementRef<HostComponent<mixed>>,
+    ...ImperativeMethods,
+  |}>,
+> &
+  TextInputComponentStatics;
diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index cb71d97bd1d4..386e6b87c882 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -8,30 +8,30 @@
  * @format
  */
 
-import * as React from 'react';
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import type {
+  PressEvent,
+  ScrollEvent,
+  SyntheticEvent,
+} from '../../Types/CoreEventTypes';
+import type {ViewProps} from '../View/ViewPropTypes';
+import type {TextInputType} from './TextInput.flow';
 
-import Platform from '../../Utilities/Platform';
+import usePressability from '../../Pressability/usePressability';
+import flattenStyle from '../../StyleSheet/flattenStyle';
 import StyleSheet, {
+  type ColorValue,
   type TextStyleProp,
   type ViewStyleProp,
-  type ColorValue,
 } from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
 import TextAncestor from '../../Text/TextAncestor';
+import Platform from '../../Utilities/Platform';
+import setAndForwardRef from '../../Utilities/setAndForwardRef';
 import TextInputState from './TextInputState';
 import invariant from 'invariant';
 import nullthrows from 'nullthrows';
-import setAndForwardRef from '../../Utilities/setAndForwardRef';
-
-import usePressability from '../../Pressability/usePressability';
-
-import type {ViewProps} from '../View/ViewPropTypes';
-import type {
-  SyntheticEvent,
-  ScrollEvent,
-  PressEvent,
-} from '../../Types/CoreEventTypes';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+import * as React from 'react';
 
 const {useLayoutEffect, useRef, useState} = React;
 
@@ -155,6 +155,16 @@ export type KeyboardType =
   // Android-only
   | 'visible-password';
 
+export type InputMode =
+  | 'none'
+  | 'text'
+  | 'decimal'
+  | 'numeric'
+  | 'tel'
+  | 'search'
+  | 'email'
+  | 'url';
+
 export type ReturnKeyType =
   // Cross Platform
   | 'done'
@@ -173,6 +183,8 @@ export type ReturnKeyType =
   | 'route'
   | 'yahoo';
 
+export type SubmitBehavior = 'submit' | 'blurAndSubmit' | 'newline';
+
 export type AutoCapitalize = 'none' | 'sentences' | 'words' | 'characters';
 
 export type TextContentType =
@@ -205,9 +217,48 @@ export type TextContentType =
   | 'newPassword'
   | 'oneTimeCode';
 
+export type enterKeyHintType =
+  | 'enter'
+  | 'done'
+  | 'go'
+  | 'next'
+  | 'previous'
+  | 'search'
+  | 'send';
+
 type PasswordRules = string;
 
 type IOSProps = $ReadOnly<{|
+  /**
+   * Give the keyboard and the system information about the
+   * expected semantic meaning for the content that users enter.
+   * @platform ios
+   */
+  autoComplete?: ?(
+    | 'address-line1'
+    | 'address-line2'
+    | 'cc-number'
+    | 'current-password'
+    | 'country'
+    | 'email'
+    | 'name'
+    | 'additional-name'
+    | 'family-name'
+    | 'given-name'
+    | 'nickname'
+    | 'honorific-prefix'
+    | 'honorific-suffix'
+    | 'new-password'
+    | 'off'
+    | 'one-time-code'
+    | 'organization'
+    | 'organization-title'
+    | 'postal-code'
+    | 'street-address'
+    | 'tel'
+    | 'url'
+    | 'username'
+  ),
   /**
    * When the clear button should appear on the right side of the text view.
    * This property is supported only for single-line TextInput component.
@@ -301,6 +352,12 @@ type IOSProps = $ReadOnly<{|
    * @platform ios
    */
   textContentType?: ?TextContentType,
+
+  /**
+   * Set line break strategy on iOS.
+   * @platform ios
+   */
+  lineBreakStrategyIOS?: ?('none' | 'standard' | 'hangul-word' | 'push-out'),
 |}>;
 
 type AndroidProps = $ReadOnly<{|
@@ -390,6 +447,23 @@ type AndroidProps = $ReadOnly<{|
     | 'username'
     | 'username-new'
     | 'off'
+    // additional HTML autocomplete values
+    | 'address-line1'
+    | 'address-line2'
+    | 'bday'
+    | 'bday-day'
+    | 'bday-month'
+    | 'bday-year'
+    | 'country'
+    | 'current-password'
+    | 'honorific-prefix'
+    | 'honorific-suffix'
+    | 'additional-name'
+    | 'family-name'
+    | 'given-name'
+    | 'new-password'
+    | 'one-time-code'
+    | 'sex'
   ),
 
   /**
@@ -450,6 +524,13 @@ type AndroidProps = $ReadOnly<{|
    */
   returnKeyLabel?: ?string,
 
+  /**
+   * Sets the number of rows for a `TextInput`. Use it with multiline set to
+   * `true` to be able to fill the lines.
+   * @platform android
+   */
+  rows?: ?number,
+
   /**
    * When `false`, it will prevent the soft keyboard from showing when the field is focused.
    * Defaults to `true`.
@@ -502,15 +583,6 @@ export type Props = $ReadOnly<{|
    */
   allowFontScaling?: ?boolean,
 
-  /**
-   * If `true`, the text field will blur when submitted.
-   * The default value is true for single-line fields and false for
-   * multiline fields. Note that for multiline fields, setting `blurOnSubmit`
-   * to `true` means that pressing return will blur the field and trigger the
-   * `onSubmitEditing` event instead of inserting a newline into the field.
-   */
-  blurOnSubmit?: ?boolean,
-
   /**
    * If `true`, caret is hidden. The default value is `false`.
    *
@@ -543,6 +615,38 @@ export type Props = $ReadOnly<{|
     React.ElementRef<HostComponent<mixed>> & ImperativeMethods,
   >,
 
+  /**
+   * `enterKeyHint` defines what action label (or icon) to present for the enter key on virtual keyboards.
+   *
+   * The following values is supported:
+   *
+   * - `enter`
+   * - `done`
+   * - `go`
+   * - `next`
+   * - `previous`
+   * - `search`
+   * - `send`
+   */
+  enterKeyHint?: ?enterKeyHintType,
+
+  /**
+   * `inputMode` works like the `inputmode` attribute in HTML, it determines which
+   * keyboard to open, e.g.`numeric` and has precedence over keyboardType
+   *
+   * Support the following values:
+   *
+   * - `none`
+   * - `text`
+   * - `decimal`
+   * - `numeric`
+   * - `tel`
+   * - `search`
+   * - `email`
+   * - `url`
+   */
+  inputMode?: ?InputMode,
+
   /**
    * Determines which keyboard to open, e.g.`numeric`.
    *
@@ -716,6 +820,13 @@ export type Props = $ReadOnly<{|
    */
   placeholderTextColor?: ?ColorValue,
 
+  /** `readOnly` works like the `readonly` attribute in HTML.
+   *  If `true`, text is not editable. The default value is `false`.
+   *  See https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/readonly
+   *  for more details.
+   */
+  readOnly?: ?boolean,
+
   /**
    * Determines how the return key should look. On Android you can also use
    * `returnKeyLabel`.
@@ -775,6 +886,40 @@ export type Props = $ReadOnly<{|
    */
   selectTextOnFocus?: ?boolean,
 
+  /**
+   * If `true`, the text field will blur when submitted.
+   * The default value is true for single-line fields and false for
+   * multiline fields. Note that for multiline fields, setting `blurOnSubmit`
+   * to `true` means that pressing return will blur the field and trigger the
+   * `onSubmitEditing` event instead of inserting a newline into the field.
+   *
+   * @deprecated
+   * Note that `submitBehavior` now takes the place of `blurOnSubmit` and will
+   * override any behavior defined by `blurOnSubmit`.
+   * @see submitBehavior
+   */
+  blurOnSubmit?: ?boolean,
+
+  /**
+   * When the return key is pressed,
+   *
+   * For single line inputs:
+   *
+   * - `'newline`' defaults to `'blurAndSubmit'`
+   * - `undefined` defaults to `'blurAndSubmit'`
+   *
+   * For multiline inputs:
+   *
+   * - `'newline'` adds a newline
+   * - `undefined` defaults to `'newline'`
+   *
+   * For both single line and multiline inputs:
+   *
+   * - `'submit'` will only send a submit event and not blur the input
+   * - `'blurAndSubmit`' will both blur the input and send a submit event
+   */
+  submitBehavior?: ?SubmitBehavior,
+
   /**
    * Note that not all Text styles are supported, an incomplete list of what is not supported includes:
    *
@@ -976,8 +1121,6 @@ function InternalTextInput(props: Props): React.Node {
   const text =
     typeof props.value === 'string'
       ? props.value
-      : typeof lastNativeText === 'string'
-      ? lastNativeText
       : typeof props.defaultValue === 'string'
       ? props.defaultValue
       : '';
@@ -1187,9 +1330,31 @@ function InternalTextInput(props: Props): React.Node {
 
   let textInput = null;
 
-  // The default value for `blurOnSubmit` is true for single-line fields and
-  // false for multi-line fields.
-  const blurOnSubmit = props.blurOnSubmit ?? !props.multiline;
+  const multiline = props.multiline ?? false;
+
+  let submitBehavior: SubmitBehavior;
+  if (props.submitBehavior != null) {
+    // `submitBehavior` is set explicitly
+    if (!multiline && props.submitBehavior === 'newline') {
+      // For single line text inputs, `'newline'` is not a valid option
+      submitBehavior = 'blurAndSubmit';
+    } else {
+      submitBehavior = props.submitBehavior;
+    }
+  } else if (multiline) {
+    if (props.blurOnSubmit === true) {
+      submitBehavior = 'blurAndSubmit';
+    } else {
+      submitBehavior = 'newline';
+    }
+  } else {
+    // Single line
+    if (props.blurOnSubmit !== false) {
+      submitBehavior = 'blurAndSubmit';
+    } else {
+      submitBehavior = 'submit';
+    }
+  }
 
   const accessible = props.accessible !== false;
   const focusable = props.focusable !== false;
@@ -1227,6 +1392,14 @@ function InternalTextInput(props: Props): React.Node {
   // so omitting onBlur and onFocus pressability handlers here.
   const {onBlur, onFocus, ...eventHandlers} = usePressability(config) || {};
 
+  const _accessibilityState = {
+    busy: props['aria-busy'] ?? props.accessibilityState?.busy,
+    checked: props['aria-checked'] ?? props.accessibilityState?.checked,
+    disabled: props['aria-disabled'] ?? props.accessibilityState?.disabled,
+    expanded: props['aria-expanded'] ?? props.accessibilityState?.expanded,
+    selected: props['aria-selected'] ?? props.accessibilityState?.selected,
+  };
+
   if (Platform.OS === 'ios') {
     const RCTTextInputView =
       props.multiline === true
@@ -1248,7 +1421,8 @@ function InternalTextInput(props: Props): React.Node {
         {...props}
         {...eventHandlers}
         accessible={accessible}
-        blurOnSubmit={blurOnSubmit}
+        accessibilityState={_accessibilityState}
+        submitBehavior={submitBehavior}
         caretHidden={caretHidden}
         dataDetectorTypes={props.dataDetectorTypes}
         focusable={focusable}
@@ -1270,6 +1444,8 @@ function InternalTextInput(props: Props): React.Node {
   } else if (Platform.OS === 'android') {
     const style = [props.style];
     const autoCapitalize = props.autoCapitalize || 'sentences';
+    const _accessibilityLabelledBy =
+      props?.['aria-labelledby'] ?? props?.accessibilityLabelledBy;
     const placeholder = props.placeholder ?? '';
     let children = props.children;
     const childCount = React.Children.count(children);
@@ -1295,13 +1471,16 @@ function InternalTextInput(props: Props): React.Node {
         {...props}
         {...eventHandlers}
         accessible={accessible}
+        accessibilityState={_accessibilityState}
+        accessibilityLabelledBy={_accessibilityLabelledBy}
         autoCapitalize={autoCapitalize}
-        blurOnSubmit={blurOnSubmit}
+        submitBehavior={submitBehavior}
         caretHidden={caretHidden}
         children={children}
         disableFullscreenUI={props.disableFullscreenUI}
         focusable={focusable}
         mostRecentEventCount={mostRecentEventCount}
+        numberOfLines={props.rows ?? props.numberOfLines}
         onBlur={_onBlur}
         onChange={_onChange}
         onFocus={_onFocus}
@@ -1326,6 +1505,88 @@ function InternalTextInput(props: Props): React.Node {
   );
 }
 
+const enterKeyHintToReturnTypeMap = {
+  enter: 'default',
+  done: 'done',
+  go: 'go',
+  next: 'next',
+  previous: 'previous',
+  search: 'search',
+  send: 'send',
+};
+
+const inputModeToKeyboardTypeMap = {
+  none: 'default',
+  text: 'default',
+  decimal: 'decimal-pad',
+  numeric: 'number-pad',
+  tel: 'phone-pad',
+  search: Platform.OS === 'ios' ? 'web-search' : 'default',
+  email: 'email-address',
+  url: 'url',
+};
+
+// Map HTML autocomplete values to Android autoComplete values
+const autoCompleteWebToAutoCompleteAndroidMap = {
+  'address-line1': 'postal-address-region',
+  'address-line2': 'postal-address-locality',
+  bday: 'birthdate-full',
+  'bday-day': 'birthdate-day',
+  'bday-month': 'birthdate-month',
+  'bday-year': 'birthdate-year',
+  'cc-csc': 'cc-csc',
+  'cc-exp': 'cc-exp',
+  'cc-exp-month': 'cc-exp-month',
+  'cc-exp-year': 'cc-exp-year',
+  'cc-number': 'cc-number',
+  country: 'postal-address-country',
+  'current-password': 'password',
+  email: 'email',
+  'honorific-prefix': 'name-prefix',
+  'honorific-suffix': 'name-suffix',
+  name: 'name',
+  'additional-name': 'name-middle',
+  'family-name': 'name-family',
+  'given-name': 'name-given',
+  'new-password': 'password-new',
+  off: 'off',
+  'one-time-code': 'sms-otp',
+  'postal-code': 'postal-code',
+  sex: 'gender',
+  'street-address': 'street-address',
+  tel: 'tel',
+  'tel-country-code': 'tel-country-code',
+  'tel-national': 'tel-national',
+  username: 'username',
+};
+
+// Map HTML autocomplete values to iOS textContentType values
+const autoCompleteWebToTextContentTypeMap = {
+  'address-line1': 'streetAddressLine1',
+  'address-line2': 'streetAddressLine2',
+  'cc-number': 'creditCardNumber',
+  'current-password': 'password',
+  country: 'countryName',
+  email: 'emailAddress',
+  name: 'name',
+  'additional-name': 'middleName',
+  'family-name': 'familyName',
+  'given-name': 'givenName',
+  nickname: 'nickname',
+  'honorific-prefix': 'namePrefix',
+  'honorific-suffix': 'nameSuffix',
+  'new-password': 'newPassword',
+  off: 'none',
+  'one-time-code': 'oneTimeCode',
+  organization: 'organizationName',
+  'organization-title': 'jobTitle',
+  'postal-code': 'postalCode',
+  'street-address': 'fullStreetAddress',
+  tel: 'telephoneNumber',
+  url: 'URL',
+  username: 'username',
+};
+
 const ExportedForwardRef: React.AbstractComponent<
   React.ElementConfig<typeof InternalTextInput>,
   React.ElementRef<HostComponent<mixed>> & ImperativeMethods,
@@ -1334,23 +1595,68 @@ const ExportedForwardRef: React.AbstractComponent<
     allowFontScaling = true,
     rejectResponderTermination = true,
     underlineColorAndroid = 'transparent',
+    autoComplete,
+    textContentType,
+    readOnly,
+    editable,
+    enterKeyHint,
+    returnKeyType,
+    inputMode,
+    keyboardType,
     ...restProps
   },
   forwardedRef: ReactRefSetter<
     React.ElementRef<HostComponent<mixed>> & ImperativeMethods,
   >,
 ) {
+  const style = flattenStyle(restProps.style);
+
+  if (style?.verticalAlign != null) {
+    style.textAlignVertical =
+      verticalAlignToTextAlignVerticalMap[style.verticalAlign];
+  }
+
   return (
     <InternalTextInput
       allowFontScaling={allowFontScaling}
       rejectResponderTermination={rejectResponderTermination}
       underlineColorAndroid={underlineColorAndroid}
+      editable={readOnly !== undefined ? !readOnly : editable}
+      returnKeyType={
+        enterKeyHint ? enterKeyHintToReturnTypeMap[enterKeyHint] : returnKeyType
+      }
+      keyboardType={
+        inputMode ? inputModeToKeyboardTypeMap[inputMode] : keyboardType
+      }
+      autoComplete={
+        Platform.OS === 'android'
+          ? // $FlowFixMe
+            autoCompleteWebToAutoCompleteAndroidMap[autoComplete] ??
+            autoComplete
+          : undefined
+      }
+      textContentType={
+        Platform.OS === 'ios' &&
+        autoComplete &&
+        autoComplete in autoCompleteWebToTextContentTypeMap
+          ? // $FlowFixMe
+            autoCompleteWebToTextContentTypeMap[autoComplete]
+          : textContentType
+      }
       {...restProps}
       forwardedRef={forwardedRef}
+      style={style}
     />
   );
 });
 
+/**
+ * Switch to `deprecated-react-native-prop-types` for compatibility with future
+ * releases. This is deprecated and will be removed in the future.
+ */
+ExportedForwardRef.propTypes =
+  require('deprecated-react-native-prop-types').TextInputPropTypes;
+
 // $FlowFixMe[prop-missing]
 ExportedForwardRef.State = {
   currentlyFocusedInput: TextInputState.currentlyFocusedInput,
@@ -1378,12 +1684,12 @@ const styles = StyleSheet.create({
   },
 });
 
+const verticalAlignToTextAlignVerticalMap = {
+  auto: 'auto',
+  top: 'top',
+  bottom: 'bottom',
+  middle: 'center',
+};
+
 // $FlowFixMe[unclear-type] Unclear type. Using `any` type is not safe.
-module.exports = ((ExportedForwardRef: any): React.AbstractComponent<
-  React.ElementConfig<typeof InternalTextInput>,
-  $ReadOnly<{|
-    ...React.ElementRef<HostComponent<mixed>>,
-    ...ImperativeMethods,
-  |}>,
-> &
-  TextInputComponentStatics);
+module.exports = ((ExportedForwardRef: any): TextInputType);
diff --git a/Libraries/Components/TextInput/TextInputNativeCommands.js b/Libraries/Components/TextInput/TextInputNativeCommands.js
index 560ae5bf8a33..e64262ae37de 100644
--- a/Libraries/Components/TextInput/TextInputNativeCommands.js
+++ b/Libraries/Components/TextInput/TextInputNativeCommands.js
@@ -8,10 +8,10 @@
  * @format
  */
 
-import * as React from 'react';
-
 import type {Int32} from '../../Types/CodegenTypes';
 
+import * as React from 'react';
+
 export interface TextInputNativeCommands<T> {
   +focus: (viewRef: React.ElementRef<T>) => void;
   +blur: (viewRef: React.ElementRef<T>) => void;
diff --git a/Libraries/Components/TextInput/TextInputState.js b/Libraries/Components/TextInput/TextInputState.js
index 87cb3ccf7870..9a381437c9f1 100644
--- a/Libraries/Components/TextInput/TextInputState.js
+++ b/Libraries/Components/TextInput/TextInputState.js
@@ -12,17 +12,34 @@
 // TextInputs. All calls relating to the keyboard should be funneled
 // through here.
 
-const React = require('react');
-const Platform = require('../../Utilities/Platform');
-const {findNodeHandle} = require('../../Renderer/shims/ReactNative');
+import type {
+  HostComponent,
+  MeasureInWindowOnSuccessCallback,
+  MeasureLayoutOnSuccessCallback,
+  MeasureOnSuccessCallback,
+} from '../../Renderer/shims/ReactNativeTypes';
+
 import {Commands as AndroidTextInputCommands} from '../../Components/TextInput/AndroidTextInputNativeComponent';
 import {Commands as iOSTextInputCommands} from '../../Components/TextInput/RCTSingelineTextInputNativeComponent';
 
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+const {findNodeHandle} = require('../../ReactNative/RendererProxy');
+const Platform = require('../../Utilities/Platform');
+const React = require('react');
 type ComponentRef = React.ElementRef<HostComponent<mixed>>;
 
 let currentlyFocusedInputRef: ?ComponentRef = null;
-const inputs = new Set();
+const inputs = new Set<{
+  blur(): void,
+  focus(): void,
+  measure(callback: MeasureOnSuccessCallback): void,
+  measureInWindow(callback: MeasureInWindowOnSuccessCallback): void,
+  measureLayout(
+    relativeToNativeNode: number | React.ElementRef<HostComponent<mixed>>,
+    onSuccess: MeasureLayoutOnSuccessCallback,
+    onFail?: () => void,
+  ): void,
+  setNativeProps(nativeProps: {...}): void,
+}>();
 
 function currentlyFocusedInput(): ?ComponentRef {
   return currentlyFocusedInputRef;
diff --git a/Libraries/Components/TextInput/__tests__/InputAccessoryView-test.js b/Libraries/Components/TextInput/__tests__/InputAccessoryView-test.js
index f1a2d643651a..d293702660a9 100644
--- a/Libraries/Components/TextInput/__tests__/InputAccessoryView-test.js
+++ b/Libraries/Components/TextInput/__tests__/InputAccessoryView-test.js
@@ -4,17 +4,17 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
+const render = require('../../../../jest/renderer');
 const View = require('../../View/View');
 const InputAccessoryView = require('../InputAccessoryView');
-const render = require('../../../../jest/renderer');
+const React = require('react');
 
 describe('<InputAccessoryView />', () => {
   it('should render as <RCTInputAccessoryView> when mocked', () => {
diff --git a/Libraries/Components/TextInput/__tests__/TextInput-test.js b/Libraries/Components/TextInput/__tests__/TextInput-test.js
index 18992428a646..40c34cb872e0 100644
--- a/Libraries/Components/TextInput/__tests__/TextInput-test.js
+++ b/Libraries/Components/TextInput/__tests__/TextInput-test.js
@@ -4,20 +4,19 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
- * @format
  * @flow-strict
+ * @format
+ * @oncall react_native
  */
 
-const React = require('react');
-const ReactTestRenderer = require('react-test-renderer');
-const TextInput = require('../TextInput');
-const ReactNative = require('../../../Renderer/shims/ReactNative');
-
+const ReactNative = require('../../../ReactNative/RendererProxy');
 const {
   enter,
   expectRendersMatchingSnapshot,
 } = require('../../../Utilities/ReactNativeTestTools');
+const TextInput = require('../TextInput');
+const React = require('react');
+const ReactTestRenderer = require('react-test-renderer');
 
 jest.unmock('../TextInput');
 
diff --git a/Libraries/Components/TextInput/__tests__/__snapshots__/TextInput-test.js.snap b/Libraries/Components/TextInput/__tests__/__snapshots__/TextInput-test.js.snap
index 874fae2b158a..ea3b4c1f0627 100644
--- a/Libraries/Components/TextInput/__tests__/__snapshots__/TextInput-test.js.snap
+++ b/Libraries/Components/TextInput/__tests__/__snapshots__/TextInput-test.js.snap
@@ -2,9 +2,17 @@
 
 exports[`TextInput tests should render as expected: should deep render when mocked (please verify output manually) 1`] = `
 <RCTSinglelineTextInputView
+  accessibilityState={
+    Object {
+      "busy": undefined,
+      "checked": undefined,
+      "disabled": undefined,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
   accessible={true}
   allowFontScaling={true}
-  blurOnSubmit={true}
   focusable={true}
   forwardedRef={null}
   mostRecentEventCount={0}
@@ -24,6 +32,7 @@ exports[`TextInput tests should render as expected: should deep render when mock
   onStartShouldSetResponder={[Function]}
   rejectResponderTermination={true}
   selection={null}
+  submitBehavior="blurAndSubmit"
   text=""
   underlineColorAndroid="transparent"
 />
@@ -31,9 +40,17 @@ exports[`TextInput tests should render as expected: should deep render when mock
 
 exports[`TextInput tests should render as expected: should deep render when not mocked (please verify output manually) 1`] = `
 <RCTSinglelineTextInputView
+  accessibilityState={
+    Object {
+      "busy": undefined,
+      "checked": undefined,
+      "disabled": undefined,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
   accessible={true}
   allowFontScaling={true}
-  blurOnSubmit={true}
   focusable={true}
   forwardedRef={null}
   mostRecentEventCount={0}
@@ -53,6 +70,7 @@ exports[`TextInput tests should render as expected: should deep render when not
   onStartShouldSetResponder={[Function]}
   rejectResponderTermination={true}
   selection={null}
+  submitBehavior="blurAndSubmit"
   text=""
   underlineColorAndroid="transparent"
 />
diff --git a/Libraries/Components/ToastAndroid/NativeToastAndroid.js b/Libraries/Components/ToastAndroid/NativeToastAndroid.js
index b35757b25d43..3a13f89bd450 100644
--- a/Libraries/Components/ToastAndroid/NativeToastAndroid.js
+++ b/Libraries/Components/ToastAndroid/NativeToastAndroid.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Components/ToastAndroid/ToastAndroid.d.ts b/Libraries/Components/ToastAndroid/ToastAndroid.d.ts
new file mode 100644
index 000000000000..9e0854380b64
--- /dev/null
+++ b/Libraries/Components/ToastAndroid/ToastAndroid.d.ts
@@ -0,0 +1,47 @@
+/**
+ * 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
+ */
+
+/**
+ * This exposes the native ToastAndroid module as a JS module. This has a function 'show'
+ * which takes the following parameters:
+ *
+ * 1. String message: A string with the text to toast
+ * 2. int duration: The duration of the toast. May be ToastAndroid.SHORT or ToastAndroid.LONG
+ *
+ * There is also a function `showWithGravity` to specify the layout gravity. May be
+ * ToastAndroid.TOP, ToastAndroid.BOTTOM, ToastAndroid.CENTER
+ */
+export interface ToastAndroidStatic {
+  /**
+   * String message: A string with the text to toast
+   * int duration: The duration of the toast.
+   * May be ToastAndroid.SHORT or ToastAndroid.LONG
+   */
+  show(message: string, duration: number): void;
+  /** `gravity` may be ToastAndroid.TOP, ToastAndroid.BOTTOM, ToastAndroid.CENTER */
+  showWithGravity(message: string, duration: number, gravity: number): void;
+
+  showWithGravityAndOffset(
+    message: string,
+    duration: number,
+    gravity: number,
+    xOffset: number,
+    yOffset: number,
+  ): void;
+  // Toast duration constants
+  SHORT: number;
+  LONG: number;
+  // Toast gravity constants
+  TOP: number;
+  BOTTOM: number;
+  CENTER: number;
+}
+
+export const ToastAndroid: ToastAndroidStatic;
+export type ToastAndroid = ToastAndroidStatic;
diff --git a/Libraries/Components/Touchable/Touchable.d.ts b/Libraries/Components/Touchable/Touchable.d.ts
new file mode 100644
index 000000000000..6915dd27927d
--- /dev/null
+++ b/Libraries/Components/Touchable/Touchable.d.ts
@@ -0,0 +1,90 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Insets} from '../../../types/public/Insets';
+import {GestureResponderEvent} from '../../Types/CoreEventTypes';
+
+/**
+ * //FIXME: need to find documentation on which component is a TTouchable and can implement that interface
+ * @see React.DOMAtributes
+ */
+export interface Touchable {
+  onTouchStart?: ((event: GestureResponderEvent) => void) | undefined;
+  onTouchMove?: ((event: GestureResponderEvent) => void) | undefined;
+  onTouchEnd?: ((event: GestureResponderEvent) => void) | undefined;
+  onTouchCancel?: ((event: GestureResponderEvent) => void) | undefined;
+  onTouchEndCapture?: ((event: GestureResponderEvent) => void) | undefined;
+}
+
+export const Touchable: {
+  TOUCH_TARGET_DEBUG: boolean;
+  renderDebugView: (config: {
+    color: string | number;
+    hitSlop?: Insets | undefined;
+  }) => React.ReactElement | null;
+};
+
+/**
+ * @see https://github.com/facebook/react-native/blob/0.34-stable\Libraries\Components\Touchable\Touchable.js
+ */
+interface TouchableMixin {
+  /**
+   * Invoked when the item should be highlighted. Mixers should implement this
+   * to visually distinguish the `VisualRect` so that the user knows that
+   * releasing a touch will result in a "selection" (analog to click).
+   */
+  touchableHandleActivePressIn(e: GestureResponderEvent): void;
+
+  /**
+   * Invoked when the item is "active" (in that it is still eligible to become
+   * a "select") but the touch has left the `PressRect`. Usually the mixer will
+   * want to unhighlight the `VisualRect`. If the user (while pressing) moves
+   * back into the `PressRect` `touchableHandleActivePressIn` will be invoked
+   * again and the mixer should probably highlight the `VisualRect` again. This
+   * event will not fire on an `touchEnd/mouseUp` event, only move events while
+   * the user is depressing the mouse/touch.
+   */
+  touchableHandleActivePressOut(e: GestureResponderEvent): void;
+
+  /**
+   * Invoked when the item is "selected" - meaning the interaction ended by
+   * letting up while the item was either in the state
+   * `RESPONDER_ACTIVE_PRESS_IN` or `RESPONDER_INACTIVE_PRESS_IN`.
+   */
+  touchableHandlePress(e: GestureResponderEvent): void;
+
+  /**
+   * Invoked when the item is long pressed - meaning the interaction ended by
+   * letting up while the item was in `RESPONDER_ACTIVE_LONG_PRESS_IN`. If
+   * `touchableHandleLongPress` is *not* provided, `touchableHandlePress` will
+   * be called as it normally is. If `touchableHandleLongPress` is provided, by
+   * default any `touchableHandlePress` callback will not be invoked. To
+   * override this default behavior, override `touchableLongPressCancelsPress`
+   * to return false. As a result, `touchableHandlePress` will be called when
+   * lifting up, even if `touchableHandleLongPress` has also been called.
+   */
+  touchableHandleLongPress(e: GestureResponderEvent): void;
+
+  /**
+   * Returns the amount to extend the `HitRect` into the `PressRect`. Positive
+   * numbers mean the size expands outwards.
+   */
+  touchableGetPressRectOffset(): Insets;
+
+  /**
+   * Returns the number of millis to wait before triggering a highlight.
+   */
+  touchableGetHighlightDelayMS(): number;
+
+  // These methods are undocumented but still being used by TouchableMixin internals
+  touchableGetLongPressDelayMS(): number;
+  touchableGetPressOutDelayMS(): number;
+  touchableGetHitSlop(): Insets;
+}
diff --git a/Libraries/Components/Touchable/Touchable.flow.js b/Libraries/Components/Touchable/Touchable.flow.js
new file mode 100644
index 000000000000..3a583c286dfc
--- /dev/null
+++ b/Libraries/Components/Touchable/Touchable.flow.js
@@ -0,0 +1,258 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+import type {EdgeInsetsProp} from '../../StyleSheet/EdgeInsetsPropType';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
+import type {PressEvent} from '../../Types/CoreEventTypes';
+
+import * as React from 'react';
+
+/**
+ * `Touchable`: Taps done right.
+ *
+ * You hook your `ResponderEventPlugin` events into `Touchable`. `Touchable`
+ * will measure time/geometry and tells you when to give feedback to the user.
+ *
+ * ====================== Touchable Tutorial ===============================
+ * The `Touchable` mixin helps you handle the "press" interaction. It analyzes
+ * the geometry of elements, and observes when another responder (scroll view
+ * etc) has stolen the touch lock. It notifies your component when it should
+ * give feedback to the user. (bouncing/highlighting/unhighlighting).
+ *
+ * - When a touch was activated (typically you highlight)
+ * - When a touch was deactivated (typically you unhighlight)
+ * - When a touch was "pressed" - a touch ended while still within the geometry
+ *   of the element, and no other element (like scroller) has "stolen" touch
+ *   lock ("responder") (Typically you bounce the element).
+ *
+ * A good tap interaction isn't as simple as you might think. There should be a
+ * slight delay before showing a highlight when starting a touch. If a
+ * subsequent touch move exceeds the boundary of the element, it should
+ * unhighlight, but if that same touch is brought back within the boundary, it
+ * should rehighlight again. A touch can move in and out of that boundary
+ * several times, each time toggling highlighting, but a "press" is only
+ * triggered if that touch ends while within the element's boundary and no
+ * scroller (or anything else) has stolen the lock on touches.
+ *
+ * To create a new type of component that handles interaction using the
+ * `Touchable` mixin, do the following:
+ *
+ * - Initialize the `Touchable` state.
+ *
+ *   getInitialState: function() {
+ *     return merge(this.touchableGetInitialState(), yourComponentState);
+ *   }
+ *
+ * - Choose the rendered component who's touches should start the interactive
+ *   sequence. On that rendered node, forward all `Touchable` responder
+ *   handlers. You can choose any rendered node you like. Choose a node whose
+ *   hit target you'd like to instigate the interaction sequence:
+ *
+ *   // In render function:
+ *   return (
+ *     <View
+ *       onStartShouldSetResponder={this.touchableHandleStartShouldSetResponder}
+ *       onResponderTerminationRequest={this.touchableHandleResponderTerminationRequest}
+ *       onResponderGrant={this.touchableHandleResponderGrant}
+ *       onResponderMove={this.touchableHandleResponderMove}
+ *       onResponderRelease={this.touchableHandleResponderRelease}
+ *       onResponderTerminate={this.touchableHandleResponderTerminate}>
+ *       <View>
+ *         Even though the hit detection/interactions are triggered by the
+ *         wrapping (typically larger) node, we usually end up implementing
+ *         custom logic that highlights this inner one.
+ *       </View>
+ *     </View>
+ *   );
+ *
+ * - You may set up your own handlers for each of these events, so long as you
+ *   also invoke the `touchable*` handlers inside of your custom handler.
+ *
+ * - Implement the handlers on your component class in order to provide
+ *   feedback to the user. See documentation for each of these class methods
+ *   that you should implement.
+ *
+ *   touchableHandlePress: function() {
+ *      this.performBounceAnimation();  // or whatever you want to do.
+ *   },
+ *   touchableHandleActivePressIn: function() {
+ *     this.beginHighlighting(...);  // Whatever you like to convey activation
+ *   },
+ *   touchableHandleActivePressOut: function() {
+ *     this.endHighlighting(...);  // Whatever you like to convey deactivation
+ *   },
+ *
+ * - There are more advanced methods you can implement (see documentation below):
+ *   touchableGetHighlightDelayMS: function() {
+ *     return 20;
+ *   }
+ *   // In practice, *always* use a predeclared constant (conserve memory).
+ *   touchableGetPressRectOffset: function() {
+ *     return {top: 20, left: 20, right: 20, bottom: 100};
+ *   }
+ */
+
+// Default amount "active" region protrudes beyond box
+
+/**
+ * By convention, methods prefixed with underscores are meant to be @private,
+ * and not @protected. Mixers shouldn't access them - not even to provide them
+ * as callback handlers.
+ *
+ *
+ * ========== Geometry =========
+ * `Touchable` only assumes that there exists a `HitRect` node. The `PressRect`
+ * is an abstract box that is extended beyond the `HitRect`.
+ *
+ *  +--------------------------+
+ *  |                          | - "Start" events in `HitRect` cause `HitRect`
+ *  |  +--------------------+  |   to become the responder.
+ *  |  |  +--------------+  |  | - `HitRect` is typically expanded around
+ *  |  |  |              |  |  |   the `VisualRect`, but shifted downward.
+ *  |  |  |  VisualRect  |  |  | - After pressing down, after some delay,
+ *  |  |  |              |  |  |   and before letting up, the Visual React
+ *  |  |  +--------------+  |  |   will become "active". This makes it eligible
+ *  |  |     HitRect        |  |   for being highlighted (so long as the
+ *  |  +--------------------+  |   press remains in the `PressRect`).
+ *  |        PressRect     o   |
+ *  +----------------------|---+
+ *           Out Region    |
+ *                         +-----+ This gap between the `HitRect` and
+ *                                 `PressRect` allows a touch to move far away
+ *                                 from the original hit rect, and remain
+ *                                 highlighted, and eligible for a "Press".
+ *                                 Customize this via
+ *                                 `touchableGetPressRectOffset()`.
+ *
+ *
+ *
+ * ======= State Machine =======
+ *
+ * +-------------+ <---+ RESPONDER_RELEASE
+ * |NOT_RESPONDER|
+ * +-------------+ <---+ RESPONDER_TERMINATED
+ *     +
+ *     | RESPONDER_GRANT (HitRect)
+ *     v
+ * +---------------------------+  DELAY   +-------------------------+  T + DELAY     +------------------------------+
+ * |RESPONDER_INACTIVE_PRESS_IN|+-------->|RESPONDER_ACTIVE_PRESS_IN| +------------> |RESPONDER_ACTIVE_LONG_PRESS_IN|
+ * +---------------------------+          +-------------------------+                +------------------------------+
+ *     +            ^                         +           ^                                 +           ^
+ *     |LEAVE_      |ENTER_                   |LEAVE_     |ENTER_                           |LEAVE_     |ENTER_
+ *     |PRESS_RECT  |PRESS_RECT               |PRESS_RECT |PRESS_RECT                       |PRESS_RECT |PRESS_RECT
+ *     |            |                         |           |                                 |           |
+ *     v            +                         v           +                                 v           +
+ * +----------------------------+  DELAY  +--------------------------+               +-------------------------------+
+ * |RESPONDER_INACTIVE_PRESS_OUT|+------->|RESPONDER_ACTIVE_PRESS_OUT|               |RESPONDER_ACTIVE_LONG_PRESS_OUT|
+ * +----------------------------+         +--------------------------+               +-------------------------------+
+ *
+ * T + DELAY => LONG_PRESS_DELAY_MS + DELAY
+ *
+ * Not drawn are the side effects of each transition. The most important side
+ * effect is the `touchableHandlePress` abstract method invocation that occurs
+ * when a responder is released while in either of the "Press" states.
+ *
+ * The other important side effects are the highlight abstract method
+ * invocations (internal callbacks) to be implemented by the mixer.
+ *
+ *
+ * @lends Touchable.prototype
+ */
+interface TouchableMixinType {
+  /**
+   * Invoked when the item receives focus. Mixers might override this to
+   * visually distinguish the `VisualRect` so that the user knows that it
+   * currently has the focus. Most platforms only support a single element being
+   * focused at a time, in which case there may have been a previously focused
+   * element that was blurred just prior to this. This can be overridden when
+   * using `Touchable.Mixin.withoutDefaultFocusAndBlur`.
+   */
+  touchableHandleFocus: (e: Event) => void;
+
+  /**
+   * Invoked when the item loses focus. Mixers might override this to
+   * visually distinguish the `VisualRect` so that the user knows that it
+   * no longer has focus. Most platforms only support a single element being
+   * focused at a time, in which case the focus may have moved to another.
+   * This can be overridden when using
+   * `Touchable.Mixin.withoutDefaultFocusAndBlur`.
+   */
+  touchableHandleBlur: (e: Event) => void;
+
+  componentDidMount: () => void;
+
+  /**
+   * Clear all timeouts on unmount
+   */
+  componentWillUnmount: () => void;
+
+  /**
+   * It's prefer that mixins determine state in this way, having the class
+   * explicitly mix the state in the one and only `getInitialState` method.
+   *
+   * @return {object} State object to be placed inside of
+   * `this.state.touchable`.
+   */
+  touchableGetInitialState: () => $TEMPORARY$object<{|
+    touchable: $TEMPORARY$object<{|responderID: null, touchState: void|}>,
+  |}>;
+
+  // ==== Hooks to Gesture Responder system ====
+  /**
+   * Must return true if embedded in a native platform scroll view.
+   */
+  touchableHandleResponderTerminationRequest: () => any;
+
+  /**
+   * Must return true to start the process of `Touchable`.
+   */
+  touchableHandleStartShouldSetResponder: () => any;
+
+  /**
+   * Return true to cancel press on long press.
+   */
+  touchableLongPressCancelsPress: () => boolean;
+
+  /**
+   * Place as callback for a DOM element's `onResponderGrant` event.
+   * @param {SyntheticEvent} e Synthetic event from event system.
+   *
+   */
+  touchableHandleResponderGrant: (e: PressEvent) => void;
+
+  /**
+   * Place as callback for a DOM element's `onResponderRelease` event.
+   */
+  touchableHandleResponderRelease: (e: PressEvent) => void;
+
+  /**
+   * Place as callback for a DOM element's `onResponderTerminate` event.
+   */
+  touchableHandleResponderTerminate: (e: PressEvent) => void;
+
+  /**
+   * Place as callback for a DOM element's `onResponderMove` event.
+   */
+  touchableHandleResponderMove: (e: PressEvent) => void;
+
+  withoutDefaultFocusAndBlur: {...};
+}
+
+export type TouchableType = {
+  Mixin: TouchableMixinType,
+  /**
+   * Renders a debugging overlay to visualize touch target with hitSlop (might not work on Android).
+   */
+  renderDebugView: ({
+    color: ColorValue,
+    hitSlop: EdgeInsetsProp,
+    ...
+  }) => null | React.Node,
+};
diff --git a/Libraries/Components/Touchable/Touchable.js b/Libraries/Components/Touchable/Touchable.js
index ea448b3efb50..48e15bf1b6d3 100644
--- a/Libraries/Components/Touchable/Touchable.js
+++ b/Libraries/Components/Touchable/Touchable.js
@@ -8,18 +8,18 @@
  * @format
  */
 
-import * as React from 'react';
-import BoundingDimensions from './BoundingDimensions';
-import Platform from '../../Utilities/Platform';
-import Position from './Position';
-import UIManager from '../../ReactNative/UIManager';
-import SoundManager from '../Sound/SoundManager';
-
-import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
-
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {EdgeInsetsProp} from '../../StyleSheet/EdgeInsetsPropType';
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {PressEvent} from '../../Types/CoreEventTypes';
+import type {TouchableType} from './Touchable.flow';
+
+import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
+import UIManager from '../../ReactNative/UIManager';
+import Platform from '../../Utilities/Platform';
+import SoundManager from '../Sound/SoundManager';
+import BoundingDimensions from './BoundingDimensions';
+import Position from './Position';
+import * as React from 'react';
 
 const extractSingleTouch = (nativeEvent: {
   +changedTouches: $ReadOnlyArray<PressEvent['nativeEvent']>,
@@ -927,7 +927,7 @@ const TouchableMixin = {
     }
   },
 
-  withoutDefaultFocusAndBlur: ({}: $TEMPORARY$object<{||}>),
+  withoutDefaultFocusAndBlur: ({}: {...}),
 };
 
 /**
@@ -944,7 +944,7 @@ const {
 TouchableMixin.withoutDefaultFocusAndBlur =
   TouchableMixinWithoutDefaultFocusAndBlur;
 
-const Touchable = {
+const Touchable: TouchableType = {
   Mixin: TouchableMixin,
   /**
    * Renders a debugging overlay to visualize touch target with hitSlop (might not work on Android).
diff --git a/Libraries/Components/Touchable/TouchableBounce.js b/Libraries/Components/Touchable/TouchableBounce.js
index f77ab0f5738f..5a8d97e85c0f 100644
--- a/Libraries/Components/Touchable/TouchableBounce.js
+++ b/Libraries/Components/Touchable/TouchableBounce.js
@@ -8,13 +8,15 @@
  * @format
  */
 
+import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
+import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';
+
+import Animated from '../../Animated/Animated';
 import Pressability, {
   type PressabilityConfig,
 } from '../../Pressability/Pressability';
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
-import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
-import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';
-import {Animated, Platform} from 'react-native';
+import Platform from '../../Utilities/Platform';
 import * as React from 'react';
 
 type Props = $ReadOnly<{|
@@ -130,23 +132,55 @@ class TouchableBounce extends React.Component<Props, State> {
     // adopting `Pressability`, so preserve that behavior.
     const {onBlur, onFocus, ...eventHandlersWithoutBlurAndFocus} =
       this.state.pressability.getEventHandlers();
+    const accessibilityLiveRegion =
+      this.props['aria-live'] === 'off'
+        ? 'none'
+        : this.props['aria-live'] ?? this.props.accessibilityLiveRegion;
+    const _accessibilityState = {
+      busy: this.props['aria-busy'] ?? this.props.accessibilityState?.busy,
+      checked:
+        this.props['aria-checked'] ?? this.props.accessibilityState?.checked,
+      disabled:
+        this.props['aria-disabled'] ?? this.props.accessibilityState?.disabled,
+      expanded:
+        this.props['aria-expanded'] ?? this.props.accessibilityState?.expanded,
+      selected:
+        this.props['aria-selected'] ?? this.props.accessibilityState?.selected,
+    };
 
+    const accessibilityValue = {
+      max: this.props['aria-valuemax'] ?? this.props.accessibilityValue?.max,
+      min: this.props['aria-valuemin'] ?? this.props.accessibilityValue?.min,
+      now: this.props['aria-valuenow'] ?? this.props.accessibilityValue?.now,
+      text: this.props['aria-valuetext'] ?? this.props.accessibilityValue?.text,
+    };
+
+    const accessibilityLabel =
+      this.props['aria-label'] ?? this.props.accessibilityLabel;
     return (
       <Animated.View
         style={[{transform: [{scale: this.state.scale}]}, this.props.style]}
         accessible={this.props.accessible !== false}
-        accessibilityLabel={this.props.accessibilityLabel}
+        accessibilityLabel={accessibilityLabel}
         accessibilityHint={this.props.accessibilityHint}
         accessibilityLanguage={this.props.accessibilityLanguage}
         accessibilityRole={this.props.accessibilityRole}
-        accessibilityState={this.props.accessibilityState}
+        accessibilityState={_accessibilityState}
         accessibilityActions={this.props.accessibilityActions}
         onAccessibilityAction={this.props.onAccessibilityAction}
-        accessibilityValue={this.props.accessibilityValue}
-        importantForAccessibility={this.props.importantForAccessibility}
-        accessibilityLiveRegion={this.props.accessibilityLiveRegion}
-        accessibilityViewIsModal={this.props.accessibilityViewIsModal}
-        accessibilityElementsHidden={this.props.accessibilityElementsHidden}
+        accessibilityValue={accessibilityValue}
+        accessibilityLiveRegion={accessibilityLiveRegion}
+        importantForAccessibility={
+          this.props['aria-hidden'] === true
+            ? 'no-hide-descendants'
+            : this.props.importantForAccessibility
+        }
+        accessibilityViewIsModal={
+          this.props['aria-modal'] ?? this.props.accessibilityViewIsModal
+        }
+        accessibilityElementsHidden={
+          this.props['aria-hidden'] ?? this.props.accessibilityElementsHidden
+        }
         nativeID={this.props.nativeID}
         testID={this.props.testID}
         hitSlop={this.props.hitSlop}
diff --git a/Libraries/Components/Touchable/TouchableHighlight.d.ts b/Libraries/Components/Touchable/TouchableHighlight.d.ts
new file mode 100644
index 000000000000..b9faa3a8798f
--- /dev/null
+++ b/Libraries/Components/Touchable/TouchableHighlight.d.ts
@@ -0,0 +1,68 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {TimerMixin} from '../../../types/private/TimerMixin';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
+import {ColorValue, StyleProp} from '../../StyleSheet/StyleSheet';
+import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
+import {TouchableMixin} from './Touchable';
+import {TouchableWithoutFeedbackProps} from './TouchableWithoutFeedback';
+
+/**
+ * @see https://reactnative.dev/docs/touchablehighlight#props
+ */
+export interface TouchableHighlightProps extends TouchableWithoutFeedbackProps {
+  /**
+   * Determines what the opacity of the wrapped view should be when touch is active.
+   */
+  activeOpacity?: number | undefined;
+
+  /**
+   *
+   * Called immediately after the underlay is hidden
+   */
+  onHideUnderlay?: (() => void) | undefined;
+
+  /**
+   * Called immediately after the underlay is shown
+   */
+  onShowUnderlay?: (() => void) | undefined;
+
+  /**
+   * @see https://reactnative.dev/docs/view#style
+   */
+  style?: StyleProp<ViewStyle> | undefined;
+
+  /**
+   * The color of the underlay that will show through when the touch is active.
+   */
+  underlayColor?: ColorValue | undefined;
+}
+
+/**
+ * A wrapper for making views respond properly to touches.
+ * On press down, the opacity of the wrapped view is decreased,
+ * which allows the underlay color to show through, darkening or tinting the view.
+ * The underlay comes from adding a view to the view hierarchy,
+ * which can sometimes cause unwanted visual artifacts if not used correctly,
+ * for example if the backgroundColor of the wrapped view isn't explicitly set to an opaque color.
+ *
+ * NOTE: TouchableHighlight supports only one child
+ * If you wish to have several child components, wrap them in a View.
+ *
+ * @see https://reactnative.dev/docs/touchablehighlight
+ */
+declare class TouchableHighlightComponent extends React.Component<TouchableHighlightProps> {}
+declare const TouchableHighlightBase: Constructor<NativeMethods> &
+  Constructor<TimerMixin> &
+  Constructor<TouchableMixin> &
+  typeof TouchableHighlightComponent;
+export class TouchableHighlight extends TouchableHighlightBase {}
diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js
index d41513b189b5..7d648ca83a99 100644
--- a/Libraries/Components/Touchable/TouchableHighlight.js
+++ b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -8,15 +8,16 @@
  * @format
  */
 
+import type {ColorValue} from '../../StyleSheet/StyleSheet';
+import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';
+
+import View from '../../Components/View/View';
 import Pressability, {
   type PressabilityConfig,
 } from '../../Pressability/Pressability';
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import StyleSheet, {type ViewStyleProp} from '../../StyleSheet/StyleSheet';
-import type {ColorValue} from '../../StyleSheet/StyleSheet';
-import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';
 import Platform from '../../Utilities/Platform';
-import View from '../../Components/View/View';
 import * as React from 'react';
 
 type AndroidProps = $ReadOnly<{|
@@ -291,21 +292,43 @@ class TouchableHighlight extends React.Component<Props, State> {
           }
         : this.props.accessibilityState;
 
+    const accessibilityValue = {
+      max: this.props['aria-valuemax'] ?? this.props.accessibilityValue?.max,
+      min: this.props['aria-valuemin'] ?? this.props.accessibilityValue?.min,
+      now: this.props['aria-valuenow'] ?? this.props.accessibilityValue?.now,
+      text: this.props['aria-valuetext'] ?? this.props.accessibilityValue?.text,
+    };
+
+    const accessibilityLiveRegion =
+      this.props['aria-live'] === 'off'
+        ? 'none'
+        : this.props['aria-live'] ?? this.props.accessibilityLiveRegion;
+
+    const accessibilityLabel =
+      this.props['aria-label'] ?? this.props.accessibilityLabel;
     return (
       <View
         accessible={this.props.accessible !== false}
-        accessibilityLabel={this.props.accessibilityLabel}
+        accessibilityLabel={accessibilityLabel}
         accessibilityHint={this.props.accessibilityHint}
         accessibilityLanguage={this.props.accessibilityLanguage}
         accessibilityRole={this.props.accessibilityRole}
         accessibilityState={accessibilityState}
-        accessibilityValue={this.props.accessibilityValue}
+        accessibilityValue={accessibilityValue}
         accessibilityActions={this.props.accessibilityActions}
         onAccessibilityAction={this.props.onAccessibilityAction}
-        importantForAccessibility={this.props.importantForAccessibility}
-        accessibilityLiveRegion={this.props.accessibilityLiveRegion}
-        accessibilityViewIsModal={this.props.accessibilityViewIsModal}
-        accessibilityElementsHidden={this.props.accessibilityElementsHidden}
+        importantForAccessibility={
+          this.props['aria-hidden'] === true
+            ? 'no-hide-descendants'
+            : this.props.importantForAccessibility
+        }
+        accessibilityViewIsModal={
+          this.props['aria-modal'] ?? this.props.accessibilityViewIsModal
+        }
+        accessibilityLiveRegion={accessibilityLiveRegion}
+        accessibilityElementsHidden={
+          this.props['aria-hidden'] ?? this.props.accessibilityElementsHidden
+        }
         style={StyleSheet.compose(
           this.props.style,
           this.state.extraStyles?.underlay,
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.d.ts b/Libraries/Components/Touchable/TouchableNativeFeedback.d.ts
new file mode 100644
index 000000000000..9de3953b3150
--- /dev/null
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.d.ts
@@ -0,0 +1,114 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {ColorValue} from '../../StyleSheet/StyleSheet';
+import {TouchableMixin} from './Touchable';
+
+import type {TVProps} from './TouchableOpacity';
+import {TouchableWithoutFeedbackProps} from './TouchableWithoutFeedback';
+
+interface BaseBackgroundPropType {
+  type: string;
+  rippleRadius?: number | null | undefined;
+}
+
+interface RippleBackgroundPropType extends BaseBackgroundPropType {
+  type: 'RippleAndroid';
+  borderless: boolean;
+  color?: number | null | undefined;
+}
+
+interface ThemeAttributeBackgroundPropType extends BaseBackgroundPropType {
+  type: 'ThemeAttrAndroid';
+  attribute: string;
+}
+
+type BackgroundPropType =
+  | RippleBackgroundPropType
+  | ThemeAttributeBackgroundPropType;
+
+/**
+ * @see https://reactnative.dev/docs/touchablenativefeedback#props
+ */
+export interface TouchableNativeFeedbackProps
+  extends TouchableWithoutFeedbackProps,
+    TVProps {
+  /**
+   * Determines the type of background drawable that's going to be used to display feedback.
+   * It takes an object with type property and extra data depending on the type.
+   * It's recommended to use one of the following static methods to generate that dictionary:
+   *      1) TouchableNativeFeedback.SelectableBackground() - will create object that represents android theme's
+   *         default background for selectable elements (?android:attr/selectableItemBackground)
+   *      2) TouchableNativeFeedback.SelectableBackgroundBorderless() - will create object that represent android
+   *         theme's default background for borderless selectable elements
+   *         (?android:attr/selectableItemBackgroundBorderless). Available on android API level 21+
+   *      3) TouchableNativeFeedback.Ripple(color, borderless) - will create object that represents ripple drawable
+   *         with specified color (as a string). If property borderless evaluates to true the ripple will render
+   *         outside of the view bounds (see native actionbar buttons as an example of that behavior). This background
+   *         type is available on Android API level 21+
+   */
+  background?: BackgroundPropType | undefined;
+  useForeground?: boolean | undefined;
+}
+
+/**
+ * A wrapper for making views respond properly to touches (Android only).
+ * On Android this component uses native state drawable to display touch feedback.
+ * At the moment it only supports having a single View instance as a child node,
+ * as it's implemented by replacing that View with another instance of RCTView node with some additional properties set.
+ *
+ * Background drawable of native feedback touchable can be customized with background property.
+ *
+ * @see https://reactnative.dev/docs/touchablenativefeedback#content
+ */
+declare class TouchableNativeFeedbackComponent extends React.Component<TouchableNativeFeedbackProps> {}
+declare const TouchableNativeFeedbackBase: Constructor<TouchableMixin> &
+  typeof TouchableNativeFeedbackComponent;
+export class TouchableNativeFeedback extends TouchableNativeFeedbackBase {
+  /**
+   * Creates an object that represents android theme's default background for
+   * selectable elements (?android:attr/selectableItemBackground).
+   *
+   * @param rippleRadius The radius of ripple effect
+   */
+  static SelectableBackground(
+    rippleRadius?: number | null,
+  ): ThemeAttributeBackgroundPropType;
+
+  /**
+   * Creates an object that represent android theme's default background for borderless
+   * selectable elements (?android:attr/selectableItemBackgroundBorderless).
+   * Available on android API level 21+.
+   *
+   * @param rippleRadius The radius of ripple effect
+   */
+  static SelectableBackgroundBorderless(
+    rippleRadius?: number | null,
+  ): ThemeAttributeBackgroundPropType;
+
+  /**
+   * Creates an object that represents ripple drawable with specified color (as a
+   * string). If property `borderless` evaluates to true the ripple will
+   * render outside of the view bounds (see native actionbar buttons as an
+   * example of that behavior). This background type is available on Android
+   * API level 21+.
+   *
+   * @param color The ripple color
+   * @param borderless If the ripple can render outside it's bounds
+   * @param rippleRadius The radius of ripple effect
+   */
+  static Ripple(
+    color: ColorValue,
+    borderless: boolean,
+    rippleRadius?: number | null,
+  ): RippleBackgroundPropType;
+  static canUseNativeForeground(): boolean;
+}
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.js b/Libraries/Components/Touchable/TouchableNativeFeedback.js
index 8fff2f302397..a377694e06c7 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.js
@@ -8,19 +8,20 @@
  * @format
  */
 
+import type {PressEvent} from '../../Types/CoreEventTypes';
+import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';
+
+import View from '../../Components/View/View';
 import Pressability, {
   type PressabilityConfig,
 } from '../../Pressability/Pressability';
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
-import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';
-import {Commands} from 'react-native/Libraries/Components/View/ViewNativeComponent';
-import ReactNative from 'react-native/Libraries/Renderer/shims/ReactNative';
-import type {PressEvent} from 'react-native/Libraries/Types/CoreEventTypes';
-import Platform from '../../Utilities/Platform';
-import View from '../../Components/View/View';
+import {findHostInstance_DEPRECATED} from '../../ReactNative/RendererProxy';
 import processColor from '../../StyleSheet/processColor';
-import * as React from 'react';
+import Platform from '../../Utilities/Platform';
+import {Commands} from '../View/ViewNativeComponent';
 import invariant from 'invariant';
+import * as React from 'react';
 
 type Props = $ReadOnly<{|
   ...React.ElementConfig<TouchableWithoutFeedback>,
@@ -162,12 +163,14 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
   };
 
   _createPressabilityConfig(): PressabilityConfig {
+    const accessibilityStateDisabled =
+      this.props['aria-disabled'] ?? this.props.accessibilityState?.disabled;
     return {
       cancelable: !this.props.rejectResponderTermination,
       disabled:
         this.props.disabled != null
           ? this.props.disabled
-          : this.props.accessibilityState?.disabled,
+          : accessibilityStateDisabled,
       hitSlop: this.props.hitSlop,
       delayLongPress: this.props.delayLongPress,
       delayPressIn: this.props.delayPressIn,
@@ -204,7 +207,7 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
 
   _dispatchPressedStateChange(pressed: boolean): void {
     if (Platform.OS === 'android') {
-      const hostComponentRef = ReactNative.findHostInstance_DEPRECATED(this);
+      const hostComponentRef = findHostInstance_DEPRECATED(this);
       if (hostComponentRef == null) {
         console.warn(
           'Touchable: Unable to find HostComponent instance. ' +
@@ -219,7 +222,7 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
   _dispatchHotspotUpdate(event: PressEvent): void {
     if (Platform.OS === 'android') {
       const {locationX, locationY} = event.nativeEvent;
-      const hostComponentRef = ReactNative.findHostInstance_DEPRECATED(this);
+      const hostComponentRef = findHostInstance_DEPRECATED(this);
       if (hostComponentRef == null) {
         console.warn(
           'Touchable: Unable to find HostComponent instance. ' +
@@ -251,14 +254,40 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
     const {onBlur, onFocus, ...eventHandlersWithoutBlurAndFocus} =
       this.state.pressability.getEventHandlers();
 
-    const accessibilityState =
+    let _accessibilityState = {
+      busy: this.props['aria-busy'] ?? this.props.accessibilityState?.busy,
+      checked:
+        this.props['aria-checked'] ?? this.props.accessibilityState?.checked,
+      disabled:
+        this.props['aria-disabled'] ?? this.props.accessibilityState?.disabled,
+      expanded:
+        this.props['aria-expanded'] ?? this.props.accessibilityState?.expanded,
+      selected:
+        this.props['aria-selected'] ?? this.props.accessibilityState?.selected,
+    };
+
+    _accessibilityState =
       this.props.disabled != null
         ? {
-            ...this.props.accessibilityState,
+            ..._accessibilityState,
             disabled: this.props.disabled,
           }
-        : this.props.accessibilityState;
+        : _accessibilityState;
+
+    const accessibilityValue = {
+      max: this.props['aria-valuemax'] ?? this.props.accessibilityValue?.max,
+      min: this.props['aria-valuemin'] ?? this.props.accessibilityValue?.min,
+      now: this.props['aria-valuenow'] ?? this.props.accessibilityValue?.now,
+      text: this.props['aria-valuetext'] ?? this.props.accessibilityValue?.text,
+    };
+
+    const accessibilityLiveRegion =
+      this.props['aria-live'] === 'off'
+        ? 'none'
+        : this.props['aria-live'] ?? this.props.accessibilityLiveRegion;
 
+    const accessibilityLabel =
+      this.props['aria-label'] ?? this.props.accessibilityLabel;
     return React.cloneElement(
       element,
       {
@@ -272,16 +301,21 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
         accessible: this.props.accessible !== false,
         accessibilityHint: this.props.accessibilityHint,
         accessibilityLanguage: this.props.accessibilityLanguage,
-        accessibilityLabel: this.props.accessibilityLabel,
+        accessibilityLabel: accessibilityLabel,
         accessibilityRole: this.props.accessibilityRole,
-        accessibilityState: accessibilityState,
+        accessibilityState: _accessibilityState,
         accessibilityActions: this.props.accessibilityActions,
         onAccessibilityAction: this.props.onAccessibilityAction,
-        accessibilityValue: this.props.accessibilityValue,
-        importantForAccessibility: this.props.importantForAccessibility,
-        accessibilityLiveRegion: this.props.accessibilityLiveRegion,
-        accessibilityViewIsModal: this.props.accessibilityViewIsModal,
-        accessibilityElementsHidden: this.props.accessibilityElementsHidden,
+        accessibilityValue: accessibilityValue,
+        importantForAccessibility:
+          this.props['aria-hidden'] === true
+            ? 'no-hide-descendants'
+            : this.props.importantForAccessibility,
+        accessibilityViewIsModal:
+          this.props['aria-modal'] ?? this.props.accessibilityViewIsModal,
+        accessibilityLiveRegion: accessibilityLiveRegion,
+        accessibilityElementsHidden:
+          this.props['aria-hidden'] ?? this.props.accessibilityElementsHidden,
         hasTVPreferredFocus: this.props.hasTVPreferredFocus,
         hitSlop: this.props.hitSlop,
         focusable:
diff --git a/Libraries/Components/Touchable/TouchableOpacity.d.ts b/Libraries/Components/Touchable/TouchableOpacity.d.ts
new file mode 100644
index 000000000000..37c4ce6df43e
--- /dev/null
+++ b/Libraries/Components/Touchable/TouchableOpacity.d.ts
@@ -0,0 +1,109 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {TimerMixin} from '../../../types/private/TimerMixin';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
+import {TVParallaxProperties} from '../View/ViewPropTypes';
+import {TouchableMixin} from './Touchable';
+import {TouchableWithoutFeedbackProps} from './TouchableWithoutFeedback';
+
+export interface TVProps {
+  /**
+   * *(Apple TV only)* TV preferred focus (see documentation for the View component).
+   *
+   * @platform ios
+   */
+  hasTVPreferredFocus?: boolean | undefined;
+
+  /**
+   * Designates the next view to receive focus when the user navigates down. See the Android documentation.
+   *
+   * @platform android
+   */
+  nextFocusDown?: number | undefined;
+
+  /**
+   * Designates the next view to receive focus when the user navigates forward. See the Android documentation.
+   *
+   * @platform android
+   */
+  nextFocusForward?: number | undefined;
+
+  /**
+   * Designates the next view to receive focus when the user navigates left. See the Android documentation.
+   *
+   * @platform android
+   */
+  nextFocusLeft?: number | undefined;
+
+  /**
+   * Designates the next view to receive focus when the user navigates right. See the Android documentation.
+   *
+   * @platform android
+   */
+  nextFocusRight?: number | undefined;
+
+  /**
+   * Designates the next view to receive focus when the user navigates up. See the Android documentation.
+   *
+   * @platform android
+   */
+  nextFocusUp?: number | undefined;
+}
+
+/**
+ * @see https://reactnative.dev/docs/touchableopacity#props
+ */
+export interface TouchableOpacityProps
+  extends TouchableWithoutFeedbackProps,
+    TVProps {
+  /**
+   * Determines what the opacity of the wrapped view should be when touch is active.
+   * Defaults to 0.2
+   */
+  activeOpacity?: number | undefined;
+
+  /**
+   * *(Apple TV only)* Object with properties to control Apple TV parallax effects.
+   *
+   * enabled: If true, parallax effects are enabled.  Defaults to true.
+   * shiftDistanceX: Defaults to 2.0.
+   * shiftDistanceY: Defaults to 2.0.
+   * tiltAngle: Defaults to 0.05.
+   * magnification: Defaults to 1.0.
+   * pressMagnification: Defaults to 1.0.
+   * pressDuration: Defaults to 0.3.
+   * pressDelay: Defaults to 0.0.
+   *
+   * @platform android
+   */
+  tvParallaxProperties?: TVParallaxProperties | undefined;
+}
+
+/**
+ * A wrapper for making views respond properly to touches.
+ * On press down, the opacity of the wrapped view is decreased, dimming it.
+ * This is done without actually changing the view hierarchy,
+ * and in general is easy to add to an app without weird side-effects.
+ *
+ * @see https://reactnative.dev/docs/touchableopacity
+ */
+declare class TouchableOpacityComponent extends React.Component<TouchableOpacityProps> {}
+declare const TouchableOpacityBase: Constructor<TimerMixin> &
+  Constructor<TouchableMixin> &
+  Constructor<NativeMethods> &
+  typeof TouchableOpacityComponent;
+export class TouchableOpacity extends TouchableOpacityBase {
+  /**
+   * Animate the touchable to a new opacity.
+   */
+  setOpacityTo: (value: number) => void;
+}
diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
index 67e18c06d54c..2aef4e824f10 100644
--- a/Libraries/Components/Touchable/TouchableOpacity.js
+++ b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -8,15 +8,16 @@
  * @format
  */
 
+import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
+import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';
+
+import Animated from '../../Animated/Animated';
+import Easing from '../../Animated/Easing';
 import Pressability, {
   type PressabilityConfig,
 } from '../../Pressability/Pressability';
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
-import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';
-import Animated from 'react-native/Libraries/Animated/Animated';
-import Easing from 'react-native/Libraries/Animated/Easing';
-import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
-import flattenStyle from 'react-native/Libraries/StyleSheet/flattenStyle';
+import flattenStyle from '../../StyleSheet/flattenStyle';
 import Platform from '../../Utilities/Platform';
 import * as React from 'react';
 
@@ -137,7 +138,10 @@ class TouchableOpacity extends React.Component<Props, State> {
   _createPressabilityConfig(): PressabilityConfig {
     return {
       cancelable: !this.props.rejectResponderTermination,
-      disabled: this.props.disabled ?? this.props.accessibilityState?.disabled,
+      disabled:
+        this.props.disabled ??
+        this.props['aria-disabled'] ??
+        this.props.accessibilityState?.disabled,
       hitSlop: this.props.hitSlop,
       delayLongPress: this.props.delayLongPress,
       delayPressIn: this.props.delayPressIn,
@@ -212,29 +216,63 @@ class TouchableOpacity extends React.Component<Props, State> {
     const {onBlur, onFocus, ...eventHandlersWithoutBlurAndFocus} =
       this.state.pressability.getEventHandlers();
 
-    const accessibilityState =
+    let _accessibilityState = {
+      busy: this.props['aria-busy'] ?? this.props.accessibilityState?.busy,
+      checked:
+        this.props['aria-checked'] ?? this.props.accessibilityState?.checked,
+      disabled:
+        this.props['aria-disabled'] ?? this.props.accessibilityState?.disabled,
+      expanded:
+        this.props['aria-expanded'] ?? this.props.accessibilityState?.expanded,
+      selected:
+        this.props['aria-selected'] ?? this.props.accessibilityState?.selected,
+    };
+
+    _accessibilityState =
       this.props.disabled != null
         ? {
-            ...this.props.accessibilityState,
+            ..._accessibilityState,
             disabled: this.props.disabled,
           }
-        : this.props.accessibilityState;
+        : _accessibilityState;
 
+    const accessibilityValue = {
+      max: this.props['aria-valuemax'] ?? this.props.accessibilityValue?.max,
+      min: this.props['aria-valuemin'] ?? this.props.accessibilityValue?.min,
+      now: this.props['aria-valuenow'] ?? this.props.accessibilityValue?.now,
+      text: this.props['aria-valuetext'] ?? this.props.accessibilityValue?.text,
+    };
+
+    const accessibilityLiveRegion =
+      this.props['aria-live'] === 'off'
+        ? 'none'
+        : this.props['aria-live'] ?? this.props.accessibilityLiveRegion;
+
+    const accessibilityLabel =
+      this.props['aria-label'] ?? this.props.accessibilityLabel;
     return (
       <Animated.View
         accessible={this.props.accessible !== false}
-        accessibilityLabel={this.props.accessibilityLabel}
+        accessibilityLabel={accessibilityLabel}
         accessibilityHint={this.props.accessibilityHint}
         accessibilityLanguage={this.props.accessibilityLanguage}
         accessibilityRole={this.props.accessibilityRole}
-        accessibilityState={accessibilityState}
+        accessibilityState={_accessibilityState}
         accessibilityActions={this.props.accessibilityActions}
         onAccessibilityAction={this.props.onAccessibilityAction}
-        accessibilityValue={this.props.accessibilityValue}
-        importantForAccessibility={this.props.importantForAccessibility}
-        accessibilityLiveRegion={this.props.accessibilityLiveRegion}
-        accessibilityViewIsModal={this.props.accessibilityViewIsModal}
-        accessibilityElementsHidden={this.props.accessibilityElementsHidden}
+        accessibilityValue={accessibilityValue}
+        importantForAccessibility={
+          this.props['aria-hidden'] === true
+            ? 'no-hide-descendants'
+            : this.props.importantForAccessibility
+        }
+        accessibilityViewIsModal={
+          this.props['aria-modal'] ?? this.props.accessibilityViewIsModal
+        }
+        accessibilityLiveRegion={accessibilityLiveRegion}
+        accessibilityElementsHidden={
+          this.props['aria-hidden'] ?? this.props.accessibilityElementsHidden
+        }
         style={[this.props.style, {opacity: this.state.anim}]}
         nativeID={this.props.nativeID}
         testID={this.props.testID}
diff --git a/Libraries/Components/Touchable/TouchableWithoutFeedback.d.ts b/Libraries/Components/Touchable/TouchableWithoutFeedback.d.ts
new file mode 100644
index 000000000000..a6f3316d36be
--- /dev/null
+++ b/Libraries/Components/Touchable/TouchableWithoutFeedback.d.ts
@@ -0,0 +1,143 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {TimerMixin} from '../../../types/private/TimerMixin';
+import {Insets} from '../../../types/public/Insets';
+import {StyleProp} from '../../StyleSheet/StyleSheet';
+import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
+import {
+  GestureResponderEvent,
+  LayoutChangeEvent,
+  NativeSyntheticEvent,
+  TargetedEvent,
+} from '../../Types/CoreEventTypes';
+import {AccessibilityProps} from '../View/ViewAccessibility';
+import {TouchableMixin} from './Touchable';
+
+export interface TouchableWithoutFeedbackPropsIOS {}
+
+export interface TouchableWithoutFeedbackPropsAndroid {
+  /**
+   * If true, doesn't play a system sound on touch.
+   *
+   * @platform android
+   */
+  touchSoundDisabled?: boolean | undefined;
+}
+
+/**
+ * @see https://reactnative.dev/docs/touchablewithoutfeedback#props
+ */
+export interface TouchableWithoutFeedbackProps
+  extends TouchableWithoutFeedbackPropsIOS,
+    TouchableWithoutFeedbackPropsAndroid,
+    AccessibilityProps {
+  children?: React.ReactNode;
+
+  /**
+   * Delay in ms, from onPressIn, before onLongPress is called.
+   */
+  delayLongPress?: number | undefined;
+
+  /**
+   * Delay in ms, from the start of the touch, before onPressIn is called.
+   */
+  delayPressIn?: number | undefined;
+
+  /**
+   * Delay in ms, from the release of the touch, before onPressOut is called.
+   */
+  delayPressOut?: number | undefined;
+
+  /**
+   * If true, disable all interactions for this component.
+   */
+  disabled?: boolean | undefined;
+
+  /**
+   * This defines how far your touch can start away from the button.
+   * This is added to pressRetentionOffset when moving off of the button.
+   * NOTE The touch area never extends past the parent view bounds and
+   * the Z-index of sibling views always takes precedence if a touch hits
+   * two overlapping views.
+   */
+  hitSlop?: Insets | undefined;
+
+  /**
+   * Used to reference react managed views from native code.
+   */
+  id?: string | undefined;
+
+  /**
+   * When `accessible` is true (which is the default) this may be called when
+   * the OS-specific concept of "blur" occurs, meaning the element lost focus.
+   * Some platforms may not have the concept of blur.
+   */
+  onBlur?: ((e: NativeSyntheticEvent<TargetedEvent>) => void) | undefined;
+
+  /**
+   * When `accessible` is true (which is the default) this may be called when
+   * the OS-specific concept of "focus" occurs. Some platforms may not have
+   * the concept of focus.
+   */
+  onFocus?: ((e: NativeSyntheticEvent<TargetedEvent>) => void) | undefined;
+
+  /**
+   * Invoked on mount and layout changes with
+   * {nativeEvent: {layout: {x, y, width, height}}}
+   */
+  onLayout?: ((event: LayoutChangeEvent) => void) | undefined;
+
+  onLongPress?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * Called when the touch is released,
+   * but not if cancelled (e.g. by a scroll that steals the responder lock).
+   */
+  onPress?: ((event: GestureResponderEvent) => void) | undefined;
+
+  onPressIn?: ((event: GestureResponderEvent) => void) | undefined;
+
+  onPressOut?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * //FIXME: not in doc but available in examples
+   */
+  style?: StyleProp<ViewStyle> | undefined;
+
+  /**
+   * When the scroll view is disabled, this defines how far your
+   * touch may move off of the button, before deactivating the button.
+   * Once deactivated, try moving it back and you'll see that the button
+   * is once again reactivated! Move it back and forth several times
+   * while the scroll view is disabled. Ensure you pass in a constant
+   * to reduce memory allocations.
+   */
+  pressRetentionOffset?: Insets | undefined;
+
+  /**
+   * Used to locate this view in end-to-end tests.
+   */
+  testID?: string | undefined;
+}
+
+/**
+ * Do not use unless you have a very good reason.
+ * All the elements that respond to press should have a visual feedback when touched.
+ * This is one of the primary reason a "web" app doesn't feel "native".
+ *
+ * @see https://reactnative.dev/docs/touchablewithoutfeedback
+ */
+declare class TouchableWithoutFeedbackComponent extends React.Component<TouchableWithoutFeedbackProps> {}
+declare const TouchableWithoutFeedbackBase: Constructor<TimerMixin> &
+  Constructor<TouchableMixin> &
+  typeof TouchableWithoutFeedbackComponent;
+export class TouchableWithoutFeedback extends TouchableWithoutFeedbackBase {}
diff --git a/Libraries/Components/Touchable/TouchableWithoutFeedback.js b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
index 2b3bd4b930e1..70b43370b11f 100755
--- a/Libraries/Components/Touchable/TouchableWithoutFeedback.js
+++ b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
@@ -8,10 +8,6 @@
  * @format
  */
 
-import Pressability, {
-  type PressabilityConfig,
-} from '../../Pressability/Pressability';
-import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import type {
   AccessibilityActionEvent,
   AccessibilityActionInfo,
@@ -26,7 +22,12 @@ import type {
   LayoutEvent,
   PressEvent,
 } from '../../Types/CoreEventTypes';
+
 import View from '../../Components/View/View';
+import Pressability, {
+  type PressabilityConfig,
+} from '../../Pressability/Pressability';
+import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import * as React from 'react';
 
 type Props = $ReadOnly<{|
@@ -40,8 +41,26 @@ type Props = $ReadOnly<{|
   accessibilityRole?: ?AccessibilityRole,
   accessibilityState?: ?AccessibilityState,
   accessibilityValue?: ?AccessibilityValue,
+  'aria-valuemax'?: AccessibilityValue['max'],
+  'aria-valuemin'?: AccessibilityValue['min'],
+  'aria-valuenow'?: AccessibilityValue['now'],
+  'aria-valuetext'?: AccessibilityValue['text'],
   accessibilityViewIsModal?: ?boolean,
+  'aria-modal'?: ?boolean,
   accessible?: ?boolean,
+  /**
+   * alias for accessibilityState
+   *
+   * see https://reactnative.dev/docs/accessibility#accessibilitystate
+   */
+  'aria-busy'?: ?boolean,
+  'aria-checked'?: ?boolean | 'mixed',
+  'aria-disabled'?: ?boolean,
+  'aria-expanded'?: ?boolean,
+  'aria-selected'?: ?boolean,
+  'aria-hidden'?: ?boolean,
+  'aria-live'?: ?('polite' | 'assertive' | 'off'),
+  'aria-label'?: ?Stringish,
   children?: ?React.Node,
   delayLongPress?: ?number,
   delayPressIn?: ?number,
@@ -49,6 +68,7 @@ type Props = $ReadOnly<{|
   disabled?: ?boolean,
   focusable?: ?boolean,
   hitSlop?: ?EdgeInsetsProp,
+  id?: string,
   importantForAccessibility?: ?('auto' | 'yes' | 'no' | 'no-hide-descendants'),
   nativeID?: ?string,
   onAccessibilityAction?: ?(event: AccessibilityActionEvent) => mixed,
@@ -79,7 +99,12 @@ const PASSTHROUGH_PROPS = [
   'accessibilityLiveRegion',
   'accessibilityRole',
   'accessibilityValue',
+  'aria-valuemax',
+  'aria-valuemin',
+  'aria-valuenow',
+  'aria-valuetext',
   'accessibilityViewIsModal',
+  'aria-modal',
   'hitSlop',
   'importantForAccessibility',
   'nativeID',
@@ -98,6 +123,8 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
   render(): React.Node {
     const element = React.Children.only(this.props.children);
     const children = [element.props.children];
+    const ariaLive = this.props['aria-live'];
+
     if (__DEV__) {
       if (element.type === View) {
         children.push(
@@ -106,6 +133,18 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
       }
     }
 
+    let _accessibilityState = {
+      busy: this.props['aria-busy'] ?? this.props.accessibilityState?.busy,
+      checked:
+        this.props['aria-checked'] ?? this.props.accessibilityState?.checked,
+      disabled:
+        this.props['aria-disabled'] ?? this.props.accessibilityState?.disabled,
+      expanded:
+        this.props['aria-expanded'] ?? this.props.accessibilityState?.expanded,
+      selected:
+        this.props['aria-selected'] ?? this.props.accessibilityState?.selected,
+    };
+
     // BACKWARD-COMPATIBILITY: Focus and blur events were never supported before
     // adopting `Pressability`, so preserve that behavior.
     const {onBlur, onFocus, ...eventHandlersWithoutBlurAndFocus} =
@@ -117,12 +156,24 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
       accessibilityState:
         this.props.disabled != null
           ? {
-              ...this.props.accessibilityState,
+              ..._accessibilityState,
               disabled: this.props.disabled,
             }
-          : this.props.accessibilityState,
+          : _accessibilityState,
       focusable:
         this.props.focusable !== false && this.props.onPress !== undefined,
+
+      accessibilityElementsHidden:
+        this.props['aria-hidden'] ?? this.props.accessibilityElementsHidden,
+      importantForAccessibility:
+        this.props['aria-hidden'] === true
+          ? 'no-hide-descendants'
+          : this.props.importantForAccessibility,
+      accessibilityLiveRegion:
+        ariaLive === 'off'
+          ? 'none'
+          : ariaLive ?? this.props.accessibilityLiveRegion,
+      nativeID: this.props.id ?? this.props.nativeID,
     };
     for (const prop of PASSTHROUGH_PROPS) {
       if (this.props[prop] !== undefined) {
@@ -142,13 +193,16 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
   }
 }
 
-function createPressabilityConfig(props: Props): PressabilityConfig {
+function createPressabilityConfig({
+  'aria-disabled': ariaDisabled,
+  ...props
+}: Props): PressabilityConfig {
+  const accessibilityStateDisabled =
+    ariaDisabled ?? props.accessibilityState?.disabled;
   return {
     cancelable: !props.rejectResponderTermination,
     disabled:
-      props.disabled !== null
-        ? props.disabled
-        : props.accessibilityState?.disabled,
+      props.disabled !== null ? props.disabled : accessibilityStateDisabled,
     hitSlop: props.hitSlop,
     delayLongPress: props.delayLongPress,
     delayPressIn: props.delayPressIn,
diff --git a/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js b/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js
index d1ae224b2206..024feffaa292 100644
--- a/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js
+++ b/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js
@@ -5,15 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
-import * as React from 'react';
 import Text from '../../../Text/Text';
 import View from '../../View/View';
 import TouchableHighlight from '../TouchableHighlight';
+import * as React from 'react';
 
 const render = require('../../../../jest/renderer');
 
diff --git a/Libraries/Components/Touchable/__tests__/TouchableNativeFeedback-test.js b/Libraries/Components/Touchable/__tests__/TouchableNativeFeedback-test.js
index dca7e508cc64..377c4f373764 100644
--- a/Libraries/Components/Touchable/__tests__/TouchableNativeFeedback-test.js
+++ b/Libraries/Components/Touchable/__tests__/TouchableNativeFeedback-test.js
@@ -5,16 +5,16 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
-import * as React from 'react';
-import ReactTestRenderer from 'react-test-renderer';
 import Text from '../../../Text/Text';
-import TouchableNativeFeedback from '../TouchableNativeFeedback';
 import View from '../../View/View';
+import TouchableNativeFeedback from '../TouchableNativeFeedback';
+import * as React from 'react';
+import ReactTestRenderer from 'react-test-renderer';
 
 const render = require('../../../../jest/renderer');
 
diff --git a/Libraries/Components/Touchable/__tests__/TouchableOpacity-test.js b/Libraries/Components/Touchable/__tests__/TouchableOpacity-test.js
index 30aa9b656aa2..8f4f4f2f6bcd 100644
--- a/Libraries/Components/Touchable/__tests__/TouchableOpacity-test.js
+++ b/Libraries/Components/Touchable/__tests__/TouchableOpacity-test.js
@@ -5,15 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
-const ReactTestRenderer = require('react-test-renderer');
 const Text = require('../../../Text/Text');
 const TouchableOpacity = require('../TouchableOpacity');
+const React = require('react');
+const ReactTestRenderer = require('react-test-renderer');
 
 describe('TouchableOpacity', () => {
   it('renders correctly', () => {
diff --git a/Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-test.js b/Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-test.js
index bbf3483ec8b0..4e1f12d45755 100644
--- a/Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-test.js
+++ b/Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-test.js
@@ -5,16 +5,16 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
-import * as React from 'react';
-import ReactTestRenderer from 'react-test-renderer';
 import Text from '../../../Text/Text';
 import View from '../../View/View';
 import TouchableWithoutFeedback from '../TouchableWithoutFeedback';
+import * as React from 'react';
+import ReactTestRenderer from 'react-test-renderer';
 
 describe('TouchableWithoutFeedback', () => {
   it('renders correctly', () => {
diff --git a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
index 70eaabe704a1..35c845e97493 100644
--- a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
+++ b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
@@ -2,6 +2,14 @@
 
 exports[`TouchableHighlight renders correctly 1`] = `
 <View
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
+    }
+  }
   accessible={true}
   focusable={false}
   onClick={[Function]}
@@ -26,6 +34,14 @@ exports[`TouchableHighlight with disabled state should be disabled when disabled
       "disabled": true,
     }
   }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
+    }
+  }
   accessible={true}
   focusable={false}
   onClick={[Function]}
@@ -47,6 +63,14 @@ exports[`TouchableHighlight with disabled state should be disabled when disabled
       "disabled": true,
     }
   }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
+    }
+  }
   accessible={true}
   focusable={false}
   onClick={[Function]}
@@ -68,6 +92,14 @@ exports[`TouchableHighlight with disabled state should disable button when acces
       "disabled": true,
     }
   }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
+    }
+  }
   accessible={true}
   focusable={false}
   onClick={[Function]}
@@ -90,6 +122,14 @@ exports[`TouchableHighlight with disabled state should keep accessibilityState w
       "disabled": true,
     }
   }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
+    }
+  }
   accessible={true}
   focusable={false}
   onClick={[Function]}
@@ -111,6 +151,14 @@ exports[`TouchableHighlight with disabled state should overwrite accessibilitySt
       "disabled": true,
     }
   }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
+    }
+  }
   accessible={true}
   focusable={false}
   onClick={[Function]}
diff --git a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableNativeFeedback-test.js.snap b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableNativeFeedback-test.js.snap
index 64b098803b11..6802f754650b 100644
--- a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableNativeFeedback-test.js.snap
+++ b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableNativeFeedback-test.js.snap
@@ -1,7 +1,24 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TouchableWithoutFeedback renders correctly 1`] = `
-<Text
+exports[`<TouchableNativeFeedback /> should render as expected 1`] = `
+<View
+  accessibilityState={
+    Object {
+      "busy": undefined,
+      "checked": undefined,
+      "disabled": undefined,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
+    }
+  }
   accessible={true}
   focusable={false}
   onClick={[Function]}
@@ -11,13 +28,28 @@ exports[`TouchableWithoutFeedback renders correctly 1`] = `
   onResponderTerminate={[Function]}
   onResponderTerminationRequest={[Function]}
   onStartShouldSetResponder={[Function]}
->
-  Touchable
-</Text>
+/>
 `;
 
-exports[`<TouchableNativeFeedback /> should render as expected 1`] = `
+exports[`<TouchableNativeFeedback disabled={false} accessibilityState={{disabled:true}}> should overwrite accessibilityState with value of disabled prop 1`] = `
 <View
+  accessibilityState={
+    Object {
+      "busy": undefined,
+      "checked": undefined,
+      "disabled": false,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
+    }
+  }
   accessible={true}
   focusable={false}
   onClick={[Function]}
@@ -30,11 +62,23 @@ exports[`<TouchableNativeFeedback /> should render as expected 1`] = `
 />
 `;
 
-exports[`<TouchableNativeFeedback disabled={true}> should be disabled when disabled is true 1`] = `
+exports[`<TouchableNativeFeedback disabled={true} accessibilityState={{}}> should be disabled when disabled is true and accessibilityState is empty 1`] = `
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -49,11 +93,23 @@ exports[`<TouchableNativeFeedback disabled={true}> should be disabled when disab
 />
 `;
 
-exports[`<TouchableNativeFeedback disabled={true} accessibilityState={{}}> should be disabled when disabled is true and accessibilityState is empty 1`] = `
+exports[`<TouchableNativeFeedback disabled={true} accessibilityState={{checked: true}}> should keep accessibilityState when disabled is true 1`] = `
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": true,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -68,12 +124,23 @@ exports[`<TouchableNativeFeedback disabled={true} accessibilityState={{}}> shoul
 />
 `;
 
-exports[`<TouchableNativeFeedback disabled={true} accessibilityState={{checked: true}}> should keep accessibilityState when disabled is true 1`] = `
+exports[`<TouchableNativeFeedback disabled={true} accessibilityState={{disabled:false}}> should overwrite accessibilityState with value of disabled prop 1`] = `
 <View
   accessibilityState={
     Object {
-      "checked": true,
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -88,11 +155,23 @@ exports[`<TouchableNativeFeedback disabled={true} accessibilityState={{checked:
 />
 `;
 
-exports[`<TouchableNativeFeedback disabled={true} accessibilityState={{disabled:false}}> should overwrite accessibilityState with value of disabled prop 1`] = `
+exports[`<TouchableNativeFeedback disabled={true}> should be disabled when disabled is true 1`] = `
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -107,11 +186,23 @@ exports[`<TouchableNativeFeedback disabled={true} accessibilityState={{disabled:
 />
 `;
 
-exports[`<TouchableNativeFeedback disabled={false} accessibilityState={{disabled:true}}> should overwrite accessibilityState with value of disabled prop 1`] = `
-<View
+exports[`TouchableWithoutFeedback renders correctly 1`] = `
+<Text
   accessibilityState={
     Object {
-      "disabled": false,
+      "busy": undefined,
+      "checked": undefined,
+      "disabled": undefined,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -123,5 +214,7 @@ exports[`<TouchableNativeFeedback disabled={false} accessibilityState={{disabled
   onResponderTerminate={[Function]}
   onResponderTerminationRequest={[Function]}
   onStartShouldSetResponder={[Function]}
-/>
+>
+  Touchable
+</Text>
 `;
diff --git a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableOpacity-test.js.snap b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableOpacity-test.js.snap
index 4d3f11bc92ef..17f2e7f6f764 100644
--- a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableOpacity-test.js.snap
+++ b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableOpacity-test.js.snap
@@ -2,6 +2,23 @@
 
 exports[`TouchableOpacity renders correctly 1`] = `
 <View
+  accessibilityState={
+    Object {
+      "busy": undefined,
+      "checked": undefined,
+      "disabled": undefined,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
+    }
+  }
   accessible={true}
   collapsable={false}
   focusable={false}
@@ -28,7 +45,19 @@ exports[`TouchableOpacity renders in disabled state when a disabled prop is pass
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -57,7 +86,19 @@ exports[`TouchableOpacity renders in disabled state when a key disabled in acces
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
diff --git a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableWithoutFeedback-test.js.snap b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableWithoutFeedback-test.js.snap
index 545e77e54e3b..932c5f133c03 100644
--- a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableWithoutFeedback-test.js.snap
+++ b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableWithoutFeedback-test.js.snap
@@ -2,6 +2,15 @@
 
 exports[`TouchableWithoutFeedback renders correctly 1`] = `
 <Text
+  accessibilityState={
+    Object {
+      "busy": undefined,
+      "checked": undefined,
+      "disabled": undefined,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
   accessible={true}
   focusable={false}
   onClick={[Function]}
@@ -20,7 +29,11 @@ exports[`TouchableWithoutFeedback with disabled state should be disabled when di
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
     }
   }
   accessible={true}
@@ -39,7 +52,11 @@ exports[`TouchableWithoutFeedback with disabled state should be disabled when di
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
     }
   }
   accessible={true}
@@ -58,7 +75,11 @@ exports[`TouchableWithoutFeedback with disabled state should disable button when
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
     }
   }
   accessible={true}
@@ -77,8 +98,11 @@ exports[`TouchableWithoutFeedback with disabled state should keep accessibilityS
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
       "checked": true,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
     }
   }
   accessible={true}
@@ -97,7 +121,11 @@ exports[`TouchableWithoutFeedback with disabled state should overwrite accessibi
 <View
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
     }
   }
   accessible={true}
diff --git a/Libraries/Components/UnimplementedViews/UnimplementedNativeViewNativeComponent.js b/Libraries/Components/UnimplementedViews/UnimplementedNativeViewNativeComponent.js
index 89e2d42f2e16..3c972820c54f 100644
--- a/Libraries/Components/UnimplementedViews/UnimplementedNativeViewNativeComponent.js
+++ b/Libraries/Components/UnimplementedViews/UnimplementedNativeViewNativeComponent.js
@@ -8,11 +8,11 @@
  * @flow strict-local
  */
 
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {WithDefault} from '../../Types/CodegenTypes';
 import type {ViewProps} from '../View/ViewPropTypes';
 
 import codegenNativeComponent from '../../Utilities/codegenNativeComponent';
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,
diff --git a/Libraries/Components/UnimplementedViews/UnimplementedView.js b/Libraries/Components/UnimplementedViews/UnimplementedView.js
index 24a6e3a51c4e..3c884ad3f6c4 100644
--- a/Libraries/Components/UnimplementedViews/UnimplementedView.js
+++ b/Libraries/Components/UnimplementedViews/UnimplementedView.js
@@ -9,8 +9,8 @@
  */
 
 'use strict';
-import * as React from 'react';
 import StyleSheet from '../../StyleSheet/StyleSheet';
+import * as React from 'react';
 
 /**
  * Common implementation for a simple stubbed view. Simply applies the view's styles to the inner
diff --git a/Libraries/Components/View/ReactNativeStyleAttributes.js b/Libraries/Components/View/ReactNativeStyleAttributes.js
index 7736e5026db9..926c0c7efa64 100644
--- a/Libraries/Components/View/ReactNativeStyleAttributes.js
+++ b/Libraries/Components/View/ReactNativeStyleAttributes.js
@@ -9,7 +9,10 @@
  */
 
 import type {AnyAttributeType} from '../../Renderer/shims/ReactNativeTypes';
+
+import processAspectRatio from '../../StyleSheet/processAspectRatio';
 import processColor from '../../StyleSheet/processColor';
+import processFontVariant from '../../StyleSheet/processFontVariant';
 import processTransform from '../../StyleSheet/processTransform';
 import sizesDiffer from '../../Utilities/differ/sizesDiffer';
 
@@ -22,13 +25,14 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
   alignContent: true,
   alignItems: true,
   alignSelf: true,
-  aspectRatio: true,
+  aspectRatio: {process: processAspectRatio},
   borderBottomWidth: true,
   borderEndWidth: true,
   borderLeftWidth: true,
   borderRightWidth: true,
   borderStartWidth: true,
   borderTopWidth: true,
+  columnGap: true,
   borderWidth: true,
   bottom: true,
   direction: true,
@@ -40,6 +44,7 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
   flexGrow: true,
   flexShrink: true,
   flexWrap: true,
+  gap: true,
   height: true,
   justifyContent: true,
   left: true,
@@ -68,6 +73,7 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
   paddingVertical: true,
   position: true,
   right: true,
+  rowGap: true,
   start: true,
   top: true,
   width: true,
@@ -98,6 +104,7 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
   borderBottomRightRadius: true,
   borderBottomStartRadius: true,
   borderColor: colorAttributes,
+  borderCurve: true,
   borderEndColor: colorAttributes,
   borderLeftColor: colorAttributes,
   borderRadius: true,
@@ -110,6 +117,7 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
   borderTopRightRadius: true,
   borderTopStartRadius: true,
   opacity: true,
+  pointerEvents: true,
 
   /**
    * Text
@@ -118,7 +126,7 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
   fontFamily: true,
   fontSize: true,
   fontStyle: true,
-  fontVariant: true,
+  fontVariant: {process: processFontVariant},
   fontWeight: true,
   includeFontPadding: true,
   letterSpacing: true,
@@ -132,6 +140,8 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
   textShadowOffset: true,
   textShadowRadius: true,
   textTransform: true,
+  userSelect: true,
+  verticalAlign: true,
   writingDirection: true,
 
   /**
@@ -140,6 +150,7 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
   overlayColor: colorAttributes,
   resizeMode: true,
   tintColor: colorAttributes,
+  objectFit: true,
 };
 
 module.exports = ReactNativeStyleAttributes;
diff --git a/Libraries/Components/View/View.d.ts b/Libraries/Components/View/View.d.ts
new file mode 100644
index 000000000000..5fbb52928e5a
--- /dev/null
+++ b/Libraries/Components/View/View.d.ts
@@ -0,0 +1,29 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../../types/private/Utilities';
+import {ViewProps} from './ViewPropTypes';
+import {NativeMethods} from '../../../types/public/ReactNativeTypes';
+
+/**
+ * The most fundamental component for building UI, View is a container that supports layout with flexbox, style, some touch handling,
+ * and accessibility controls, and is designed to be nested inside other views and to have 0 to many children of any type.
+ * View maps directly to the native view equivalent on whatever platform React is running on,
+ * whether that is a UIView, <div>, android.view, etc.
+ */
+declare class ViewComponent extends React.Component<ViewProps> {}
+declare const ViewBase: Constructor<NativeMethods> & typeof ViewComponent;
+export class View extends ViewBase {
+  /**
+   * Is 3D Touch / Force Touch available (i.e. will touch events include `force`)
+   * @platform ios
+   */
+  static forceTouchAvailable: boolean;
+}
diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js
index 0379a7ce912f..8ef1f814a312 100644
--- a/Libraries/Components/View/View.js
+++ b/Libraries/Components/View/View.js
@@ -10,8 +10,10 @@
 
 import type {ViewProps} from './ViewPropTypes';
 
-import ViewNativeComponent from './ViewNativeComponent';
+import flattenStyle from '../../StyleSheet/flattenStyle';
 import TextAncestor from '../../Text/TextAncestor';
+import {getAccessibilityRoleFromRole} from '../../Utilities/AcessibilityMapping';
+import ViewNativeComponent from './ViewNativeComponent';
 import * as React from 'react';
 
 export type Props = ViewProps;
@@ -26,13 +28,94 @@ export type Props = ViewProps;
 const View: React.AbstractComponent<
   ViewProps,
   React.ElementRef<typeof ViewNativeComponent>,
-> = React.forwardRef((props: ViewProps, forwardedRef) => {
-  return (
-    <TextAncestor.Provider value={false}>
-      <ViewNativeComponent {...props} ref={forwardedRef} />
-    </TextAncestor.Provider>
-  );
-});
+> = React.forwardRef(
+  (
+    {
+      accessibilityElementsHidden,
+      accessibilityLabel,
+      accessibilityLabelledBy,
+      accessibilityLiveRegion,
+      accessibilityRole,
+      accessibilityState,
+      accessibilityValue,
+      'aria-busy': ariaBusy,
+      'aria-checked': ariaChecked,
+      'aria-disabled': ariaDisabled,
+      'aria-expanded': ariaExpanded,
+      'aria-hidden': ariaHidden,
+      'aria-label': ariaLabel,
+      'aria-labelledby': ariaLabelledBy,
+      'aria-live': ariaLive,
+      'aria-selected': ariaSelected,
+      'aria-valuemax': ariaValueMax,
+      'aria-valuemin': ariaValueMin,
+      'aria-valuenow': ariaValueNow,
+      'aria-valuetext': ariaValueText,
+      focusable,
+      id,
+      importantForAccessibility,
+      nativeID,
+      pointerEvents,
+      role,
+      style,
+      tabIndex,
+      ...otherProps
+    }: ViewProps,
+    forwardedRef,
+  ) => {
+    const _accessibilityLabelledBy =
+      ariaLabelledBy?.split(/\s*,\s*/g) ?? accessibilityLabelledBy;
+
+    const _accessibilityState = {
+      busy: ariaBusy ?? accessibilityState?.busy,
+      checked: ariaChecked ?? accessibilityState?.checked,
+      disabled: ariaDisabled ?? accessibilityState?.disabled,
+      expanded: ariaExpanded ?? accessibilityState?.expanded,
+      selected: ariaSelected ?? accessibilityState?.selected,
+    };
+
+    const _accessibilityValue = {
+      max: ariaValueMax ?? accessibilityValue?.max,
+      min: ariaValueMin ?? accessibilityValue?.min,
+      now: ariaValueNow ?? accessibilityValue?.now,
+      text: ariaValueText ?? accessibilityValue?.text,
+    };
+
+    const flattenedStyle = flattenStyle(style);
+    const newPointerEvents = flattenedStyle?.pointerEvents || pointerEvents;
+
+    return (
+      <TextAncestor.Provider value={false}>
+        <ViewNativeComponent
+          {...otherProps}
+          accessibilityLiveRegion={
+            ariaLive === 'off' ? 'none' : ariaLive ?? accessibilityLiveRegion
+          }
+          accessibilityLabel={ariaLabel ?? accessibilityLabel}
+          focusable={tabIndex !== undefined ? !tabIndex : focusable}
+          accessibilityState={_accessibilityState}
+          accessibilityRole={
+            role ? getAccessibilityRoleFromRole(role) : accessibilityRole
+          }
+          accessibilityElementsHidden={
+            ariaHidden ?? accessibilityElementsHidden
+          }
+          accessibilityLabelledBy={_accessibilityLabelledBy}
+          accessibilityValue={_accessibilityValue}
+          importantForAccessibility={
+            ariaHidden === true
+              ? 'no-hide-descendants'
+              : importantForAccessibility
+          }
+          nativeID={id ?? nativeID}
+          style={style}
+          pointerEvents={newPointerEvents}
+          ref={forwardedRef}
+        />
+      </TextAncestor.Provider>
+    );
+  },
+);
 
 View.displayName = 'View';
 
diff --git a/Libraries/Components/View/ViewAccessibility.d.ts b/Libraries/Components/View/ViewAccessibility.d.ts
new file mode 100644
index 000000000000..c68c758410c8
--- /dev/null
+++ b/Libraries/Components/View/ViewAccessibility.d.ts
@@ -0,0 +1,360 @@
+/**
+ * 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
+ */
+
+import {NativeSyntheticEvent} from '../../Types/CoreEventTypes';
+
+/**
+ * @see https://reactnative.dev/docs/accessibility#accessibility-properties
+ */
+export interface AccessibilityProps
+  extends AccessibilityPropsAndroid,
+    AccessibilityPropsIOS {
+  /**
+   * When true, indicates that the view is an accessibility element.
+   * By default, all the touchable elements are accessible.
+   */
+  accessible?: boolean | undefined;
+
+  /**
+   * Provides an array of custom actions available for accessibility.
+   */
+  accessibilityActions?: ReadonlyArray<AccessibilityActionInfo> | undefined;
+
+  /**
+   * Overrides the text that's read by the screen reader when the user interacts with the element. By default, the
+   * label is constructed by traversing all the children and accumulating all the Text nodes separated by space.
+   */
+  accessibilityLabel?: string | undefined;
+
+  /**
+   * Alias for accessibilityLabel  https://reactnative.dev/docs/view#accessibilitylabel
+   * https://github.com/facebook/react-native/issues/34424
+   */
+  'aria-label'?: string | undefined;
+
+  /**
+   * Accessibility Role tells a person using either VoiceOver on iOS or TalkBack on Android the type of element that is focused on.
+   */
+  accessibilityRole?: AccessibilityRole | undefined;
+  /**
+   * Accessibility State tells a person using either VoiceOver on iOS or TalkBack on Android the state of the element currently focused on.
+   */
+  accessibilityState?: AccessibilityState | undefined;
+
+  /**
+   * alias for accessibilityState
+   *
+   * see https://reactnative.dev/docs/accessibility#accessibilitystate
+   */
+  'aria-busy'?: boolean | undefined;
+  'aria-checked'?: boolean | 'mixed' | undefined;
+  'aria-disabled'?: boolean | undefined;
+  'aria-expanded'?: boolean | undefined;
+  'aria-selected'?: boolean | undefined;
+
+  /**
+   * Represents the nativeID of the associated label text. When the assistive technology focuses on the component with this props, the text is read aloud.
+   *
+   * @platform android
+   */
+  'aria-labelledby'?: string | undefined;
+
+  /**
+   * An accessibility hint helps users understand what will happen when they perform an action on the accessibility element when that result is not obvious from the accessibility label.
+   */
+  accessibilityHint?: string | undefined;
+  /**
+   * Represents the current value of a component. It can be a textual description of a component's value, or for range-based components, such as sliders and progress bars,
+   * it contains range information (minimum, current, and maximum).
+   */
+  accessibilityValue?: AccessibilityValue | undefined;
+
+  'aria-valuemax'?: AccessibilityValue['max'];
+  'aria-valuemin'?: AccessibilityValue['min'];
+  'aria-valuenow'?: AccessibilityValue['now'];
+  'aria-valuetext'?: AccessibilityValue['text'];
+  /**
+   * When `accessible` is true, the system will try to invoke this function when the user performs an accessibility custom action.
+   */
+  onAccessibilityAction?:
+    | ((event: AccessibilityActionEvent) => void)
+    | undefined;
+
+  /**
+   * [Android] Controlling if a view fires accessibility events and if it is reported to accessibility services.
+   */
+  importantForAccessibility?:
+    | ('auto' | 'yes' | 'no' | 'no-hide-descendants')
+    | undefined;
+
+  /**
+   * A value indicating whether the accessibility elements contained within
+   * this accessibility element are hidden.
+   */
+  'aria-hidden'?: boolean | undefined;
+
+  'aria-live'?: ('polite' | 'assertive' | 'off') | undefined;
+  'aria-modal'?: boolean | undefined;
+
+  /**
+   * Indicates to accessibility services to treat UI component like a specific role.
+   */
+  role?: Role;
+}
+
+export type AccessibilityActionInfo = Readonly<{
+  name: AccessibilityActionName | string;
+  label?: string | undefined;
+}>;
+
+export type AccessibilityActionName =
+  /**
+   * Generated when a screen reader user double taps the component.
+   */
+  | 'activate'
+  /**
+   * Generated when a screen reader user increments an adjustable component.
+   */
+  | 'increment'
+  /**
+   * Generated when a screen reader user decrements an adjustable component.
+   */
+  | 'decrement'
+  /**
+   * Generated when a TalkBack user places accessibility focus on the component and double taps and holds one finger on the screen.
+   * @platform android
+   */
+  | 'longpress'
+  /**
+   * Generated when a VoiceOver user places focus on or inside the component and double taps with two fingers.
+   * @platform ios
+   * */
+  | 'magicTap'
+  /**
+   * Generated when a VoiceOver user places focus on or inside the component and performs a two finger scrub gesture (left, right, left).
+   * @platform ios
+   * */
+  | 'escape';
+
+export type AccessibilityActionEvent = NativeSyntheticEvent<
+  Readonly<{
+    actionName: string;
+  }>
+>;
+
+export interface AccessibilityState {
+  /**
+   * When true, informs accessible tools if the element is disabled
+   */
+  disabled?: boolean | undefined;
+  /**
+   * When true, informs accessible tools if the element is selected
+   */
+  selected?: boolean | undefined;
+  /**
+   * For items like Checkboxes and Toggle switches, reports their state to accessible tools
+   */
+  checked?: boolean | 'mixed' | undefined;
+  /**
+   *  When present, informs accessible tools if the element is busy
+   */
+  busy?: boolean | undefined;
+  /**
+   *  When present, informs accessible tools the element is expanded or collapsed
+   */
+  expanded?: boolean | undefined;
+}
+
+export interface AccessibilityValue {
+  /**
+   * The minimum value of this component's range. (should be an integer)
+   */
+  min?: number | undefined;
+
+  /**
+   * The maximum value of this component's range. (should be an integer)
+   */
+  max?: number | undefined;
+
+  /**
+   * The current value of this component's range. (should be an integer)
+   */
+  now?: number | undefined;
+
+  /**
+   * A textual description of this component's value. (will override minimum, current, and maximum if set)
+   */
+  text?: string | undefined;
+}
+
+export type AccessibilityRole =
+  | 'none'
+  | 'button'
+  | 'togglebutton'
+  | 'link'
+  | 'search'
+  | 'image'
+  | 'keyboardkey'
+  | 'text'
+  | 'adjustable'
+  | 'imagebutton'
+  | 'header'
+  | 'summary'
+  | 'alert'
+  | 'checkbox'
+  | 'combobox'
+  | 'menu'
+  | 'menubar'
+  | 'menuitem'
+  | 'progressbar'
+  | 'radio'
+  | 'radiogroup'
+  | 'scrollbar'
+  | 'spinbutton'
+  | 'switch'
+  | 'tab'
+  | 'tabbar'
+  | 'tablist'
+  | 'timer'
+  | 'list'
+  | 'toolbar';
+
+export interface AccessibilityPropsAndroid {
+  /**
+   * Indicates to accessibility services whether the user should be notified when this view changes.
+   * Works for Android API >= 19 only.
+   * See http://developer.android.com/reference/android/view/View.html#attr_android:accessibilityLiveRegion for references.
+   * @platform android
+   */
+  accessibilityLiveRegion?: 'none' | 'polite' | 'assertive' | undefined;
+
+  /**
+   * Controls how view is important for accessibility which is if it fires accessibility events
+   * and if it is reported to accessibility services that query the screen.
+   * Works for Android only. See http://developer.android.com/reference/android/R.attr.html#importantForAccessibility for references.
+   *
+   * Possible values:
+   *      'auto' - The system determines whether the view is important for accessibility - default (recommended).
+   *      'yes' - The view is important for accessibility.
+   *      'no' - The view is not important for accessibility.
+   *      'no-hide-descendants' - The view is not important for accessibility, nor are any of its descendant views.
+   */
+  importantForAccessibility?:
+    | 'auto'
+    | 'yes'
+    | 'no'
+    | 'no-hide-descendants'
+    | undefined;
+}
+
+export interface AccessibilityPropsIOS {
+  /**
+   * A Boolean value indicating whether the accessibility elements contained within this accessibility element
+   * are hidden to the screen reader.
+   * @platform ios
+   */
+  accessibilityElementsHidden?: boolean | undefined;
+
+  /**
+   * A Boolean value indicating whether VoiceOver should ignore the elements within views that are siblings of the receiver.
+   * @platform ios
+   */
+  accessibilityViewIsModal?: boolean | undefined;
+
+  /**
+   * When accessibile is true, the system will invoke this function when the user performs the escape gesture (scrub with two fingers).
+   * @platform ios
+   */
+  onAccessibilityEscape?: (() => void) | undefined;
+
+  /**
+   * When `accessible` is true, the system will try to invoke this function when the user performs accessibility tap gesture.
+   * @platform ios
+   */
+  onAccessibilityTap?: (() => void) | undefined;
+
+  /**
+   * When accessible is true, the system will invoke this function when the user performs the magic tap gesture.
+   * @platform ios
+   */
+  onMagicTap?: (() => void) | undefined;
+
+  /**
+   * https://reactnative.dev/docs/accessibility#accessibilityignoresinvertcolorsios
+   * @platform ios
+   */
+  accessibilityIgnoresInvertColors?: boolean | undefined;
+}
+
+export type Role =
+  | 'alert'
+  | 'alertdialog'
+  | 'application'
+  | 'article'
+  | 'banner'
+  | 'button'
+  | 'cell'
+  | 'checkbox'
+  | 'columnheader'
+  | 'combobox'
+  | 'complementary'
+  | 'contentinfo'
+  | 'definition'
+  | 'dialog'
+  | 'directory'
+  | 'document'
+  | 'feed'
+  | 'figure'
+  | 'form'
+  | 'grid'
+  | 'group'
+  | 'heading'
+  | 'img'
+  | 'link'
+  | 'list'
+  | 'listitem'
+  | 'log'
+  | 'main'
+  | 'marquee'
+  | 'math'
+  | 'menu'
+  | 'menubar'
+  | 'menuitem'
+  | 'meter'
+  | 'navigation'
+  | 'none'
+  | 'note'
+  | 'option'
+  | 'presentation'
+  | 'progressbar'
+  | 'radio'
+  | 'radiogroup'
+  | 'region'
+  | 'row'
+  | 'rowgroup'
+  | 'rowheader'
+  | 'scrollbar'
+  | 'searchbox'
+  | 'separator'
+  | 'slider'
+  | 'spinbutton'
+  | 'status'
+  | 'summary'
+  | 'switch'
+  | 'tab'
+  | 'table'
+  | 'tablist'
+  | 'tabpanel'
+  | 'term'
+  | 'timer'
+  | 'toolbar'
+  | 'tooltip'
+  | 'tree'
+  | 'treegrid'
+  | 'treeitem';
diff --git a/Libraries/Components/View/ViewAccessibility.js b/Libraries/Components/View/ViewAccessibility.js
index 51343752c55e..c62be022b046 100644
--- a/Libraries/Components/View/ViewAccessibility.js
+++ b/Libraries/Components/View/ViewAccessibility.js
@@ -43,7 +43,76 @@ export type AccessibilityRole =
   | 'tablist'
   | 'timer'
   | 'list'
-  | 'toolbar';
+  | 'toolbar'
+  | 'grid';
+
+// Role types for web
+export type Role =
+  | 'alert'
+  | 'alertdialog'
+  | 'application'
+  | 'article'
+  | 'banner'
+  | 'button'
+  | 'cell'
+  | 'checkbox'
+  | 'columnheader'
+  | 'combobox'
+  | 'complementary'
+  | 'contentinfo'
+  | 'definition'
+  | 'dialog'
+  | 'directory'
+  | 'document'
+  | 'feed'
+  | 'figure'
+  | 'form'
+  | 'grid'
+  | 'group'
+  | 'heading'
+  | 'img'
+  | 'link'
+  | 'list'
+  | 'listitem'
+  | 'log'
+  | 'main'
+  | 'marquee'
+  | 'math'
+  | 'menu'
+  | 'menubar'
+  | 'menuitem'
+  | 'meter'
+  | 'navigation'
+  | 'none'
+  | 'note'
+  | 'option'
+  | 'presentation'
+  | 'progressbar'
+  | 'radio'
+  | 'radiogroup'
+  | 'region'
+  | 'row'
+  | 'rowgroup'
+  | 'rowheader'
+  | 'scrollbar'
+  | 'searchbox'
+  | 'separator'
+  | 'slider'
+  | 'spinbutton'
+  | 'status'
+  | 'summary'
+  | 'switch'
+  | 'tab'
+  | 'table'
+  | 'tablist'
+  | 'tabpanel'
+  | 'term'
+  | 'timer'
+  | 'toolbar'
+  | 'tooltip'
+  | 'tree'
+  | 'treegrid'
+  | 'treeitem';
 
 // the info associated with an accessibility action
 export type AccessibilityActionInfo = $ReadOnly<{
diff --git a/Libraries/Components/View/ViewNativeComponent.js b/Libraries/Components/View/ViewNativeComponent.js
index bba9f3971e6e..7f41843de777 100644
--- a/Libraries/Components/View/ViewNativeComponent.js
+++ b/Libraries/Components/View/ViewNativeComponent.js
@@ -8,15 +8,15 @@
  * @format
  */
 
-import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
 import type {
   HostComponent,
   PartialViewConfig,
 } from '../../Renderer/shims/ReactNativeTypes';
+
+import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
 import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
-import {type ViewProps as Props} from './ViewPropTypes';
 import Platform from '../../Utilities/Platform';
-
+import {type ViewProps as Props} from './ViewPropTypes';
 import * as React from 'react';
 
 export const __INTERNAL_VIEW_CONFIG: PartialViewConfig =
diff --git a/Libraries/Components/View/ViewPropTypes.d.ts b/Libraries/Components/View/ViewPropTypes.d.ts
new file mode 100644
index 000000000000..b7da46fe4bc5
--- /dev/null
+++ b/Libraries/Components/View/ViewPropTypes.d.ts
@@ -0,0 +1,245 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Insets} from '../../../types/public/Insets';
+import {GestureResponderHandlers} from '../../../types/public/ReactNativeRenderer';
+import {StyleProp} from '../../StyleSheet/StyleSheet';
+import {ViewStyle} from '../../StyleSheet/StyleSheetTypes';
+import {LayoutChangeEvent, PointerEvents} from '../../Types/CoreEventTypes';
+import {Touchable} from '../Touchable/Touchable';
+import {AccessibilityProps} from './ViewAccessibility';
+
+export type TVParallaxProperties = {
+  /**
+   * If true, parallax effects are enabled.  Defaults to true.
+   */
+  enabled?: boolean | undefined;
+
+  /**
+   * Defaults to 2.0.
+   */
+  shiftDistanceX?: number | undefined;
+
+  /**
+   * Defaults to 2.0.
+   */
+  shiftDistanceY?: number | undefined;
+
+  /**
+   * Defaults to 0.05.
+   */
+  tiltAngle?: number | undefined;
+
+  /**
+   * Defaults to 1.0
+   */
+  magnification?: number | undefined;
+
+  /**
+   * Defaults to 1.0
+   */
+  pressMagnification?: number | undefined;
+
+  /**
+   * Defaults to 0.3
+   */
+  pressDuration?: number | undefined;
+
+  /**
+   * Defaults to 0.3
+   */
+  pressDelay?: number | undefined;
+};
+
+export interface TVViewPropsIOS {
+  /**
+   * *(Apple TV only)* When set to true, this view will be focusable
+   * and navigable using the Apple TV remote.
+   *
+   * @platform ios
+   */
+  isTVSelectable?: boolean | undefined;
+
+  /**
+   * *(Apple TV only)* May be set to true to force the Apple TV focus engine to move focus to this view.
+   *
+   * @platform ios
+   */
+  hasTVPreferredFocus?: boolean | undefined;
+
+  /**
+   * *(Apple TV only)* Object with properties to control Apple TV parallax effects.
+   *
+   * @platform ios
+   */
+  tvParallaxProperties?: TVParallaxProperties | undefined;
+
+  /**
+   * *(Apple TV only)* May be used to change the appearance of the Apple TV parallax effect when this view goes in or out of focus.  Defaults to 2.0.
+   *
+   * @platform ios
+   */
+  tvParallaxShiftDistanceX?: number | undefined;
+
+  /**
+   * *(Apple TV only)* May be used to change the appearance of the Apple TV parallax effect when this view goes in or out of focus.  Defaults to 2.0.
+   *
+   * @platform ios
+   */
+  tvParallaxShiftDistanceY?: number | undefined;
+
+  /**
+   * *(Apple TV only)* May be used to change the appearance of the Apple TV parallax effect when this view goes in or out of focus.  Defaults to 0.05.
+   *
+   * @platform ios
+   */
+  tvParallaxTiltAngle?: number | undefined;
+
+  /**
+   * *(Apple TV only)* May be used to change the appearance of the Apple TV parallax effect when this view goes in or out of focus.  Defaults to 1.0.
+   *
+   * @platform ios
+   */
+  tvParallaxMagnification?: number | undefined;
+}
+
+export interface ViewPropsIOS extends TVViewPropsIOS {
+  /**
+   * Whether this view should be rendered as a bitmap before compositing.
+   *
+   * On iOS, this is useful for animations and interactions that do not modify this component's dimensions nor its children;
+   * for example, when translating the position of a static view, rasterization allows the renderer to reuse a cached bitmap of a static view
+   * and quickly composite it during each frame.
+   *
+   * Rasterization incurs an off-screen drawing pass and the bitmap consumes memory.
+   * Test and measure when using this property.
+   */
+  shouldRasterizeIOS?: boolean | undefined;
+}
+
+export interface ViewPropsAndroid {
+  /**
+   * Views that are only used to layout their children or otherwise don't draw anything
+   * may be automatically removed from the native hierarchy as an optimization.
+   * Set this property to false to disable this optimization and ensure that this View exists in the native view hierarchy.
+   */
+  collapsable?: boolean | undefined;
+
+  /**
+   * Whether this view needs to rendered offscreen and composited with an alpha in order to preserve 100% correct colors and blending behavior.
+   * The default (false) falls back to drawing the component and its children
+   * with an alpha applied to the paint used to draw each element instead of rendering the full component offscreen and compositing it back with an alpha value.
+   * This default may be noticeable and undesired in the case where the View you are setting an opacity on
+   * has multiple overlapping elements (e.g. multiple overlapping Views, or text and a background).
+   *
+   * Rendering offscreen to preserve correct alpha behavior is extremely expensive
+   * and hard to debug for non-native developers, which is why it is not turned on by default.
+   * If you do need to enable this property for an animation,
+   * consider combining it with renderToHardwareTextureAndroid if the view contents are static (i.e. it doesn't need to be redrawn each frame).
+   * If that property is enabled, this View will be rendered off-screen once,
+   * saved in a hardware texture, and then composited onto the screen with an alpha each frame without having to switch rendering targets on the GPU.
+   */
+  needsOffscreenAlphaCompositing?: boolean | undefined;
+
+  /**
+   * Whether this view should render itself (and all of its children) into a single hardware texture on the GPU.
+   *
+   * On Android, this is useful for animations and interactions that only modify opacity, rotation, translation, and/or scale:
+   * in those cases, the view doesn't have to be redrawn and display lists don't need to be re-executed. The texture can just be
+   * re-used and re-composited with different parameters. The downside is that this can use up limited video memory, so this prop should be set back to false at the end of the interaction/animation.
+   */
+  renderToHardwareTextureAndroid?: boolean | undefined;
+
+  /**
+   * Whether this `View` should be focusable with a non-touch input device, eg. receive focus with a hardware keyboard.
+   */
+  focusable?: boolean | undefined;
+}
+
+/**
+ * @see https://reactnative.dev/docs/view#props
+ */
+export interface ViewProps
+  extends ViewPropsAndroid,
+    ViewPropsIOS,
+    GestureResponderHandlers,
+    Touchable,
+    PointerEvents,
+    AccessibilityProps {
+  children?: React.ReactNode;
+  /**
+   * This defines how far a touch event can start away from the view.
+   * Typical interface guidelines recommend touch targets that are at least
+   * 30 - 40 points/density-independent pixels. If a Touchable view has
+   * a height of 20 the touchable height can be extended to 40 with
+   * hitSlop={{top: 10, bottom: 10, left: 0, right: 0}}
+   * NOTE The touch area never extends past the parent view bounds and
+   * the Z-index of sibling views always takes precedence if a touch
+   * hits two overlapping views.
+   */
+  hitSlop?: Insets | undefined;
+
+  /**
+   * Used to reference react managed views from native code.
+   */
+  id?: string | undefined;
+
+  /**
+   * Invoked on mount and layout changes with
+   *
+   * {nativeEvent: { layout: {x, y, width, height}}}.
+   */
+  onLayout?: ((event: LayoutChangeEvent) => void) | undefined;
+
+  /**
+   *
+   * In the absence of auto property, none is much like CSS's none value. box-none is as if you had applied the CSS class:
+   *
+   * .box-none {
+   *   pointer-events: none;
+   * }
+   * .box-none * {
+   *   pointer-events: all;
+   * }
+   *
+   * box-only is the equivalent of
+   *
+   * .box-only {
+   *   pointer-events: all;
+   * }
+   * .box-only * {
+   *   pointer-events: none;
+   * }
+   *
+   * But since pointerEvents does not affect layout/appearance, and we are already deviating from the spec by adding additional modes,
+   * we opt to not include pointerEvents on style. On some platforms, we would need to implement it as a className anyways. Using style or not is an implementation detail of the platform.
+   */
+  pointerEvents?: 'box-none' | 'none' | 'box-only' | 'auto' | undefined;
+
+  /**
+   *
+   * This is a special performance property exposed by RCTView and is useful for scrolling content when there are many subviews,
+   * most of which are offscreen. For this property to be effective, it must be applied to a view that contains many subviews that extend outside its bound.
+   * The subviews must also have overflow: hidden, as should the containing view (or one of its superviews).
+   */
+  removeClippedSubviews?: boolean | undefined;
+
+  style?: StyleProp<ViewStyle> | undefined;
+
+  /**
+   * Used to locate this view in end-to-end tests.
+   */
+  testID?: string | undefined;
+
+  /**
+   * Used to reference react managed views from native code.
+   */
+  nativeID?: string | undefined;
+}
diff --git a/Libraries/Components/View/ViewPropTypes.js b/Libraries/Components/View/ViewPropTypes.js
index 4a97e85f669e..2330f45c0051 100644
--- a/Libraries/Components/View/ViewPropTypes.js
+++ b/Libraries/Components/View/ViewPropTypes.js
@@ -10,34 +10,30 @@
 
 'use strict';
 
+import type {EdgeInsetsOrSizeProp} from '../../StyleSheet/EdgeInsetsPropType';
+import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
 import type {
   BlurEvent,
   FocusEvent,
+  Layout,
+  LayoutEvent,
   MouseEvent,
   PointerEvent,
   PressEvent,
-  Layout,
-  LayoutEvent,
 } from '../../Types/CoreEventTypes';
-import type {EdgeInsetsOrSizeProp} from '../../StyleSheet/EdgeInsetsPropType';
-import type {Node} from 'react';
-import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
 import type {
+  AccessibilityActionEvent,
+  AccessibilityActionInfo,
   AccessibilityRole,
   AccessibilityState,
   AccessibilityValue,
-  AccessibilityActionEvent,
-  AccessibilityActionInfo,
+  Role,
 } from './ViewAccessibility';
+import type {Node} from 'react';
 
 export type ViewLayout = Layout;
 export type ViewLayoutEvent = LayoutEvent;
 
-type BubblingEventProps = $ReadOnly<{|
-  onBlur?: ?(event: BlurEvent) => mixed,
-  onFocus?: ?(event: FocusEvent) => mixed,
-|}>;
-
 type DirectEventProps = $ReadOnly<{|
   /**
    * When `accessible` is true, the system will try to invoke this function
@@ -103,6 +99,17 @@ type PointerEventProps = $ReadOnly<{|
   onPointerDownCapture?: ?(e: PointerEvent) => void,
   onPointerUp?: ?(e: PointerEvent) => void,
   onPointerUpCapture?: ?(e: PointerEvent) => void,
+  onPointerOver?: ?(e: PointerEvent) => void,
+  onPointerOverCapture?: ?(e: PointerEvent) => void,
+  onPointerOut?: ?(e: PointerEvent) => void,
+  onPointerOutCapture?: ?(e: PointerEvent) => void,
+|}>;
+
+type FocusEventProps = $ReadOnly<{|
+  onBlur?: ?(event: BlurEvent) => void,
+  onBlurCapture?: ?(event: BlurEvent) => void,
+  onFocus?: ?(event: FocusEvent) => void,
+  onFocusCapture?: ?(event: FocusEvent) => void,
 |}>;
 
 type TouchEventProps = $ReadOnly<{|
@@ -286,6 +293,16 @@ type AndroidViewProps = $ReadOnly<{|
    */
   accessibilityLiveRegion?: ?('none' | 'polite' | 'assertive'),
 
+  /**
+   * Indicates to accessibility services whether the user should be notified
+   * when this view changes. Works for Android API >= 19 only.
+   *
+   * @platform android
+   *
+   * See https://reactnative.dev/docs/view#accessibilityliveregion
+   */
+  'aria-live'?: ?('polite' | 'assertive' | 'off'),
+
   /**
    * Controls how view is important for accessibility which is if it
    * fires accessibility events and if it is reported to accessibility services
@@ -346,6 +363,19 @@ type AndroidViewProps = $ReadOnly<{|
    */
   focusable?: boolean,
 
+  /**
+   * Indicates whether this `View` should be focusable with a non-touch input device, eg. receive focus with a hardware keyboard.
+   * See https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/tabindex
+   * for more details.
+   *
+   * Supports the following values:
+   * -  0 (View is focusable)
+   * - -1 (View is not focusable)
+   *
+   * @platform android
+   */
+  tabIndex?: 0 | -1,
+
   /**
    * The action to perform when this `View` is clicked on by a non-touch click, eg. enter key on a hardware keyboard.
    *
@@ -373,6 +403,15 @@ type IOSViewProps = $ReadOnly<{|
    */
   accessibilityViewIsModal?: ?boolean,
 
+  /**
+   * The aria-modal attribute indicates content contained within a modal with aria-modal="true"
+   * should be accessible to the user.
+   * Default is `false`.
+   *
+   *  @platform ios
+   */
+  'aria-modal'?: ?boolean,
+
   /**
    * A value indicating whether the accessibility elements contained within
    * this accessibility element are hidden.
@@ -394,11 +433,11 @@ type IOSViewProps = $ReadOnly<{|
 |}>;
 
 export type ViewProps = $ReadOnly<{|
-  ...BubblingEventProps,
   ...DirectEventProps,
   ...GestureResponderEventProps,
   ...MouseEventProps,
   ...PointerEventProps,
+  ...FocusEventProps,
   ...TouchEventProps,
   ...AndroidViewProps,
   ...IOSViewProps,
@@ -433,6 +472,12 @@ export type ViewProps = $ReadOnly<{|
    */
   accessibilityHint?: ?Stringish,
 
+  /**
+   * Alias for accessibilityLabel  https://reactnative.dev/docs/view#accessibilitylabel
+   * https://github.com/facebook/react-native/issues/34424
+   */
+  'aria-label'?: ?Stringish,
+
   /**
    * Indicates to the accessibility services that the UI component is in
    * a specific language. The provided string should be formatted following
@@ -447,12 +492,26 @@ export type ViewProps = $ReadOnly<{|
    */
   accessibilityRole?: ?AccessibilityRole,
 
+  /**
+   * Alias for accessibilityRole
+   */
+  role?: ?Role,
+
   /**
    * Indicates to accessibility services that UI Component is in a specific State.
    */
   accessibilityState?: ?AccessibilityState,
   accessibilityValue?: ?AccessibilityValue,
 
+  /**
+   * alias for accessibilityState
+   * It represents textual description of a component's value, or for range-based components, such as sliders and progress bars.
+   */
+  'aria-valuemax'?: ?AccessibilityValue['max'],
+  'aria-valuemin'?: ?AccessibilityValue['min'],
+  'aria-valuenow'?: ?AccessibilityValue['now'],
+  'aria-valuetext'?: ?AccessibilityValue['text'],
+
   /**
    * Provides an array of custom actions available for accessibility.
    *
@@ -466,6 +525,30 @@ export type ViewProps = $ReadOnly<{|
    */
   accessibilityLabelledBy?: ?string | ?Array<string>,
 
+  /**
+   * alias for accessibilityState
+   *
+   * see https://reactnative.dev/docs/accessibility#accessibilitystate
+   */
+  'aria-busy'?: ?boolean,
+  'aria-checked'?: ?boolean | 'mixed',
+  'aria-disabled'?: ?boolean,
+  'aria-expanded'?: ?boolean,
+  'aria-selected'?: ?boolean,
+  /** A value indicating whether the accessibility elements contained within
+   * this accessibility element are hidden.
+   *
+   * See https://reactnative.dev/docs/view#aria-hidden
+   */
+  'aria-hidden'?: ?boolean,
+
+  /**
+   * It reperesents the nativeID of the associated label text. When the assistive technology focuses on the component with this props, the text is read aloud.
+   *
+   * @platform android
+   */
+  'aria-labelledby'?: ?string,
+
   /**
    * Views that are only used to layout their children or otherwise don't draw
    * anything may be automatically removed from the native hierarchy as an
@@ -479,6 +562,15 @@ export type ViewProps = $ReadOnly<{|
    */
   collapsable?: ?boolean,
 
+  /**
+   * Used to locate this view from native classes.
+   *
+   * > This disables the 'layout-only view removal' optimization for this view!
+   *
+   * See https://reactnative.dev/docs/view#id
+   */
+  id?: string,
+
   /**
    * Used to locate this view in end-to-end tests.
    *
diff --git a/Libraries/Components/__tests__/Button-test.js b/Libraries/Components/__tests__/Button-test.js
index d2f976371aa9..8ecd5f7f6a64 100644
--- a/Libraries/Components/__tests__/Button-test.js
+++ b/Libraries/Components/__tests__/Button-test.js
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import Button from '../Button';
 import * as React from 'react';
 import ReactTestRenderer from 'react-test-renderer';
-import Button from '../Button';
 
 describe('<Button />', () => {
   it('should render as expected', () => {
@@ -46,4 +46,14 @@ describe('<Button />', () => {
     expect(ReactTestRenderer.create( <Button title="Test Button" disabled={false} accessibilityState={{disabled: false}} />)
     ).toMatchSnapshot();
   });
+
+  it('should be set importantForAccessibility={no-hide-descendants} when importantForAccessibility={no-hide-descendants}', () => {
+    expect(ReactTestRenderer.create( <Button title="Test Button" importantForAccessibility={'no-hide-descendants'} />)
+    ).toMatchSnapshot();
+  });
+
+  it('should be set importantForAccessibility={no-hide-descendants} when importantForAccessibility={no}', () => {
+    expect(ReactTestRenderer.create( <Button title="Test Button" importantForAccessibility={'no'} />)
+    ).toMatchSnapshot();
+  });
 });
diff --git a/Libraries/Components/__tests__/Slider-test.js b/Libraries/Components/__tests__/Slider-test.js
index 876627fa038d..9be43af838ad 100644
--- a/Libraries/Components/__tests__/Slider-test.js
+++ b/Libraries/Components/__tests__/Slider-test.js
@@ -8,9 +8,9 @@
  * @format
  */
 
+import Slider from '../Slider/Slider';
 import * as React from 'react';
 import ReactTestRenderer from 'react-test-renderer';
-import Slider from '../Slider/Slider';
 
 describe('<Slider />', () => {
   it('should render as expected', () => {
diff --git a/Libraries/Components/__tests__/__snapshots__/Button-test.js.snap b/Libraries/Components/__tests__/__snapshots__/Button-test.js.snap
index 8f31a7be12de..5b4294e0e8c8 100644
--- a/Libraries/Components/__tests__/__snapshots__/Button-test.js.snap
+++ b/Libraries/Components/__tests__/__snapshots__/Button-test.js.snap
@@ -5,7 +5,19 @@ exports[`<Button /> should be disabled and it should set accessibilityState to d
   accessibilityRole="button"
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -59,7 +71,19 @@ exports[`<Button /> should be disabled when disabled is empty and accessibilityS
   accessibilityRole="button"
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -113,7 +137,19 @@ exports[`<Button /> should be disabled when disabled={true} and accessibilitySta
   accessibilityRole="button"
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -162,12 +198,148 @@ exports[`<Button /> should be disabled when disabled={true} and accessibilitySta
 </View>
 `;
 
+exports[`<Button /> should be set importantForAccessibility={no-hide-descendants} when importantForAccessibility={no} 1`] = `
+<View
+  accessibilityRole="button"
+  accessibilityState={
+    Object {
+      "busy": undefined,
+      "checked": undefined,
+      "disabled": undefined,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  focusable={false}
+  importantForAccessibility="no-hide-descendants"
+  onClick={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+  style={
+    Object {
+      "opacity": 1,
+    }
+  }
+>
+  <View
+    style={
+      Array [
+        Object {},
+      ]
+    }
+  >
+    <Text
+      style={
+        Array [
+          Object {
+            "color": "#007AFF",
+            "fontSize": 18,
+            "margin": 8,
+            "textAlign": "center",
+          },
+        ]
+      }
+    >
+      Test Button
+    </Text>
+  </View>
+</View>
+`;
+
+exports[`<Button /> should be set importantForAccessibility={no-hide-descendants} when importantForAccessibility={no-hide-descendants} 1`] = `
+<View
+  accessibilityRole="button"
+  accessibilityState={
+    Object {
+      "busy": undefined,
+      "checked": undefined,
+      "disabled": undefined,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
+    }
+  }
+  accessible={true}
+  collapsable={false}
+  focusable={false}
+  importantForAccessibility="no-hide-descendants"
+  onClick={[Function]}
+  onResponderGrant={[Function]}
+  onResponderMove={[Function]}
+  onResponderRelease={[Function]}
+  onResponderTerminate={[Function]}
+  onResponderTerminationRequest={[Function]}
+  onStartShouldSetResponder={[Function]}
+  style={
+    Object {
+      "opacity": 1,
+    }
+  }
+>
+  <View
+    style={
+      Array [
+        Object {},
+      ]
+    }
+  >
+    <Text
+      style={
+        Array [
+          Object {
+            "color": "#007AFF",
+            "fontSize": 18,
+            "margin": 8,
+            "textAlign": "center",
+          },
+        ]
+      }
+    >
+      Test Button
+    </Text>
+  </View>
+</View>
+`;
+
 exports[`<Button /> should not be disabled when disabled={false} and accessibilityState={{disabled: false}} 1`] = `
 <View
   accessibilityRole="button"
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": false,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -217,7 +389,19 @@ exports[`<Button /> should not be disabled when disabled={false} and accessibili
   accessibilityRole="button"
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": false,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -267,7 +451,19 @@ exports[`<Button /> should overwrite accessibilityState with value of disabled p
   accessibilityRole="button"
   accessibilityState={
     Object {
+      "busy": undefined,
+      "checked": undefined,
       "disabled": true,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
     }
   }
   accessible={true}
@@ -319,6 +515,23 @@ exports[`<Button /> should overwrite accessibilityState with value of disabled p
 exports[`<Button /> should render as expected 1`] = `
 <View
   accessibilityRole="button"
+  accessibilityState={
+    Object {
+      "busy": undefined,
+      "checked": undefined,
+      "disabled": undefined,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
+  accessibilityValue={
+    Object {
+      "max": undefined,
+      "min": undefined,
+      "now": undefined,
+      "text": undefined,
+    }
+  }
   accessible={true}
   collapsable={false}
   focusable={false}
diff --git a/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js b/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js
index 020af845708b..d9b2cfb40b19 100644
--- a/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js
+++ b/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Core/Devtools/__tests__/parseHermesStack-test.js b/Libraries/Core/Devtools/__tests__/parseHermesStack-test.js
index f821fc1c91ca..d2be85c40aec 100644
--- a/Libraries/Core/Devtools/__tests__/parseHermesStack-test.js
+++ b/Libraries/Core/Devtools/__tests__/parseHermesStack-test.js
@@ -6,7 +6,7 @@
  *
  * @flow strict-local
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Core/Devtools/openFileInEditor.js b/Libraries/Core/Devtools/openFileInEditor.js
index 2f4e8b127d27..c9eb343031ef 100644
--- a/Libraries/Core/Devtools/openFileInEditor.js
+++ b/Libraries/Core/Devtools/openFileInEditor.js
@@ -15,6 +15,9 @@ const getDevServer = require('./getDevServer');
 function openFileInEditor(file: string, lineNumber: number) {
   fetch(getDevServer().url + 'open-stack-frame', {
     method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
     body: JSON.stringify({file, lineNumber}),
   });
 }
diff --git a/Libraries/Core/Devtools/parseErrorStack.js b/Libraries/Core/Devtools/parseErrorStack.js
index e0039c85d6f1..c85ddf05f138 100644
--- a/Libraries/Core/Devtools/parseErrorStack.js
+++ b/Libraries/Core/Devtools/parseErrorStack.js
@@ -16,7 +16,7 @@ import type {HermesParsedStack} from './parseHermesStack';
 const parseHermesStack = require('./parseHermesStack');
 
 function convertHermesStack(stack: HermesParsedStack): Array<StackFrame> {
-  const frames = [];
+  const frames: Array<StackFrame> = [];
   for (const entry of stack.entries) {
     if (entry.type !== 'FRAME') {
       continue;
diff --git a/Libraries/Core/Devtools/symbolicateStackTrace.js b/Libraries/Core/Devtools/symbolicateStackTrace.js
index 32ad1c7636fe..b45bc368d54f 100644
--- a/Libraries/Core/Devtools/symbolicateStackTrace.js
+++ b/Libraries/Core/Devtools/symbolicateStackTrace.js
@@ -10,10 +10,10 @@
 
 'use strict';
 
-const getDevServer = require('./getDevServer');
-
 import type {StackFrame} from '../NativeExceptionsManager';
 
+const getDevServer = require('./getDevServer');
+
 export type CodeFrame = $ReadOnly<{
   content: string,
   location: ?{
diff --git a/Libraries/Core/ExceptionsManager.js b/Libraries/Core/ExceptionsManager.js
index 9d9e46098cbb..4616569b4b28 100644
--- a/Libraries/Core/ExceptionsManager.js
+++ b/Libraries/Core/ExceptionsManager.js
@@ -22,6 +22,11 @@ type ExceptionDecorator = ExceptionData => ExceptionData;
 let userExceptionDecorator: ?ExceptionDecorator;
 let inUserExceptionDecorator = false;
 
+// This Symbol is used to decorate an ExtendedError with extra data in select usecases.
+// Note that data passed using this method should be strictly contained,
+// as data that's not serializable/too large may cause issues with passing the error to the native code.
+const decoratedExtraDataKey: symbol = Symbol('decoratedExtraDataKey');
+
 /**
  * Allows the app to add information to the exception report before it is sent
  * to native. This API is not final.
@@ -83,6 +88,8 @@ function reportException(
     id: currentExceptionID,
     isFatal,
     extraData: {
+      // $FlowFixMe[incompatible-use] we can't define a type with a Symbol-keyed field in flow
+      ...e[decoratedExtraDataKey],
       jsEngine: e.jsEngine,
       rawStack: e.stack,
     },
@@ -235,6 +242,7 @@ function installConsoleErrorReporter() {
 }
 
 module.exports = {
+  decoratedExtraDataKey,
   handleException,
   installConsoleErrorReporter,
   SyntheticError,
diff --git a/Libraries/Core/ExtendedError.js b/Libraries/Core/ExtendedError.js
index ced640c5046a..2ff43c88a9c9 100644
--- a/Libraries/Core/ExtendedError.js
+++ b/Libraries/Core/ExtendedError.js
@@ -8,11 +8,14 @@
  * @format
  */
 
-export type ExtendedError = Error & {
-  jsEngine?: string,
-  preventSymbolication?: boolean,
-  componentStack?: string,
-  isComponentError?: boolean,
-  type?: string,
-  ...
-};
+export type ExtendedError = Error &
+  interface {
+    jsEngine?: string,
+    preventSymbolication?: boolean,
+    componentStack?: string,
+    isComponentError?: boolean,
+    type?: string,
+    // Note: A field keyed by the Symbol ExceptionsManager.decoratedExtraDataKey is also read from ExtendedErrors.
+    // This field isn't documented in the types as Flow does not support this usecase, but it's effectively:
+    // [decoratedExtraDataKey]?: {[string]: mixed},
+  };
diff --git a/Libraries/Core/InitializeCore.js b/Libraries/Core/InitializeCore.js
index ee7b99f74318..1379ffd6cbe7 100644
--- a/Libraries/Core/InitializeCore.js
+++ b/Libraries/Core/InitializeCore.js
@@ -28,7 +28,6 @@ const start = Date.now();
 
 require('./setUpGlobals');
 require('./setUpPerformance');
-require('./setUpSystrace');
 require('./setUpErrorHandling');
 require('./polyfillPromise');
 require('./setUpRegeneratorRuntime');
@@ -44,6 +43,8 @@ if (__DEV__) {
   require('../LogBox/LogBox').install();
 }
 
+require('../ReactNative/AppRegistry');
+
 const GlobalPerformanceLogger = require('../Utilities/GlobalPerformanceLogger');
 // We could just call GlobalPerformanceLogger.markPoint at the top of the file,
 // but then we'd be excluding the time it took to require the logger.
diff --git a/Libraries/Core/NativeExceptionsManager.js b/Libraries/Core/NativeExceptionsManager.js
index 566428ab2c23..aac86e07edad 100644
--- a/Libraries/Core/NativeExceptionsManager.js
+++ b/Libraries/Core/NativeExceptionsManager.js
@@ -9,8 +9,11 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
+const Platform = require('../Utilities/Platform');
+
 export type StackFrame = {|
   column: ?number,
   file: ?string,
@@ -18,7 +21,6 @@ export type StackFrame = {|
   methodName: string,
   collapse?: boolean,
 |};
-
 export type ExceptionData = {
   message: string,
   originalMessage: ?string,
@@ -31,7 +33,6 @@ export type ExceptionData = {
   extraData?: Object,
   ...
 };
-
 export interface Spec extends TurboModule {
   // Deprecated: Use `reportException`
   +reportFatalException: (
@@ -55,8 +56,6 @@ export interface Spec extends TurboModule {
   +dismissRedbox?: () => void;
 }
 
-const Platform = require('../Utilities/Platform');
-
 const NativeModule =
   TurboModuleRegistry.getEnforcing<Spec>('ExceptionsManager');
 
diff --git a/Libraries/Core/RawEventEmitter.js b/Libraries/Core/RawEventEmitter.js
index cd330469cd74..03950ff8c16a 100644
--- a/Libraries/Core/RawEventEmitter.js
+++ b/Libraries/Core/RawEventEmitter.js
@@ -8,9 +8,10 @@
  * @format
  */
 
-import EventEmitter from '../vendor/emitter/EventEmitter';
 import type {IEventEmitter} from '../vendor/emitter/EventEmitter';
 
+import EventEmitter from '../vendor/emitter/EventEmitter';
+
 export type RawEventEmitterEvent = $ReadOnly<{|
   eventName: string,
   // We expect, but do not/cannot require, that nativeEvent is an object
diff --git a/Libraries/Core/ReactFiberErrorDialog.js b/Libraries/Core/ReactFiberErrorDialog.js
index cb1132b1f88f..f9e783c5587b 100644
--- a/Libraries/Core/ReactFiberErrorDialog.js
+++ b/Libraries/Core/ReactFiberErrorDialog.js
@@ -8,10 +8,10 @@
  * @flow strict-local
  */
 
-import {handleException, SyntheticError} from './ExceptionsManager';
-
 import type {ExtendedError} from './ExtendedError';
 
+import {SyntheticError, handleException} from './ExceptionsManager';
+
 export type CapturedError = {
   +componentStack: string,
   +error: mixed,
diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js
index eefc716eaa9b..f5a9fc5d020b 100644
--- a/Libraries/Core/ReactNativeVersion.js
+++ b/Libraries/Core/ReactNativeVersion.js
@@ -1,17 +1,17 @@
 /**
+ * @generated by scripts/set-rn-version.js
+ *
  * 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
- * @generated by scripts/set-rn-version.js
  * @flow strict
  */
 
 exports.version = {
   major: 0,
-  minor: 0,
+  minor: 71,
   patch: 0,
-  prerelease: null,
+  prerelease: 'rc.5',
 };
diff --git a/Libraries/Core/ReactNativeVersionCheck.js b/Libraries/Core/ReactNativeVersionCheck.js
index 6b4c0973e571..19f639a16916 100644
--- a/Libraries/Core/ReactNativeVersionCheck.js
+++ b/Libraries/Core/ReactNativeVersionCheck.js
@@ -9,6 +9,7 @@
  */
 
 import Platform from '../Utilities/Platform';
+
 const ReactNativeVersion = require('./ReactNativeVersion');
 
 /**
diff --git a/Libraries/Core/SegmentFetcher/NativeSegmentFetcher.js b/Libraries/Core/SegmentFetcher/NativeSegmentFetcher.js
index 32efa714cc60..b39822ca9c16 100644
--- a/Libraries/Core/SegmentFetcher/NativeSegmentFetcher.js
+++ b/Libraries/Core/SegmentFetcher/NativeSegmentFetcher.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Core/Timers/JSTimers.js b/Libraries/Core/Timers/JSTimers.js
index 2ef47d88c0a6..33f8a68d76b6 100644
--- a/Libraries/Core/Timers/JSTimers.js
+++ b/Libraries/Core/Timers/JSTimers.js
@@ -8,13 +8,12 @@
  * @flow
  */
 
+import NativeTiming from './NativeTiming';
+
 const BatchedBridge = require('../../BatchedBridge/BatchedBridge');
 const Systrace = require('../../Performance/Systrace');
-
 const invariant = require('invariant');
 
-import NativeTiming from './NativeTiming';
-
 /**
  * JS implementation of timer functions. Must be completely driven by an
  * external clock signal, all that's stored here is timerID, timer type, and
@@ -243,7 +242,7 @@ const JSTimers = {
    * @param {function} func Callback to be invoked before the end of the
    * current JavaScript execution loop.
    */
-  queueReactNativeMicrotask: function (func: Function, ...args: any) {
+  queueReactNativeMicrotask: function (func: Function, ...args: any): number {
     const id = _allocateCallback(
       () => func.apply(undefined, args),
       'queueReactNativeMicrotask',
@@ -255,7 +254,7 @@ const JSTimers = {
   /**
    * @param {function} func Callback to be invoked every frame.
    */
-  requestAnimationFrame: function (func: Function) {
+  requestAnimationFrame: function (func: Function): any | number {
     const id = _allocateCallback(func, 'requestAnimationFrame');
     createTimer(id, 1, Date.now(), /* recurring */ false);
     return id;
@@ -266,16 +265,19 @@ const JSTimers = {
    * with time remaining in frame.
    * @param {?object} options
    */
-  requestIdleCallback: function (func: Function, options: ?Object) {
+  requestIdleCallback: function (
+    func: Function,
+    options: ?Object,
+  ): any | number {
     if (requestIdleCallbacks.length === 0) {
       setSendIdleEvents(true);
     }
 
     const timeout = options && options.timeout;
-    const id = _allocateCallback(
+    const id: number = _allocateCallback(
       timeout != null
         ? (deadline: any) => {
-            const timeoutId = requestIdleCallbackTimeouts[id];
+            const timeoutId: number = requestIdleCallbackTimeouts[id];
             if (timeoutId) {
               JSTimers.clearTimeout(timeoutId);
               delete requestIdleCallbackTimeouts[id];
@@ -288,8 +290,8 @@ const JSTimers = {
     requestIdleCallbacks.push(id);
 
     if (timeout != null) {
-      const timeoutId = JSTimers.setTimeout(() => {
-        const index = requestIdleCallbacks.indexOf(id);
+      const timeoutId: number = JSTimers.setTimeout(() => {
+        const index: number = requestIdleCallbacks.indexOf(id);
         if (index > -1) {
           requestIdleCallbacks.splice(index, 1);
           _callTimer(id, global.performance.now(), true);
@@ -346,7 +348,7 @@ const JSTimers = {
    * This is called from the native side. We are passed an array of timerIDs,
    * and
    */
-  callTimers: function (timersToCall: Array<number>) {
+  callTimers: function (timersToCall: Array<number>): any | void {
     invariant(
       timersToCall.length !== 0,
       'Cannot call `callTimers` with an empty list of IDs.',
diff --git a/Libraries/Core/Timers/NativeTiming.js b/Libraries/Core/Timers/NativeTiming.js
index fa9b14d6f338..5feaa3077a00 100644
--- a/Libraries/Core/Timers/NativeTiming.js
+++ b/Libraries/Core/Timers/NativeTiming.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Core/Timers/__tests__/JSTimers-test.js b/Libraries/Core/Timers/__tests__/JSTimers-test.js
index cd33eea71959..b92a981c3b0a 100644
--- a/Libraries/Core/Timers/__tests__/JSTimers-test.js
+++ b/Libraries/Core/Timers/__tests__/JSTimers-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Core/__tests__/ExceptionsManager-test.js b/Libraries/Core/__tests__/ExceptionsManager-test.js
index 11047221e4bd..e1dc1f535c1b 100644
--- a/Libraries/Core/__tests__/ExceptionsManager-test.js
+++ b/Libraries/Core/__tests__/ExceptionsManager-test.js
@@ -5,14 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
+const LogBox = require('../../LogBox/LogBox');
 const ExceptionsManager = require('../ExceptionsManager');
 const NativeExceptionsManager = require('../NativeExceptionsManager').default;
-const LogBox = require('../../LogBox/LogBox');
 const ReactFiberErrorDialog = require('../ReactFiberErrorDialog').default;
 const fs = require('fs');
 const path = require('path');
@@ -26,271 +26,211 @@ const capturedErrorDefaults = {
   willRetry: false,
 };
 
-describe('ExceptionsManager', () => {
-  let nativeReportException;
-  let logBoxAddException;
-
-  beforeEach(() => {
-    jest.resetModules();
-    jest.mock('../../LogBox/LogBox', () => ({
-      addException: jest.fn(),
-    }));
-    jest.mock('../NativeExceptionsManager', () => {
-      return {
-        default: {
-          reportException: jest.fn(),
-          // Used to show symbolicated messages, not part of this test.
-          updateExceptionMessage: () => {},
-        },
-      };
-    });
-    // Make symbolication a no-op.
-    jest.mock(
-      '../Devtools/symbolicateStackTrace',
-      () =>
-        async function symbolicateStackTrace(stack) {
-          return {stack};
-        },
-    );
-    jest.spyOn(console, 'error').mockReturnValue(undefined);
-    nativeReportException = NativeExceptionsManager.reportException;
-    logBoxAddException = LogBox.addException;
+describe('checkVersion', () => {
+  describe('in development', () => {
+    setDevelopmentModeForTests(true);
+    runExceptionsManagerTests();
   });
 
-  afterEach(() => {
-    jest.restoreAllMocks();
+  describe('in production', () => {
+    setDevelopmentModeForTests(false);
+    runExceptionsManagerTests();
   });
+});
 
-  describe('ReactFiberErrorDialog.showErrorDialog', () => {
-    test('forwards error instance to reportException', () => {
-      const error = new ReferenceError('Some error happened');
-      // Copy all the data we care about before any possible mutation.
-      const {message, name} = error;
-
-      const logToConsoleInReact = ReactFiberErrorDialog.showErrorDialog({
-        ...capturedErrorDefaults,
-        error,
-      });
-
-      if (__DEV__) {
-        expect(nativeReportException.mock.calls.length).toBe(0);
-        expect(logBoxAddException.mock.calls.length).toBe(1);
-        return;
-      }
-      expect(nativeReportException.mock.calls.length).toBe(1);
-      const exceptionData = nativeReportException.mock.calls[0][0];
-      const formattedMessage =
-        'ReferenceError: ' +
-        message +
-        '\n\n' +
-        'This error is located at:' +
-        capturedErrorDefaults.componentStack;
-      expect(exceptionData.message).toBe(formattedMessage);
-      expect(exceptionData.originalMessage).toBe(message);
-      expect(exceptionData.name).toBe(name);
-      expect(exceptionData.componentStack).toBe(
-        capturedErrorDefaults.componentStack,
-      );
-      expect(getLineFromFrame(exceptionData.stack[0])).toBe(
-        "const error = new ReferenceError('Some error happened');",
-      );
-      expect(exceptionData.isFatal).toBe(false);
-      expect(logToConsoleInReact).toBe(false);
-      expect(console.error).toBeCalledWith(formattedMessage);
-    });
+function setDevelopmentModeForTests(dev) {
+  let originalDev;
 
-    test('does not pop frames off the stack with framesToPop', () => {
-      function createError() {
-        const error = new Error('Some error happened');
-        error.framesToPop = 1;
-        return error;
-      }
-      const error = createError();
+  beforeAll(() => {
+    originalDev = global.__DEV__;
+    global.__DEV__ = dev;
+  });
 
-      ReactFiberErrorDialog.showErrorDialog({
-        ...capturedErrorDefaults,
-        error,
-      });
+  afterAll(() => {
+    global.__DEV__ = originalDev;
+  });
+}
 
-      let exceptionData;
+function runExceptionsManagerTests() {
+  describe('ExceptionsManager', () => {
+    let nativeReportException;
+    let logBoxAddException;
 
-      if (__DEV__) {
-        expect(logBoxAddException.mock.calls.length).toBe(1);
-        exceptionData = logBoxAddException.mock.calls[0][0];
-      } else {
-        expect(nativeReportException.mock.calls.length).toBe(1);
-        exceptionData = nativeReportException.mock.calls[0][0];
-      }
-      expect(getLineFromFrame(exceptionData.stack[0])).toBe(
-        "const error = new Error('Some error happened');",
+    beforeEach(() => {
+      jest.resetModules();
+      jest.mock('../../LogBox/LogBox', () => ({
+        addException: jest.fn(),
+      }));
+      jest.mock('../NativeExceptionsManager', () => {
+        return {
+          default: {
+            reportException: jest.fn(),
+            // Used to show symbolicated messages, not part of this test.
+            updateExceptionMessage: () => {},
+          },
+        };
+      });
+      // Make symbolication a no-op.
+      jest.mock(
+        '../Devtools/symbolicateStackTrace',
+        () =>
+          async function symbolicateStackTrace(stack) {
+            return {stack};
+          },
       );
+      jest.spyOn(console, 'error').mockReturnValue(undefined);
+      nativeReportException = NativeExceptionsManager.reportException;
+      logBoxAddException = LogBox.addException;
     });
 
-    test('adds the JS engine to the message', () => {
-      const error = new Error('Some error happened');
-      error.jsEngine = 'hermes';
-      // Copy all the data we care about before any possible mutation.
-      const {message, jsEngine} = error;
+    afterEach(() => {
+      jest.restoreAllMocks();
+    });
 
-      ReactFiberErrorDialog.showErrorDialog({
-        ...capturedErrorDefaults,
-        error,
-      });
+    describe('ReactFiberErrorDialog.showErrorDialog', () => {
+      test('forwards error instance to reportException', () => {
+        const error = new ReferenceError('Some error happened');
+        // Copy all the data we care about before any possible mutation.
+        const {message, name} = error;
 
-      let exceptionData;
+        const logToConsoleInReact = ReactFiberErrorDialog.showErrorDialog({
+          ...capturedErrorDefaults,
+          error,
+        });
 
-      if (__DEV__) {
-        expect(logBoxAddException.mock.calls.length).toBe(1);
-        exceptionData = logBoxAddException.mock.calls[0][0];
-      } else {
+        if (__DEV__) {
+          expect(nativeReportException.mock.calls.length).toBe(0);
+          expect(logBoxAddException.mock.calls.length).toBe(1);
+          return;
+        }
         expect(nativeReportException.mock.calls.length).toBe(1);
-        exceptionData = nativeReportException.mock.calls[0][0];
-      }
-      expect(exceptionData.message).toBe(
-        'Error: ' +
-          message +
-          '\n\n' +
-          'This error is located at:' +
-          capturedErrorDefaults.componentStack +
-          ', js engine: ' +
-          jsEngine,
-      );
-      expect(console.error).toBeCalledWith(
-        'Error: ' +
+        const exceptionData = nativeReportException.mock.calls[0][0];
+        const formattedMessage =
+          'ReferenceError: ' +
           message +
           '\n\n' +
           'This error is located at:' +
-          capturedErrorDefaults.componentStack +
-          ', js engine: ' +
-          jsEngine,
-      );
-    });
-
-    test('wraps string in an Error and sends to handleException', () => {
-      const message = 'Some error happened';
-
-      const logToConsoleInReact = ReactFiberErrorDialog.showErrorDialog({
-        ...capturedErrorDefaults,
-        error: message,
+          capturedErrorDefaults.componentStack;
+        expect(exceptionData.message).toBe(formattedMessage);
+        expect(exceptionData.originalMessage).toBe(message);
+        expect(exceptionData.name).toBe(name);
+        expect(exceptionData.componentStack).toBe(
+          capturedErrorDefaults.componentStack,
+        );
+        expect(getLineFromFrame(exceptionData.stack[0])).toBe(
+          "const error = new ReferenceError('Some error happened');",
+        );
+        expect(exceptionData.isFatal).toBe(false);
+        expect(logToConsoleInReact).toBe(false);
+        expect(console.error).toBeCalledWith(formattedMessage);
       });
 
-      let exceptionData;
+      test('does not pop frames off the stack with framesToPop', () => {
+        function createError() {
+          const error = new Error('Some error happened');
+          error.framesToPop = 1;
+          return error;
+        }
+        const error = createError();
 
-      if (__DEV__) {
-        expect(logBoxAddException.mock.calls.length).toBe(1);
-        exceptionData = logBoxAddException.mock.calls[0][0];
-      } else {
-        expect(nativeReportException.mock.calls.length).toBe(1);
-        exceptionData = nativeReportException.mock.calls[0][0];
-      }
-      const formattedMessage =
-        message +
-        '\n\n' +
-        'This error is located at:' +
-        capturedErrorDefaults.componentStack;
-      expect(exceptionData.message).toBe(formattedMessage);
-      expect(exceptionData.originalMessage).toBe(message);
-      expect(exceptionData.componentStack).toBe(
-        capturedErrorDefaults.componentStack,
-      );
-      expect(exceptionData.stack[0].file).toMatch(/ReactFiberErrorDialog\.js$/);
-      expect(exceptionData.isFatal).toBe(false);
-      expect(logToConsoleInReact).toBe(false);
-      expect(console.error).toBeCalledWith(formattedMessage);
-    });
+        ReactFiberErrorDialog.showErrorDialog({
+          ...capturedErrorDefaults,
+          error,
+        });
+
+        let exceptionData;
 
-    test('reports "Unspecified error" if error is null', () => {
-      const logToConsoleInReact = ReactFiberErrorDialog.showErrorDialog({
-        ...capturedErrorDefaults,
-        error: null,
+        if (__DEV__) {
+          expect(logBoxAddException.mock.calls.length).toBe(1);
+          exceptionData = logBoxAddException.mock.calls[0][0];
+        } else {
+          expect(nativeReportException.mock.calls.length).toBe(1);
+          exceptionData = nativeReportException.mock.calls[0][0];
+        }
+        expect(getLineFromFrame(exceptionData.stack[0])).toBe(
+          "const error = new Error('Some error happened');",
+        );
       });
 
-      let exceptionData;
+      test('adds the JS engine to the message', () => {
+        const error = new Error('Some error happened');
+        error.jsEngine = 'hermes';
+        // Copy all the data we care about before any possible mutation.
+        const {message, jsEngine} = error;
 
-      if (__DEV__) {
-        expect(logBoxAddException.mock.calls.length).toBe(1);
-        exceptionData = logBoxAddException.mock.calls[0][0];
-      } else {
-        expect(nativeReportException.mock.calls.length).toBe(1);
-        exceptionData = nativeReportException.mock.calls[0][0];
-      }
-      const formattedMessage =
-        'Unspecified error' +
-        '\n\n' +
-        'This error is located at:' +
-        capturedErrorDefaults.componentStack;
-      expect(exceptionData.message).toBe(formattedMessage);
-      expect(exceptionData.originalMessage).toBe('Unspecified error');
-      expect(exceptionData.name).toBe(null);
-      expect(exceptionData.componentStack).toBe(
-        capturedErrorDefaults.componentStack,
-      );
-      expect(exceptionData.stack[0].file).toMatch(/ReactFiberErrorDialog\.js$/);
-      expect(exceptionData.isFatal).toBe(false);
-      expect(logToConsoleInReact).toBe(false);
-      expect(console.error).toBeCalledWith(formattedMessage);
-    });
+        ReactFiberErrorDialog.showErrorDialog({
+          ...capturedErrorDefaults,
+          error,
+        });
 
-    test('works with a frozen error object', () => {
-      const error = Object.freeze(new Error('Some error happened'));
+        let exceptionData;
 
-      ReactFiberErrorDialog.showErrorDialog({
-        ...capturedErrorDefaults,
-        error,
+        if (__DEV__) {
+          expect(logBoxAddException.mock.calls.length).toBe(1);
+          exceptionData = logBoxAddException.mock.calls[0][0];
+        } else {
+          expect(nativeReportException.mock.calls.length).toBe(1);
+          exceptionData = nativeReportException.mock.calls[0][0];
+        }
+        expect(exceptionData.message).toBe(
+          'Error: ' +
+            message +
+            '\n\n' +
+            'This error is located at:' +
+            capturedErrorDefaults.componentStack +
+            ', js engine: ' +
+            jsEngine,
+        );
+        expect(console.error).toBeCalledWith(
+          'Error: ' +
+            message +
+            '\n\n' +
+            'This error is located at:' +
+            capturedErrorDefaults.componentStack +
+            ', js engine: ' +
+            jsEngine,
+        );
       });
 
-      let exceptionData;
-
-      if (__DEV__) {
-        expect(logBoxAddException.mock.calls.length).toBe(1);
-        exceptionData = logBoxAddException.mock.calls[0][0];
-      } else {
-        expect(nativeReportException.mock.calls.length).toBe(1);
-        exceptionData = nativeReportException.mock.calls[0][0];
-      }
-      expect(getLineFromFrame(exceptionData.stack[0])).toBe(
-        "const error = Object.freeze(new Error('Some error happened'));",
-      );
-    });
-
-    test('does not mutate the message', () => {
-      const error = new ReferenceError('Some error happened');
-      const {message} = error;
+      test('wraps string in an Error and sends to handleException', () => {
+        const message = 'Some error happened';
 
-      ReactFiberErrorDialog.showErrorDialog({
-        ...capturedErrorDefaults,
-        error,
-      });
+        const logToConsoleInReact = ReactFiberErrorDialog.showErrorDialog({
+          ...capturedErrorDefaults,
+          error: message,
+        });
 
-      if (__DEV__) {
-        expect(logBoxAddException).toHaveBeenCalled();
-      } else {
-        expect(nativeReportException).toHaveBeenCalled();
-        expect(error.message).toBe(message);
-      }
-    });
+        let exceptionData;
 
-    test('can safely process the same error multiple times', () => {
-      const error = new ReferenceError('Some error happened');
-      // Copy all the data we care about before any possible mutation.
-      const {message} = error;
-      const componentStacks = [
-        '\n  in A\n  in B\n  in C',
-        '\n  in X\n  in Y\n  in Z',
-      ];
-      for (const componentStack of componentStacks) {
-        nativeReportException.mockClear();
-        logBoxAddException.mockClear();
+        if (__DEV__) {
+          expect(logBoxAddException.mock.calls.length).toBe(1);
+          exceptionData = logBoxAddException.mock.calls[0][0];
+        } else {
+          expect(nativeReportException.mock.calls.length).toBe(1);
+          exceptionData = nativeReportException.mock.calls[0][0];
+        }
         const formattedMessage =
-          'ReferenceError: ' +
           message +
           '\n\n' +
           'This error is located at:' +
-          componentStack;
+          capturedErrorDefaults.componentStack;
+        expect(exceptionData.message).toBe(formattedMessage);
+        expect(exceptionData.originalMessage).toBe(message);
+        expect(exceptionData.componentStack).toBe(
+          capturedErrorDefaults.componentStack,
+        );
+        expect(exceptionData.stack[0].file).toMatch(
+          /ReactFiberErrorDialog\.js$/,
+        );
+        expect(exceptionData.isFatal).toBe(false);
+        expect(logToConsoleInReact).toBe(false);
+        expect(console.error).toBeCalledWith(formattedMessage);
+      });
+
+      test('reports "Unspecified error" if error is null', () => {
         const logToConsoleInReact = ReactFiberErrorDialog.showErrorDialog({
           ...capturedErrorDefaults,
-          componentStack,
-          error,
+          error: null,
         });
 
         let exceptionData;
@@ -302,526 +242,642 @@ describe('ExceptionsManager', () => {
           expect(nativeReportException.mock.calls.length).toBe(1);
           exceptionData = nativeReportException.mock.calls[0][0];
         }
+        const formattedMessage =
+          'Unspecified error' +
+          '\n\n' +
+          'This error is located at:' +
+          capturedErrorDefaults.componentStack;
         expect(exceptionData.message).toBe(formattedMessage);
-        expect(exceptionData.originalMessage).toBe(message);
-        expect(exceptionData.componentStack).toBe(componentStack);
-        expect(getLineFromFrame(exceptionData.stack[0])).toBe(
-          "const error = new ReferenceError('Some error happened');",
+        expect(exceptionData.originalMessage).toBe('Unspecified error');
+        expect(exceptionData.name).toBe(null);
+        expect(exceptionData.componentStack).toBe(
+          capturedErrorDefaults.componentStack,
+        );
+        expect(exceptionData.stack[0].file).toMatch(
+          /ReactFiberErrorDialog\.js$/,
         );
         expect(exceptionData.isFatal).toBe(false);
         expect(logToConsoleInReact).toBe(false);
         expect(console.error).toBeCalledWith(formattedMessage);
-      }
-    });
-  });
+      });
 
-  describe('console.error handler', () => {
-    let mockError;
-    beforeEach(() => {
-      // NOTE: We initialise a fresh mock every time using spyOn, above.
-      // We can't use `console._errorOriginal` for this, because that's a bound
-      // (=wrapped) version of the mock and Jest does not approve.
-      mockError = console.error;
-      ExceptionsManager.installConsoleErrorReporter();
-    });
+      test('works with a frozen error object', () => {
+        const error = Object.freeze(new Error('Some error happened'));
 
-    afterEach(() => {
-      // There is no uninstallConsoleErrorReporter. Do this so the next install
-      // works.
-      console.error = console._errorOriginal;
-      delete console._errorOriginal;
-      delete console.reportErrorsAsExceptions;
-    });
+        ReactFiberErrorDialog.showErrorDialog({
+          ...capturedErrorDefaults,
+          error,
+        });
 
-    test('logging an Error', () => {
-      const error = new Error('Some error happened');
-      const {message, name} = error;
+        let exceptionData;
 
-      console.error(error);
+        if (__DEV__) {
+          expect(logBoxAddException.mock.calls.length).toBe(1);
+          exceptionData = logBoxAddException.mock.calls[0][0];
+        } else {
+          expect(nativeReportException.mock.calls.length).toBe(1);
+          exceptionData = nativeReportException.mock.calls[0][0];
+        }
+        expect(getLineFromFrame(exceptionData.stack[0])).toBe(
+          "const error = Object.freeze(new Error('Some error happened'));",
+        );
+      });
 
-      let exceptionData;
+      test('does not mutate the message', () => {
+        const error = new ReferenceError('Some error happened');
+        const {message} = error;
 
-      if (__DEV__) {
-        expect(logBoxAddException.mock.calls.length).toBe(1);
-        exceptionData = logBoxAddException.mock.calls[0][0];
-      } else {
-        expect(nativeReportException.mock.calls.length).toBe(1);
-        exceptionData = nativeReportException.mock.calls[0][0];
-      }
-      const formattedMessage = 'Error: ' + message;
-      expect(exceptionData.message).toBe(formattedMessage);
-      expect(exceptionData.originalMessage).toBe(message);
-      expect(exceptionData.name).toBe(name);
-      expect(getLineFromFrame(exceptionData.stack[0])).toBe(
-        "const error = new Error('Some error happened');",
-      );
-      expect(exceptionData.isFatal).toBe(false);
-      expect(mockError.mock.calls[0]).toHaveLength(1);
-      expect(mockError.mock.calls[0][0]).toBeInstanceOf(Error);
-      expect(mockError.mock.calls[0][0].toString()).toBe(formattedMessage);
-    });
+        ReactFiberErrorDialog.showErrorDialog({
+          ...capturedErrorDefaults,
+          error,
+        });
 
-    test('logging a string', () => {
-      const message = 'Some error happened';
+        if (__DEV__) {
+          expect(logBoxAddException).toHaveBeenCalled();
+        } else {
+          expect(nativeReportException).toHaveBeenCalled();
+          expect(error.message).toBe(message);
+        }
+      });
 
-      console.error(message);
+      test('can safely process the same error multiple times', () => {
+        const error = new ReferenceError('Some error happened');
+        // Copy all the data we care about before any possible mutation.
+        const {message} = error;
+        const componentStacks = [
+          '\n  in A\n  in B\n  in C',
+          '\n  in X\n  in Y\n  in Z',
+        ];
+        for (const componentStack of componentStacks) {
+          nativeReportException.mockClear();
+          logBoxAddException.mockClear();
+          const formattedMessage =
+            'ReferenceError: ' +
+            message +
+            '\n\n' +
+            'This error is located at:' +
+            componentStack;
+          const logToConsoleInReact = ReactFiberErrorDialog.showErrorDialog({
+            ...capturedErrorDefaults,
+            componentStack,
+            error,
+          });
+
+          let exceptionData;
+
+          if (__DEV__) {
+            expect(logBoxAddException.mock.calls.length).toBe(1);
+            exceptionData = logBoxAddException.mock.calls[0][0];
+          } else {
+            expect(nativeReportException.mock.calls.length).toBe(1);
+            exceptionData = nativeReportException.mock.calls[0][0];
+          }
+          expect(exceptionData.message).toBe(formattedMessage);
+          expect(exceptionData.originalMessage).toBe(message);
+          expect(exceptionData.componentStack).toBe(componentStack);
+          expect(getLineFromFrame(exceptionData.stack[0])).toBe(
+            "const error = new ReferenceError('Some error happened');",
+          );
+          expect(exceptionData.isFatal).toBe(false);
+          expect(logToConsoleInReact).toBe(false);
+          expect(console.error).toBeCalledWith(formattedMessage);
+        }
+      });
+    });
 
-      let exceptionData;
+    describe('console.error handler', () => {
+      let mockError;
+      beforeEach(() => {
+        // NOTE: We initialise a fresh mock every time using spyOn, above.
+        // We can't use `console._errorOriginal` for this, because that's a bound
+        // (=wrapped) version of the mock and Jest does not approve.
+        mockError = console.error;
+        ExceptionsManager.installConsoleErrorReporter();
+      });
 
-      if (__DEV__) {
-        expect(logBoxAddException.mock.calls.length).toBe(1);
-        exceptionData = logBoxAddException.mock.calls[0][0];
-      } else {
-        expect(nativeReportException.mock.calls.length).toBe(1);
-        exceptionData = nativeReportException.mock.calls[0][0];
-      }
-      expect(exceptionData.message).toBe('console.error: Some error happened');
-      expect(exceptionData.originalMessage).toBe('Some error happened');
-      expect(exceptionData.name).toBe('console.error');
-      expect(
-        getLineFromFrame(getFirstFrameInThisFile(exceptionData.stack)),
-      ).toBe('console.error(message);');
-      expect(exceptionData.isFatal).toBe(false);
-      expect(mockError.mock.calls[0]).toEqual([message]);
-    });
+      afterEach(() => {
+        // There is no uninstallConsoleErrorReporter. Do this so the next install
+        // works.
+        console.error = console._errorOriginal;
+        delete console._errorOriginal;
+        delete console.reportErrorsAsExceptions;
+      });
 
-    test('logging arbitrary arguments', () => {
-      const args = [42, true, Symbol(), {x: undefined, y: null}];
+      test('logging an Error', () => {
+        const error = new Error('Some error happened');
+        const {message, name} = error;
 
-      console.error(...args);
+        console.error(error);
 
-      let exceptionData;
+        let exceptionData;
 
-      if (__DEV__) {
-        expect(logBoxAddException.mock.calls.length).toBe(1);
-        exceptionData = logBoxAddException.mock.calls[0][0];
-      } else {
-        expect(nativeReportException.mock.calls.length).toBe(1);
-        exceptionData = nativeReportException.mock.calls[0][0];
-      }
-      expect(exceptionData.message).toBe(
-        'console.error: 42 true ["symbol" failed to stringify] {"y":null}',
-      );
-      expect(exceptionData.originalMessage).toBe(
-        '42 true ["symbol" failed to stringify] {"y":null}',
-      );
-      expect(exceptionData.name).toBe('console.error');
-      expect(
-        getLineFromFrame(getFirstFrameInThisFile(exceptionData.stack)),
-      ).toBe('console.error(...args);');
-      expect(exceptionData.isFatal).toBe(false);
-
-      expect(mockError).toHaveBeenCalledTimes(1);
-      // Shallowly compare the mock call arguments with `args`
-      expect(mockError.mock.calls[0]).toHaveLength(args.length);
-      for (let i = 0; i < args.length; ++i) {
-        expect(mockError.mock.calls[0][i]).toBe(args[i]);
-      }
-    });
+        if (__DEV__) {
+          expect(logBoxAddException.mock.calls.length).toBe(1);
+          exceptionData = logBoxAddException.mock.calls[0][0];
+        } else {
+          expect(nativeReportException.mock.calls.length).toBe(1);
+          exceptionData = nativeReportException.mock.calls[0][0];
+        }
+        const formattedMessage = 'Error: ' + message;
+        expect(exceptionData.message).toBe(formattedMessage);
+        expect(exceptionData.originalMessage).toBe(message);
+        expect(exceptionData.name).toBe(name);
+        expect(getLineFromFrame(exceptionData.stack[0])).toBe(
+          "const error = new Error('Some error happened');",
+        );
+        expect(exceptionData.isFatal).toBe(false);
+        expect(mockError.mock.calls[0]).toHaveLength(1);
+        expect(mockError.mock.calls[0][0]).toBeInstanceOf(Error);
+        expect(mockError.mock.calls[0][0].toString()).toBe(formattedMessage);
+      });
 
-    test('logging a warning', () => {
-      const message = 'Warning: Some mild issue happened';
+      test('logging a string', () => {
+        const message = 'Some error happened';
 
-      console.error(message);
+        console.error(message);
 
-      expect(nativeReportException).not.toHaveBeenCalled();
-      expect(mockError.mock.calls[0]).toEqual([message]);
-    });
+        let exceptionData;
 
-    test('logging a warning with more arguments', () => {
-      const args = ['Warning: Some mild issue happened', 42];
+        if (__DEV__) {
+          expect(logBoxAddException.mock.calls.length).toBe(1);
+          exceptionData = logBoxAddException.mock.calls[0][0];
+        } else {
+          expect(nativeReportException.mock.calls.length).toBe(1);
+          exceptionData = nativeReportException.mock.calls[0][0];
+        }
+        expect(exceptionData.message).toBe(
+          'console.error: Some error happened',
+        );
+        expect(exceptionData.originalMessage).toBe('Some error happened');
+        expect(exceptionData.name).toBe('console.error');
+        expect(
+          getLineFromFrame(getFirstFrameInThisFile(exceptionData.stack)),
+        ).toBe('console.error(message);');
+        expect(exceptionData.isFatal).toBe(false);
+        expect(mockError.mock.calls[0]).toEqual([message]);
+      });
 
-      console.error(...args);
+      test('logging arbitrary arguments', () => {
+        const args = [42, true, Symbol(), {x: undefined, y: null}];
 
-      expect(nativeReportException).not.toHaveBeenCalled();
-      expect(mockError.mock.calls[0]).toEqual(args);
-    });
+        console.error(...args);
 
-    test('logging a warning-looking object', () => {
-      // Forces `strignifySafe` to invoke `toString()`.
-      const object = {toString: () => 'Warning: Some error may have happened'};
-      object.cycle = object;
+        let exceptionData;
 
-      const args = [object];
+        if (__DEV__) {
+          expect(logBoxAddException.mock.calls.length).toBe(1);
+          exceptionData = logBoxAddException.mock.calls[0][0];
+        } else {
+          expect(nativeReportException.mock.calls.length).toBe(1);
+          exceptionData = nativeReportException.mock.calls[0][0];
+        }
+        expect(exceptionData.message).toBe(
+          'console.error: 42 true ["symbol" failed to stringify] {"y":null}',
+        );
+        expect(exceptionData.originalMessage).toBe(
+          '42 true ["symbol" failed to stringify] {"y":null}',
+        );
+        expect(exceptionData.name).toBe('console.error');
+        expect(
+          getLineFromFrame(getFirstFrameInThisFile(exceptionData.stack)),
+        ).toBe('console.error(...args);');
+        expect(exceptionData.isFatal).toBe(false);
 
-      console.error(...args);
+        expect(mockError).toHaveBeenCalledTimes(1);
+        // Shallowly compare the mock call arguments with `args`
+        expect(mockError.mock.calls[0]).toHaveLength(args.length);
+        for (let i = 0; i < args.length; ++i) {
+          expect(mockError.mock.calls[0][i]).toBe(args[i]);
+        }
+      });
 
-      if (__DEV__) {
-        expect(logBoxAddException).toHaveBeenCalled();
-      } else {
-        expect(nativeReportException).toHaveBeenCalled();
-      }
-    });
+      test('logging a warning', () => {
+        const message = 'Warning: Some mild issue happened';
 
-    test('does not log "warn"-type errors', () => {
-      const error = new Error('This is a warning.');
-      error.type = 'warn';
+        console.error(message);
 
-      console.error(error);
+        expect(nativeReportException).not.toHaveBeenCalled();
+        expect(mockError.mock.calls[0]).toEqual([message]);
+      });
 
-      expect(nativeReportException).not.toHaveBeenCalled();
-    });
+      test('logging a warning with more arguments', () => {
+        const args = ['Warning: Some mild issue happened', 42];
 
-    test('reportErrorsAsExceptions = false', () => {
-      console.reportErrorsAsExceptions = false;
-      const message = 'Some error happened';
+        console.error(...args);
 
-      console.error(message);
+        expect(nativeReportException).not.toHaveBeenCalled();
+        expect(mockError.mock.calls[0]).toEqual(args);
+      });
 
-      expect(nativeReportException).not.toHaveBeenCalled();
-      expect(mockError.mock.calls[0]).toEqual([message]);
-    });
+      test('logging a warning-looking object', () => {
+        // Forces `strignifySafe` to invoke `toString()`.
+        const object = {
+          toString: () => 'Warning: Some error may have happened',
+        };
+        object.cycle = object;
 
-    test('does not pop frames off the stack with framesToPop', () => {
-      function createError() {
-        const error = new Error('Some error happened');
-        error.framesToPop = 1;
-        return error;
-      }
-      const error = createError();
+        const args = [object];
 
-      console.error(error);
+        console.error(...args);
 
-      let exceptionData;
+        if (__DEV__) {
+          expect(logBoxAddException).toHaveBeenCalled();
+        } else {
+          expect(nativeReportException).toHaveBeenCalled();
+        }
+      });
 
-      if (__DEV__) {
-        expect(logBoxAddException.mock.calls.length).toBe(1);
-        exceptionData = logBoxAddException.mock.calls[0][0];
-      } else {
-        expect(nativeReportException.mock.calls.length).toBe(1);
-        exceptionData = nativeReportException.mock.calls[0][0];
-      }
-      expect(getLineFromFrame(exceptionData.stack[0])).toBe(
-        "const error = new Error('Some error happened');",
-      );
-    });
-  });
+      test('does not log "warn"-type errors', () => {
+        const error = new Error('This is a warning.');
+        error.type = 'warn';
 
-  describe('handleException', () => {
-    test('handling a fatal Error', () => {
-      const error = new Error('Some error happened');
-      const {message} = error;
+        console.error(error);
 
-      ExceptionsManager.handleException(error, true);
+        expect(nativeReportException).not.toHaveBeenCalled();
+      });
 
-      let exceptionData;
+      test('reportErrorsAsExceptions = false', () => {
+        console.reportErrorsAsExceptions = false;
+        const message = 'Some error happened';
 
-      if (__DEV__) {
-        expect(logBoxAddException.mock.calls.length).toBe(1);
-        exceptionData = logBoxAddException.mock.calls[0][0];
-      } else {
-        expect(nativeReportException.mock.calls.length).toBe(1);
-        exceptionData = nativeReportException.mock.calls[0][0];
-      }
-      const formattedMessage = 'Error: ' + message;
-      expect(exceptionData.message).toBe(formattedMessage);
-      expect(exceptionData.originalMessage).toBe(message);
-      expect(exceptionData.name).toBe('Error');
-      expect(getLineFromFrame(exceptionData.stack[0])).toBe(
-        "const error = new Error('Some error happened');",
-      );
-      expect(exceptionData.isFatal).toBe(true);
-      expect(console.error.mock.calls[0]).toHaveLength(1);
-      expect(console.error.mock.calls[0][0]).toBe(formattedMessage);
-    });
+        console.error(message);
 
-    test('handling a non-fatal Error', () => {
-      const error = new Error('Some error happened');
-      const {message} = error;
+        expect(nativeReportException).not.toHaveBeenCalled();
+        expect(mockError.mock.calls[0]).toEqual([message]);
+      });
 
-      ExceptionsManager.handleException(error, false);
+      test('does not pop frames off the stack with framesToPop', () => {
+        function createError() {
+          const error = new Error('Some error happened');
+          error.framesToPop = 1;
+          return error;
+        }
+        const error = createError();
 
-      let exceptionData;
+        console.error(error);
 
-      if (__DEV__) {
-        expect(logBoxAddException.mock.calls.length).toBe(1);
-        exceptionData = logBoxAddException.mock.calls[0][0];
-      } else {
-        expect(nativeReportException.mock.calls.length).toBe(1);
-        exceptionData = nativeReportException.mock.calls[0][0];
-      }
-      const formattedMessage = 'Error: ' + message;
-      expect(exceptionData.message).toBe(formattedMessage);
-      expect(exceptionData.originalMessage).toBe(message);
-      expect(exceptionData.name).toBe('Error');
-      expect(getLineFromFrame(exceptionData.stack[0])).toBe(
-        "const error = new Error('Some error happened');",
-      );
-      expect(exceptionData.isFatal).toBe(false);
-      expect(console.error.mock.calls[0]).toHaveLength(1);
-      expect(console.error.mock.calls[0][0]).toBe(formattedMessage);
+        let exceptionData;
+
+        if (__DEV__) {
+          expect(logBoxAddException.mock.calls.length).toBe(1);
+          exceptionData = logBoxAddException.mock.calls[0][0];
+        } else {
+          expect(nativeReportException.mock.calls.length).toBe(1);
+          exceptionData = nativeReportException.mock.calls[0][0];
+        }
+        expect(getLineFromFrame(exceptionData.stack[0])).toBe(
+          "const error = new Error('Some error happened');",
+        );
+      });
     });
 
-    test('handling a thrown string', () => {
-      const message = 'Some error happened';
+    describe('handleException', () => {
+      test('handling a fatal Error', () => {
+        const error = new Error('Some error happened');
+        const {message} = error;
 
-      ExceptionsManager.handleException(message, true);
+        ExceptionsManager.handleException(error, true);
 
-      let exceptionData;
+        let exceptionData;
 
-      if (__DEV__) {
-        expect(logBoxAddException.mock.calls.length).toBe(1);
-        exceptionData = logBoxAddException.mock.calls[0][0];
-      } else {
-        expect(nativeReportException.mock.calls.length).toBe(1);
-        exceptionData = nativeReportException.mock.calls[0][0];
-      }
-      expect(exceptionData.message).toBe(message);
-      expect(exceptionData.originalMessage).toBe(null);
-      expect(exceptionData.name).toBe(null);
-      expect(exceptionData.stack[0].file).toMatch(/ExceptionsManager\.js$/);
-      expect(exceptionData.isFatal).toBe(true);
-      expect(console.error.mock.calls[0]).toEqual([message]);
-    });
+        if (__DEV__) {
+          expect(logBoxAddException.mock.calls.length).toBe(1);
+          exceptionData = logBoxAddException.mock.calls[0][0];
+        } else {
+          expect(nativeReportException.mock.calls.length).toBe(1);
+          exceptionData = nativeReportException.mock.calls[0][0];
+        }
+        const formattedMessage = 'Error: ' + message;
+        expect(exceptionData.message).toBe(formattedMessage);
+        expect(exceptionData.originalMessage).toBe(message);
+        expect(exceptionData.name).toBe('Error');
+        expect(getLineFromFrame(exceptionData.stack[0])).toBe(
+          "const error = new Error('Some error happened');",
+        );
+        expect(exceptionData.isFatal).toBe(true);
+        expect(console.error.mock.calls[0]).toHaveLength(1);
+        expect(console.error.mock.calls[0][0]).toBe(formattedMessage);
+      });
 
-    test('does not pop frames off the stack with framesToPop', () => {
-      function createError() {
+      test('handling a non-fatal Error', () => {
         const error = new Error('Some error happened');
-        error.framesToPop = 1;
-        return error;
-      }
-      const error = createError();
+        const {message} = error;
 
-      ExceptionsManager.handleException(error, true);
+        ExceptionsManager.handleException(error, false);
 
-      let exceptionData;
+        let exceptionData;
 
-      if (__DEV__) {
-        expect(logBoxAddException.mock.calls.length).toBe(1);
-        exceptionData = logBoxAddException.mock.calls[0][0];
-      } else {
-        expect(nativeReportException.mock.calls.length).toBe(1);
-        exceptionData = nativeReportException.mock.calls[0][0];
-      }
-      expect(getLineFromFrame(exceptionData.stack[0])).toBe(
-        "const error = new Error('Some error happened');",
-      );
-    });
+        if (__DEV__) {
+          expect(logBoxAddException.mock.calls.length).toBe(1);
+          exceptionData = logBoxAddException.mock.calls[0][0];
+        } else {
+          expect(nativeReportException.mock.calls.length).toBe(1);
+          exceptionData = nativeReportException.mock.calls[0][0];
+        }
+        const formattedMessage = 'Error: ' + message;
+        expect(exceptionData.message).toBe(formattedMessage);
+        expect(exceptionData.originalMessage).toBe(message);
+        expect(exceptionData.name).toBe('Error');
+        expect(getLineFromFrame(exceptionData.stack[0])).toBe(
+          "const error = new Error('Some error happened');",
+        );
+        expect(exceptionData.isFatal).toBe(false);
+        expect(console.error.mock.calls[0]).toHaveLength(1);
+        expect(console.error.mock.calls[0][0]).toBe(formattedMessage);
+      });
 
-    test('logs fatal "warn"-type errors', () => {
-      const error = new Error('This is a fatal... warning?');
-      error.type = 'warn';
+      test('handling a thrown string', () => {
+        const message = 'Some error happened';
 
-      ExceptionsManager.handleException(error, true);
+        ExceptionsManager.handleException(message, true);
 
-      if (__DEV__) {
-        expect(logBoxAddException).toHaveBeenCalled();
-      } else {
-        expect(nativeReportException).toHaveBeenCalled();
-      }
-    });
-  });
+        let exceptionData;
 
-  describe('unstable_setExceptionDecorator', () => {
-    let mockError;
-    beforeEach(() => {
-      // NOTE: We initialise a fresh mock every time using spyOn, above.
-      // We can't use `console._errorOriginal` for this, because that's a bound
-      // (=wrapped) version of the mock and Jest does not approve.
-      mockError = console.error;
-      ExceptionsManager.installConsoleErrorReporter();
-    });
+        if (__DEV__) {
+          expect(logBoxAddException.mock.calls.length).toBe(1);
+          exceptionData = logBoxAddException.mock.calls[0][0];
+        } else {
+          expect(nativeReportException.mock.calls.length).toBe(1);
+          exceptionData = nativeReportException.mock.calls[0][0];
+        }
+        expect(exceptionData.message).toBe(message);
+        expect(exceptionData.originalMessage).toBe(null);
+        expect(exceptionData.name).toBe(null);
+        expect(exceptionData.stack[0].file).toMatch(/ExceptionsManager\.js$/);
+        expect(exceptionData.isFatal).toBe(true);
+        expect(console.error.mock.calls[0]).toEqual([message]);
+      });
 
-    afterEach(() => {
-      // There is no uninstallConsoleErrorReporter. Do this so the next install
-      // works.
-      console.error = console._errorOriginal;
-      delete console._errorOriginal;
-      delete console.reportErrorsAsExceptions;
-    });
+      test('does not pop frames off the stack with framesToPop', () => {
+        function createError() {
+          const error = new Error('Some error happened');
+          error.framesToPop = 1;
+          return error;
+        }
+        const error = createError();
 
-    test('modifying the exception data', () => {
-      const error = new Error('Some error happened');
-      const decorator = jest.fn().mockImplementation(data => ({
-        ...data,
-        message: 'decorated: ' + data.message,
-      }));
+        ExceptionsManager.handleException(error, true);
+
+        let exceptionData;
 
-      // Report the same exception with and without the decorator
-      ExceptionsManager.handleException(error, true);
-      ExceptionsManager.unstable_setExceptionDecorator(decorator);
-      ExceptionsManager.handleException(error, true);
-
-      expect(decorator.mock.calls.length).toBe(1);
-      const beforeDecorator = decorator.mock.calls[0][0];
-
-      let withoutDecoratorInstalled;
-      let afterDecorator;
-
-      if (__DEV__) {
-        expect(logBoxAddException.mock.calls.length).toBe(2);
-        withoutDecoratorInstalled = logBoxAddException.mock.calls[0][0];
-        afterDecorator = logBoxAddException.mock.calls[1][0];
-      } else {
-        expect(nativeReportException.mock.calls.length).toBe(2);
-        withoutDecoratorInstalled = nativeReportException.mock.calls[0][0];
-        afterDecorator = nativeReportException.mock.calls[1][0];
-      }
-
-      expect(afterDecorator.id).toEqual(beforeDecorator.id);
-
-      // id will change between successive exceptions
-      delete withoutDecoratorInstalled.id;
-      delete beforeDecorator.id;
-      delete afterDecorator.id;
-      delete withoutDecoratorInstalled.isComponentError;
-      delete afterDecorator.isComponentError;
-
-      expect(withoutDecoratorInstalled).toEqual(beforeDecorator);
-      expect(afterDecorator).toEqual({
-        ...beforeDecorator,
-        message: 'decorated: ' + beforeDecorator.message,
+        if (__DEV__) {
+          expect(logBoxAddException.mock.calls.length).toBe(1);
+          exceptionData = logBoxAddException.mock.calls[0][0];
+        } else {
+          expect(nativeReportException.mock.calls.length).toBe(1);
+          exceptionData = nativeReportException.mock.calls[0][0];
+        }
+        expect(getLineFromFrame(exceptionData.stack[0])).toBe(
+          "const error = new Error('Some error happened');",
+        );
       });
-    });
 
-    test('clearing a decorator', () => {
-      const error = new Error('Some error happened');
-      const decorator = jest.fn().mockImplementation(data => ({
-        ...data,
-        message: 'decorated: ' + data.message,
-      }));
+      test('logs fatal "warn"-type errors', () => {
+        const error = new Error('This is a fatal... warning?');
+        error.type = 'warn';
 
-      ExceptionsManager.unstable_setExceptionDecorator(decorator);
-      ExceptionsManager.unstable_setExceptionDecorator(null);
-      ExceptionsManager.handleException(error, true);
+        ExceptionsManager.handleException(error, true);
 
-      expect(decorator).not.toHaveBeenCalled();
-      if (__DEV__) {
-        expect(logBoxAddException).toHaveBeenCalled();
-      } else {
-        expect(nativeReportException).toHaveBeenCalled();
-      }
+        if (__DEV__) {
+          expect(logBoxAddException).toHaveBeenCalled();
+        } else {
+          expect(nativeReportException).toHaveBeenCalled();
+        }
+      });
     });
 
-    test('prevents decorator recursion from error handler', () => {
-      const error = new Error('Some error happened');
-      const decorator = jest.fn().mockImplementation(data => {
-        console.error('Logging an error within the decorator');
-        return {
+    describe('unstable_setExceptionDecorator', () => {
+      let mockError;
+      beforeEach(() => {
+        // NOTE: We initialise a fresh mock every time using spyOn, above.
+        // We can't use `console._errorOriginal` for this, because that's a bound
+        // (=wrapped) version of the mock and Jest does not approve.
+        mockError = console.error;
+        ExceptionsManager.installConsoleErrorReporter();
+      });
+
+      afterEach(() => {
+        // There is no uninstallConsoleErrorReporter. Do this so the next install
+        // works.
+        console.error = console._errorOriginal;
+        delete console._errorOriginal;
+        delete console.reportErrorsAsExceptions;
+      });
+
+      test('modifying the exception data', () => {
+        const error = new Error('Some error happened');
+        const decorator = jest.fn().mockImplementation(data => ({
           ...data,
           message: 'decorated: ' + data.message,
-        };
-      });
+        }));
 
-      ExceptionsManager.unstable_setExceptionDecorator(decorator);
-      ExceptionsManager.handleException(error, true);
+        // Report the same exception with and without the decorator
+        ExceptionsManager.handleException(error, true);
+        ExceptionsManager.unstable_setExceptionDecorator(decorator);
+        ExceptionsManager.handleException(error, true);
 
-      if (__DEV__) {
-        expect(logBoxAddException).toHaveBeenCalledTimes(1);
-        expect(logBoxAddException.mock.calls[0][0].message).toMatch(
-          /decorated: .*Some error happened/,
-        );
-      } else {
-        expect(nativeReportException).toHaveBeenCalledTimes(1);
-        expect(nativeReportException.mock.calls[0][0].message).toMatch(
-          /decorated: .*Some error happened/,
-        );
-      }
-      expect(mockError).toHaveBeenCalledTimes(2);
-      expect(mockError.mock.calls[0][0]).toMatch(
-        /Logging an error within the decorator/,
-      );
-      expect(mockError.mock.calls[1][0]).toMatch(
-        /decorated: .*Some error happened/,
-      );
-    });
+        expect(decorator.mock.calls.length).toBe(1);
+        const beforeDecorator = decorator.mock.calls[0][0];
 
-    test('prevents decorator recursion from console.error', () => {
-      const error = new Error('Some error happened');
-      const decorator = jest.fn().mockImplementation(data => {
-        console.error('Logging an error within the decorator');
-        return {
+        let withoutDecoratorInstalled;
+        let afterDecorator;
+
+        if (__DEV__) {
+          expect(logBoxAddException.mock.calls.length).toBe(2);
+          withoutDecoratorInstalled = logBoxAddException.mock.calls[0][0];
+          afterDecorator = logBoxAddException.mock.calls[1][0];
+        } else {
+          expect(nativeReportException.mock.calls.length).toBe(2);
+          withoutDecoratorInstalled = nativeReportException.mock.calls[0][0];
+          afterDecorator = nativeReportException.mock.calls[1][0];
+        }
+
+        expect(afterDecorator.id).toEqual(beforeDecorator.id);
+
+        // id will change between successive exceptions
+        delete withoutDecoratorInstalled.id;
+        delete beforeDecorator.id;
+        delete afterDecorator.id;
+        delete withoutDecoratorInstalled.isComponentError;
+        delete afterDecorator.isComponentError;
+
+        expect(withoutDecoratorInstalled).toEqual(beforeDecorator);
+        expect(afterDecorator).toEqual({
+          ...beforeDecorator,
+          message: 'decorated: ' + beforeDecorator.message,
+        });
+      });
+
+      test('clearing a decorator', () => {
+        const error = new Error('Some error happened');
+        const decorator = jest.fn().mockImplementation(data => ({
           ...data,
           message: 'decorated: ' + data.message,
-        };
+        }));
+
+        ExceptionsManager.unstable_setExceptionDecorator(decorator);
+        ExceptionsManager.unstable_setExceptionDecorator(null);
+        ExceptionsManager.handleException(error, true);
+
+        expect(decorator).not.toHaveBeenCalled();
+        if (__DEV__) {
+          expect(logBoxAddException).toHaveBeenCalled();
+        } else {
+          expect(nativeReportException).toHaveBeenCalled();
+        }
       });
 
-      ExceptionsManager.unstable_setExceptionDecorator(decorator);
-      console.error(error);
+      test('prevents decorator recursion from error handler', () => {
+        const error = new Error('Some error happened');
+        const decorator = jest.fn().mockImplementation(data => {
+          console.error('Logging an error within the decorator');
+          return {
+            ...data,
+            message: 'decorated: ' + data.message,
+          };
+        });
 
-      if (__DEV__) {
-        expect(logBoxAddException).toHaveBeenCalledTimes(2);
-        expect(logBoxAddException.mock.calls[0][0].message).toMatch(
-          /Logging an error within the decorator/,
-        );
-        expect(logBoxAddException.mock.calls[1][0].message).toMatch(
-          /decorated: .*Some error happened/,
-        );
-      } else {
-        expect(nativeReportException).toHaveBeenCalledTimes(2);
-        expect(nativeReportException.mock.calls[0][0].message).toMatch(
+        ExceptionsManager.unstable_setExceptionDecorator(decorator);
+        ExceptionsManager.handleException(error, true);
+
+        if (__DEV__) {
+          expect(logBoxAddException).toHaveBeenCalledTimes(1);
+          expect(logBoxAddException.mock.calls[0][0].message).toMatch(
+            /decorated: .*Some error happened/,
+          );
+        } else {
+          expect(nativeReportException).toHaveBeenCalledTimes(1);
+          expect(nativeReportException.mock.calls[0][0].message).toMatch(
+            /decorated: .*Some error happened/,
+          );
+        }
+        expect(mockError).toHaveBeenCalledTimes(2);
+        expect(mockError.mock.calls[0][0]).toMatch(
           /Logging an error within the decorator/,
         );
-        expect(nativeReportException.mock.calls[1][0].message).toMatch(
+        expect(mockError.mock.calls[1][0]).toMatch(
           /decorated: .*Some error happened/,
         );
-      }
-      expect(mockError).toHaveBeenCalledTimes(2);
-      // console.error calls are chained without exception pre-processing, so decorator doesn't apply
-      expect(mockError.mock.calls[0][0].toString()).toMatch(
-        /Error: Some error happened/,
-      );
-      expect(mockError.mock.calls[1][0]).toMatch(
-        /Logging an error within the decorator/,
-      );
-    });
-
-    test('can handle throwing decorators recursion when exception is thrown', () => {
-      const error = new Error('Some error happened');
-      const decorator = jest.fn().mockImplementation(data => {
-        throw new Error('Throwing an error within the decorator');
       });
 
-      ExceptionsManager.unstable_setExceptionDecorator(decorator);
-      ExceptionsManager.handleException(error, true);
+      test('prevents decorator recursion from console.error', () => {
+        const error = new Error('Some error happened');
+        const decorator = jest.fn().mockImplementation(data => {
+          console.error('Logging an error within the decorator');
+          return {
+            ...data,
+            message: 'decorated: ' + data.message,
+          };
+        });
+
+        ExceptionsManager.unstable_setExceptionDecorator(decorator);
+        console.error(error);
 
-      if (__DEV__) {
-        expect(logBoxAddException).toHaveBeenCalledTimes(1);
-        // Exceptions in decorators are ignored and the decorator is not applied
-        expect(logBoxAddException.mock.calls[0][0].message).toMatch(
+        if (__DEV__) {
+          expect(logBoxAddException).toHaveBeenCalledTimes(2);
+          expect(logBoxAddException.mock.calls[0][0].message).toMatch(
+            /Logging an error within the decorator/,
+          );
+          expect(logBoxAddException.mock.calls[1][0].message).toMatch(
+            /decorated: .*Some error happened/,
+          );
+        } else {
+          expect(nativeReportException).toHaveBeenCalledTimes(2);
+          expect(nativeReportException.mock.calls[0][0].message).toMatch(
+            /Logging an error within the decorator/,
+          );
+          expect(nativeReportException.mock.calls[1][0].message).toMatch(
+            /decorated: .*Some error happened/,
+          );
+        }
+        expect(mockError).toHaveBeenCalledTimes(2);
+        // console.error calls are chained without exception pre-processing, so decorator doesn't apply
+        expect(mockError.mock.calls[0][0].toString()).toMatch(
           /Error: Some error happened/,
         );
-      } else {
-        expect(nativeReportException).toHaveBeenCalledTimes(1);
-        // Exceptions in decorators are ignored and the decorator is not applied
-        expect(nativeReportException.mock.calls[0][0].message).toMatch(
-          /Error: Some error happened/,
+        expect(mockError.mock.calls[1][0]).toMatch(
+          /Logging an error within the decorator/,
         );
-      }
-      expect(mockError).toHaveBeenCalledTimes(1);
-      expect(mockError.mock.calls[0][0]).toMatch(/Error: Some error happened/);
-    });
-
-    test('can handle throwing decorators recursion when exception is logged', () => {
-      const error = new Error('Some error happened');
-      const decorator = jest.fn().mockImplementation(data => {
-        throw new Error('Throwing an error within the decorator');
       });
 
-      ExceptionsManager.unstable_setExceptionDecorator(decorator);
-      console.error(error);
+      test('can handle throwing decorators recursion when exception is thrown', () => {
+        const error = new Error('Some error happened');
+        const decorator = jest.fn().mockImplementation(data => {
+          throw new Error('Throwing an error within the decorator');
+        });
+
+        ExceptionsManager.unstable_setExceptionDecorator(decorator);
+        ExceptionsManager.handleException(error, true);
 
-      if (__DEV__) {
-        expect(logBoxAddException).toHaveBeenCalledTimes(1);
-        // Exceptions in decorators are ignored and the decorator is not applied
-        expect(logBoxAddException.mock.calls[0][0].message).toMatch(
+        if (__DEV__) {
+          expect(logBoxAddException).toHaveBeenCalledTimes(1);
+          // Exceptions in decorators are ignored and the decorator is not applied
+          expect(logBoxAddException.mock.calls[0][0].message).toMatch(
+            /Error: Some error happened/,
+          );
+        } else {
+          expect(nativeReportException).toHaveBeenCalledTimes(1);
+          // Exceptions in decorators are ignored and the decorator is not applied
+          expect(nativeReportException.mock.calls[0][0].message).toMatch(
+            /Error: Some error happened/,
+          );
+        }
+        expect(mockError).toHaveBeenCalledTimes(1);
+        expect(mockError.mock.calls[0][0]).toMatch(
           /Error: Some error happened/,
         );
-      } else {
-        expect(nativeReportException).toHaveBeenCalledTimes(1);
-        // Exceptions in decorators are ignored and the decorator is not applied
-        expect(nativeReportException.mock.calls[0][0].message).toMatch(
+      });
+
+      test('can handle throwing decorators recursion when exception is logged', () => {
+        const error = new Error('Some error happened');
+        const decorator = jest.fn().mockImplementation(data => {
+          throw new Error('Throwing an error within the decorator');
+        });
+
+        ExceptionsManager.unstable_setExceptionDecorator(decorator);
+        console.error(error);
+
+        if (__DEV__) {
+          expect(logBoxAddException).toHaveBeenCalledTimes(1);
+          // Exceptions in decorators are ignored and the decorator is not applied
+          expect(logBoxAddException.mock.calls[0][0].message).toMatch(
+            /Error: Some error happened/,
+          );
+        } else {
+          expect(nativeReportException).toHaveBeenCalledTimes(1);
+          // Exceptions in decorators are ignored and the decorator is not applied
+          expect(nativeReportException.mock.calls[0][0].message).toMatch(
+            /Error: Some error happened/,
+          );
+        }
+        expect(mockError).toHaveBeenCalledTimes(1);
+        expect(mockError.mock.calls[0][0].toString()).toMatch(
           /Error: Some error happened/,
         );
-      }
-      expect(mockError).toHaveBeenCalledTimes(1);
-      expect(mockError.mock.calls[0][0].toString()).toMatch(
-        /Error: Some error happened/,
-      );
+      });
     });
-  });
-});
+    describe('Errors with custom extraData', () => {
+      test('ExtendedErrors may pass custom extraData using the decoratedExtraDataKey symbol', () => {
+        const error = new Error('Some error happened');
+        // Annotates the error with some custom extra data.
+        error[ExceptionsManager.decoratedExtraDataKey] = {foo: 'bar'};
+        ExceptionsManager.handleException(error, true);
 
+        if (__DEV__) {
+          expect(logBoxAddException).toHaveBeenCalledTimes(1);
+          expect(logBoxAddException.mock.calls[0][0].extraData?.foo).toBe(
+            'bar',
+          );
+        } else {
+          expect(nativeReportException).toHaveBeenCalledTimes(1);
+          expect(nativeReportException.mock.calls[0][0].extraData?.foo).toBe(
+            'bar',
+          );
+        }
+      });
+    });
+  });
+}
 const linesByFile = new Map();
 
 function getLineFromFrame({lineNumber /* 1-based */, file}) {
diff --git a/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js b/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js
index fde28ee223cb..bf281f9debad 100644
--- a/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js
+++ b/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Core/setUpBatchedBridge.js b/Libraries/Core/setUpBatchedBridge.js
index 17ba06eb818b..abac069677bc 100644
--- a/Libraries/Core/setUpBatchedBridge.js
+++ b/Libraries/Core/setUpBatchedBridge.js
@@ -20,7 +20,6 @@ if (global.RN$Bridgeless === true && global.RN$registerCallableModule) {
       | $TEMPORARY$string<'GlobalPerformanceLogger'>
       | $TEMPORARY$string<'HMRClient'>
       | $TEMPORARY$string<'HeapCapture'>
-      | $TEMPORARY$string<'JSDevSupportModule'>
       | $TEMPORARY$string<'JSTimers'>
       | $TEMPORARY$string<'RCTDeviceEventEmitter'>
       | $TEMPORARY$string<'RCTLog'>
@@ -52,11 +51,8 @@ registerModule('RCTNativeAppEventEmitter', () =>
 registerModule('GlobalPerformanceLogger', () =>
   require('../Utilities/GlobalPerformanceLogger'),
 );
-registerModule('JSDevSupportModule', () =>
-  require('../Utilities/JSDevSupportModule'),
-);
 
-if (__DEV__ && !global.__RCTProfileIsProfiling) {
+if (__DEV__) {
   registerModule('HMRClient', () => require('../Utilities/HMRClient'));
 } else {
   registerModule('HMRClient', () => require('../Utilities/HMRClientProdShim'));
diff --git a/Libraries/Core/setUpDeveloperTools.js b/Libraries/Core/setUpDeveloperTools.js
index 9d1a342ada66..06f2079b8786 100644
--- a/Libraries/Core/setUpDeveloperTools.js
+++ b/Libraries/Core/setUpDeveloperTools.js
@@ -17,13 +17,11 @@ declare var console: typeof console & {_isPolyfilled: boolean, ...};
  * You can use this module directly, or just require InitializeCore.
  */
 if (__DEV__) {
-  if (!global.__RCTProfileIsProfiling) {
-    require('./setUpReactDevTools');
+  require('./setUpReactDevTools');
 
-    // Set up inspector
-    const JSInspector = require('../JSInspector/JSInspector');
-    JSInspector.registerAgent(require('../JSInspector/NetworkAgent'));
-  }
+  // Set up inspector
+  const JSInspector = require('../JSInspector/JSInspector');
+  JSInspector.registerAgent(require('../JSInspector/NetworkAgent'));
 
   // Note we can't check if console is "native" because it would appear "native" in JSC and Hermes.
   // We also can't check any properties that don't exist in the Chrome worker environment.
diff --git a/Libraries/Core/setUpReactDevTools.js b/Libraries/Core/setUpReactDevTools.js
index 46955da62035..be647e33b4d2 100644
--- a/Libraries/Core/setUpReactDevTools.js
+++ b/Libraries/Core/setUpReactDevTools.js
@@ -39,7 +39,10 @@ if (__DEV__) {
       // Get hostname from development server (packager)
       const devServer = getDevServer();
       const host = devServer.bundleLoadedFromServer
-        ? devServer.url.replace(/https?:\/\//, '').split(':')[0]
+        ? devServer.url
+            .replace(/https?:\/\//, '')
+            .replace(/\/$/, '')
+            .split(':')[0]
         : 'localhost';
 
       // Read the optional global variable for backward compatibility.
diff --git a/Libraries/Core/setUpRegeneratorRuntime.js b/Libraries/Core/setUpRegeneratorRuntime.js
index d5a7dda07b5b..425e715a1e3f 100644
--- a/Libraries/Core/setUpRegeneratorRuntime.js
+++ b/Libraries/Core/setUpRegeneratorRuntime.js
@@ -10,8 +10,8 @@
 
 'use strict';
 
-const {polyfillGlobal} = require('../Utilities/PolyfillFunctions');
 const {hasNativeConstructor} = require('../Utilities/FeatureDetection');
+const {polyfillGlobal} = require('../Utilities/PolyfillFunctions');
 
 /**
  * Set up regenerator.
diff --git a/Libraries/Core/setUpSystrace.js b/Libraries/Core/setUpSystrace.js
deleted file mode 100644
index 17a2d7bb2eb8..000000000000
--- a/Libraries/Core/setUpSystrace.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-'use strict';
-
-/**
- * Set up Systrace profiling hooks if necessary.
- * You can use this module directly, or just require InitializeCore.
- */
-if (global.__RCTProfileIsProfiling) {
-  const Systrace = require('../Performance/Systrace');
-  Systrace.installReactHook();
-  Systrace.setEnabled(true);
-}
diff --git a/Libraries/Core/setUpTimers.js b/Libraries/Core/setUpTimers.js
index 901de90f750e..b2b036fdc9d0 100644
--- a/Libraries/Core/setUpTimers.js
+++ b/Libraries/Core/setUpTimers.js
@@ -10,8 +10,8 @@
 
 'use strict';
 
-const {polyfillGlobal} = require('../Utilities/PolyfillFunctions');
 const {isNativeFunction} = require('../Utilities/FeatureDetection');
+const {polyfillGlobal} = require('../Utilities/PolyfillFunctions');
 
 if (__DEV__) {
   if (typeof global.Promise !== 'function') {
diff --git a/Libraries/EventEmitter/NativeEventEmitter.d.ts b/Libraries/EventEmitter/NativeEventEmitter.d.ts
new file mode 100644
index 000000000000..c9f30d0cceb4
--- /dev/null
+++ b/Libraries/EventEmitter/NativeEventEmitter.d.ts
@@ -0,0 +1,70 @@
+/**
+ * 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
+ */
+
+import {
+  EmitterSubscription,
+  EventEmitter,
+} from '../vendor/emitter/EventEmitter';
+
+/**
+ * The React Native implementation of the IOS RCTEventEmitter which is required when creating
+ * a module that communicates with IOS
+ */
+type NativeModule = {
+  /**
+   * Add the provided eventType as an active listener
+   * @param eventType name of the event for which we are registering listener
+   */
+  addListener: (eventType: string) => void;
+
+  /**
+   * Remove a specified number of events.  There are no eventTypes in this case, as
+   * the native side doesn't remove the name, but only manages a counter of total
+   * listeners
+   * @param count number of listeners to remove (of any type)
+   */
+  removeListeners: (count: number) => void;
+};
+
+/**
+ * Abstract base class for implementing event-emitting modules. This implements
+ * a subset of the standard EventEmitter node module API.
+ */
+declare class NativeEventEmitter extends EventEmitter {
+  /**
+   * @param nativeModule the NativeModule implementation.  This is required on IOS and will throw
+   *      an invariant error if undefined.
+   */
+  constructor(nativeModule?: NativeModule);
+
+  /**
+   * Add the specified listener, this call passes through to the NativeModule
+   * addListener
+   *
+   * @param eventType name of the event for which we are registering listener
+   * @param listener the listener function
+   * @param context context of the listener
+   */
+  addListener(
+    eventType: string,
+    listener: (event: any) => void,
+    context?: Object,
+  ): EmitterSubscription;
+
+  /**
+   * @param eventType  name of the event whose registered listeners to remove
+   */
+  removeAllListeners(eventType: string): void;
+
+  /**
+   * Removes a subscription created by the addListener, the EventSubscription#remove()
+   * function actually calls through to this.
+   */
+  removeSubscription(subscription: EmitterSubscription): void;
+}
diff --git a/Libraries/EventEmitter/NativeEventEmitter.js b/Libraries/EventEmitter/NativeEventEmitter.js
index 402faec5282c..f30a69df7a4f 100644
--- a/Libraries/EventEmitter/NativeEventEmitter.js
+++ b/Libraries/EventEmitter/NativeEventEmitter.js
@@ -14,6 +14,7 @@ import type {
   EventSubscription,
   IEventEmitter,
 } from '../vendor/emitter/EventEmitter';
+
 import Platform from '../Utilities/Platform';
 import RCTDeviceEventEmitter from './RCTDeviceEventEmitter';
 import invariant from 'invariant';
diff --git a/Libraries/EventEmitter/RCTDeviceEventEmitter.d.ts b/Libraries/EventEmitter/RCTDeviceEventEmitter.d.ts
new file mode 100644
index 000000000000..1e92935b9b5b
--- /dev/null
+++ b/Libraries/EventEmitter/RCTDeviceEventEmitter.d.ts
@@ -0,0 +1,30 @@
+/**
+ * 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
+ */
+
+import {
+  EmitterSubscription,
+  EventEmitter,
+  EventSubscriptionVendor,
+} from '../vendor/emitter/EventEmitter';
+
+/**
+ * Deprecated - subclass NativeEventEmitter to create granular event modules instead of
+ * adding all event listeners directly to RCTDeviceEventEmitter.
+ */
+interface DeviceEventEmitterStatic extends EventEmitter {
+  sharedSubscriber: EventSubscriptionVendor;
+  new (): DeviceEventEmitterStatic;
+  addListener(
+    type: string,
+    listener: (data: any) => void,
+    context?: any,
+  ): EmitterSubscription;
+}
+
+export const DeviceEventEmitter: DeviceEventEmitterStatic;
diff --git a/Libraries/EventEmitter/RCTDeviceEventEmitter.js b/Libraries/EventEmitter/RCTDeviceEventEmitter.js
index c9f182f76504..65fe57da7b3a 100644
--- a/Libraries/EventEmitter/RCTDeviceEventEmitter.js
+++ b/Libraries/EventEmitter/RCTDeviceEventEmitter.js
@@ -8,9 +8,10 @@
  * @format
  */
 
-import EventEmitter from '../vendor/emitter/EventEmitter';
 import type {IEventEmitter} from '../vendor/emitter/EventEmitter';
 
+import EventEmitter from '../vendor/emitter/EventEmitter';
+
 // FIXME: use typed events
 type RCTDeviceEventDefinitions = $FlowFixMe;
 
diff --git a/Libraries/EventEmitter/RCTNativeAppEventEmitter.d.ts b/Libraries/EventEmitter/RCTNativeAppEventEmitter.d.ts
new file mode 100644
index 000000000000..417043220e47
--- /dev/null
+++ b/Libraries/EventEmitter/RCTNativeAppEventEmitter.d.ts
@@ -0,0 +1,32 @@
+/**
+ * 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
+ */
+
+import {DeviceEventEmitterStatic} from './RCTDeviceEventEmitter';
+
+export interface NativeEventSubscription {
+  /**
+   * Call this method to un-subscribe from a native-event
+   */
+  remove(): void;
+}
+
+/**
+ * Receive events from native-code
+ * Deprecated - subclass NativeEventEmitter to create granular event modules instead of
+ * adding all event listeners directly to RCTNativeAppEventEmitter.
+ * @see https://github.com/facebook/react-native/blob/0.34-stable\Libraries\EventEmitter\RCTNativeAppEventEmitter.js
+ * @see https://reactnative.dev/docs/native-modules-ios#sending-events-to-javascript
+ */
+type RCTNativeAppEventEmitter = DeviceEventEmitterStatic;
+
+/**
+ * Deprecated - subclass NativeEventEmitter to create granular event modules instead of
+ * adding all event listeners directly to RCTNativeAppEventEmitter.
+ */
+export const NativeAppEventEmitter: RCTNativeAppEventEmitter;
diff --git a/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
index fe388c81ffc3..1a63d5a88a44 100644
--- a/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
+++ b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
@@ -12,6 +12,7 @@ import type {
   EventSubscription,
   IEventEmitter,
 } from '../../vendor/emitter/EventEmitter';
+
 import RCTDeviceEventEmitter from '../RCTDeviceEventEmitter';
 
 /**
diff --git a/Libraries/Events/EventPolyfill.js b/Libraries/Events/EventPolyfill.js
index 9d6f4364918d..e6e0e7b12805 100644
--- a/Libraries/Events/EventPolyfill.js
+++ b/Libraries/Events/EventPolyfill.js
@@ -227,7 +227,7 @@ class EventPolyfill implements IEvent {
 }
 
 // Assertion magic for polyfill follows.
-declare var checkEvent: Event;
+declare var checkEvent: Event; // eslint-disable-line no-unused-vars
 
 /*::
 // This can be a strict mode error at runtime so put it in a Flow comment.
diff --git a/Libraries/FBLazyVector/BUCK b/Libraries/FBLazyVector/BUCK
index 89ab4c058e5b..56dd699d6b99 100644
--- a/Libraries/FBLazyVector/BUCK
+++ b/Libraries/FBLazyVector/BUCK
@@ -13,8 +13,9 @@ fb_apple_library(
     extension_api_only = True,
     frameworks = [],
     labels = [
+        "fbios_link_group:xplat/default/public.react_native.infra",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
+        "talkios_link_group:xplat/default/public.react_native.infra",
     ],
     link_whole = False,
     visibility = ["PUBLIC"],
diff --git a/Libraries/FBLazyVector/FBLazyVector/FBLazyIterator.h b/Libraries/FBLazyVector/FBLazyVector/FBLazyIterator.h
index bbeff166a11e..796b9aa472e0 100644
--- a/Libraries/FBLazyVector/FBLazyVector/FBLazyIterator.h
+++ b/Libraries/FBLazyVector/FBLazyVector/FBLazyIterator.h
@@ -27,7 +27,7 @@ class LazyIterator {
   LazyIterator() = default;
 
   LazyIterator(U vector, convert_type convert, size_type i)
-  : _v(vector), _i(i), _convert(std::move(convert)) {}
+      : _v(vector), _i(i), _convert(std::move(convert)) {}
 
   bool operator==(const LazyIterator &other) const {
     return _i == other._i && _v == other._v;
@@ -98,33 +98,30 @@ class LazyIterator {
 };
 
 template <typename T, typename U>
-LazyIterator<T, U> operator+(typename LazyIterator<T, U>::difference_type n,
-          const LazyIterator<T, U> &i) {
+LazyIterator<T, U> operator+(
+    typename LazyIterator<T, U>::difference_type n,
+    const LazyIterator<T, U> &i) {
   return i + n;
 }
 
 template <typename T, typename U>
-bool operator!=(const LazyIterator<T, U> &a,
-                const LazyIterator<T, U> &b) {
+bool operator!=(const LazyIterator<T, U> &a, const LazyIterator<T, U> &b) {
   return !(a == b);
 }
 
 template <typename T, typename U>
-bool operator<=(const LazyIterator<T, U> &a,
-                const LazyIterator<T, U> &b) {
+bool operator<=(const LazyIterator<T, U> &a, const LazyIterator<T, U> &b) {
   return a < b || a == b;
 }
 
 template <typename T, typename U>
-bool operator>(const LazyIterator<T, U> &a,
-               const LazyIterator<T, U> &b) {
+bool operator>(const LazyIterator<T, U> &a, const LazyIterator<T, U> &b) {
   return b < a;
 }
 
 template <typename T, typename U>
-bool operator>=(const LazyIterator<T, U> &a,
-                const LazyIterator<T, U> &b) {
+bool operator>=(const LazyIterator<T, U> &a, const LazyIterator<T, U> &b) {
   return a > b || a == b;
 }
 
-}
+} // namespace FB
diff --git a/Libraries/FBLazyVector/FBLazyVector/FBLazyVector.h b/Libraries/FBLazyVector/FBLazyVector/FBLazyVector.h
index ddd64bb2e774..481398ee14ef 100644
--- a/Libraries/FBLazyVector/FBLazyVector/FBLazyVector.h
+++ b/Libraries/FBLazyVector/FBLazyVector/FBLazyVector.h
@@ -16,8 +16,9 @@
 namespace FB {
 
 /**
- * Presents a type-safe wrapper around an arbitrary object that represents an _immutable_ array of objects.
- * Each item is constructed lazily on demand and reconstructed on each access; there is no caching.
+ * Presents a type-safe wrapper around an arbitrary object that represents an
+ * _immutable_ array of objects. Each item is constructed lazily on demand and
+ * reconstructed on each access; there is no caching.
  */
 template <typename T, typename U>
 class LazyVector {
@@ -30,7 +31,8 @@ class LazyVector {
   using size_type = std::int32_t;
   using convert_type = std::function<T(U)>;
 
-  static LazyVector<T, U> fromUnsafeRawValue(U v, size_type size, convert_type convert) {
+  static LazyVector<T, U>
+  fromUnsafeRawValue(U v, size_type size, convert_type convert) {
     return {v, size, convert};
   }
 
@@ -48,7 +50,8 @@ class LazyVector {
 
   const_reference at(size_type pos) const {
 #ifndef _LIBCPP_NO_EXCEPTIONS
-    if (!(pos < _size)) throw std::out_of_range("out of range");
+    if (!(pos < _size))
+      throw std::out_of_range("out of range");
 #else
     assert(pos < _size || !"out of range");
 #endif
@@ -89,11 +92,11 @@ class LazyVector {
  private:
   /** Wrapped vector */
   LazyVector(U vector, size_type size, convert_type convert)
-  : _v(vector), _size(size), _convert(convert) {}
+      : _v(vector), _size(size), _convert(convert) {}
 
   U _v;
   size_type _size;
   convert_type _convert;
 };
 
-}
+} // namespace FB
diff --git a/Libraries/HeapCapture/NativeJSCHeapCapture.js b/Libraries/HeapCapture/NativeJSCHeapCapture.js
index 21347dac036e..d892ad0bca4f 100644
--- a/Libraries/HeapCapture/NativeJSCHeapCapture.js
+++ b/Libraries/HeapCapture/NativeJSCHeapCapture.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Image/AssetSourceResolver.js b/Libraries/Image/AssetSourceResolver.js
index 61b7c10794d3..5e7f2c2b738e 100644
--- a/Libraries/Image/AssetSourceResolver.js
+++ b/Libraries/Image/AssetSourceResolver.js
@@ -21,16 +21,14 @@ export type ResolvedAssetSource = {|
 import type {PackagerAsset} from '@react-native/assets/registry';
 
 const PixelRatio = require('../Utilities/PixelRatio');
-const {pickScale} = require('./AssetUtils');
 const Platform = require('../Utilities/Platform');
-
-const invariant = require('invariant');
-
+const {pickScale} = require('./AssetUtils');
 const {
   getAndroidResourceFolderName,
   getAndroidResourceIdentifier,
   getBasePath,
 } = require('@react-native/assets/path-support');
+const invariant = require('invariant');
 
 /**
  * Returns a path like 'assets/AwesomeModule/icon@2x.png'
@@ -47,9 +45,9 @@ function getScaledAssetPath(asset: PackagerAsset): string {
  */
 function getAssetPathInDrawableFolder(asset: PackagerAsset): string {
   const scale = pickScale(asset.scales, PixelRatio.get());
-  const drawbleFolder = getAndroidResourceFolderName(asset, scale);
+  const drawableFolder = getAndroidResourceFolderName(asset, scale);
   const fileName = getAndroidResourceIdentifier(asset);
-  return drawbleFolder + '/' + fileName + '.' + asset.type;
+  return drawableFolder + '/' + fileName + '.' + asset.type;
 }
 
 class AssetSourceResolver {
diff --git a/Libraries/Image/Image.android.js b/Libraries/Image/Image.android.js
index eac8a56c63eb..f874c6abc93f 100644
--- a/Libraries/Image/Image.android.js
+++ b/Libraries/Image/Image.android.js
@@ -8,21 +8,22 @@
  * @format
  */
 
-import ImageViewNativeComponent from './ImageViewNativeComponent';
-import * as React from 'react';
+import type {RootTag} from '../Types/RootTagTypes';
+import type {ImageAndroid} from './Image.flow';
+import type {ImageProps as ImagePropsType} from './ImageProps';
+
+import flattenStyle from '../StyleSheet/flattenStyle';
 import StyleSheet from '../StyleSheet/StyleSheet';
 import TextAncestor from '../Text/TextAncestor';
-import ImageInjection from './ImageInjection';
 import ImageAnalyticsTagContext from './ImageAnalyticsTagContext';
-import flattenStyle from '../StyleSheet/flattenStyle';
-import resolveAssetSource from './resolveAssetSource';
-
+import ImageInjection from './ImageInjection';
+import {getImageSourcesFromImageProps} from './ImageSourceUtils';
+import {convertObjectFitToResizeMode} from './ImageUtils';
+import ImageViewNativeComponent from './ImageViewNativeComponent';
 import NativeImageLoaderAndroid from './NativeImageLoaderAndroid';
-
+import resolveAssetSource from './resolveAssetSource';
 import TextInlineImageNativeComponent from './TextInlineImageNativeComponent';
-
-import type {ImageProps as ImagePropsType} from './ImageProps';
-import type {RootTag} from '../Types/RootTagTypes';
+import * as React from 'react';
 
 let _requestId = 1;
 function generateRequestId() {
@@ -126,25 +127,16 @@ export type ImageComponentStatics = $ReadOnly<{|
 /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
  * LTI update could not be added via codemod */
 const BaseImage = (props: ImagePropsType, forwardedRef) => {
-  let source = resolveAssetSource(props.source);
+  let source = getImageSourcesFromImageProps(props) || {
+    uri: undefined,
+    width: undefined,
+    height: undefined,
+  };
   const defaultSource = resolveAssetSource(props.defaultSource);
   const loadingIndicatorSource = resolveAssetSource(
     props.loadingIndicatorSource,
   );
 
-  if (source) {
-    const uri = source.uri;
-    if (uri === '') {
-      console.warn('source.uri should not be an empty string');
-    }
-  }
-
-  if (props.src) {
-    console.warn(
-      'The <Image> component requires a `source` property rather than `src`.',
-    );
-  }
-
   if (props.children) {
     throw new Error(
       'The <Image> component cannot contain children. If you want to render content on top of the image, consider using the <ImageBackground> component or absolute positioning.',
@@ -157,37 +149,58 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => {
     );
   }
 
-  if (source && !source.uri && !Array.isArray(source)) {
-    source = null;
-  }
-
   let style;
   let sources;
-  if (source?.uri != null) {
-    const {width, height} = source;
-    style = flattenStyle([{width, height}, styles.base, props.style]);
-    sources = [{uri: source.uri}];
-  } else {
+  if (Array.isArray(source)) {
     style = flattenStyle([styles.base, props.style]);
     sources = source;
+  } else {
+    const {width = props.width, height = props.height, uri} = source;
+    style = flattenStyle([{width, height}, styles.base, props.style]);
+    sources = [source];
+
+    if (uri === '') {
+      console.warn('source.uri should not be an empty string');
+    }
   }
 
+  const {height, width, ...restProps} = props;
   const {onLoadStart, onLoad, onLoadEnd, onError} = props;
   const nativeProps = {
-    ...props,
+    ...restProps,
     style,
     shouldNotifyLoadEvents: !!(onLoadStart || onLoad || onLoadEnd || onError),
     src: sources,
     /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
      * when making Flow check .android.js files. */
-    headers: source?.headers,
+    headers: (source?.[0]?.headers || source?.headers: ?{[string]: string}),
     defaultSrc: defaultSource ? defaultSource.uri : null,
     loadingIndicatorSrc: loadingIndicatorSource
       ? loadingIndicatorSource.uri
       : null,
     ref: forwardedRef,
+    accessibilityLabel:
+      props['aria-label'] ?? props.accessibilityLabel ?? props.alt,
+    accessibilityLabelledBy:
+      props?.['aria-labelledby'] ?? props?.accessibilityLabelledBy,
+    accessible: props.alt !== undefined ? true : props.accessible,
+    accessibilityState: {
+      busy: props['aria-busy'] ?? props.accessibilityState?.busy,
+      checked: props['aria-checked'] ?? props.accessibilityState?.checked,
+      disabled: props['aria-disabled'] ?? props.accessibilityState?.disabled,
+      expanded: props['aria-expanded'] ?? props.accessibilityState?.expanded,
+      selected: props['aria-selected'] ?? props.accessibilityState?.selected,
+    },
   };
 
+  const objectFit =
+    style && style.objectFit
+      ? convertObjectFitToResizeMode(style.objectFit)
+      : null;
+  // $FlowFixMe[prop-missing]
+  const resizeMode =
+    objectFit || props.resizeMode || (style && style.resizeMode) || 'cover';
+
   return (
     <ImageAnalyticsTagContext.Consumer>
       {analyticTag => {
@@ -202,19 +215,23 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => {
           <TextAncestor.Consumer>
             {hasTextAncestor => {
               if (hasTextAncestor) {
-                let src = Array.isArray(sources) ? sources : [sources];
                 return (
                   <TextInlineImageNativeComponent
                     style={style}
-                    resizeMode={props.resizeMode}
+                    resizeMode={resizeMode}
                     headers={nativeProps.headers}
-                    src={src}
+                    src={sources}
                     ref={forwardedRef}
                   />
                 );
               }
 
-              return <ImageViewNativeComponent {...nativePropsWithAnalytics} />;
+              return (
+                <ImageViewNativeComponent
+                  {...nativePropsWithAnalytics}
+                  resizeMode={resizeMode}
+                />
+              );
             }}
           </TextAncestor.Consumer>
         );
@@ -308,15 +325,16 @@ Image.queryCache = queryCache;
  * comment and run Flow. */
 Image.resolveAssetSource = resolveAssetSource;
 
+/**
+ * Switch to `deprecated-react-native-prop-types` for compatibility with future
+ * releases. This is deprecated and will be removed in the future.
+ */
+Image.propTypes = require('deprecated-react-native-prop-types').ImagePropTypes;
+
 const styles = StyleSheet.create({
   base: {
     overflow: 'hidden',
   },
 });
 
-module.exports = ((Image: any): React.AbstractComponent<
-  ImagePropsType,
-  | React.ElementRef<typeof TextInlineImageNativeComponent>
-  | React.ElementRef<typeof ImageViewNativeComponent>,
-> &
-  ImageComponentStatics);
+module.exports = ((Image: any): ImageAndroid);
diff --git a/Libraries/Image/Image.d.ts b/Libraries/Image/Image.d.ts
new file mode 100644
index 000000000000..dd2c089e75a4
--- /dev/null
+++ b/Libraries/Image/Image.d.ts
@@ -0,0 +1,322 @@
+/**
+ * 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
+ */
+
+import * as React from 'react';
+import {Constructor} from '../../types/private/Utilities';
+import {AccessibilityProps} from '../Components/View/ViewAccessibility';
+import {Insets} from '../../types/public/Insets';
+import {NativeMethods} from '../../types/public/ReactNativeTypes';
+import {StyleProp} from '../StyleSheet/StyleSheet';
+import {ImageStyle, ViewStyle} from '../StyleSheet/StyleSheetTypes';
+import {LayoutChangeEvent, NativeSyntheticEvent} from '../Types/CoreEventTypes';
+import {ImageResizeMode} from './ImageResizeMode';
+import {ImageRequireSource, ImageURISource} from './ImageSource';
+
+/**
+ * @see ImagePropsIOS.onProgress
+ */
+export interface ImageProgressEventDataIOS {
+  loaded: number;
+  total: number;
+}
+
+export interface ImagePropsIOS {
+  /**
+   * blurRadius: the blur radius of the blur filter added to the image
+   * @platform ios
+   */
+  blurRadius?: number | undefined;
+
+  /**
+   * When the image is resized, the corners of the size specified by capInsets will stay a fixed size,
+   * but the center content and borders of the image will be stretched.
+   * This is useful for creating resizable rounded buttons, shadows, and other resizable assets.
+   * More info on Apple documentation
+   */
+  capInsets?: Insets | undefined;
+
+  /**
+   * Invoked on download progress with {nativeEvent: {loaded, total}}
+   */
+  onProgress?:
+    | ((event: NativeSyntheticEvent<ImageProgressEventDataIOS>) => void)
+    | undefined;
+
+  /**
+   * Invoked when a partial load of the image is complete. The definition of
+   * what constitutes a "partial load" is loader specific though this is meant
+   * for progressive JPEG loads.
+   * @platform ios
+   */
+  onPartialLoad?: (() => void) | undefined;
+}
+
+interface ImagePropsAndroid {
+  /**
+   * The mechanism that should be used to resize the image when the image's dimensions
+   * differ from the image view's dimensions. Defaults to auto.
+   *
+   * 'auto': Use heuristics to pick between resize and scale.
+   *
+   * 'resize': A software operation which changes the encoded image in memory before it gets decoded.
+   * This should be used instead of scale when the image is much larger than the view.
+   *
+   * 'scale': The image gets drawn downscaled or upscaled. Compared to resize, scale is faster (usually hardware accelerated)
+   * and produces higher quality images. This should be used if the image is smaller than the view.
+   * It should also be used if the image is slightly bigger than the view.
+   */
+  resizeMethod?: 'auto' | 'resize' | 'scale' | undefined;
+
+  /**
+   * Duration of fade in animation in ms. Defaults to 300
+   *
+   * @platform android
+   */
+  fadeDuration?: number | undefined;
+}
+
+/**
+ * @see https://reactnative.dev/docs/image#source
+ */
+export type ImageSourcePropType =
+  | ImageURISource
+  | ImageURISource[]
+  | ImageRequireSource;
+
+export interface ImageLoadEventData {
+  source: {
+    height: number;
+    width: number;
+    uri: string;
+  };
+}
+
+export interface ImageErrorEventData {
+  error: any;
+}
+
+/**
+ * @see https://reactnative.dev/docs/image#resolveassetsource
+ */
+export interface ImageResolvedAssetSource {
+  height: number;
+  width: number;
+  scale: number;
+  uri: string;
+}
+
+/**
+ * @see https://reactnative.dev/docs/image
+ */
+export interface ImagePropsBase
+  extends ImagePropsIOS,
+    ImagePropsAndroid,
+    AccessibilityProps {
+  /**
+   * Used to reference react managed images from native code.
+   */
+  id?: string | undefined;
+
+  /**
+   * onLayout function
+   *
+   * Invoked on mount and layout changes with
+   *
+   * {nativeEvent: { layout: {x, y, width, height} }}.
+   */
+  onLayout?: ((event: LayoutChangeEvent) => void) | undefined;
+
+  /**
+   * Invoked on load error with {nativeEvent: {error}}
+   */
+  onError?:
+    | ((error: NativeSyntheticEvent<ImageErrorEventData>) => void)
+    | undefined;
+
+  /**
+   * Invoked when load completes successfully
+   * { source: { uri, height, width } }.
+   */
+  onLoad?:
+    | ((event: NativeSyntheticEvent<ImageLoadEventData>) => void)
+    | undefined;
+
+  /**
+   * Invoked when load either succeeds or fails
+   */
+  onLoadEnd?: (() => void) | undefined;
+
+  /**
+   * Invoked on load start
+   */
+  onLoadStart?: (() => void) | undefined;
+
+  progressiveRenderingEnabled?: boolean | undefined;
+
+  borderRadius?: number | undefined;
+
+  borderTopLeftRadius?: number | undefined;
+
+  borderTopRightRadius?: number | undefined;
+
+  borderBottomLeftRadius?: number | undefined;
+
+  borderBottomRightRadius?: number | undefined;
+
+  /**
+   * Determines how to resize the image when the frame doesn't match the raw
+   * image dimensions.
+   *
+   * 'cover': Scale the image uniformly (maintain the image's aspect ratio)
+   * so that both dimensions (width and height) of the image will be equal
+   * to or larger than the corresponding dimension of the view (minus padding).
+   *
+   * 'contain': Scale the image uniformly (maintain the image's aspect ratio)
+   * so that both dimensions (width and height) of the image will be equal to
+   * or less than the corresponding dimension of the view (minus padding).
+   *
+   * 'stretch': Scale width and height independently, This may change the
+   * aspect ratio of the src.
+   *
+   * 'repeat': Repeat the image to cover the frame of the view.
+   * The image will keep it's size and aspect ratio. (iOS only)
+   *
+   * 'center': Scale the image down so that it is completely visible,
+   * if bigger than the area of the view.
+   * The image will not be scaled up.
+   */
+  resizeMode?: ImageResizeMode | undefined;
+
+  /**
+   * The mechanism that should be used to resize the image when the image's dimensions
+   * differ from the image view's dimensions. Defaults to `auto`.
+   *
+   * - `auto`: Use heuristics to pick between `resize` and `scale`.
+   *
+   * - `resize`: A software operation which changes the encoded image in memory before it
+   * gets decoded. This should be used instead of `scale` when the image is much larger
+   * than the view.
+   *
+   * - `scale`: The image gets drawn downscaled or upscaled. Compared to `resize`, `scale` is
+   * faster (usually hardware accelerated) and produces higher quality images. This
+   * should be used if the image is smaller than the view. It should also be used if the
+   * image is slightly bigger than the view.
+   *
+   * More details about `resize` and `scale` can be found at http://frescolib.org/docs/resizing-rotating.html.
+   *
+   * @platform android
+   */
+  resizeMethod?: 'auto' | 'resize' | 'scale' | undefined;
+
+  /**
+   * The image source (either a remote URL or a local file resource).
+   *
+   * This prop can also contain several remote URLs, specified together with their width and height and potentially with scale/other URI arguments.
+   * The native side will then choose the best uri to display based on the measured size of the image container.
+   * A cache property can be added to control how networked request interacts with the local cache.
+   *
+   * The currently supported formats are png, jpg, jpeg, bmp, gif, webp (Android only), psd (iOS only).
+   */
+  source: ImageSourcePropType;
+
+  /**
+   * similarly to `source`, this property represents the resource used to render
+   * the loading indicator for the image, displayed until image is ready to be
+   * displayed, typically after when it got downloaded from network.
+   */
+  loadingIndicatorSource?: ImageURISource | undefined;
+
+  /**
+   * A unique identifier for this element to be used in UI Automation testing scripts.
+   */
+  testID?: string | undefined;
+
+  /**
+   * Used to reference react managed images from native code.
+   */
+  nativeID?: string | undefined;
+
+  /**
+   * A static image to display while downloading the final image off the network.
+   */
+  defaultSource?: ImageURISource | number | undefined;
+
+  /**
+   * The text that's read by the screen reader when the user interacts with
+   * the image.
+   *
+   * See https://reactnative.dev/docs/image#alt
+   */
+  alt?: string | undefined;
+}
+
+export interface ImageProps extends ImagePropsBase {
+  /**
+   *
+   * Style
+   */
+  style?: StyleProp<ImageStyle> | undefined;
+}
+
+declare class ImageComponent extends React.Component<ImageProps> {}
+declare const ImageBase: Constructor<NativeMethods> & typeof ImageComponent;
+export class Image extends ImageBase {
+  static getSize(
+    uri: string,
+    success: (width: number, height: number) => void,
+    failure?: (error: any) => void,
+  ): any;
+  static getSizeWithHeaders(
+    uri: string,
+    headers: {[index: string]: string},
+    success: (width: number, height: number) => void,
+    failure?: (error: any) => void,
+  ): any;
+  static prefetch(url: string): Promise<boolean>;
+  static prefetchWithMetadata(
+    url: string,
+    queryRootName: string,
+    rootTag?: number,
+  ): Promise<boolean>;
+  static abortPrefetch?(requestId: number): void;
+  static queryCache?(
+    urls: string[],
+  ): Promise<{[url: string]: 'memory' | 'disk' | 'disk/memory'}>;
+
+  /**
+   * @see https://reactnative.dev/docs/image#resolveassetsource
+   */
+  static resolveAssetSource(
+    source: ImageSourcePropType,
+  ): ImageResolvedAssetSource;
+}
+
+export interface ImageBackgroundProps extends ImagePropsBase {
+  children?: React.ReactNode;
+  imageStyle?: StyleProp<ImageStyle> | undefined;
+  style?: StyleProp<ViewStyle> | undefined;
+  imageRef?(image: Image): void;
+}
+
+declare class ImageBackgroundComponent extends React.Component<ImageBackgroundProps> {}
+declare const ImageBackgroundBase: Constructor<NativeMethods> &
+  typeof ImageBackgroundComponent;
+export class ImageBackground extends ImageBackgroundBase {
+  resizeMode: ImageResizeMode;
+  getSize(
+    uri: string,
+    success: (width: number, height: number) => void,
+    failure: (error: any) => void,
+  ): any;
+  prefetch(url: string): any;
+  abortPrefetch?(requestId: number): void;
+  queryCache?(
+    urls: string[],
+  ): Promise<{[url: string]: 'memory' | 'disk' | 'disk/memory'}>;
+}
diff --git a/Libraries/Image/Image.flow.js b/Libraries/Image/Image.flow.js
new file mode 100644
index 000000000000..2cbbbf7fbbe1
--- /dev/null
+++ b/Libraries/Image/Image.flow.js
@@ -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.
+ *
+ * @flow
+ * @format
+ */
+
+import type {RootTag} from '../Types/RootTagTypes';
+import type {ResolvedAssetSource} from './AssetSourceResolver';
+import type {ImageProps as ImagePropsType} from './ImageProps';
+
+import ImageViewNativeComponent from './ImageViewNativeComponent';
+import TextInlineImageNativeComponent from './TextInlineImageNativeComponent';
+import * as React from 'react';
+
+type ImageComponentStaticsIOS = $ReadOnly<{|
+  getSize: (
+    uri: string,
+    success: (width: number, height: number) => void,
+    failure?: (error: any) => void,
+  ) => void,
+
+  getSizeWithHeaders(
+    uri: string,
+    headers: {[string]: string, ...},
+    success: (width: number, height: number) => void,
+    failure?: (error: any) => void,
+  ): any,
+
+  prefetch(url: string): any,
+
+  prefetchWithMetadata(
+    url: string,
+    queryRootName: string,
+    rootTag?: ?RootTag,
+  ): any,
+
+  queryCache(
+    urls: Array<string>,
+  ): Promise<{[string]: 'memory' | 'disk' | 'disk/memory', ...}>,
+
+  resolveAssetSource(source: any): ?ResolvedAssetSource,
+|}>;
+
+type ImageComponentStaticsAndroid = {
+  ...ImageComponentStaticsIOS,
+  abortPrefetch(requestId: number): void,
+};
+
+export type ImageAndroid = React.AbstractComponent<
+  ImagePropsType,
+  | React.ElementRef<typeof TextInlineImageNativeComponent>
+  | React.ElementRef<typeof ImageViewNativeComponent>,
+> &
+  ImageComponentStaticsAndroid;
+
+export type ImageIOS = React.AbstractComponent<
+  ImagePropsType,
+  React.ElementRef<typeof ImageViewNativeComponent>,
+> &
+  ImageComponentStaticsIOS;
diff --git a/Libraries/Image/Image.ios.js b/Libraries/Image/Image.ios.js
index 7b5d0c0c4337..6f1d72fcb5a8 100644
--- a/Libraries/Image/Image.ios.js
+++ b/Libraries/Image/Image.ios.js
@@ -8,21 +8,21 @@
  * @format
  */
 
-import * as React from 'react';
-import StyleSheet from '../StyleSheet/StyleSheet';
-
-import ImageInjection from './ImageInjection';
-import ImageAnalyticsTagContext from './ImageAnalyticsTagContext';
-import flattenStyle from '../StyleSheet/flattenStyle';
-import resolveAssetSource from './resolveAssetSource';
-
-import type {ImageProps as ImagePropsType} from './ImageProps';
-
 import type {ImageStyleProp} from '../StyleSheet/StyleSheet';
-import NativeImageLoaderIOS from './NativeImageLoaderIOS';
+import type {RootTag} from '../Types/RootTagTypes';
+import type {ImageIOS} from './Image.flow';
+import type {ImageProps as ImagePropsType} from './ImageProps';
 
+import flattenStyle from '../StyleSheet/flattenStyle';
+import StyleSheet from '../StyleSheet/StyleSheet';
+import ImageAnalyticsTagContext from './ImageAnalyticsTagContext';
+import ImageInjection from './ImageInjection';
+import {getImageSourcesFromImageProps} from './ImageSourceUtils';
+import {convertObjectFitToResizeMode} from './ImageUtils';
 import ImageViewNativeComponent from './ImageViewNativeComponent';
-import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';
+import NativeImageLoaderIOS from './NativeImageLoaderIOS';
+import resolveAssetSource from './resolveAssetSource';
+import * as React from 'react';
 
 function getSize(
   uri: string,
@@ -105,7 +105,7 @@ export type ImageComponentStatics = $ReadOnly<{|
 /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
  * LTI update could not be added via codemod */
 const BaseImage = (props: ImagePropsType, forwardedRef) => {
-  const source = resolveAssetSource(props.source) || {
+  const source = getImageSourcesFromImageProps(props) || {
     uri: undefined,
     width: undefined,
     height: undefined,
@@ -117,7 +117,7 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => {
     style = flattenStyle([styles.base, props.style]) || {};
     sources = source;
   } else {
-    const {width, height, uri} = source;
+    const {width = props.width, height = props.height, uri} = source;
     style = flattenStyle([{width, height}, styles.base, props.style]) || {};
     sources = [source];
 
@@ -126,27 +126,52 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => {
     }
   }
 
-  const resizeMode = props.resizeMode || style.resizeMode || 'cover';
-  const tintColor = style.tintColor;
-
-  if (props.src != null) {
-    console.warn(
-      'The <Image> component requires a `source` property rather than `src`.',
-    );
-  }
+  const objectFit =
+    // $FlowFixMe[prop-missing]
+    style && style.objectFit
+      ? convertObjectFitToResizeMode(style.objectFit)
+      : null;
+  const resizeMode =
+    // $FlowFixMe[prop-missing]
+    objectFit || props.resizeMode || (style && style.resizeMode) || 'cover';
+  // $FlowFixMe[prop-missing]
+  const tintColor = props.tintColor || style.tintColor;
 
   if (props.children != null) {
     throw new Error(
       'The <Image> component cannot contain children. If you want to render content on top of the image, consider using the <ImageBackground> component or absolute positioning.',
     );
   }
+  const {
+    'aria-busy': ariaBusy,
+    'aria-checked': ariaChecked,
+    'aria-disabled': ariaDisabled,
+    'aria-expanded': ariaExpanded,
+    'aria-selected': ariaSelected,
+    height,
+    src,
+    width,
+    ...restProps
+  } = props;
+
+  const _accessibilityState = {
+    busy: ariaBusy ?? props.accessibilityState?.busy,
+    checked: ariaChecked ?? props.accessibilityState?.checked,
+    disabled: ariaDisabled ?? props.accessibilityState?.disabled,
+    expanded: ariaExpanded ?? props.accessibilityState?.expanded,
+    selected: ariaSelected ?? props.accessibilityState?.selected,
+  };
+  const accessibilityLabel = props['aria-label'] ?? props.accessibilityLabel;
 
   return (
     <ImageAnalyticsTagContext.Consumer>
       {analyticTag => {
         return (
           <ImageViewNativeComponent
-            {...props}
+            accessibilityState={_accessibilityState}
+            {...restProps}
+            accessible={props.alt !== undefined ? true : props.accessible}
+            accessibilityLabel={accessibilityLabel ?? props.alt}
             ref={forwardedRef}
             style={style}
             resizeMode={resizeMode}
@@ -235,14 +260,16 @@ Image.queryCache = queryCache;
  * delete this comment and run Flow. */
 Image.resolveAssetSource = resolveAssetSource;
 
+/**
+ * Switch to `deprecated-react-native-prop-types` for compatibility with future
+ * releases. This is deprecated and will be removed in the future.
+ */
+Image.propTypes = require('deprecated-react-native-prop-types').ImagePropTypes;
+
 const styles = StyleSheet.create({
   base: {
     overflow: 'hidden',
   },
 });
 
-module.exports = ((Image: any): React.AbstractComponent<
-  ImagePropsType,
-  React.ElementRef<typeof ImageViewNativeComponent>,
-> &
-  ImageComponentStatics);
+module.exports = ((Image: any): ImageIOS);
diff --git a/Libraries/Image/ImageBackground.js b/Libraries/Image/ImageBackground.js
index 30ac413552af..7beb733e7032 100644
--- a/Libraries/Image/ImageBackground.js
+++ b/Libraries/Image/ImageBackground.js
@@ -10,14 +10,15 @@
 
 'use strict';
 
-import Image from './Image';
-import * as React from 'react';
-import StyleSheet from '../StyleSheet/StyleSheet';
-import flattenStyle from '../StyleSheet/flattenStyle';
-import View from '../Components/View/View';
+import type {ViewProps} from '../Components/View/ViewPropTypes';
 import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
 import type {ImageBackgroundProps} from './ImageProps';
-import type {ViewProps} from '../Components/View/ViewPropTypes';
+
+import View from '../Components/View/View';
+import flattenStyle from '../StyleSheet/flattenStyle';
+import StyleSheet from '../StyleSheet/StyleSheet';
+import Image from './Image';
+import * as React from 'react';
 
 /**
  * Very simple drop-in replacement for <Image> which supports nesting views.
@@ -66,15 +67,25 @@ class ImageBackground extends React.Component<ImageBackgroundProps> {
   };
 
   render(): React.Node {
-    const {children, style, imageStyle, imageRef, ...props} = this.props;
+    const {
+      children,
+      style,
+      imageStyle,
+      imageRef,
+      importantForAccessibility,
+      ...props
+    } = this.props;
+
     const flattenedStyle = flattenStyle(style);
     return (
       <View
         accessibilityIgnoresInvertColors={true}
+        importantForAccessibility={importantForAccessibility}
         style={style}
         ref={this._captureRef}>
         <Image
           {...props}
+          importantForAccessibility={importantForAccessibility}
           style={[
             StyleSheet.absoluteFill,
             {
diff --git a/Libraries/Image/ImageBackground.js.flow b/Libraries/Image/ImageBackground.js.flow
new file mode 100644
index 000000000000..ad91f1a4e78d
--- /dev/null
+++ b/Libraries/Image/ImageBackground.js.flow
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+import * as React from 'react';
+import type {ImageBackgroundProps} from './ImageProps';
+
+declare class ImageBackground extends React.Component<ImageBackgroundProps> {}
+module.exports = ImageBackground;
diff --git a/Libraries/Image/ImageInjection.js b/Libraries/Image/ImageInjection.js
index 9a32ef3fd0a2..e42d32cd9c4f 100644
--- a/Libraries/Image/ImageInjection.js
+++ b/Libraries/Image/ImageInjection.js
@@ -8,10 +8,11 @@
  * @flow
  */
 
-import * as React from 'react';
 import type {ImageProps as ImagePropsType} from './ImageProps';
+
 import ImageViewNativeComponent from './ImageViewNativeComponent';
 import TextInlineImageNativeComponent from './TextInlineImageNativeComponent';
+import * as React from 'react';
 
 export default {
   unstable_createImageComponent: (null: ?(
diff --git a/Libraries/Image/ImagePickerIOS.js b/Libraries/Image/ImagePickerIOS.js
deleted file mode 100644
index e94cd646e9a1..000000000000
--- a/Libraries/Image/ImagePickerIOS.js
+++ /dev/null
@@ -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;
diff --git a/Libraries/Image/ImageProps.js b/Libraries/Image/ImageProps.js
index 6bb36fedb5d4..5822188c5afa 100644
--- a/Libraries/Image/ImageProps.js
+++ b/Libraries/Image/ImageProps.js
@@ -10,13 +10,17 @@
 
 'use strict';
 
-import type {SyntheticEvent, LayoutEvent} from '../Types/CoreEventTypes';
+import type {ViewProps} from '../Components/View/ViewPropTypes';
 import type {EdgeInsetsProp} from '../StyleSheet/EdgeInsetsPropType';
+import type {
+  ColorValue,
+  ImageStyleProp,
+  ViewStyleProp,
+} from '../StyleSheet/StyleSheet';
+import type {LayoutEvent, SyntheticEvent} from '../Types/CoreEventTypes';
+import typeof Image from './Image';
 import type {ImageSource} from './ImageSource';
-import type {ViewStyleProp, ImageStyleProp} from '../StyleSheet/StyleSheet';
-import type {ViewProps} from '../Components/View/ViewPropTypes';
 import type {Node, Ref} from 'react';
-import typeof Image from './Image';
 
 export type ImageLoadEvent = SyntheticEvent<
   $ReadOnly<{|
@@ -82,6 +86,26 @@ export type ImageProps = {|
    */
   accessibilityLabel?: ?Stringish,
 
+  /**
+   * Alias for accessibilityLabel
+   * See https://reactnative.dev/docs/image#accessibilitylabel
+   */
+  'aria-label'?: ?Stringish,
+
+  /**
+   * Reperesents the nativeID of the associated label. When the assistive technology focuses on the component with this props.
+   *
+   * @platform android
+   */
+  'aria-labelledby'?: ?string,
+  /**
+   * The text that's read by the screen reader when the user interacts with
+   * the image.
+   *
+   * See https://reactnative.dev/docs/image#alt
+   */
+  alt?: ?Stringish,
+
   /**
    * blurRadius: the blur radius of the blur filter added to the image
    *
@@ -94,6 +118,28 @@ export type ImageProps = {|
    */
   capInsets?: ?EdgeInsetsProp,
 
+  /**
+   * Adds the CORS related header to the request.
+   * Similar to crossorigin from HTML.
+   *
+   * See https://reactnative.dev/docs/image#crossorigin
+   */
+  crossOrigin?: ?('anonymous' | 'use-credentials'),
+
+  /**
+   * Height of the image component.
+   *
+   * See https://reactnative.dev/docs/image#height
+   */
+  height?: number,
+
+  /**
+   * Width of the image component.
+   *
+   * See https://reactnative.dev/docs/image#width
+   */
+  width?: number,
+
   /**
    * Invoked on load error with `{nativeEvent: {error}}`.
    *
@@ -154,6 +200,23 @@ export type ImageProps = {|
    */
   style?: ?ImageStyleProp,
 
+  /**
+   * A string indicating which referrer to use when fetching the resource.
+   * Similar to referrerpolicy from HTML.
+   *
+   * See https://reactnative.dev/docs/image#referrerpolicy
+   */
+  referrerPolicy?: ?(
+    | 'no-referrer'
+    | 'no-referrer-when-downgrade'
+    | 'origin'
+    | 'origin-when-cross-origin'
+    | 'same-origin'
+    | 'strict-origin'
+    | 'strict-origin-when-cross-origin'
+    | 'unsafe-url'
+  ),
+
   /**
    * Determines how to resize the image when the frame doesn't match the raw
    * image dimensions.
@@ -170,7 +233,27 @@ export type ImageProps = {|
    */
   testID?: ?string,
 
-  src?: empty,
+  /**
+   * Changes the color of all the non-transparent pixels to the tintColor.
+   *
+   * See https://reactnative.dev/docs/image#tintcolor
+   */
+  tintColor?: ColorValue,
+
+  /**
+   * A string representing the resource identifier for the image. Similar to
+   * src from HTML.
+   *
+   * See https://reactnative.dev/docs/image#src
+   */
+  src?: ?string,
+
+  /**
+   * Similar to srcset from HTML.
+   *
+   * See https://reactnative.dev/docs/image#srcset
+   */
+  srcSet?: ?string,
   children?: empty,
 |};
 
diff --git a/Libraries/Image/ImageResizeMode.d.ts b/Libraries/Image/ImageResizeMode.d.ts
new file mode 100644
index 000000000000..84174e3da962
--- /dev/null
+++ b/Libraries/Image/ImageResizeMode.d.ts
@@ -0,0 +1,49 @@
+/**
+ * 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 type ImageResizeMode =
+  | 'cover'
+  | 'contain'
+  | 'stretch'
+  | 'repeat'
+  | 'center';
+
+/**
+ * @see ImageResizeMode.js
+ */
+export interface ImageResizeModeStatic {
+  /**
+   * contain - The image will be resized such that it will be completely
+   * visible, contained within the frame of the View.
+   */
+  contain: ImageResizeMode;
+  /**
+   * cover - The image will be resized such that the entire area of the view
+   * is covered by the image, potentially clipping parts of the image.
+   */
+  cover: ImageResizeMode;
+  /**
+   * stretch - The image will be stretched to fill the entire frame of the
+   * view without clipping.  This may change the aspect ratio of the image,
+   * distoring it.  Only supported on iOS.
+   */
+  stretch: ImageResizeMode;
+  /**
+   * center - The image will be scaled down such that it is completely visible,
+   * if bigger than the area of the view.
+   * The image will not be scaled up.
+   */
+  center: ImageResizeMode;
+
+  /**
+   * repeat - The image will be repeated to cover the frame of the View. The
+   * image will keep it's size and aspect ratio.
+   */
+  repeat: ImageResizeMode;
+}
diff --git a/Libraries/Image/ImageSource.d.ts b/Libraries/Image/ImageSource.d.ts
new file mode 100644
index 000000000000..0e163309a87a
--- /dev/null
+++ b/Libraries/Image/ImageSource.d.ts
@@ -0,0 +1,76 @@
+/**
+ * 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
+ */
+
+/*
+ * @see https://github.com/facebook/react-native/blob/master/Libraries/Image/ImageSource.js
+ */
+export interface ImageURISource {
+  /**
+   * `uri` is a string representing the resource identifier for the image, which
+   * could be an http address, a local file path, or the name of a static image
+   * resource (which should be wrapped in the `require('./path/to/image.png')`
+   * function).
+   */
+  uri?: string | undefined;
+  /**
+   * `bundle` is the iOS asset bundle which the image is included in. This
+   * will default to [NSBundle mainBundle] if not set.
+   * @platform ios
+   */
+  bundle?: string | undefined;
+  /**
+   * `method` is the HTTP Method to use. Defaults to GET if not specified.
+   */
+  method?: string | undefined;
+  /**
+   * `headers` is an object representing the HTTP headers to send along with the
+   * request for a remote image.
+   */
+  headers?: {[key: string]: string} | undefined;
+  /**
+   * `cache` determines how the requests handles potentially cached
+   * responses.
+   *
+   * - `default`: Use the native platforms default strategy. `useProtocolCachePolicy` on iOS.
+   *
+   * - `reload`: The data for the URL will be loaded from the originating source.
+   * No existing cache data should be used to satisfy a URL load request.
+   *
+   * - `force-cache`: The existing cached data will be used to satisfy the request,
+   * regardless of its age or expiration date. If there is no existing data in the cache
+   * corresponding the request, the data is loaded from the originating source.
+   *
+   * - `only-if-cached`: The existing cache data will be used to satisfy a request, regardless of
+   * its age or expiration date. If there is no existing data in the cache corresponding
+   * to a URL load request, no attempt is made to load the data from the originating source,
+   * and the load is considered to have failed.
+   *
+   * @platform ios
+   */
+  cache?: 'default' | 'reload' | 'force-cache' | 'only-if-cached' | undefined;
+  /**
+   * `body` is the HTTP body to send with the request. This must be a valid
+   * UTF-8 string, and will be sent exactly as specified, with no
+   * additional encoding (e.g. URL-escaping or base64) applied.
+   */
+  body?: string | undefined;
+  /**
+   * `width` and `height` can be specified if known at build time, in which case
+   * these will be used to set the default `<Image/>` component dimensions.
+   */
+  width?: number | undefined;
+  height?: number | undefined;
+  /**
+   * `scale` is used to indicate the scale factor of the image. Defaults to 1.0 if
+   * unspecified, meaning that one image pixel equates to one display point / DIP.
+   */
+  scale?: number | undefined;
+}
+
+export type ImageRequireSource = number;
diff --git a/Libraries/Image/ImageSource.js b/Libraries/Image/ImageSource.js
index 20966d581660..bbb32572125c 100644
--- a/Libraries/Image/ImageSource.js
+++ b/Libraries/Image/ImageSource.js
@@ -11,8 +11,6 @@
 'use strict';
 
 /**
- * Keep this in sync with `DeprecatedImageSourcePropType.js`.
- *
  * This type is intentionally inexact in order to permit call sites that supply
  * extra properties.
  */
diff --git a/Libraries/Image/ImageSourceUtils.js b/Libraries/Image/ImageSourceUtils.js
new file mode 100644
index 000000000000..16cd5eb538a8
--- /dev/null
+++ b/Libraries/Image/ImageSourceUtils.js
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+import type {ResolvedAssetSource} from './AssetSourceResolver';
+import type {ImageProps} from './ImageProps';
+
+import resolveAssetSource from './resolveAssetSource';
+
+/**
+ * A function which returns the appropriate value for image source
+ * by resolving the `source`, `src` and `srcSet` props.
+ */
+export function getImageSourcesFromImageProps(
+  imageProps: ImageProps,
+): ?ResolvedAssetSource | $ReadOnlyArray<{uri: string, ...}> {
+  let source = resolveAssetSource(imageProps.source);
+
+  let sources;
+
+  const {crossOrigin, referrerPolicy, src, srcSet, width, height} = imageProps;
+
+  const headers: {[string]: string} = {};
+  if (crossOrigin === 'use-credentials') {
+    headers['Access-Control-Allow-Credentials'] = 'true';
+  }
+  if (referrerPolicy != null) {
+    headers['Referrer-Policy'] = referrerPolicy;
+  }
+  if (srcSet != null) {
+    const sourceList = [];
+    const srcSetList = srcSet.split(', ');
+    // `src` prop should be used with default scale if `srcSet` does not have 1x scale.
+    let shouldUseSrcForDefaultScale = true;
+    srcSetList.forEach(imageSrc => {
+      const [uri, xScale = '1x'] = imageSrc.split(' ');
+      if (!xScale.endsWith('x')) {
+        console.warn(
+          'The provided format for scale is not supported yet. Please use scales like 1x, 2x, etc.',
+        );
+      } else {
+        const scale = parseInt(xScale.split('x')[0], 10);
+        if (!isNaN(scale)) {
+          // 1x scale is provided in `srcSet` prop so ignore the `src` prop if provided.
+          shouldUseSrcForDefaultScale =
+            scale === 1 ? false : shouldUseSrcForDefaultScale;
+          sourceList.push({headers: headers, scale, uri, width, height});
+        }
+      }
+    });
+
+    if (shouldUseSrcForDefaultScale && src != null) {
+      sourceList.push({
+        headers: headers,
+        scale: 1,
+        uri: src,
+        width,
+        height,
+      });
+    }
+    if (sourceList.length === 0) {
+      console.warn('The provided value for srcSet is not valid.');
+    }
+
+    sources = sourceList;
+  } else if (src != null) {
+    sources = [{uri: src, headers: headers, width, height}];
+  } else {
+    sources = source;
+  }
+  return sources;
+}
diff --git a/Libraries/Image/ImageUtils.js b/Libraries/Image/ImageUtils.js
new file mode 100644
index 000000000000..734f36c7e90b
--- /dev/null
+++ b/Libraries/Image/ImageUtils.js
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+type ResizeMode = 'cover' | 'contain' | 'stretch' | 'repeat' | 'center';
+
+export function convertObjectFitToResizeMode(objectFit: string): ResizeMode {
+  const objectFitMap = {
+    contain: 'contain',
+    cover: 'cover',
+    fill: 'stretch',
+    'scale-down': 'contain',
+  };
+  return objectFitMap[objectFit];
+}
diff --git a/Libraries/Image/ImageViewNativeComponent.js b/Libraries/Image/ImageViewNativeComponent.js
index ad724a5efb72..5c30ef718fc5 100644
--- a/Libraries/Image/ImageViewNativeComponent.js
+++ b/Libraries/Image/ImageViewNativeComponent.js
@@ -8,11 +8,7 @@
  * @format
  */
 
-import type {ResolvedAssetSource} from './AssetSourceResolver';
-import type {ImageProps} from './ImageProps';
 import type {ViewProps} from '../Components/View/ViewPropTypes';
-import * as NativeComponentRegistry from '../NativeComponent/NativeComponentRegistry';
-import {ConditionallyIgnoredEventHandlers} from '../NativeComponent/ViewConfigIgnore';
 import type {
   HostComponent,
   PartialViewConfig,
@@ -22,6 +18,11 @@ import type {
   DangerouslyImpreciseStyle,
   ImageStyleProp,
 } from '../StyleSheet/StyleSheet';
+import type {ResolvedAssetSource} from './AssetSourceResolver';
+import type {ImageProps} from './ImageProps';
+
+import * as NativeComponentRegistry from '../NativeComponent/NativeComponentRegistry';
+import {ConditionallyIgnoredEventHandlers} from '../NativeComponent/ViewConfigIgnore';
 import Platform from '../Utilities/Platform';
 
 type Props = $ReadOnly<{
@@ -35,7 +36,9 @@ type Props = $ReadOnly<{
 
   // Android native props
   shouldNotifyLoadEvents?: boolean,
-  src?: ?ResolvedAssetSource | $ReadOnlyArray<{uri: string, ...}>,
+  src?:
+    | ?ResolvedAssetSource
+    | ?$ReadOnlyArray<?$ReadOnly<{uri?: ?string, ...}>>,
   headers?: ?{[string]: string},
   defaultSrc?: ?string,
   loadingIndicatorSrc?: ?string,
diff --git a/Libraries/Image/ImageViewNativeComponent.js.flow b/Libraries/Image/ImageViewNativeComponent.js.flow
new file mode 100644
index 000000000000..f5ca83225d55
--- /dev/null
+++ b/Libraries/Image/ImageViewNativeComponent.js.flow
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {ResolvedAssetSource} from './AssetSourceResolver';
+import type {ImageProps} from './ImageProps';
+import type {ViewProps} from '../Components/View/ViewPropTypes';
+import {ConditionallyIgnoredEventHandlers} from '../NativeComponent/ViewConfigIgnore';
+import type {
+  HostComponent,
+  PartialViewConfig,
+} from '../Renderer/shims/ReactNativeTypes';
+import type {
+  ColorValue,
+  DangerouslyImpreciseStyle,
+  ImageStyleProp,
+} from '../StyleSheet/StyleSheet';
+import Platform from '../Utilities/Platform';
+
+type Props = $ReadOnly<{
+  ...ImageProps,
+  ...ViewProps,
+
+  style?: ImageStyleProp | DangerouslyImpreciseStyle,
+
+  // iOS native props
+  tintColor?: ColorValue,
+
+  // Android native props
+  shouldNotifyLoadEvents?: boolean,
+  src?:
+    | ?ResolvedAssetSource
+    | ?$ReadOnlyArray<?$ReadOnly<{uri?: ?string, ...}>>,
+  headers?: ?{[string]: string},
+  defaultSrc?: ?string,
+  loadingIndicatorSrc?: ?string,
+}>;
+
+declare export default HostComponent<Props>;
diff --git a/Libraries/Image/NativeImageEditor.js b/Libraries/Image/NativeImageEditor.js
index e17f836e3a1d..543afac65de5 100644
--- a/Libraries/Image/NativeImageEditor.js
+++ b/Libraries/Image/NativeImageEditor.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 type Options = {|
diff --git a/Libraries/Image/NativeImageLoaderAndroid.js b/Libraries/Image/NativeImageLoaderAndroid.js
index dcc3db261573..121de3bc99e3 100644
--- a/Libraries/Image/NativeImageLoaderAndroid.js
+++ b/Libraries/Image/NativeImageLoaderAndroid.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Image/NativeImageLoaderIOS.js b/Libraries/Image/NativeImageLoaderIOS.js
index 18a4703d886b..b46a43be5807 100644
--- a/Libraries/Image/NativeImageLoaderIOS.js
+++ b/Libraries/Image/NativeImageLoaderIOS.js
@@ -10,6 +10,7 @@
 
 import type {RootTag} from '../TurboModule/RCTExport';
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Image/NativeImagePickerIOS.js b/Libraries/Image/NativeImagePickerIOS.js
deleted file mode 100644
index 9e641f206a95..000000000000
--- a/Libraries/Image/NativeImagePickerIOS.js
+++ /dev/null
@@ -1,38 +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);
diff --git a/Libraries/Image/NativeImageStoreAndroid.js b/Libraries/Image/NativeImageStoreAndroid.js
index 7dc4ed58e05c..68644b9a2df5 100644
--- a/Libraries/Image/NativeImageStoreAndroid.js
+++ b/Libraries/Image/NativeImageStoreAndroid.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Image/NativeImageStoreIOS.js b/Libraries/Image/NativeImageStoreIOS.js
index 7a057f0ad377..332b7bc9fbed 100644
--- a/Libraries/Image/NativeImageStoreIOS.js
+++ b/Libraries/Image/NativeImageStoreIOS.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Image/RCTAnimatedImage.m b/Libraries/Image/RCTAnimatedImage.m
index 158d7a2b657e..e0452b72ae4c 100644
--- a/Libraries/Image/RCTAnimatedImage.m
+++ b/Libraries/Image/RCTAnimatedImage.m
@@ -49,7 +49,10 @@ - (instancetype)initWithData:(NSData *)data scale:(CGFloat)scale
     }
     self = [super initWithCGImage:image.CGImage scale:MAX(scale, 1) orientation:image.imageOrientation];
 
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didReceiveMemoryWarning:) name:UIApplicationDidReceiveMemoryWarningNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(didReceiveMemoryWarning:)
+                                                 name:UIApplicationDidReceiveMemoryWarningNotification
+                                               object:nil];
   }
 
   return self;
@@ -89,7 +92,7 @@ - (NSUInteger)imageLoopCountWithSource:(CGImageSourceRef)source
       loopCount = gifLoopCount.unsignedIntegerValue;
       if (@available(iOS 14, *)) {
       } else {
-      // A loop count of 1 means it should animate twice, 2 means, thrice, etc.
+        // A loop count of 1 means it should animate twice, 2 means, thrice, etc.
         if (loopCount != 0) {
           loopCount++;
         }
diff --git a/Libraries/Image/RCTDisplayWeakRefreshable.m b/Libraries/Image/RCTDisplayWeakRefreshable.m
index 20631dd53cbe..436f624d2679 100644
--- a/Libraries/Image/RCTDisplayWeakRefreshable.m
+++ b/Libraries/Image/RCTDisplayWeakRefreshable.m
@@ -9,7 +9,8 @@
 
 @implementation RCTDisplayWeakRefreshable
 
-+ (CADisplayLink *)displayLinkWithWeakRefreshable:(id<RCTDisplayRefreshable>)refreshable {
++ (CADisplayLink *)displayLinkWithWeakRefreshable:(id<RCTDisplayRefreshable>)refreshable
+{
   RCTDisplayWeakRefreshable *target = [[RCTDisplayWeakRefreshable alloc] initWithRefreshable:refreshable];
   return [CADisplayLink displayLinkWithTarget:target selector:@selector(displayDidRefresh:)];
 }
@@ -22,7 +23,8 @@ - (instancetype)initWithRefreshable:(id<RCTDisplayRefreshable>)refreshable
   return self;
 }
 
-- (void)displayDidRefresh:(CADisplayLink *)displayLink {
+- (void)displayDidRefresh:(CADisplayLink *)displayLink
+{
   [_refreshable displayDidRefresh:displayLink];
 }
 
diff --git a/Libraries/Image/RCTGIFImageDecoder.mm b/Libraries/Image/RCTGIFImageDecoder.mm
index a7d101b0825c..ca66cda7eb02 100644
--- a/Libraries/Image/RCTGIFImageDecoder.mm
+++ b/Libraries/Image/RCTGIFImageDecoder.mm
@@ -15,7 +15,7 @@
 
 #import "RCTImagePlugins.h"
 
-@interface RCTGIFImageDecoder() <RCTTurboModule>
+@interface RCTGIFImageDecoder () <RCTTurboModule>
 @end
 
 @implementation RCTGIFImageDecoder
@@ -40,11 +40,13 @@ - (RCTImageLoaderCancellationBlock)decodeImageData:(NSData *)imageData
 
   if (!image) {
     completionHandler(nil, nil);
-    return ^{};
+    return ^{
+    };
   }
 
   completionHandler(nil, image);
-  return ^{};
+  return ^{
+  };
 }
 
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
@@ -55,6 +57,7 @@ - (RCTImageLoaderCancellationBlock)decodeImageData:(NSData *)imageData
 
 @end
 
-Class RCTGIFImageDecoderCls() {
+Class RCTGIFImageDecoderCls()
+{
   return RCTGIFImageDecoder.class;
 }
diff --git a/Libraries/Image/RCTImageBlurUtils.m b/Libraries/Image/RCTImageBlurUtils.m
index d40cd2d0da5c..c17e41ddde17 100644
--- a/Libraries/Image/RCTImageBlurUtils.m
+++ b/Libraries/Image/RCTImageBlurUtils.m
@@ -18,17 +18,17 @@
     return inputImage;
   }
 
-  //convert to ARGB if it isn't
-  if (CGImageGetBitsPerPixel(imageRef) != 32 ||
-      CGImageGetBitsPerComponent(imageRef) != 8 ||
+  // convert to ARGB if it isn't
+  if (CGImageGetBitsPerPixel(imageRef) != 32 || CGImageGetBitsPerComponent(imageRef) != 8 ||
       !((CGImageGetBitmapInfo(imageRef) & kCGBitmapAlphaInfoMask))) {
     UIGraphicsImageRendererFormat *const rendererFormat = [UIGraphicsImageRendererFormat defaultFormat];
     rendererFormat.scale = inputImage.scale;
-    UIGraphicsImageRenderer *const renderer = [[UIGraphicsImageRenderer alloc] initWithSize:inputImage.size format:rendererFormat];
+    UIGraphicsImageRenderer *const renderer = [[UIGraphicsImageRenderer alloc] initWithSize:inputImage.size
+                                                                                     format:rendererFormat];
 
     imageRef = [renderer imageWithActions:^(UIGraphicsImageRendererContext *_Nonnull context) {
-      [inputImage drawAtPoint:CGPointZero];
-    }].CGImage;
+                 [inputImage drawAtPoint:CGPointZero];
+               }].CGImage;
   }
 
   vImage_Buffer buffer1, buffer2;
@@ -52,9 +52,9 @@
   uint32_t boxSize = floor((radius * imageScale * 3 * sqrt(2 * M_PI) / 4 + 0.5) / 2);
   boxSize |= 1; // Ensure boxSize is odd
 
-  //create temp buffer
-  vImage_Error tempBufferSize = vImageBoxConvolve_ARGB8888(&buffer1, &buffer2, NULL, 0, 0, boxSize, boxSize,
-                                                           NULL, kvImageGetTempBufferSize | kvImageEdgeExtend);
+  // create temp buffer
+  vImage_Error tempBufferSize = vImageBoxConvolve_ARGB8888(
+      &buffer1, &buffer2, NULL, 0, 0, boxSize, boxSize, NULL, kvImageGetTempBufferSize | kvImageEdgeExtend);
   if (tempBufferSize < 0) {
     free(buffer1.data);
     free(buffer2.data);
@@ -67,26 +67,31 @@
     return inputImage;
   }
 
-  //copy image data
+  // copy image data
   CFDataRef dataSource = CGDataProviderCopyData(CGImageGetDataProvider(imageRef));
   memcpy(buffer1.data, CFDataGetBytePtr(dataSource), bytes);
   CFRelease(dataSource);
 
-  //perform blur
+  // perform blur
   vImageBoxConvolve_ARGB8888(&buffer1, &buffer2, tempBuffer, 0, 0, boxSize, boxSize, NULL, kvImageEdgeExtend);
   vImageBoxConvolve_ARGB8888(&buffer2, &buffer1, tempBuffer, 0, 0, boxSize, boxSize, NULL, kvImageEdgeExtend);
   vImageBoxConvolve_ARGB8888(&buffer1, &buffer2, tempBuffer, 0, 0, boxSize, boxSize, NULL, kvImageEdgeExtend);
 
-  //free buffers
+  // free buffers
   free(buffer2.data);
   free(tempBuffer);
 
-  //create image context from buffer
-  CGContextRef ctx = CGBitmapContextCreate(buffer1.data, buffer1.width, buffer1.height,
-                                           8, buffer1.rowBytes, CGImageGetColorSpace(imageRef),
-                                           CGImageGetBitmapInfo(imageRef));
+  // create image context from buffer
+  CGContextRef ctx = CGBitmapContextCreate(
+      buffer1.data,
+      buffer1.width,
+      buffer1.height,
+      8,
+      buffer1.rowBytes,
+      CGImageGetColorSpace(imageRef),
+      CGImageGetBitmapInfo(imageRef));
 
-  //create image from context
+  // create image from context
   imageRef = CGBitmapContextCreateImage(ctx);
   UIImage *outputImage = [UIImage imageWithCGImage:imageRef scale:imageScale orientation:imageOrientation];
   CGImageRelease(imageRef);
diff --git a/Libraries/Image/RCTImageCache.h b/Libraries/Image/RCTImageCache.h
index b85de924e221..d90de9b7134f 100644
--- a/Libraries/Image/RCTImageCache.h
+++ b/Libraries/Image/RCTImageCache.h
@@ -5,15 +5,16 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 #import <React/RCTResizeMode.h>
 
 @interface UIImage (React)
 
 /**
- * Memory bytes of the image with the default calculation of static image or GIF. Custom calculations of decoded bytes can be assigned manually.
+ * Memory bytes of the image with the default calculation of static image or GIF. Custom calculations of decoded bytes
+ * can be assigned manually.
  */
 @property (nonatomic, assign) NSInteger reactDecodedImageBytes;
 
@@ -24,10 +25,7 @@
  */
 @protocol RCTImageCache <NSObject>
 
-- (UIImage *)imageForUrl:(NSString *)url
-                    size:(CGSize)size
-                   scale:(CGFloat)scale
-              resizeMode:(RCTResizeMode)resizeMode;
+- (UIImage *)imageForUrl:(NSString *)url size:(CGSize)size scale:(CGFloat)scale resizeMode:(RCTResizeMode)resizeMode;
 
 - (void)addImageToCache:(UIImage *)image
                     URL:(NSString *)url
@@ -40,6 +38,8 @@
 
 @interface RCTImageCache : NSObject <RCTImageCache>
 
-RCT_EXTERN void RCTSetImageCacheLimits(NSUInteger maxCachableDecodedImageSizeInBytes, NSUInteger imageCacheTotalCostLimit);
+RCT_EXTERN void RCTSetImageCacheLimits(
+    NSUInteger maxCachableDecodedImageSizeInBytes,
+    NSUInteger imageCacheTotalCostLimit);
 
 @end
diff --git a/Libraries/Image/RCTImageCache.m b/Libraries/Image/RCTImageCache.m
index 76e28cf947de..5a061516cf96 100644
--- a/Libraries/Image/RCTImageCache.m
+++ b/Libraries/Image/RCTImageCache.m
@@ -13,28 +13,27 @@
 
 #import <React/RCTConvert.h>
 #import <React/RCTNetworking.h>
-#import <React/RCTUtils.h>
 #import <React/RCTResizeMode.h>
+#import <React/RCTUtils.h>
 
 #import <React/RCTImageUtils.h>
 
-static NSUInteger RCTMaxCachableDecodedImageSizeInBytes = 2*1024*1024;
-static NSUInteger RCTImageCacheTotalCostLimit = 20*1024*1024;
+static NSUInteger RCTMaxCachableDecodedImageSizeInBytes = 2 * 1024 * 1024;
+static NSUInteger RCTImageCacheTotalCostLimit = 20 * 1024 * 1024;
 
-void RCTSetImageCacheLimits(NSUInteger maxCachableDecodedImageSizeInBytes, NSUInteger imageCacheTotalCostLimit) {
+void RCTSetImageCacheLimits(NSUInteger maxCachableDecodedImageSizeInBytes, NSUInteger imageCacheTotalCostLimit)
+{
   RCTMaxCachableDecodedImageSizeInBytes = maxCachableDecodedImageSizeInBytes;
   RCTImageCacheTotalCostLimit = imageCacheTotalCostLimit;
 }
 
-static NSString *RCTCacheKeyForImage(NSString *imageTag, CGSize size, CGFloat scale,
-                                     RCTResizeMode resizeMode)
+static NSString *RCTCacheKeyForImage(NSString *imageTag, CGSize size, CGFloat scale, RCTResizeMode resizeMode)
 {
-  return [NSString stringWithFormat:@"%@|%g|%g|%g|%lld",
-          imageTag, size.width, size.height, scale, (long long)resizeMode];
+  return
+      [NSString stringWithFormat:@"%@|%g|%g|%g|%lld", imageTag, size.width, size.height, scale, (long long)resizeMode];
 }
 
-@implementation RCTImageCache
-{
+@implementation RCTImageCache {
   NSOperationQueue *_imageDecodeQueue;
   NSCache *_decodedImageCache;
   NSMutableDictionary *_cacheStaleTimes;
@@ -68,24 +67,18 @@ - (void)clearCache
   }
 }
 
-- (void)addImageToCache:(UIImage *)image
-                 forKey:(NSString *)cacheKey
+- (void)addImageToCache:(UIImage *)image forKey:(NSString *)cacheKey
 {
   if (!image) {
     return;
   }
   NSInteger bytes = image.reactDecodedImageBytes;
   if (bytes <= RCTMaxCachableDecodedImageSizeInBytes) {
-    [self->_decodedImageCache setObject:image
-                                 forKey:cacheKey
-                                   cost:bytes];
+    [self->_decodedImageCache setObject:image forKey:cacheKey cost:bytes];
   }
 }
 
-- (UIImage *)imageForUrl:(NSString *)url
-                    size:(CGSize)size
-                   scale:(CGFloat)scale
-              resizeMode:(RCTResizeMode)resizeMode
+- (UIImage *)imageForUrl:(NSString *)url size:(CGSize)size scale:(CGFloat)scale resizeMode:(RCTResizeMode)resizeMode
 {
   NSString *cacheKey = RCTCacheKeyForImage(url, size, scale, resizeMode);
   @synchronized(_cacheStaleTimes) {
@@ -118,7 +111,8 @@ - (void)addImageToCache:(UIImage *)image
     NSDate *staleTime;
     NSArray<NSString *> *components = [cacheControl componentsSeparatedByString:@","];
     for (NSString *component in components) {
-      if ([component containsString:@"no-cache"] || [component containsString:@"no-store"] || [component hasSuffix:@"max-age=0"]) {
+      if ([component containsString:@"no-cache"] || [component containsString:@"no-store"] ||
+          [component hasSuffix:@"max-age=0"]) {
         shouldCache = NO;
         break;
       } else {
@@ -153,7 +147,8 @@ - (void)addImageToCache:(UIImage *)image
   }
 }
 
-- (NSDate *)dateWithHeaderString:(NSString *)headerDateString {
+- (NSDate *)dateWithHeaderString:(NSString *)headerDateString
+{
   static NSDateFormatter *formatter;
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
diff --git a/Libraries/Image/RCTImageDataDecoder.h b/Libraries/Image/RCTImageDataDecoder.h
index 1d126aab5f89..1f52b4a07e7f 100644
--- a/Libraries/Image/RCTImageDataDecoder.h
+++ b/Libraries/Image/RCTImageDataDecoder.h
@@ -8,9 +8,9 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTBridge.h>
+#import <React/RCTImageURLLoader.h>
 #import <React/RCTResizeMode.h>
 #import <React/RCTURLRequestHandler.h>
-#import <React/RCTImageURLLoader.h>
 
 /**
  * Provides the interface needed to register an image decoder. Image decoders
diff --git a/Libraries/Image/RCTImageEditingManager.mm b/Libraries/Image/RCTImageEditingManager.mm
index 1f75fe3006f8..9fe7f2238d22 100644
--- a/Libraries/Image/RCTImageEditingManager.mm
+++ b/Libraries/Image/RCTImageEditingManager.mm
@@ -10,16 +10,16 @@
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTConvert.h>
 #import <React/RCTImageLoader.h>
+#import <React/RCTImageLoaderProtocol.h>
 #import <React/RCTImageStoreManager.h>
 #import <React/RCTImageUtils.h>
-#import <React/RCTImageLoaderProtocol.h>
 #import <React/RCTLog.h>
 #import <React/RCTUtils.h>
 #import <UIKit/UIKit.h>
 
 #import "RCTImagePlugins.h"
 
-@interface RCTImageEditingManager() <NativeImageEditorSpec>
+@interface RCTImageEditingManager () <NativeImageEditorSpec>
 @end
 
 @implementation RCTImageEditingManager
@@ -38,19 +38,20 @@ @implementation RCTImageEditingManager
  *        be scaled down to `displaySize` rather than `size`.
  *        All units are in px (not points).
  */
-RCT_EXPORT_METHOD(cropImage:(NSURLRequest *)imageRequest
-                  cropData:(JS::NativeImageEditor::Options &)cropData
-                  successCallback:(RCTResponseSenderBlock)successCallback
-                  errorCallback:(RCTResponseSenderBlock)errorCallback)
+RCT_EXPORT_METHOD(cropImage
+                  : (NSURLRequest *)imageRequest cropData
+                  : (JS::NativeImageEditor::Options &)cropData successCallback
+                  : (RCTResponseSenderBlock)successCallback errorCallback
+                  : (RCTResponseSenderBlock)errorCallback)
 {
   CGRect rect = {
     [RCTConvert CGPoint:@{
-      @"x": @(cropData.offset().x()),
-      @"y": @(cropData.offset().y()),
+      @"x" : @(cropData.offset().x()),
+      @"y" : @(cropData.offset().y()),
     }],
     [RCTConvert CGSize:@{
-      @"width": @(cropData.size().width()),
-      @"height": @(cropData.size().height()),
+      @"width" : @(cropData.size().width()),
+      @"height" : @(cropData.size().height()),
     }]
   };
 
@@ -58,47 +59,55 @@ @implementation RCTImageEditingManager
   JS::NativeImageEditor::Options cropDataCopy = cropData;
 
   [[_moduleRegistry moduleForName:"ImageLoader"]
-   loadImageWithURLRequest:imageRequest callback:^(NSError *error, UIImage *image) {
-     if (error) {
-       errorCallback(@[RCTJSErrorFromNSError(error)]);
-       return;
-     }
-
-     // Crop image
-     CGSize targetSize = rect.size;
-     CGRect targetRect = {{-rect.origin.x, -rect.origin.y}, image.size};
-     CGAffineTransform transform = RCTTransformFromTargetRect(image.size, targetRect);
-     UIImage *croppedImage = RCTTransformImage(image, targetSize, image.scale, transform);
-
-     // Scale image
-     if (cropDataCopy.displaySize()) {
-       targetSize = [RCTConvert CGSize:@{@"width": @(cropDataCopy.displaySize()->width()), @"height": @(cropDataCopy.displaySize()->height())}]; // in pixels
-       RCTResizeMode resizeMode = [RCTConvert RCTResizeMode:cropDataCopy.resizeMode() ?: @"contain"];
-       targetRect = RCTTargetRect(croppedImage.size, targetSize, 1, resizeMode);
-       transform = RCTTransformFromTargetRect(croppedImage.size, targetRect);
-       croppedImage = RCTTransformImage(croppedImage, targetSize, image.scale, transform);
-     }
-
-     // Store image
-     [[self->_moduleRegistry moduleForName:"ImageStoreManager"] storeImage:croppedImage withBlock:^(NSString *croppedImageTag) {
-       if (!croppedImageTag) {
-         NSString *errorMessage = @"Error storing cropped image in RCTImageStoreManager";
-         RCTLogWarn(@"%@", errorMessage);
-         errorCallback(@[RCTJSErrorFromNSError(RCTErrorWithMessage(errorMessage))]);
-         return;
-       }
-       successCallback(@[croppedImageTag]);
-     }];
-   }];
+      loadImageWithURLRequest:imageRequest
+                     callback:^(NSError *error, UIImage *image) {
+                       if (error) {
+                         errorCallback(@[ RCTJSErrorFromNSError(error) ]);
+                         return;
+                       }
+
+                       // Crop image
+                       CGSize targetSize = rect.size;
+                       CGRect targetRect = {{-rect.origin.x, -rect.origin.y}, image.size};
+                       CGAffineTransform transform = RCTTransformFromTargetRect(image.size, targetRect);
+                       UIImage *croppedImage = RCTTransformImage(image, targetSize, image.scale, transform);
+
+                       // Scale image
+                       if (cropDataCopy.displaySize()) {
+                         targetSize = [RCTConvert CGSize:@{
+                           @"width" : @(cropDataCopy.displaySize()->width()),
+                           @"height" : @(cropDataCopy.displaySize()->height())
+                         }]; // in pixels
+                         RCTResizeMode resizeMode = [RCTConvert RCTResizeMode:cropDataCopy.resizeMode() ?: @"contain"];
+                         targetRect = RCTTargetRect(croppedImage.size, targetSize, 1, resizeMode);
+                         transform = RCTTransformFromTargetRect(croppedImage.size, targetRect);
+                         croppedImage = RCTTransformImage(croppedImage, targetSize, image.scale, transform);
+                       }
+
+                       // Store image
+                       [[self->_moduleRegistry moduleForName:"ImageStoreManager"]
+                           storeImage:croppedImage
+                            withBlock:^(NSString *croppedImageTag) {
+                              if (!croppedImageTag) {
+                                NSString *errorMessage = @"Error storing cropped image in RCTImageStoreManager";
+                                RCTLogWarn(@"%@", errorMessage);
+                                errorCallback(@[ RCTJSErrorFromNSError(RCTErrorWithMessage(errorMessage)) ]);
+                                return;
+                              }
+                              successCallback(@[ croppedImageTag ]);
+                            }];
+                     }];
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   return std::make_shared<facebook::react::NativeImageEditorSpecJSI>(params);
 }
 
 @end
 
-Class RCTImageEditingManagerCls() {
+Class RCTImageEditingManagerCls()
+{
   return RCTImageEditingManager.class;
 }
diff --git a/Libraries/Image/RCTImageLoader.h b/Libraries/Image/RCTImageLoader.h
index c24d5ad384b3..592785573066 100644
--- a/Libraries/Image/RCTImageLoader.h
+++ b/Libraries/Image/RCTImageLoader.h
@@ -9,20 +9,20 @@
 
 #import <React/RCTBridge.h>
 #import <React/RCTDefines.h>
-#import <React/RCTResizeMode.h>
-#import <React/RCTURLRequestHandler.h>
-#import <React/RCTImageDataDecoder.h>
-#import <React/RCTImageURLLoader.h>
 #import <React/RCTImageCache.h>
-#import <React/RCTImageLoaderProtocol.h>
+#import <React/RCTImageDataDecoder.h>
 #import <React/RCTImageLoaderLoggable.h>
+#import <React/RCTImageLoaderProtocol.h>
+#import <React/RCTImageURLLoader.h>
+#import <React/RCTResizeMode.h>
+#import <React/RCTURLRequestHandler.h>
 
 @interface RCTImageLoader : NSObject <RCTBridgeModule, RCTImageLoaderProtocol, RCTImageLoaderLoggableProtocol>
 - (instancetype)init;
 - (instancetype)initWithRedirectDelegate:(id<RCTImageRedirectProtocol>)redirectDelegate NS_DESIGNATED_INITIALIZER;
 - (instancetype)initWithRedirectDelegate:(id<RCTImageRedirectProtocol>)redirectDelegate
-                              loadersProvider:(NSArray<id<RCTImageURLLoader>> * (^)(RCTModuleRegistry *))getLoaders
-                             decodersProvider:(NSArray<id<RCTImageDataDecoder>> * (^)(RCTModuleRegistry *))getDecoders;
+                         loadersProvider:(NSArray<id<RCTImageURLLoader>> * (^)(RCTModuleRegistry *))getLoaders
+                        decodersProvider:(NSArray<id<RCTImageDataDecoder>> * (^)(RCTModuleRegistry *))getDecoders;
 @end
 
 /**
diff --git a/Libraries/Image/RCTImageLoader.mm b/Libraries/Image/RCTImageLoader.mm
index 85a1fbae64c4..bfcdf26a5d3c 100644
--- a/Libraries/Image/RCTImageLoader.mm
+++ b/Libraries/Image/RCTImageLoader.mm
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#import <mach/mach_time.h>
 #import <objc/runtime.h>
 #import <atomic>
-#import <mach/mach_time.h>
 
 #import <ImageIO/ImageIO.h>
 
@@ -56,16 +56,18 @@ static uint64_t monotonicTimeGetCurrentNanoseconds(void)
   return (mach_absolute_time() * tb_info.numer) / tb_info.denom;
 }
 
-static NSError* addResponseHeadersToError(NSError* originalError, NSHTTPURLResponse* response) {
-    NSMutableDictionary<NSString*, id>* _userInfo =  (NSMutableDictionary<NSString*, id>*)originalError.userInfo.mutableCopy;
-    _userInfo[@"httpStatusCode"] = [NSNumber numberWithInt:response.statusCode];
-    _userInfo[@"httpResponseHeaders"] = response.allHeaderFields;
-    NSError *error = [NSError errorWithDomain:originalError.domain code:originalError.code userInfo:_userInfo];
-    
-    return error;
+static NSError *addResponseHeadersToError(NSError *originalError, NSHTTPURLResponse *response)
+{
+  NSMutableDictionary<NSString *, id> *_userInfo =
+      (NSMutableDictionary<NSString *, id> *)originalError.userInfo.mutableCopy;
+  _userInfo[@"httpStatusCode"] = [NSNumber numberWithInt:response.statusCode];
+  _userInfo[@"httpResponseHeaders"] = response.allHeaderFields;
+  NSError *error = [NSError errorWithDomain:originalError.domain code:originalError.code userInfo:_userInfo];
+
+  return error;
 }
 
-@interface RCTImageLoader() <NativeImageLoaderIOSSpec, RCTImageLoaderWithAttributionProtocol>
+@interface RCTImageLoader () <NativeImageLoaderIOSSpec, RCTImageLoaderWithAttributionProtocol>
 
 @end
 
@@ -87,8 +89,7 @@ - (void)setReactDecodedImageBytes:(NSInteger)bytes
 
 @end
 
-@implementation RCTImageLoader
-{
+@implementation RCTImageLoader {
   NSArray<id<RCTImageURLLoader>> * (^_loadersProvider)(RCTModuleRegistry *);
   NSArray<id<RCTImageDataDecoder>> * (^_decodersProvider)(RCTModuleRegistry *);
   NSArray<id<RCTImageURLLoader>> *_loaders;
@@ -161,7 +162,7 @@ - (float)handlerPriority
 - (id<RCTImageCache>)imageCache
 {
   if (!_imageCache) {
-    //set up with default cache
+    // set up with default cache
     _imageCache = [RCTImageCache new];
   }
   return _imageCache;
@@ -184,7 +185,6 @@ - (void)setImageCache:(id<RCTImageCache>)cache
   if (!_loaders) {
     std::unique_lock<std::mutex> guard(_loadersMutex);
     if (!_loaders) {
-
       // Get loaders, sorted in reverse priority order (highest priority first)
       if (_loadersProvider) {
         _loaders = _loadersProvider(self.moduleRegistry);
@@ -193,17 +193,18 @@ - (void)setImageCache:(id<RCTImageCache>)cache
         _loaders = [_bridge modulesConformingToProtocol:@protocol(RCTImageURLLoader)];
       }
 
-      _loaders = [_loaders sortedArrayUsingComparator:^NSComparisonResult(id<RCTImageURLLoader> a, id<RCTImageURLLoader> b) {
-        float priorityA = [a respondsToSelector:@selector(loaderPriority)] ? [a loaderPriority] : 0;
-        float priorityB = [b respondsToSelector:@selector(loaderPriority)] ? [b loaderPriority] : 0;
-        if (priorityA > priorityB) {
-          return NSOrderedAscending;
-        } else if (priorityA < priorityB) {
-          return NSOrderedDescending;
-        } else {
-          return NSOrderedSame;
-        }
-      }];
+      _loaders =
+          [_loaders sortedArrayUsingComparator:^NSComparisonResult(id<RCTImageURLLoader> a, id<RCTImageURLLoader> b) {
+            float priorityA = [a respondsToSelector:@selector(loaderPriority)] ? [a loaderPriority] : 0;
+            float priorityB = [b respondsToSelector:@selector(loaderPriority)] ? [b loaderPriority] : 0;
+            if (priorityA > priorityB) {
+              return NSOrderedAscending;
+            } else if (priorityA < priorityB) {
+              return NSOrderedDescending;
+            } else {
+              return NSOrderedSame;
+            }
+          }];
     }
   }
 
@@ -219,10 +220,14 @@ - (void)setImageCache:(id<RCTImageCache>)cache
       if ([loader canLoadImageURL:URL]) {
         if (previousLoader) {
           if (priority == previousPriority) {
-            RCTLogError(@"The RCTImageURLLoaders %@ and %@ both reported that"
-                        " they can load the URL %@, and have equal priority"
-                        " (%g). This could result in non-deterministic behavior.",
-                        loader, previousLoader, URL, priority);
+            RCTLogError(
+                @"The RCTImageURLLoaders %@ and %@ both reported that"
+                 " they can load the URL %@, and have equal priority"
+                 " (%g). This could result in non-deterministic behavior.",
+                loader,
+                previousLoader,
+                URL,
+                priority);
           }
         } else {
           previousLoader = loader;
@@ -242,7 +247,7 @@ - (void)setImageCache:(id<RCTImageCache>)cache
   return nil;
 }
 
-# pragma mark - Private Image Decoding & Resizing
+#pragma mark - Private Image Decoding & Resizing
 
 - (id<RCTImageDataDecoder>)imageDataDecoderForData:(NSData *)data
 {
@@ -260,17 +265,18 @@ - (void)setImageCache:(id<RCTImageCache>)cache
       _decoders = [_bridge modulesConformingToProtocol:@protocol(RCTImageDataDecoder)];
     }
 
-    _decoders = [_decoders sortedArrayUsingComparator:^NSComparisonResult(id<RCTImageDataDecoder> a, id<RCTImageDataDecoder> b) {
-      float priorityA = [a respondsToSelector:@selector(decoderPriority)] ? [a decoderPriority] : 0;
-      float priorityB = [b respondsToSelector:@selector(decoderPriority)] ? [b decoderPriority] : 0;
-      if (priorityA > priorityB) {
-        return NSOrderedAscending;
-      } else if (priorityA < priorityB) {
-        return NSOrderedDescending;
-      } else {
-        return NSOrderedSame;
-      }
-    }];
+    _decoders = [_decoders
+        sortedArrayUsingComparator:^NSComparisonResult(id<RCTImageDataDecoder> a, id<RCTImageDataDecoder> b) {
+          float priorityA = [a respondsToSelector:@selector(decoderPriority)] ? [a decoderPriority] : 0;
+          float priorityB = [b respondsToSelector:@selector(decoderPriority)] ? [b decoderPriority] : 0;
+          if (priorityA > priorityB) {
+            return NSOrderedAscending;
+          } else if (priorityA < priorityB) {
+            return NSOrderedDescending;
+          } else {
+            return NSOrderedSame;
+          }
+        }];
   }
 
   if (RCT_DEBUG) {
@@ -285,11 +291,16 @@ - (void)setImageCache:(id<RCTImageCache>)cache
       if ([decoder canDecodeImageData:data]) {
         if (previousDecoder) {
           if (priority == previousPriority) {
-            RCTLogError(@"The RCTImageDataDecoders %@ and %@ both reported that"
-                        " they can decode the data <NSData %p; %tu bytes>, and"
-                        " have equal priority (%g). This could result in"
-                        " non-deterministic behavior.",
-                        decoder, previousDecoder, data, data.length, priority);
+            RCTLogError(
+                @"The RCTImageDataDecoders %@ and %@ both reported that"
+                 " they can decode the data <NSData %p; %tu bytes>, and"
+                 " have equal priority (%g). This could result in"
+                 " non-deterministic behavior.",
+                decoder,
+                previousDecoder,
+                data,
+                data.length,
+                priority);
           }
         } else {
           previousDecoder = decoder;
@@ -309,13 +320,9 @@ - (void)setImageCache:(id<RCTImageCache>)cache
   return nil;
 }
 
-static UIImage *RCTResizeImageIfNeeded(UIImage *image,
-                                       CGSize size,
-                                       CGFloat scale,
-                                       RCTResizeMode resizeMode)
+static UIImage *RCTResizeImageIfNeeded(UIImage *image, CGSize size, CGFloat scale, RCTResizeMode resizeMode)
 {
-  if (CGSizeEqualToSize(size, CGSizeZero) ||
-      CGSizeEqualToSize(image.size, CGSizeZero) ||
+  if (CGSizeEqualToSize(size, CGSizeZero) || CGSizeEqualToSize(image.size, CGSizeZero) ||
       CGSizeEqualToSize(image.size, size)) {
     return image;
   }
@@ -330,23 +337,22 @@ - (void)setImageCache:(id<RCTImageCache>)cache
 - (nullable RCTImageLoaderCancellationBlock)loadImageWithURLRequest:(NSURLRequest *)imageURLRequest
                                                            callback:(RCTImageLoaderCompletionBlock)callback
 {
-    return [self loadImageWithURLRequest:imageURLRequest
-                                priority:RCTImageLoaderPriorityImmediate
-                                callback:callback];
+  return [self loadImageWithURLRequest:imageURLRequest priority:RCTImageLoaderPriorityImmediate callback:callback];
 }
 
 - (nullable RCTImageLoaderCancellationBlock)loadImageWithURLRequest:(NSURLRequest *)imageURLRequest
                                                            priority:(RCTImageLoaderPriority)priority
-                                                           callback:(RCTImageLoaderCompletionBlock)callback {
-    return [self loadImageWithURLRequest:imageURLRequest
-                                    size:CGSizeZero
-                                   scale:1
-                                 clipped:YES
-                              resizeMode:RCTResizeModeStretch
-                                priority:priority
-                           progressBlock:nil
-                        partialLoadBlock:nil
-                         completionBlock:callback];
+                                                           callback:(RCTImageLoaderCompletionBlock)callback
+{
+  return [self loadImageWithURLRequest:imageURLRequest
+                                  size:CGSizeZero
+                                 scale:1
+                               clipped:YES
+                            resizeMode:RCTResizeModeStretch
+                              priority:priority
+                         progressBlock:nil
+                      partialLoadBlock:nil
+                       completionBlock:callback];
 }
 
 - (nullable RCTImageLoaderCancellationBlock)loadImageWithURLRequest:(NSURLRequest *)imageURLRequest
@@ -358,15 +364,15 @@ - (nullable RCTImageLoaderCancellationBlock)loadImageWithURLRequest:(NSURLReques
                                                    partialLoadBlock:(RCTImageLoaderPartialLoadBlock)partialLoadBlock
                                                     completionBlock:(RCTImageLoaderCompletionBlock)completionBlock
 {
-    return [self loadImageWithURLRequest:imageURLRequest
-                                    size:size
-                                   scale:scale
-                                 clipped:clipped
-                              resizeMode:resizeMode
-                                priority:RCTImageLoaderPriorityImmediate
-                           progressBlock:progressBlock
-                        partialLoadBlock:partialLoadBlock
-                         completionBlock:completionBlock];
+  return [self loadImageWithURLRequest:imageURLRequest
+                                  size:size
+                                 scale:scale
+                               clipped:clipped
+                            resizeMode:resizeMode
+                              priority:RCTImageLoaderPriorityImmediate
+                         progressBlock:progressBlock
+                      partialLoadBlock:partialLoadBlock
+                       completionBlock:completionBlock];
 }
 
 - (nullable RCTImageLoaderCancellationBlock)loadImageWithURLRequest:(NSURLRequest *)imageURLRequest
@@ -380,17 +386,17 @@ - (nullable RCTImageLoaderCancellationBlock)loadImageWithURLRequest:(NSURLReques
                                                     completionBlock:(RCTImageLoaderCompletionBlock)completionBlock
 {
   RCTImageURLLoaderRequest *request = [self loadImageWithURLRequest:imageURLRequest
-                                                               size:size
-                                                              scale:scale
-                                                            clipped:clipped
-                                                         resizeMode:resizeMode
-                                                           priority:priority
-                                                        attribution:{}
-                                                      progressBlock:progressBlock
-                                                   partialLoadBlock:partialLoadBlock
-                                                    completionBlock:^(NSError *error, UIImage *image, id metadata) {
-    completionBlock(error, image);
-                                                    }];
+      size:size
+      scale:scale
+      clipped:clipped
+      resizeMode:resizeMode
+      priority:priority
+      attribution:{}
+      progressBlock:progressBlock
+      partialLoadBlock:partialLoadBlock
+      completionBlock:^(NSError *error, UIImage *image, id metadata) {
+        completionBlock(error, image);
+      }];
   return ^{
     [request cancel];
   };
@@ -435,8 +441,9 @@ - (void)dequeueTasks
 
     // Start queued decode
     NSInteger activeDecodes = self->_scheduledDecodes - self->_pendingDecodes.count;
-    while (activeDecodes == 0 || (self->_activeBytes <= self->_maxConcurrentDecodingBytes &&
-                                  activeDecodes <= self->_maxConcurrentDecodingTasks)) {
+    while (activeDecodes == 0 ||
+           (self->_activeBytes <= self->_maxConcurrentDecodingBytes &&
+            activeDecodes <= self->_maxConcurrentDecodingTasks)) {
       dispatch_block_t decodeBlock = self->_pendingDecodes.firstObject;
       if (decodeBlock) {
         [self->_pendingDecodes removeObjectAtIndex:0];
@@ -472,13 +479,16 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
                                                  attribution:(const ImageURLLoaderAttribution &)attribution
                                                progressBlock:(RCTImageLoaderProgressBlock)progressHandler
                                             partialLoadBlock:(RCTImageLoaderPartialLoadBlock)partialLoadHandler
-                                             completionBlock:(void (^)(NSError *error, id imageOrData, id imageMetadata, BOOL cacheResult, NSURLResponse *response))completionBlock
+                                             completionBlock:(void (^)(
+                                                                 NSError *error,
+                                                                 id imageOrData,
+                                                                 id imageMetadata,
+                                                                 BOOL cacheResult,
+                                                                 NSURLResponse *response))completionBlock
 {
   {
     NSMutableURLRequest *mutableRequest = [request mutableCopy];
-    [NSURLProtocol setProperty:@"RCTImageLoader"
-                        forKey:@"trackingName"
-                     inRequest:mutableRequest];
+    [NSURLProtocol setProperty:@"RCTImageLoader" forKey:@"trackingName" inRequest:mutableRequest];
 
     // Add missing png extension
     if (request.URL.fileURL && request.URL.pathExtension.length == 0) {
@@ -495,11 +505,15 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
 
   // Find suitable image URL loader
   id<RCTImageURLLoader> loadHandler = [self imageURLLoaderForURL:request.URL];
-  BOOL requiresScheduling = [loadHandler respondsToSelector:@selector(requiresScheduling)] ?
-  [loadHandler requiresScheduling] : YES;
+  BOOL requiresScheduling =
+      [loadHandler respondsToSelector:@selector(requiresScheduling)] ? [loadHandler requiresScheduling] : YES;
+
+  BOOL cacheResult =
+      [loadHandler respondsToSelector:@selector(shouldCacheLoadedImages)] ? [loadHandler shouldCacheLoadedImages] : YES;
 
-  BOOL cacheResult = [loadHandler respondsToSelector:@selector(shouldCacheLoadedImages)] ?
-  [loadHandler shouldCacheLoadedImages] : YES;
+  if (request.cachePolicy == NSURLRequestReloadIgnoringLocalCacheData) {
+    cacheResult = NO;
+  }
 
   if (cacheResult && partialLoadHandler) {
     UIImage *image = [[self imageCache] imageForUrl:request.URL.absoluteString
@@ -514,48 +528,51 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
   auto cancelled = std::make_shared<std::atomic<int>>(0);
   __block dispatch_block_t cancelLoad = nil;
   __block NSLock *cancelLoadLock = [NSLock new];
-  NSString *requestId = [NSString stringWithFormat:@"%@-%llu",[[NSUUID UUID] UUIDString], monotonicTimeGetCurrentNanoseconds()];
+  NSString *requestId =
+      [NSString stringWithFormat:@"%@-%llu", [[NSUUID UUID] UUIDString], monotonicTimeGetCurrentNanoseconds()];
 
-  void (^completionHandler)(NSError *, id, id, NSURLResponse *) = ^(NSError *error, id imageOrData, id imageMetadata, NSURLResponse *response) {
-    [cancelLoadLock lock];
-    cancelLoad = nil;
-    [cancelLoadLock unlock];
+  void (^completionHandler)(NSError *, id, id, NSURLResponse *) =
+      ^(NSError *error, id imageOrData, id imageMetadata, NSURLResponse *response) {
+        [cancelLoadLock lock];
+        cancelLoad = nil;
+        [cancelLoadLock unlock];
 
-    // If we've received an image, we should try to set it synchronously,
-    // if it's data, do decoding on a background thread.
-    if (RCTIsMainQueue() && ![imageOrData isKindOfClass:[UIImage class]]) {
-      // Most loaders do not return on the main thread, so caller is probably not
-      // expecting it, and may do expensive post-processing in the callback
-      dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        if (!std::atomic_load(cancelled.get())) {
-          completionBlock(error, imageOrData, imageMetadata, cacheResult, response);
-        }
-      });
-    } else if (!std::atomic_load(cancelled.get())) {
-        if (response && error && [response isKindOfClass: [NSHTTPURLResponse class]]) {
-            NSHTTPURLResponse* _httpResp = (NSHTTPURLResponse*)response;
+        // If we've received an image, we should try to set it synchronously,
+        // if it's data, do decoding on a background thread.
+        if (RCTIsMainQueue() && ![imageOrData isKindOfClass:[UIImage class]]) {
+          // Most loaders do not return on the main thread, so caller is probably not
+          // expecting it, and may do expensive post-processing in the callback
+          dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            if (!std::atomic_load(cancelled.get())) {
+              completionBlock(error, imageOrData, imageMetadata, cacheResult, response);
+            }
+          });
+        } else if (!std::atomic_load(cancelled.get())) {
+          if (response && error && [response isKindOfClass:[NSHTTPURLResponse class]]) {
+            NSHTTPURLResponse *_httpResp = (NSHTTPURLResponse *)response;
             error = addResponseHeadersToError(error, _httpResp);
+          }
+          completionBlock(error, imageOrData, imageMetadata, cacheResult, response);
         }
-      completionBlock(error, imageOrData, imageMetadata, cacheResult, response);
-    }
-  };
+      };
 
   // If the loader doesn't require scheduling we call it directly on
   // the main queue.
   if (loadHandler && !requiresScheduling) {
     if ([loadHandler conformsToProtocol:@protocol(RCTImageURLLoaderWithAttribution)]) {
-      return [(id<RCTImageURLLoaderWithAttribution>)loadHandler loadImageForURL:request.URL
-                                                                           size:size
-                                                                          scale:scale
-                                                                     resizeMode:resizeMode
-                                                                      requestId:requestId
-                                                                       priority:priority
-                                                                    attribution:attributionCopy
-                                                                progressHandler:progressHandler
-                                                             partialLoadHandler:partialLoadHandler
-                                                              completionHandler:^(NSError *error, UIImage *image, id metadata) {
-                                                                completionHandler(error, image, metadata, nil);
-                                                              }];
+      return [(id<RCTImageURLLoaderWithAttribution>)loadHandler
+             loadImageForURL:request.URL
+                        size:size
+                       scale:scale
+                  resizeMode:resizeMode
+                   requestId:requestId
+                    priority:priority
+                 attribution:attributionCopy
+             progressHandler:progressHandler
+          partialLoadHandler:partialLoadHandler
+           completionHandler:^(NSError *error, UIImage *image, id metadata) {
+             completionHandler(error, image, metadata, nil);
+           }];
     }
     RCTImageLoaderCancellationBlock cb = [loadHandler loadImageForURL:request.URL
                                                                  size:size
@@ -577,36 +594,37 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
   __weak RCTImageLoader *weakSelf = self;
   dispatch_async(_URLRequestQueue, ^{
     __typeof(self) strongSelf = weakSelf;
-  if (atomic_load(cancelled.get()) || !strongSelf) {
-    return;
+    if (atomic_load(cancelled.get()) || !strongSelf) {
+      return;
     }
 
     if (loadHandler) {
       dispatch_block_t cancelLoadLocal;
       if ([loadHandler conformsToProtocol:@protocol(RCTImageURLLoaderWithAttribution)]) {
-        RCTImageURLLoaderRequest *loaderRequest = [(id<RCTImageURLLoaderWithAttribution>)loadHandler loadImageForURL:request.URL
-                                                                                                                size:size
-                                                                                                               scale:scale
-                                                                                                          resizeMode:resizeMode
-                                                                                                           requestId:requestId
-                                                                                                            priority:priority
-                                                                                                         attribution:attributionCopy
-                                                                                                     progressHandler:progressHandler
-                                                                                                  partialLoadHandler:partialLoadHandler
-                                                                                                   completionHandler:^(NSError *error, UIImage *image, id metadata) {
-                                                                                                     completionHandler(error, image, metadata, nil);
-                                                                                                   }];
+        RCTImageURLLoaderRequest *loaderRequest = [(id<RCTImageURLLoaderWithAttribution>)loadHandler
+               loadImageForURL:request.URL
+                          size:size
+                         scale:scale
+                    resizeMode:resizeMode
+                     requestId:requestId
+                      priority:priority
+                   attribution:attributionCopy
+               progressHandler:progressHandler
+            partialLoadHandler:partialLoadHandler
+             completionHandler:^(NSError *error, UIImage *image, id metadata) {
+               completionHandler(error, image, metadata, nil);
+             }];
         cancelLoadLocal = loaderRequest.cancellationBlock;
       } else {
-       cancelLoadLocal = [loadHandler loadImageForURL:request.URL
-                                                 size:size
-                                                scale:scale
-                                           resizeMode:resizeMode
-                                      progressHandler:progressHandler
-                                   partialLoadHandler:partialLoadHandler
-                                    completionHandler:^(NSError *error, UIImage *image) {
-                                      completionHandler(error, image, nil, nil);
-                                    }];
+        cancelLoadLocal = [loadHandler loadImageForURL:request.URL
+                                                  size:size
+                                                 scale:scale
+                                            resizeMode:resizeMode
+                                       progressHandler:progressHandler
+                                    partialLoadHandler:partialLoadHandler
+                                     completionHandler:^(NSError *error, UIImage *image) {
+                                       completionHandler(error, image, nil, nil);
+                                     }];
       }
       [cancelLoadLock lock];
       cancelLoad = cancelLoadLocal;
@@ -624,11 +642,12 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
         completionHandler(nil, image, nil, nil);
       } else {
         // Use networking module to load image
-        dispatch_block_t cancelLoadLocal = [strongSelf _loadURLRequest:request
-                                                         progressBlock:progressHandler
-                                                       completionBlock:^(NSError *error, id imageOrData, NSURLResponse *response) {
-                                                         completionHandler(error, imageOrData, nil, response);
-                                                       }];
+        dispatch_block_t cancelLoadLocal =
+            [strongSelf _loadURLRequest:request
+                          progressBlock:progressHandler
+                        completionBlock:^(NSError *error, id imageOrData, NSURLResponse *response) {
+                          completionHandler(error, imageOrData, nil, response);
+                        }];
         [cancelLoadLock lock];
         cancelLoad = cancelLoadLocal;
         [cancelLoadLock unlock];
@@ -636,30 +655,34 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
     }
   });
 
-  return [[RCTImageURLLoaderRequest alloc] initWithRequestId:requestId imageURL:request.URL cancellationBlock:^{
-    BOOL alreadyCancelled = atomic_fetch_or(cancelled.get(), 1) ? YES : NO;
-    if (alreadyCancelled) {
-      return;
-    }
-    [cancelLoadLock lock];
-    dispatch_block_t cancelLoadLocal = cancelLoad;
-    cancelLoad = nil;
-    [cancelLoadLock unlock];
-    if (cancelLoadLocal) {
-      cancelLoadLocal();
-    }
-  }];
+  return [[RCTImageURLLoaderRequest alloc] initWithRequestId:requestId
+                                                    imageURL:request.URL
+                                           cancellationBlock:^{
+                                             BOOL alreadyCancelled = atomic_fetch_or(cancelled.get(), 1) ? YES : NO;
+                                             if (alreadyCancelled) {
+                                               return;
+                                             }
+                                             [cancelLoadLock lock];
+                                             dispatch_block_t cancelLoadLocal = cancelLoad;
+                                             cancelLoad = nil;
+                                             [cancelLoadLock unlock];
+                                             if (cancelLoadLocal) {
+                                               cancelLoadLocal();
+                                             }
+                                           }];
 }
 
 - (RCTImageLoaderCancellationBlock)_loadURLRequest:(NSURLRequest *)request
                                      progressBlock:(RCTImageLoaderProgressBlock)progressHandler
-                                   completionBlock:(void (^)(NSError *error, id imageOrData, NSURLResponse *response))completionHandler
+                                   completionBlock:(void (^)(NSError *error, id imageOrData, NSURLResponse *response))
+                                                       completionHandler
 {
   RCTNetworking *networking = [_moduleRegistry moduleForName:"Networking"];
   if (RCT_DEBUG && !networking) {
-    RCTLogError(@"No suitable image URL loader found for %@. You may need to "
-                " import the RCTNetwork library in order to load images.",
-                request.URL.absoluteString);
+    RCTLogError(
+        @"No suitable image URL loader found for %@. You may need to "
+         " import the RCTNetwork library in order to load images.",
+        request.URL.absoluteString);
     return NULL;
   }
 
@@ -688,10 +711,9 @@ - (RCTImageLoaderCancellationBlock)_loadURLRequest:(NSURLRequest *)request
       NSInteger statusCode = ((NSHTTPURLResponse *)response).statusCode;
       if (statusCode != 200) {
         NSString *errorMessage = [NSString stringWithFormat:@"Failed to load %@", response.URL];
-        NSDictionary *userInfo = @{NSLocalizedDescriptionKey: errorMessage};
-        completionHandler([[NSError alloc] initWithDomain:NSURLErrorDomain
-                                                     code:statusCode
-                                                 userInfo:userInfo], nil, response);
+        NSDictionary *userInfo = @{NSLocalizedDescriptionKey : errorMessage};
+        completionHandler(
+            [[NSError alloc] initWithDomain:NSURLErrorDomain code:statusCode userInfo:userInfo], nil, response);
         return;
       }
     }
@@ -703,35 +725,35 @@ - (RCTImageLoaderCancellationBlock)_loadURLRequest:(NSURLRequest *)request
   // Download image
   __weak __typeof(self) weakSelf = self;
   __block RCTNetworkTask *task =
-  [networking networkTaskWithRequest:request
-                     completionBlock:^(NSURLResponse *response, NSData *data, NSError *error) {
-                       __typeof(self) strongSelf = weakSelf;
-                       if (!strongSelf) {
-                         return;
-                       }
-
-                       if (error || !response || !data) {
-                         NSError *someError = nil;
-                         if (error) {
-                           someError = error;
-                         } else if (!response) {
-                           someError = RCTErrorWithMessage(@"Response metadata error");
-                         } else {
-                           someError = RCTErrorWithMessage(@"Unknown image download error");
-                         }
-                         completionHandler(someError, nil, response);
-                         [strongSelf dequeueTasks];
-                         return;
-                       }
-
-                       dispatch_async(strongSelf->_URLRequestQueue, ^{
-                         // Process image data
-                         processResponse(response, data, nil);
-
-                         // Prepare for next task
-                         [strongSelf dequeueTasks];
-                       });
-                     }];
+      [networking networkTaskWithRequest:request
+                         completionBlock:^(NSURLResponse *response, NSData *data, NSError *error) {
+                           __typeof(self) strongSelf = weakSelf;
+                           if (!strongSelf) {
+                             return;
+                           }
+
+                           if (error || !response || !data) {
+                             NSError *someError = nil;
+                             if (error) {
+                               someError = error;
+                             } else if (!response) {
+                               someError = RCTErrorWithMessage(@"Response metadata error");
+                             } else {
+                               someError = RCTErrorWithMessage(@"Unknown image download error");
+                             }
+                             completionHandler(someError, nil, response);
+                             [strongSelf dequeueTasks];
+                             return;
+                           }
+
+                           dispatch_async(strongSelf->_URLRequestQueue, ^{
+                             // Process image data
+                             processResponse(response, data, nil);
+
+                             // Prepare for next task
+                             [strongSelf dequeueTasks];
+                           });
+                         }];
 
   task.downloadProgressBlock = ^(int64_t progress, int64_t total) {
     if (progressHandler) {
@@ -791,60 +813,64 @@ - (RCTImageURLLoaderRequest *)loadImageWithURLRequest:(NSURLRequest *)imageURLRe
   };
 
   __weak RCTImageLoader *weakSelf = self;
-  void (^completionHandler)(NSError *, id, id, BOOL, NSURLResponse *) = ^(NSError *error, id imageOrData, id imageMetadata, BOOL cacheResult, NSURLResponse *response) {
-    __typeof(self) strongSelf = weakSelf;
-    if (std::atomic_load(cancelled.get()) || !strongSelf) {
-      return;
-    }
+  void (^completionHandler)(NSError *, id, id, BOOL, NSURLResponse *) =
+      ^(NSError *error, id imageOrData, id imageMetadata, BOOL cacheResult, NSURLResponse *response) {
+        __typeof(self) strongSelf = weakSelf;
+        if (std::atomic_load(cancelled.get()) || !strongSelf) {
+          return;
+        }
 
-    if (!imageOrData || [imageOrData isKindOfClass:[UIImage class]]) {
-      [cancelLoadLock lock];
-      cancelLoad = nil;
-      [cancelLoadLock unlock];
-      completionBlock(error, imageOrData, imageMetadata);
-      return;
-    }
+        if (!imageOrData || [imageOrData isKindOfClass:[UIImage class]]) {
+          [cancelLoadLock lock];
+          cancelLoad = nil;
+          [cancelLoadLock unlock];
+          completionBlock(error, imageOrData, imageMetadata);
+          return;
+        }
 
-    RCTImageLoaderCompletionBlock decodeCompletionHandler = ^(NSError *error_, UIImage *image) {
-      if (cacheResult && image) {
-        // Store decoded image in cache
-        [[strongSelf imageCache] addImageToCache:image
-                                             URL:imageURLRequest.URL.absoluteString
-                                            size:size
-                                           scale:scale
-                                      resizeMode:resizeMode
-                                        response:response];
-      }
-      [cancelLoadLock lock];
-      cancelLoad = nil;
-      [cancelLoadLock unlock];
-      completionBlock(error_, image, nil);
-    };
-    dispatch_block_t cancelLoadLocal = [strongSelf decodeImageData:imageOrData
-                                                              size:size
-                                                             scale:scale
-                                                           clipped:clipped
-                                                        resizeMode:resizeMode
-                                                   completionBlock:decodeCompletionHandler];
-    [cancelLoadLock lock];
-    cancelLoad = cancelLoadLocal;
-    [cancelLoadLock unlock];
-  };
+        RCTImageLoaderCompletionBlock decodeCompletionHandler = ^(NSError *error_, UIImage *image) {
+          if (cacheResult && image) {
+            // Store decoded image in cache
+            [[strongSelf imageCache] addImageToCache:image
+                                                 URL:imageURLRequest.URL.absoluteString
+                                                size:size
+                                               scale:scale
+                                          resizeMode:resizeMode
+                                            response:response];
+          }
+          [cancelLoadLock lock];
+          cancelLoad = nil;
+          [cancelLoadLock unlock];
+          completionBlock(error_, image, nil);
+        };
+        dispatch_block_t cancelLoadLocal = [strongSelf decodeImageData:imageOrData
+                                                                  size:size
+                                                                 scale:scale
+                                                               clipped:clipped
+                                                            resizeMode:resizeMode
+                                                       completionBlock:decodeCompletionHandler];
+        [cancelLoadLock lock];
+        cancelLoad = cancelLoadLocal;
+        [cancelLoadLock unlock];
+      };
 
   RCTImageURLLoaderRequest *loaderRequest = [self _loadImageOrDataWithURLRequest:imageURLRequest
-                                                                             size:size
-                                                                            scale:scale
-                                                                       resizeMode:resizeMode
-                                                                         priority:priority
-                                                                      attribution:attribution
-                                                                    progressBlock:progressBlock
-                                                                 partialLoadBlock:partialLoadBlock
-                                                                  completionBlock:completionHandler];
+                                                                            size:size
+                                                                           scale:scale
+                                                                      resizeMode:resizeMode
+                                                                        priority:priority
+                                                                     attribution:attribution
+                                                                   progressBlock:progressBlock
+                                                                partialLoadBlock:partialLoadBlock
+                                                                 completionBlock:completionHandler];
   cancelLoad = loaderRequest.cancellationBlock;
-  return [[RCTImageURLLoaderRequest alloc] initWithRequestId:loaderRequest.requestId imageURL:imageURLRequest.URL cancellationBlock:cancellationBlock];
+  return [[RCTImageURLLoaderRequest alloc] initWithRequestId:loaderRequest.requestId
+                                                    imageURL:imageURLRequest.URL
+                                           cancellationBlock:cancellationBlock];
 }
 
-- (BOOL)shouldEnablePerfLoggingForRequestUrl:(NSURL *)url {
+- (BOOL)shouldEnablePerfLoggingForRequestUrl:(NSURL *)url
+{
   id<RCTImageURLLoader> loadHandler = [self imageURLLoaderForURL:url];
   if ([loadHandler respondsToSelector:@selector(shouldEnablePerfLogging)]) {
     return [(id<RCTImageURLLoaderWithAttribution>)loadHandler shouldEnablePerfLogging];
@@ -860,7 +886,8 @@ - (void)trackURLImageVisibilityForRequest:(RCTImageURLLoaderRequest *)loaderRequ
 
   id<RCTImageURLLoader> loadHandler = [self imageURLLoaderForURL:loaderRequest.imageURL];
   if ([loadHandler respondsToSelector:@selector(trackURLImageVisibilityForRequest:imageView:)]) {
-    [(id<RCTImageURLLoaderWithAttribution>)loadHandler trackURLImageVisibilityForRequest:loaderRequest imageView:imageView];
+    [(id<RCTImageURLLoaderWithAttribution>)loadHandler trackURLImageVisibilityForRequest:loaderRequest
+                                                                               imageView:imageView];
   }
 }
 
@@ -899,7 +926,8 @@ - (RCTImageLoaderCancellationBlock)decodeImageData:(NSData *)data
 {
   if (data.length == 0) {
     completionBlock(RCTErrorWithMessage(@"No image data"), nil);
-    return ^{};
+    return ^{
+    };
   }
 
   auto cancelled = std::make_shared<std::atomic<int>>(0);
@@ -923,7 +951,9 @@ - (RCTImageLoaderCancellationBlock)decodeImageData:(NSData *)data
                                     size:size
                                    scale:scale
                               resizeMode:resizeMode
-                       completionHandler:completionHandler] ?: ^{};
+                       completionHandler:completionHandler]
+        ?: ^{
+          };
   } else {
     dispatch_block_t decodeBlock = ^{
       // Calculate the size, in bytes, that the decompressed image will require
@@ -935,25 +965,26 @@ - (RCTImageLoaderCancellationBlock)decodeImageData:(NSData *)data
       // Do actual decompression on a concurrent background queue
       dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         if (!std::atomic_load(cancelled.get())) {
-
           // Decompress the image data (this may be CPU and memory intensive)
           UIImage *image = RCTDecodeImageWithData(data, size, scale, resizeMode);
 
 #if RCT_DEV
           CGSize imagePixelSize = RCTSizeInPixels(image.size, image.scale);
           CGSize screenPixelSize = RCTSizeInPixels(RCTScreenSize(), RCTScreenScale());
-          if (imagePixelSize.width * imagePixelSize.height >
-              screenPixelSize.width * screenPixelSize.height) {
-            RCTLogInfo(@"[PERF ASSETS] Loading image at size %@, which is larger "
-                       "than the screen size %@", NSStringFromCGSize(imagePixelSize),
-                       NSStringFromCGSize(screenPixelSize));
+          if (imagePixelSize.width * imagePixelSize.height > screenPixelSize.width * screenPixelSize.height) {
+            RCTLogInfo(
+                @"[PERF ASSETS] Loading image at size %@, which is larger "
+                 "than the screen size %@",
+                NSStringFromCGSize(imagePixelSize),
+                NSStringFromCGSize(screenPixelSize));
           }
 #endif
 
           if (image) {
             completionHandler(nil, image);
           } else {
-            NSString *errorMessage = [NSString stringWithFormat:@"Error decoding image data <NSData %p; %tu bytes>", data, data.length];
+            NSString *errorMessage =
+                [NSString stringWithFormat:@"Error decoding image data <NSData %p; %tu bytes>", data, data.length];
             NSError *finalError = RCTErrorWithMessage(errorMessage);
             completionHandler(finalError, nil);
           }
@@ -982,8 +1013,9 @@ - (RCTImageLoaderCancellationBlock)decodeImageData:(NSData *)data
         self->_pendingDecodes = [NSMutableArray new];
       }
       NSInteger activeDecodes = self->_scheduledDecodes - self->_pendingDecodes.count - 1;
-      if (activeDecodes == 0 || (self->_activeBytes <= self->_maxConcurrentDecodingBytes &&
-                                 activeDecodes <= self->_maxConcurrentDecodingTasks)) {
+      if (activeDecodes == 0 ||
+          (self->_activeBytes <= self->_maxConcurrentDecodingBytes &&
+           activeDecodes <= self->_maxConcurrentDecodingTasks)) {
         decodeBlock();
       } else {
         [self->_pendingDecodes addObject:decodeBlock];
@@ -997,51 +1029,52 @@ - (RCTImageLoaderCancellationBlock)decodeImageData:(NSData *)data
 }
 
 - (RCTImageLoaderCancellationBlock)getImageSizeForURLRequest:(NSURLRequest *)imageURLRequest
-                                                       block:(void(^)(NSError *error, CGSize size))callback
+                                                       block:(void (^)(NSError *error, CGSize size))callback
 {
-  void (^completion)(NSError *, id, id, BOOL, NSURLResponse *) = ^(NSError *error, id imageOrData, id imageMetadata, BOOL cacheResult, NSURLResponse *response) {
-    CGSize size;
-    if ([imageOrData isKindOfClass:[NSData class]]) {
-      NSDictionary *meta = RCTGetImageMetadata(imageOrData);
-
-      NSInteger imageOrientation = [meta[(id)kCGImagePropertyOrientation] integerValue];
-      switch (imageOrientation) {
-        case kCGImagePropertyOrientationLeft:
-        case kCGImagePropertyOrientationRight:
-        case kCGImagePropertyOrientationLeftMirrored:
-        case kCGImagePropertyOrientationRightMirrored:
-          // swap width and height
-          size = (CGSize){
-            [meta[(id)kCGImagePropertyPixelHeight] floatValue],
-            [meta[(id)kCGImagePropertyPixelWidth] floatValue],
-          };
-          break;
-        case kCGImagePropertyOrientationUp:
-        case kCGImagePropertyOrientationDown:
-        case kCGImagePropertyOrientationUpMirrored:
-        case kCGImagePropertyOrientationDownMirrored:
-        default:
+  void (^completion)(NSError *, id, id, BOOL, NSURLResponse *) =
+      ^(NSError *error, id imageOrData, id imageMetadata, BOOL cacheResult, NSURLResponse *response) {
+        CGSize size;
+        if ([imageOrData isKindOfClass:[NSData class]]) {
+          NSDictionary *meta = RCTGetImageMetadata(imageOrData);
+
+          NSInteger imageOrientation = [meta[(id)kCGImagePropertyOrientation] integerValue];
+          switch (imageOrientation) {
+            case kCGImagePropertyOrientationLeft:
+            case kCGImagePropertyOrientationRight:
+            case kCGImagePropertyOrientationLeftMirrored:
+            case kCGImagePropertyOrientationRightMirrored:
+              // swap width and height
+              size = (CGSize){
+                  [meta[(id)kCGImagePropertyPixelHeight] floatValue],
+                  [meta[(id)kCGImagePropertyPixelWidth] floatValue],
+              };
+              break;
+            case kCGImagePropertyOrientationUp:
+            case kCGImagePropertyOrientationDown:
+            case kCGImagePropertyOrientationUpMirrored:
+            case kCGImagePropertyOrientationDownMirrored:
+            default:
+              size = (CGSize){
+                  [meta[(id)kCGImagePropertyPixelWidth] floatValue],
+                  [meta[(id)kCGImagePropertyPixelHeight] floatValue],
+              };
+              break;
+          }
+        } else {
+          UIImage *image = imageOrData;
           size = (CGSize){
-            [meta[(id)kCGImagePropertyPixelWidth] floatValue],
-            [meta[(id)kCGImagePropertyPixelHeight] floatValue],
+              image.size.width * image.scale,
+              image.size.height * image.scale,
           };
-          break;
-      }
-    } else {
-      UIImage *image = imageOrData;
-      size = (CGSize){
-        image.size.width * image.scale,
-        image.size.height * image.scale,
+        }
+        callback(error, size);
       };
-    }
-    callback(error, size);
-  };
 
   RCTImageURLLoaderRequest *loaderRequest = [self _loadImageOrDataWithURLRequest:imageURLRequest
                                                                             size:CGSizeZero
                                                                            scale:1
                                                                       resizeMode:RCTResizeModeStretch
-                                                                        priority: RCTImageLoaderPriorityImmediate
+                                                                        priority:RCTImageLoaderPriorityImmediate
                                                                      attribution:{}
                                                                    progressBlock:NULL
                                                                 partialLoadBlock:NULL
@@ -1096,12 +1129,7 @@ - (BOOL)canHandleRequest:(NSURLRequest *)request
   });
 
   NSString *query = requestURL.query;
-  if (
-      query != nil &&
-      [videoRegex firstMatchInString:query
-                             options:0
-                               range:NSMakeRange(0, query.length)]
-      ) {
+  if (query != nil && [videoRegex firstMatchInString:query options:0 range:NSMakeRange(0, query.length)]) {
     return NO;
   }
 
@@ -1109,8 +1137,7 @@ - (BOOL)canHandleRequest:(NSURLRequest *)request
     // Don't use RCTImageURLLoader protocol for modules that already conform to
     // RCTURLRequestHandler as it's inefficient to decode an image and then
     // convert it back into data
-    if (![loader conformsToProtocol:@protocol(RCTURLRequestHandler)] &&
-        [loader canLoadImageURL:requestURL]) {
+    if (![loader conformsToProtocol:@protocol(RCTURLRequestHandler)] && [loader canLoadImageURL:requestURL]) {
       return YES;
     }
   }
@@ -1121,31 +1148,32 @@ - (BOOL)canHandleRequest:(NSURLRequest *)request
 - (id)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequestDelegate>)delegate
 {
   __block RCTImageLoaderCancellationBlock requestToken;
-  requestToken = [self loadImageWithURLRequest:request callback:^(NSError *error, UIImage *image) {
-    if (error) {
-      [delegate URLRequest:requestToken didCompleteWithError:error];
-      return;
-    }
-
-    NSString *mimeType = nil;
-    NSData *imageData = nil;
-    if (RCTImageHasAlpha(image.CGImage)) {
-      mimeType = @"image/png";
-      imageData = UIImagePNGRepresentation(image);
-    } else {
-      mimeType = @"image/jpeg";
-      imageData = UIImageJPEGRepresentation(image, 1.0);
-    }
-
-    NSURLResponse *response = [[NSURLResponse alloc] initWithURL:request.URL
-                                                        MIMEType:mimeType
-                                           expectedContentLength:imageData.length
-                                                textEncodingName:nil];
-
-    [delegate URLRequest:requestToken didReceiveResponse:response];
-    [delegate URLRequest:requestToken didReceiveData:imageData];
-    [delegate URLRequest:requestToken didCompleteWithError:nil];
-  }];
+  requestToken = [self loadImageWithURLRequest:request
+                                      callback:^(NSError *error, UIImage *image) {
+                                        if (error) {
+                                          [delegate URLRequest:requestToken didCompleteWithError:error];
+                                          return;
+                                        }
+
+                                        NSString *mimeType = nil;
+                                        NSData *imageData = nil;
+                                        if (RCTImageHasAlpha(image.CGImage)) {
+                                          mimeType = @"image/png";
+                                          imageData = UIImagePNGRepresentation(image);
+                                        } else {
+                                          mimeType = @"image/jpeg";
+                                          imageData = UIImageJPEGRepresentation(image, 1.0);
+                                        }
+
+                                        NSURLResponse *response = [[NSURLResponse alloc] initWithURL:request.URL
+                                                                                            MIMEType:mimeType
+                                                                               expectedContentLength:imageData.length
+                                                                                    textEncodingName:nil];
+
+                                        [delegate URLRequest:requestToken didReceiveResponse:response];
+                                        [delegate URLRequest:requestToken didReceiveData:imageData];
+                                        [delegate URLRequest:requestToken didCompleteWithError:nil];
+                                      }];
 
   return requestToken;
 }
@@ -1157,31 +1185,36 @@ - (void)cancelRequest:(id)requestToken
   }
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   return std::make_shared<facebook::react::NativeImageLoaderIOSSpecJSI>(params);
 }
 
-RCT_EXPORT_METHOD(getSize:(NSString *)uri resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getSize
+                  : (NSString *)uri resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
   NSURLRequest *request = [RCTConvert NSURLRequest:uri];
   [self getImageSizeForURLRequest:request
-   block:^(NSError *error, CGSize size) {
-     if (error) {
-       reject(
-        @"E_GET_SIZE_FAILURE",
-        [NSString stringWithFormat: @"Failed to getSize of %@", uri],
-        error);
-     } else {
-       resolve(@[@(size.width), @(size.height)]);
-     }
-   }];
+                            block:^(NSError *error, CGSize size) {
+                              if (error) {
+                                reject(
+                                    @"E_GET_SIZE_FAILURE",
+                                    [NSString stringWithFormat:@"Failed to getSize of %@", uri],
+                                    error);
+                              } else {
+                                resolve(@[ @(size.width), @(size.height) ]);
+                              }
+                            }];
 }
 
-RCT_EXPORT_METHOD(getSizeWithHeaders:(NSString *)uri
-                  headers:(NSDictionary *)headers
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getSizeWithHeaders
+                  : (NSString *)uri headers
+                  : (NSDictionary *)headers resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
   NSURL *URL = [RCTConvert NSURL:uri];
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
@@ -1189,27 +1222,29 @@ - (void)cancelRequest:(id)requestToken
     [request addValue:[RCTConvert NSString:value] forHTTPHeaderField:key];
   }];
   [self getImageSizeForURLRequest:request
-   block:^(NSError *error, CGSize size) {
-     if (error) {
-       reject(@"E_GET_SIZE_FAILURE", nil, error);
-       return;
-     }
-     resolve(@{@"width":@(size.width),@"height":@(size.height)});
-   }];
+                            block:^(NSError *error, CGSize size) {
+                              if (error) {
+                                reject(@"E_GET_SIZE_FAILURE", nil, error);
+                                return;
+                              }
+                              resolve(@{@"width" : @(size.width), @"height" : @(size.height)});
+                            }];
 }
 
-RCT_EXPORT_METHOD(prefetchImage:(NSString *)uri
-              resolve:(RCTPromiseResolveBlock)resolve
-               reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(prefetchImage
+                  : (NSString *)uri resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
   [self prefetchImageWithMetadata:uri queryRootName:nil rootTag:0 resolve:resolve reject:reject];
 }
 
-RCT_EXPORT_METHOD(prefetchImageWithMetadata:(NSString *)uri
-                  queryRootName:(NSString *)queryRootName
-                  rootTag:(double)rootTag
-              resolve:(RCTPromiseResolveBlock)resolve
-               reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(prefetchImageWithMetadata
+                  : (NSString *)uri queryRootName
+                  : (NSString *)queryRootName rootTag
+                  : (double)rootTag resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
   NSURLRequest *request = [RCTConvert NSURLRequest:uri];
   [self loadImageWithURLRequest:request
@@ -1219,23 +1254,24 @@ - (void)cancelRequest:(id)requestToken
                      resizeMode:RCTResizeModeStretch
                        priority:RCTImageLoaderPriorityPrefetch
                     attribution:{
-                                  .queryRootName = queryRootName ? [queryRootName UTF8String] : "",
-                                  .surfaceId = (int)rootTag,
+                                    .queryRootName = queryRootName ? [queryRootName UTF8String] : "",
+                                    .surfaceId = (int)rootTag,
                                 }
                   progressBlock:nil
                partialLoadBlock:nil
-                       completionBlock:^(NSError *error, UIImage *image, id completionMetadata) {
-     if (error) {
-       reject(@"E_PREFETCH_FAILURE", nil, error);
-       return;
-     }
-     resolve(@YES);
-   }];
+                completionBlock:^(NSError *error, UIImage *image, id completionMetadata) {
+                  if (error) {
+                    reject(@"E_PREFETCH_FAILURE", nil, error);
+                    return;
+                  }
+                  resolve(@YES);
+                }];
 }
 
-RCT_EXPORT_METHOD(queryCache:(NSArray *)uris
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(queryCache
+                  : (NSArray *)uris resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
   resolve([self getImageCacheStatus:uris]);
 }
@@ -1249,8 +1285,9 @@ @implementation RCTBridge (RCTImageLoader)
 
 - (RCTImageLoader *)imageLoader
 {
-  RCTLogWarn(@"Calling bridge.imageLoader is deprecated and will not work in newer versions of RN. Please update to the "
-             "moduleForClass API or turboModuleRegistry API.");
+  RCTLogWarn(
+      @"Calling bridge.imageLoader is deprecated and will not work in newer versions of RN. Please update to the "
+       "moduleForClass API or turboModuleRegistry API.");
   return [self moduleForClass:[RCTImageLoader class]];
 }
 
diff --git a/Libraries/Image/RCTImageLoaderProtocol.h b/Libraries/Image/RCTImageLoaderProtocol.h
index 5e8f4f8b16fd..17bc12cc7e37 100644
--- a/Libraries/Image/RCTImageLoaderProtocol.h
+++ b/Libraries/Image/RCTImageLoaderProtocol.h
@@ -8,11 +8,11 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTBridge.h>
-#import <React/RCTResizeMode.h>
-#import <React/RCTURLRequestHandler.h>
+#import <React/RCTImageCache.h>
 #import <React/RCTImageDataDecoder.h>
 #import <React/RCTImageURLLoader.h>
-#import <React/RCTImageCache.h>
+#import <React/RCTResizeMode.h>
+#import <React/RCTURLRequestHandler.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -34,12 +34,9 @@ NS_ASSUME_NONNULL_BEGIN
  * Use PriorityPrefetch to prefetch images at a lower priority.
  * The priority logic is up to each @RCTImageLoaderProtocol implementation
  */
-typedef NS_ENUM(NSInteger, RCTImageLoaderPriority) {
-  RCTImageLoaderPriorityImmediate,
-  RCTImageLoaderPriorityPrefetch
-};
+typedef NS_ENUM(NSInteger, RCTImageLoaderPriority) { RCTImageLoaderPriorityImmediate, RCTImageLoaderPriorityPrefetch };
 
-@protocol RCTImageLoaderProtocol<RCTURLRequestHandler>
+@protocol RCTImageLoaderProtocol <RCTURLRequestHandler>
 
 /**
  * The maximum number of concurrent image loading tasks. Loading and decoding
@@ -80,14 +77,14 @@ typedef NS_ENUM(NSInteger, RCTImageLoaderPriority) {
                                                            callback:(RCTImageLoaderCompletionBlock)callback;
 
 /**
-* As above, but includes target `size`, `scale` and `resizeMode`, which are used to
-* select the optimal dimensions for the loaded image. The `clipped` option
-* controls whether the image will be clipped to fit the specified size exactly,
-* or if the original aspect ratio should be retained.
-* `partialLoadBlock` is meant for custom image loaders that do not ship with the core RN library.
-* It is meant to be called repeatedly while loading the image as higher quality versions are decoded,
-* for instance with progressive JPEGs.
-*/
+ * As above, but includes target `size`, `scale` and `resizeMode`, which are used to
+ * select the optimal dimensions for the loaded image. The `clipped` option
+ * controls whether the image will be clipped to fit the specified size exactly,
+ * or if the original aspect ratio should be retained.
+ * `partialLoadBlock` is meant for custom image loaders that do not ship with the core RN library.
+ * It is meant to be called repeatedly while loading the image as higher quality versions are decoded,
+ * for instance with progressive JPEGs.
+ */
 - (nullable RCTImageLoaderCancellationBlock)loadImageWithURLRequest:(NSURLRequest *)imageURLRequest
                                                                size:(CGSize)size
                                                               scale:(CGFloat)scale
@@ -116,7 +113,7 @@ typedef NS_ENUM(NSInteger, RCTImageLoaderPriority) {
  * the information, and won't decode the image if it doesn't have to.
  */
 - (RCTImageLoaderCancellationBlock)getImageSizeForURLRequest:(NSURLRequest *)imageURLRequest
-                                                       block:(void(^)(NSError *error, CGSize size))completionBlock;
+                                                       block:(void (^)(NSError *error, CGSize size))completionBlock;
 /**
  * Determines whether given image URLs are cached locally. The `requests` array is expected
  * to contain objects convertible to NSURLRequest. The return value maps URLs to strings:
diff --git a/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h b/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h
index 1bdbe2eb87db..14997865e50d 100644
--- a/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h
+++ b/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h
@@ -13,7 +13,7 @@
 RCT_EXTERN BOOL RCTImageLoadingPerfInstrumentationEnabled(void);
 RCT_EXTERN void RCTEnableImageLoadingPerfInstrumentation(BOOL enabled);
 
-@protocol RCTImageLoaderWithAttributionProtocol<RCTImageLoaderProtocol, RCTImageLoaderLoggableProtocol>
+@protocol RCTImageLoaderWithAttributionProtocol <RCTImageLoaderProtocol, RCTImageLoaderLoggableProtocol>
 
 // TODO (T61325135): Remove C++ checks
 #ifdef __cplusplus
@@ -26,7 +26,7 @@ RCT_EXTERN void RCTEnableImageLoadingPerfInstrumentation(BOOL enabled);
                                                 scale:(CGFloat)scale
                                               clipped:(BOOL)clipped
                                            resizeMode:(RCTResizeMode)resizeMode
-                                             priority: (RCTImageLoaderPriority)priority
+                                             priority:(RCTImageLoaderPriority)priority
                                           attribution:(const facebook::react::ImageURLLoaderAttribution &)attribution
                                         progressBlock:(RCTImageLoaderProgressBlock)progressBlock
                                      partialLoadBlock:(RCTImageLoaderPartialLoadBlock)partialLoadBlock
diff --git a/Libraries/Image/RCTImageStoreManager.mm b/Libraries/Image/RCTImageStoreManager.mm
index c62ad0927537..acfa4d3434c4 100644
--- a/Libraries/Image/RCTImageStoreManager.mm
+++ b/Libraries/Image/RCTImageStoreManager.mm
@@ -14,19 +14,18 @@
 #import <ImageIO/ImageIO.h>
 #import <MobileCoreServices/UTType.h>
 #import <React/RCTAssert.h>
+#import <React/RCTImageUtils.h>
 #import <React/RCTLog.h>
 #import <React/RCTUtils.h>
-#import <React/RCTImageUtils.h>
 
 #import "RCTImagePlugins.h"
 
 static NSString *const RCTImageStoreURLScheme = @"rct-image-store";
 
-@interface RCTImageStoreManager() <NativeImageStoreIOSSpec>
+@interface RCTImageStoreManager () <NativeImageStoreIOSSpec>
 @end
 
-@implementation RCTImageStoreManager
-{
+@implementation RCTImageStoreManager {
   NSMutableDictionary<NSString *, NSData *> *_store;
   NSUInteger _id;
 }
@@ -37,7 +36,7 @@ @implementation RCTImageStoreManager
 
 - (float)handlerPriority
 {
-    return 1;
+  return 1;
 }
 
 - (void)removeImageForTag:(NSString *)imageTag withBlock:(void (^)(void))block
@@ -91,36 +90,38 @@ - (void)storeImage:(UIImage *)image withBlock:(void (^)(NSString *imageTag))bloc
   });
 }
 
-RCT_EXPORT_METHOD(removeImageForTag:(NSString *)imageTag)
+RCT_EXPORT_METHOD(removeImageForTag : (NSString *)imageTag)
 {
   [_store removeObjectForKey:imageTag];
 }
 
-RCT_EXPORT_METHOD(hasImageForTag:(NSString *)imageTag
-                  callback:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(hasImageForTag : (NSString *)imageTag callback : (RCTResponseSenderBlock)callback)
 {
-  callback(@[@(_store[imageTag] != nil)]);
+  callback(@[ @(_store[imageTag] != nil) ]);
 }
 
 // TODO (#5906496): Name could be more explicit - something like getBase64EncodedDataForTag:?
-RCT_EXPORT_METHOD(getBase64ForTag:(NSString *)imageTag
-                  successCallback:(RCTResponseSenderBlock)successCallback
-                  errorCallback:(RCTResponseSenderBlock)errorCallback)
+RCT_EXPORT_METHOD(getBase64ForTag
+                  : (NSString *)imageTag successCallback
+                  : (RCTResponseSenderBlock)successCallback errorCallback
+                  : (RCTResponseSenderBlock)errorCallback)
 {
   NSData *imageData = _store[imageTag];
   if (!imageData) {
-    errorCallback(@[RCTJSErrorFromNSError(RCTErrorWithMessage([NSString stringWithFormat:@"Invalid imageTag: %@", imageTag]))]);
+    errorCallback(
+        @[ RCTJSErrorFromNSError(RCTErrorWithMessage([NSString stringWithFormat:@"Invalid imageTag: %@", imageTag])) ]);
     return;
   }
   // Dispatching to a background thread to perform base64 encoding
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-    successCallback(@[[imageData base64EncodedStringWithOptions:0]]);
+    successCallback(@[ [imageData base64EncodedStringWithOptions:0] ]);
   });
 }
 
-RCT_EXPORT_METHOD(addImageFromBase64:(NSString *)base64String
-                  successCallback:(RCTResponseSenderBlock)successCallback
-                  errorCallback:(RCTResponseSenderBlock)errorCallback)
+RCT_EXPORT_METHOD(addImageFromBase64
+                  : (NSString *)base64String successCallback
+                  : (RCTResponseSenderBlock)successCallback errorCallback
+                  : (RCTResponseSenderBlock)errorCallback)
 
 {
   // Dispatching to a background thread to perform base64 decoding
@@ -128,10 +129,10 @@ - (void)storeImage:(UIImage *)image withBlock:(void (^)(NSString *imageTag))bloc
     NSData *imageData = [[NSData alloc] initWithBase64EncodedString:base64String options:0];
     if (imageData) {
       dispatch_async(self->_methodQueue, ^{
-        successCallback(@[[self _storeImageData:imageData]]);
+        successCallback(@[ [self _storeImageData:imageData] ]);
       });
     } else {
-      errorCallback(@[RCTJSErrorFromNSError(RCTErrorWithMessage(@"Failed to add image from base64String"))]);
+      errorCallback(@[ RCTJSErrorFromNSError(RCTErrorWithMessage(@"Failed to add image from base64String")) ]);
     }
   });
 }
@@ -166,7 +167,8 @@ - (id)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequestDelegate
 
     CGImageSourceRef sourceRef = CGImageSourceCreateWithData((__bridge CFDataRef)imageData, NULL);
     if (!sourceRef) {
-      NSError *error = RCTErrorWithMessage([NSString stringWithFormat:@"Unable to decode data for imageTag: %@", imageTag]);
+      NSError *error =
+          RCTErrorWithMessage([NSString stringWithFormat:@"Unable to decode data for imageTag: %@", imageTag]);
       [delegate URLRequest:cancellationBlock didCompleteWithError:error];
       return;
     }
@@ -183,7 +185,6 @@ - (id)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequestDelegate
     [delegate URLRequest:cancellationBlock didReceiveResponse:response];
     [delegate URLRequest:cancellationBlock didReceiveData:imageData];
     [delegate URLRequest:cancellationBlock didCompleteWithError:nil];
-
   });
 
   return cancellationBlock;
@@ -196,7 +197,8 @@ - (void)cancelRequest:(id)requestToken
   }
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   return std::make_shared<facebook::react::NativeImageStoreIOSSpecJSI>(params);
 }
@@ -208,7 +210,8 @@ @implementation RCTImageStoreManager (Deprecated)
 - (NSString *)storeImage:(UIImage *)image
 {
   RCTAssertMainQueue();
-  RCTLogWarn(@"RCTImageStoreManager.storeImage() is deprecated and has poor performance. Use an alternative method instead.");
+  RCTLogWarn(
+      @"RCTImageStoreManager.storeImage() is deprecated and has poor performance. Use an alternative method instead.");
   __block NSString *imageTag;
   dispatch_sync(_methodQueue, ^{
     imageTag = [self _storeImageData:RCTGetImageData(image, 0.75)];
@@ -219,7 +222,8 @@ - (NSString *)storeImage:(UIImage *)image
 - (UIImage *)imageForTag:(NSString *)imageTag
 {
   RCTAssertMainQueue();
-  RCTLogWarn(@"RCTImageStoreManager.imageForTag() is deprecated and has poor performance. Use an alternative method instead.");
+  RCTLogWarn(
+      @"RCTImageStoreManager.imageForTag() is deprecated and has poor performance. Use an alternative method instead.");
   __block NSData *imageData;
   dispatch_sync(_methodQueue, ^{
     imageData = self->_store[imageTag];
@@ -250,6 +254,7 @@ - (RCTImageStoreManager *)imageStoreManager
 
 @end
 
-Class RCTImageStoreManagerCls(void) {
+Class RCTImageStoreManagerCls(void)
+{
   return RCTImageStoreManager.class;
 }
diff --git a/Libraries/Image/RCTImageURLLoader.h b/Libraries/Image/RCTImageURLLoader.h
index e8ceb26121a1..b58b11f7d691 100644
--- a/Libraries/Image/RCTImageURLLoader.h
+++ b/Libraries/Image/RCTImageURLLoader.h
@@ -14,10 +14,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 typedef void (^RCTImageLoaderProgressBlock)(int64_t progress, int64_t total);
 typedef void (^RCTImageLoaderPartialLoadBlock)(UIImage *image);
-typedef void (^RCTImageLoaderCompletionBlock)(NSError * _Nullable error, UIImage * _Nullable image);
+typedef void (^RCTImageLoaderCompletionBlock)(NSError *_Nullable error, UIImage *_Nullable image);
 // Metadata is passed as a id in an additional parameter because there are forks of RN without this parameter,
 // and the complexity of RCTImageLoader would make using protocols here difficult to typecheck.
-typedef void (^RCTImageLoaderCompletionBlockWithMetadata)(NSError * _Nullable error, UIImage * _Nullable image, id _Nullable metadata);
+typedef void (^RCTImageLoaderCompletionBlockWithMetadata)(
+    NSError *_Nullable error,
+    UIImage *_Nullable image,
+    id _Nullable metadata);
 typedef dispatch_block_t RCTImageLoaderCancellationBlock;
 
 /**
@@ -41,12 +44,12 @@ typedef dispatch_block_t RCTImageLoaderCancellationBlock;
  * applicable.
  */
 - (nullable RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL
-                                              size:(CGSize)size
-                                             scale:(CGFloat)scale
-                                        resizeMode:(RCTResizeMode)resizeMode
-                                   progressHandler:(RCTImageLoaderProgressBlock)progressHandler
-                                partialLoadHandler:(RCTImageLoaderPartialLoadBlock)partialLoadHandler
-                                 completionHandler:(RCTImageLoaderCompletionBlock)completionHandler;
+                                                       size:(CGSize)size
+                                                      scale:(CGFloat)scale
+                                                 resizeMode:(RCTResizeMode)resizeMode
+                                            progressHandler:(RCTImageLoaderProgressBlock)progressHandler
+                                         partialLoadHandler:(RCTImageLoaderPartialLoadBlock)partialLoadHandler
+                                          completionHandler:(RCTImageLoaderCompletionBlock)completionHandler;
 
 @optional
 
diff --git a/Libraries/Image/RCTImageURLLoaderWithAttribution.h b/Libraries/Image/RCTImageURLLoaderWithAttribution.h
index f417cdc79899..c512736e1065 100644
--- a/Libraries/Image/RCTImageURLLoaderWithAttribution.h
+++ b/Libraries/Image/RCTImageURLLoaderWithAttribution.h
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTImageURLLoader.h>
-#import <React/RCTImageLoaderProtocol.h>
 #import <React/RCTImageLoaderLoggable.h>
+#import <React/RCTImageLoaderProtocol.h>
+#import <React/RCTImageURLLoader.h>
 
 // TODO (T61325135): Remove C++ checks
 #ifdef __cplusplus
@@ -31,7 +31,9 @@ struct ImageURLLoaderAttribution {
 @property (nonatomic, strong, readonly) NSURL *imageURL;
 @property (nonatomic, copy, readonly) RCTImageLoaderCancellationBlock cancellationBlock;
 
-- (instancetype)initWithRequestId:(NSString *)requestId imageURL:(NSURL *)imageURL cancellationBlock:(RCTImageLoaderCancellationBlock)cancellationBlock;
+- (instancetype)initWithRequestId:(NSString *)requestId
+                         imageURL:(NSURL *)imageURL
+                cancellationBlock:(RCTImageLoaderCancellationBlock)cancellationBlock;
 - (void)cancel;
 
 @end
@@ -53,7 +55,7 @@ struct ImageURLLoaderAttribution {
                                         scale:(CGFloat)scale
                                    resizeMode:(RCTResizeMode)resizeMode
                                     requestId:(NSString *)requestId
-                                    priority: (RCTImageLoaderPriority)priority
+                                     priority:(RCTImageLoaderPriority)priority
                                   attribution:(const facebook::react::ImageURLLoaderAttribution &)attribution
                               progressHandler:(RCTImageLoaderProgressBlock)progressHandler
                            partialLoadHandler:(RCTImageLoaderPartialLoadBlock)partialLoadHandler
diff --git a/Libraries/Image/RCTImageURLLoaderWithAttribution.mm b/Libraries/Image/RCTImageURLLoaderWithAttribution.mm
index 1ba2d8964a05..dcd4c39e5023 100644
--- a/Libraries/Image/RCTImageURLLoaderWithAttribution.mm
+++ b/Libraries/Image/RCTImageURLLoaderWithAttribution.mm
@@ -9,7 +9,9 @@
 
 @implementation RCTImageURLLoaderRequest
 
-- (instancetype)initWithRequestId:(NSString *)requestId imageURL:(NSURL *)imageURL cancellationBlock:(RCTImageLoaderCancellationBlock)cancellationBlock
+- (instancetype)initWithRequestId:(NSString *)requestId
+                         imageURL:(NSURL *)imageURL
+                cancellationBlock:(RCTImageLoaderCancellationBlock)cancellationBlock
 {
   if (self = [super init]) {
     _requestId = requestId;
diff --git a/Libraries/Image/RCTImageUtils.h b/Libraries/Image/RCTImageUtils.h
index 5763b04dfbfa..b430e7a5b9a7 100644
--- a/Libraries/Image/RCTImageUtils.h
+++ b/Libraries/Image/RCTImageUtils.h
@@ -18,16 +18,14 @@ NS_ASSUME_NONNULL_BEGIN
  * calculates the rectangle to draw the image into so that it will be sized and
  * positioned correctly according to the specified resizeMode.
  */
-RCT_EXTERN CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize,
-                                CGFloat destScale, RCTResizeMode resizeMode);
+RCT_EXTERN CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize, CGFloat destScale, RCTResizeMode resizeMode);
 
 /**
  * This function takes a source size (typically from an image), a target rect
  * that it will be drawn into (typically relative to a CGContext), and works out
  * the transform needed to draw the image at the correct scale and position.
  */
-RCT_EXTERN CGAffineTransform RCTTransformFromTargetRect(CGSize sourceSize,
-                                                        CGRect targetRect);
+RCT_EXTERN CGAffineTransform RCTTransformFromTargetRect(CGSize sourceSize, CGRect targetRect);
 
 /**
  * This function takes an input content size & scale (typically from an image),
@@ -35,18 +33,25 @@ RCT_EXTERN CGAffineTransform RCTTransformFromTargetRect(CGSize sourceSize,
  * UIImageView) and then calculates the optimal size at which to redraw the
  * image so that it will be displayed correctly with the specified resizeMode.
  */
-RCT_EXTERN CGSize RCTTargetSize(CGSize sourceSize, CGFloat sourceScale,
-                                CGSize destSize, CGFloat destScale,
-                                RCTResizeMode resizeMode, BOOL allowUpscaling);
+RCT_EXTERN CGSize RCTTargetSize(
+    CGSize sourceSize,
+    CGFloat sourceScale,
+    CGSize destSize,
+    CGFloat destScale,
+    RCTResizeMode resizeMode,
+    BOOL allowUpscaling);
 
 /**
  * This function takes an input content size & scale (typically from an image),
  * a target size & scale that it will be displayed at, and determines if the
  * source will need to be upscaled to fit (which may result in pixelization).
  */
-RCT_EXTERN BOOL RCTUpscalingRequired(CGSize sourceSize, CGFloat sourceScale,
-                                     CGSize destSize, CGFloat destScale,
-                                     RCTResizeMode resizeMode);
+RCT_EXTERN BOOL RCTUpscalingRequired(
+    CGSize sourceSize,
+    CGFloat sourceScale,
+    CGSize destSize,
+    CGFloat destScale,
+    RCTResizeMode resizeMode);
 
 /**
  * This function takes the source data for an image and decodes it at the
@@ -55,10 +60,8 @@ RCT_EXTERN BOOL RCTUpscalingRequired(CGSize sourceSize, CGFloat sourceScale,
  * width/height of the returned image is guaranteed to be >= destSize.
  * Pass a destSize of CGSizeZero to decode the image at its original size.
  */
-RCT_EXTERN UIImage *__nullable RCTDecodeImageWithData(NSData *data,
-                                                      CGSize destSize,
-                                                      CGFloat destScale,
-                                                      RCTResizeMode resizeMode);
+RCT_EXTERN UIImage *__nullable
+RCTDecodeImageWithData(NSData *data, CGSize destSize, CGFloat destScale, RCTResizeMode resizeMode);
 
 /**
  * This function takes the source data for an image and decodes just the
@@ -80,10 +83,8 @@ RCT_EXTERN NSData *__nullable RCTGetImageData(UIImage *image, float quality);
  * and `destScale` is its scale. The `transform` argument controls how the
  * source image will be mapped to the destination image.
  */
-RCT_EXTERN UIImage *__nullable RCTTransformImage(UIImage *image,
-                                                 CGSize destSize,
-                                                 CGFloat destScale,
-                                                 CGAffineTransform transform);
+RCT_EXTERN UIImage *__nullable
+RCTTransformImage(UIImage *image, CGSize destSize, CGFloat destScale, CGAffineTransform transform);
 
 /*
  * Return YES if image has an alpha component
diff --git a/Libraries/Image/RCTImageUtils.m b/Libraries/Image/RCTImageUtils.m
index 2724a3d6c0ea..a55c81fb41f4 100644
--- a/Libraries/Image/RCTImageUtils.m
+++ b/Libraries/Image/RCTImageUtils.m
@@ -27,30 +27,35 @@ static CGFloat RCTFloorValue(CGFloat value, CGFloat scale)
 
 static CGSize RCTCeilSize(CGSize size, CGFloat scale)
 {
-  return (CGSize){
-    RCTCeilValue(size.width, scale),
-    RCTCeilValue(size.height, scale)
-  };
+  return (CGSize){RCTCeilValue(size.width, scale), RCTCeilValue(size.height, scale)};
 }
 
 static CGImagePropertyOrientation CGImagePropertyOrientationFromUIImageOrientation(UIImageOrientation imageOrientation)
 {
   // see https://stackoverflow.com/a/6699649/496389
   switch (imageOrientation) {
-    case UIImageOrientationUp: return kCGImagePropertyOrientationUp;
-    case UIImageOrientationDown: return kCGImagePropertyOrientationDown;
-    case UIImageOrientationLeft: return kCGImagePropertyOrientationLeft;
-    case UIImageOrientationRight: return kCGImagePropertyOrientationRight;
-    case UIImageOrientationUpMirrored: return kCGImagePropertyOrientationUpMirrored;
-    case UIImageOrientationDownMirrored: return kCGImagePropertyOrientationDownMirrored;
-    case UIImageOrientationLeftMirrored: return kCGImagePropertyOrientationLeftMirrored;
-    case UIImageOrientationRightMirrored: return kCGImagePropertyOrientationRightMirrored;
-    default: return kCGImagePropertyOrientationUp;
+    case UIImageOrientationUp:
+      return kCGImagePropertyOrientationUp;
+    case UIImageOrientationDown:
+      return kCGImagePropertyOrientationDown;
+    case UIImageOrientationLeft:
+      return kCGImagePropertyOrientationLeft;
+    case UIImageOrientationRight:
+      return kCGImagePropertyOrientationRight;
+    case UIImageOrientationUpMirrored:
+      return kCGImagePropertyOrientationUpMirrored;
+    case UIImageOrientationDownMirrored:
+      return kCGImagePropertyOrientationDownMirrored;
+    case UIImageOrientationLeftMirrored:
+      return kCGImagePropertyOrientationLeftMirrored;
+    case UIImageOrientationRightMirrored:
+      return kCGImagePropertyOrientationRightMirrored;
+    default:
+      return kCGImagePropertyOrientationUp;
   }
 }
 
-CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize,
-                     CGFloat destScale, RCTResizeMode resizeMode)
+CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize, CGFloat destScale, RCTResizeMode resizeMode)
 {
   if (CGSizeEqualToSize(destSize, CGSizeZero)) {
     // Assume we require the largest size available
@@ -70,8 +75,7 @@ CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize,
 
   // Calculate target aspect ratio if needed
   CGFloat targetAspect = 0.0;
-  if (resizeMode != RCTResizeModeCenter &&
-      resizeMode != RCTResizeModeStretch) {
+  if (resizeMode != RCTResizeModeCenter && resizeMode != RCTResizeModeStretch) {
     targetAspect = destSize.width / destSize.height;
     if (aspect == targetAspect) {
       resizeMode = RCTResizeModeStretch;
@@ -97,12 +101,11 @@ CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize,
         sourceSize.width = sourceSize.height * aspect;
       }
       return (CGRect){
-        {
-          RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale),
-          RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale),
-        },
-        RCTCeilSize(sourceSize, destScale)
-      };
+          {
+              RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale),
+              RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale),
+          },
+          RCTCeilSize(sourceSize, destScale)};
 
     case RCTResizeModeCover:
 
@@ -112,9 +115,7 @@ CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize,
         sourceSize.width = sourceSize.height * aspect;
         destSize.width = destSize.height * targetAspect;
         return (CGRect){
-          {RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale), 0},
-          RCTCeilSize(sourceSize, destScale)
-        };
+            {RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale), 0}, RCTCeilSize(sourceSize, destScale)};
 
       } else { // target is wider than content
 
@@ -122,9 +123,8 @@ CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize,
         sourceSize.height = sourceSize.width / aspect;
         destSize.height = destSize.width / targetAspect;
         return (CGRect){
-          {0, RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale)},
-          RCTCeilSize(sourceSize, destScale)
-        };
+            {0, RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale)},
+            RCTCeilSize(sourceSize, destScale)};
       }
 
     case RCTResizeModeCenter:
@@ -140,31 +140,30 @@ CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize,
       }
 
       return (CGRect){
-        {
-          RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale),
-          RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale),
-        },
-        RCTCeilSize(sourceSize, destScale)
-      };
+          {
+              RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale),
+              RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale),
+          },
+          RCTCeilSize(sourceSize, destScale)};
   }
 }
 
 CGAffineTransform RCTTransformFromTargetRect(CGSize sourceSize, CGRect targetRect)
 {
   CGAffineTransform transform = CGAffineTransformIdentity;
-  transform = CGAffineTransformTranslate(transform,
-                                         targetRect.origin.x,
-                                         targetRect.origin.y);
-  transform = CGAffineTransformScale(transform,
-                                     targetRect.size.width / sourceSize.width,
-                                     targetRect.size.height / sourceSize.height);
+  transform = CGAffineTransformTranslate(transform, targetRect.origin.x, targetRect.origin.y);
+  transform = CGAffineTransformScale(
+      transform, targetRect.size.width / sourceSize.width, targetRect.size.height / sourceSize.height);
   return transform;
 }
 
-CGSize RCTTargetSize(CGSize sourceSize, CGFloat sourceScale,
-                     CGSize destSize, CGFloat destScale,
-                     RCTResizeMode resizeMode,
-                     BOOL allowUpscaling)
+CGSize RCTTargetSize(
+    CGSize sourceSize,
+    CGFloat sourceScale,
+    CGSize destSize,
+    CGFloat destScale,
+    RCTResizeMode resizeMode,
+    BOOL allowUpscaling)
 {
   switch (resizeMode) {
     case RCTResizeModeCenter:
@@ -181,7 +180,6 @@ CGSize RCTTargetSize(CGSize sourceSize, CGFloat sourceScale,
       return RCTCeilSize(destSize, destScale);
 
     default: {
-
       // Get target size
       CGSize size = RCTTargetRect(sourceSize, destSize, destScale, resizeMode).size;
       if (!allowUpscaling) {
@@ -195,9 +193,12 @@ CGSize RCTTargetSize(CGSize sourceSize, CGFloat sourceScale,
   }
 }
 
-BOOL RCTUpscalingRequired(CGSize sourceSize, CGFloat sourceScale,
-                          CGSize destSize, CGFloat destScale,
-                          RCTResizeMode resizeMode)
+BOOL RCTUpscalingRequired(
+    CGSize sourceSize,
+    CGFloat sourceScale,
+    CGSize destSize,
+    CGFloat destScale,
+    RCTResizeMode resizeMode)
 {
   if (CGSizeEqualToSize(destSize, CGSizeZero)) {
     // Assume we require the largest size available
@@ -253,10 +254,7 @@ BOOL RCTUpscalingRequired(CGSize sourceSize, CGFloat sourceScale,
   }
 }
 
-UIImage *__nullable RCTDecodeImageWithData(NSData *data,
-                                           CGSize destSize,
-                                           CGFloat destScale,
-                                           RCTResizeMode resizeMode)
+UIImage *__nullable RCTDecodeImageWithData(NSData *data, CGSize destSize, CGFloat destScale, RCTResizeMode resizeMode)
 {
   CGImageSourceRef sourceRef = CGImageSourceCreateWithData((__bridge CFDataRef)data, NULL);
   if (!sourceRef) {
@@ -292,14 +290,14 @@ BOOL RCTUpscalingRequired(CGSize sourceSize, CGFloat sourceScale,
   // Calculate target size
   CGSize targetSize = RCTTargetSize(sourceSize, 1, destSize, destScale, resizeMode, NO);
   CGSize targetPixelSize = RCTSizeInPixels(targetSize, destScale);
-  CGFloat maxPixelSize = fmax(fmin(sourceSize.width, targetPixelSize.width),
-                              fmin(sourceSize.height, targetPixelSize.height));
+  CGFloat maxPixelSize =
+      fmax(fmin(sourceSize.width, targetPixelSize.width), fmin(sourceSize.height, targetPixelSize.height));
 
   NSDictionary<NSString *, NSNumber *> *options = @{
-    (id)kCGImageSourceShouldAllowFloat: @YES,
-    (id)kCGImageSourceCreateThumbnailWithTransform: @YES,
-    (id)kCGImageSourceCreateThumbnailFromImageAlways: @YES,
-    (id)kCGImageSourceThumbnailMaxPixelSize: @(maxPixelSize),
+    (id)kCGImageSourceShouldAllowFloat : @YES,
+    (id)kCGImageSourceCreateThumbnailWithTransform : @YES,
+    (id)kCGImageSourceCreateThumbnailFromImageAlways : @YES,
+    (id)kCGImageSourceThumbnailMaxPixelSize : @(maxPixelSize),
   };
 
   // Get thumbnail
@@ -310,9 +308,7 @@ BOOL RCTUpscalingRequired(CGSize sourceSize, CGFloat sourceScale,
   }
 
   // Return image
-  UIImage *image = [UIImage imageWithCGImage:imageRef
-                                       scale:destScale
-                                 orientation:UIImageOrientationUp];
+  UIImage *image = [UIImage imageWithCGImage:imageRef scale:destScale orientation:UIImageOrientationUp];
   CGImageRelease(imageRef);
   return image;
 }
@@ -360,10 +356,7 @@ BOOL RCTUpscalingRequired(CGSize sourceSize, CGFloat sourceScale,
   return (__bridge_transfer NSData *)imageData;
 }
 
-UIImage *__nullable RCTTransformImage(UIImage *image,
-                                      CGSize destSize,
-                                      CGFloat destScale,
-                                      CGAffineTransform transform)
+UIImage *__nullable RCTTransformImage(UIImage *image, CGSize destSize, CGFloat destScale, CGAffineTransform transform)
 {
   if (destSize.width <= 0 | destSize.height <= 0 || destScale <= 0) {
     return nil;
@@ -373,7 +366,8 @@ BOOL RCTUpscalingRequired(CGSize sourceSize, CGFloat sourceScale,
   UIGraphicsImageRendererFormat *const rendererFormat = [UIGraphicsImageRendererFormat defaultFormat];
   rendererFormat.opaque = opaque;
   rendererFormat.scale = destScale;
-  UIGraphicsImageRenderer *const renderer = [[UIGraphicsImageRenderer alloc] initWithSize:destSize format:rendererFormat];
+  UIGraphicsImageRenderer *const renderer = [[UIGraphicsImageRenderer alloc] initWithSize:destSize
+                                                                                   format:rendererFormat];
   return [renderer imageWithActions:^(UIGraphicsImageRendererContext *_Nonnull context) {
     CGContextConcatCTM(context.CGContext, transform);
     [image drawAtPoint:CGPointZero];
diff --git a/Libraries/Image/RCTImageView.h b/Libraries/Image/RCTImageView.h
index c5057fc8db15..da7f860228c6 100644
--- a/Libraries/Image/RCTImageView.h
+++ b/Libraries/Image/RCTImageView.h
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <UIKit/UIKit.h>
-#import <React/RCTView.h>
 #import <React/RCTResizeMode.h>
+#import <React/RCTView.h>
+#import <UIKit/UIKit.h>
 
 @class RCTBridge;
 @class RCTImageSource;
diff --git a/Libraries/Image/RCTImageView.mm b/Libraries/Image/RCTImageView.mm
index 410f21b73aa7..050a44769bd6 100644
--- a/Libraries/Image/RCTImageView.mm
+++ b/Libraries/Image/RCTImageView.mm
@@ -10,9 +10,9 @@
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
 #import <React/RCTImageBlurUtils.h>
+#import <React/RCTImageLoaderWithAttributionProtocol.h>
 #import <React/RCTImageSource.h>
 #import <React/RCTImageUtils.h>
-#import <React/RCTImageLoaderWithAttributionProtocol.h>
 #import <React/RCTUIImageViewAnimated.h>
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
@@ -30,7 +30,7 @@ static BOOL RCTShouldReloadImageForSizeChange(CGSize currentSize, CGSize idealSi
   CGFloat heightMultiplier = idealSize.height / currentSize.height;
 
   return widthMultiplier > upscaleThreshold || widthMultiplier < downscaleThreshold ||
-    heightMultiplier > upscaleThreshold || heightMultiplier < downscaleThreshold;
+      heightMultiplier > upscaleThreshold || heightMultiplier < downscaleThreshold;
 }
 
 /**
@@ -40,11 +40,11 @@ static BOOL RCTShouldReloadImageForSizeChange(CGSize currentSize, CGSize idealSi
 static NSDictionary *onLoadParamsForSource(RCTImageSource *source)
 {
   NSDictionary *dict = @{
-    @"uri": source.request.URL.absoluteString,
-    @"width": @(source.size.width),
-    @"height": @(source.size.height),
+    @"uri" : source.request.URL.absoluteString,
+    @"width" : @(source.size.width),
+    @"height" : @(source.size.height),
   };
-  return @{ @"source": dict };
+  return @{@"source" : dict};
 }
 
 @interface RCTImageView ()
@@ -58,8 +58,7 @@ @interface RCTImageView ()
 
 @end
 
-@implementation RCTImageView
-{
+@implementation RCTImageView {
   // Weak reference back to the bridge, for image loading
   __weak RCTBridge *_bridge;
 
@@ -113,11 +112,11 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
-RCT_NOT_IMPLEMENTED(- (instancetype)init)
+RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
-RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)aDecoder)
+RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 
-RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
+RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
 
 - (void)updateWithImage:(UIImage *)image
 {
@@ -153,7 +152,8 @@ - (void)setImage:(UIImage *)image
   }
 }
 
-- (UIImage *)image {
+- (UIImage *)image
+{
   return _imageView.image;
 }
 
@@ -215,11 +215,12 @@ - (void)setResizeMode:(RCTResizeMode)resizeMode
   }
 }
 
-- (void)setInternal_analyticTag:(NSString *)internal_analyticTag {
-    if (_internal_analyticTag != internal_analyticTag) {
-        _internal_analyticTag = internal_analyticTag;
-        _needsReload = YES;
-    }
+- (void)setInternal_analyticTag:(NSString *)internal_analyticTag
+{
+  if (_internal_analyticTag != internal_analyticTag) {
+    _internal_analyticTag = internal_analyticTag;
+    _needsReload = YES;
+  }
 }
 
 - (void)cancelImageLoad
@@ -272,8 +273,7 @@ - (RCTImageSource *)imageSourceForSize:(CGSize)size
   CGFloat bestFit = CGFLOAT_MAX;
   for (RCTImageSource *source in _imageSources) {
     CGSize imgSize = source.size;
-    const CGFloat imagePixels =
-      imgSize.width * imgSize.height * source.scale * source.scale;
+    const CGFloat imagePixels = imgSize.width * imgSize.height * source.scale * source.scale;
     const CGFloat fit = ABS(1 - (imagePixels / targetImagePixels));
 
     if (fit < bestFit) {
@@ -295,8 +295,7 @@ - (BOOL)shouldChangeImageSource
   // We need to reload if the desired image source is different from the current image
   // source AND the image load that's pending
   RCTImageSource *desiredImageSource = [self imageSourceForSize:self.frame.size];
-  return ![desiredImageSource isEqual:_imageSource] &&
-         ![desiredImageSource isEqual:_pendingImageSource];
+  return ![desiredImageSource isEqual:_imageSource] && ![desiredImageSource isEqual:_pendingImageSource];
 }
 
 - (void)reloadImage
@@ -317,8 +316,8 @@ - (void)reloadImage
       RCTDirectEventBlock onProgress = self.onProgress;
       progressHandler = ^(int64_t loaded, int64_t total) {
         onProgress(@{
-          @"loaded": @((double)loaded),
-          @"total": @((double)total),
+          @"loaded" : @((double)loaded),
+          @"total" : @((double)total),
         });
       };
     }
@@ -344,27 +343,29 @@ - (void)reloadImage
       _imageLoader = [_bridge moduleForName:@"ImageLoader" lazilyLoadIfNecessary:YES];
     }
 
-    RCTImageURLLoaderRequest *loaderRequest = [_imageLoader loadImageWithURLRequest:source.request
-                                                                               size:imageSize
-                                                                              scale:imageScale
-                                                                           clipped:NO
-                                                                        resizeMode:_resizeMode
-                                                                          priority:RCTImageLoaderPriorityImmediate
-                                                                       attribution:{
-                                                                                   .nativeViewTag = [self.reactTag intValue],
-                                                                                   .surfaceId = [self.rootTag intValue],
-                                                                                   .analyticTag = self.internal_analyticTag
-                                                                                   }
-                                                                     progressBlock:progressHandler
-                                                                  partialLoadBlock:partialLoadHandler
-                                                                   completionBlock:completionHandler];
+    RCTImageURLLoaderRequest *loaderRequest =
+        [_imageLoader loadImageWithURLRequest:source.request
+                                         size:imageSize
+                                        scale:imageScale
+                                      clipped:NO
+                                   resizeMode:_resizeMode
+                                     priority:RCTImageLoaderPriorityImmediate
+                                  attribution:{.nativeViewTag = [self.reactTag intValue],
+                                               .surfaceId = [self.rootTag intValue],
+                                               .analyticTag = self.internal_analyticTag}
+                                progressBlock:progressHandler
+                             partialLoadBlock:partialLoadHandler
+                              completionBlock:completionHandler];
     _loaderRequest = loaderRequest;
   } else {
     [self cancelAndClearImageLoad];
   }
 }
 
-- (void)imageLoaderLoadedImage:(UIImage *)loadedImage error:(NSError *)error forImageSource:(RCTImageSource *)source partial:(BOOL)isPartialLoad
+- (void)imageLoaderLoadedImage:(UIImage *)loadedImage
+                         error:(NSError *)error
+                forImageSource:(RCTImageSource *)source
+                       partial:(BOOL)isPartialLoad
 {
   if (![source isEqual:_pendingImageSource]) {
     // Bail out if source has changed since we started loading
@@ -378,7 +379,11 @@ - (void)imageLoaderLoadedImage:(UIImage *)loadedImage error:(NSError *)error for
     });
 
     if (_onError) {
-      _onError(@{ @"error": error.localizedDescription, @"responseCode": (error.userInfo[@"httpStatusCode"]?: [NSNull null]), @"httpResponseHeaders": (error.userInfo[@"httpResponseHeaders"] ?: [NSNull null]) });
+      _onError(@{
+        @"error" : error.localizedDescription,
+        @"responseCode" : (error.userInfo[@"httpStatusCode"] ?: [NSNull null]),
+        @"httpResponseHeaders" : (error.userInfo[@"httpResponseHeaders"] ?: [NSNull null])
+      });
     }
     if (_onLoadEnd) {
       _onLoadEnd(nil);
@@ -446,8 +451,8 @@ - (void)reactSetFrame:(CGRect)frame
   } else if ([self shouldReloadImageSourceAfterResize]) {
     CGSize imageSize = self.image.size;
     CGFloat imageScale = self.image.scale;
-    CGSize idealSize = RCTTargetSize(imageSize, imageScale, frame.size, RCTScreenScale(),
-                                     (RCTResizeMode)self.contentMode, YES);
+    CGSize idealSize =
+        RCTTargetSize(imageSize, imageScale, frame.size, RCTScreenScale(), (RCTResizeMode)self.contentMode, YES);
 
     // Don't reload if the current image or target image size is close enough
     if (!RCTShouldReloadImageForSizeChange(imageSize, idealSize) ||
@@ -462,7 +467,8 @@ - (void)reactSetFrame:(CGRect)frame
       return;
     }
 
-    RCTLogInfo(@"Reloading image %@ as size %@", _imageSource.request.URL.absoluteString, NSStringFromCGSize(idealSize));
+    RCTLogInfo(
+        @"Reloading image %@ as size %@", _imageSource.request.URL.absoluteString, NSStringFromCGSize(idealSize));
 
     // If the existing image or an image being loaded are not the right
     // size, reload the asset in case there is a better size available.
@@ -494,7 +500,8 @@ - (void)didMoveToWindow
   }
 }
 
-- (void)dealloc {
+- (void)dealloc
+{
   [_imageLoader trackURLImageDidDestroy:_loaderRequest];
 }
 
diff --git a/Libraries/Image/RCTImageViewManager.mm b/Libraries/Image/RCTImageViewManager.mm
index cbf0d4eee953..19ecaf7ee2c9 100644
--- a/Libraries/Image/RCTImageViewManager.mm
+++ b/Libraries/Image/RCTImageViewManager.mm
@@ -12,9 +12,9 @@
 #import <React/RCTConvert.h>
 #import <React/RCTImageSource.h>
 
+#import <React/RCTImageLoaderProtocol.h>
 #import <React/RCTImageShadowView.h>
 #import <React/RCTImageView.h>
-#import <React/RCTImageLoaderProtocol.h>
 
 @implementation RCTImageViewManager
 
@@ -51,60 +51,64 @@ - (UIView *)view
   view.renderingMode = json ? UIImageRenderingModeAlwaysTemplate : defaultView.renderingMode;
 }
 
-RCT_EXPORT_METHOD(getSize:(NSURLRequest *)request
-                  successBlock:(RCTResponseSenderBlock)successBlock
-                  errorBlock:(RCTResponseErrorBlock)errorBlock)
+RCT_EXPORT_METHOD(getSize
+                  : (NSURLRequest *)request successBlock
+                  : (RCTResponseSenderBlock)successBlock errorBlock
+                  : (RCTResponseErrorBlock)errorBlock)
 {
-  [[self.bridge moduleForName:@"ImageLoader" lazilyLoadIfNecessary:YES]
-   getImageSizeForURLRequest:request
-   block:^(NSError *error, CGSize size) {
-     if (error) {
-       errorBlock(error);
-     } else {
-       successBlock(@[@(size.width), @(size.height)]);
-     }
-   }];
+  [[self.bridge moduleForName:@"ImageLoader"
+        lazilyLoadIfNecessary:YES] getImageSizeForURLRequest:request
+                                                       block:^(NSError *error, CGSize size) {
+                                                         if (error) {
+                                                           errorBlock(error);
+                                                         } else {
+                                                           successBlock(@[ @(size.width), @(size.height) ]);
+                                                         }
+                                                       }];
 }
 
-RCT_EXPORT_METHOD(getSizeWithHeaders:(RCTImageSource *)source
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getSizeWithHeaders
+                  : (RCTImageSource *)source resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
   [[self.bridge moduleForName:@"ImageLoader" lazilyLoadIfNecessary:YES]
-   getImageSizeForURLRequest:source.request
-   block:^(NSError *error, CGSize size) {
-     if (error) {
-       reject(@"E_GET_SIZE_FAILURE", nil, error);
-       return;
-     }
-     resolve(@{@"width":@(size.width),@"height":@(size.height)});
-   }];
+      getImageSizeForURLRequest:source.request
+                          block:^(NSError *error, CGSize size) {
+                            if (error) {
+                              reject(@"E_GET_SIZE_FAILURE", nil, error);
+                              return;
+                            }
+                            resolve(@{@"width" : @(size.width), @"height" : @(size.height)});
+                          }];
 }
 
-RCT_EXPORT_METHOD(prefetchImage:(NSURLRequest *)request
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(prefetchImage
+                  : (NSURLRequest *)request resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
   if (!request) {
     reject(@"E_INVALID_URI", @"Cannot prefetch an image for an empty URI", nil);
     return;
   }
-    id<RCTImageLoaderProtocol> imageLoader = (id<RCTImageLoaderProtocol>)[self.bridge
-                                                                          moduleForName:@"ImageLoader" lazilyLoadIfNecessary:YES];
-    [imageLoader loadImageWithURLRequest:request
-                                priority:RCTImageLoaderPriorityPrefetch
-                                callback:^(NSError *error, UIImage *image) {
-        if (error) {
-            reject(@"E_PREFETCH_FAILURE", nil, error);
-            return;
-        }
-        resolve(@YES);
-    }];
+  id<RCTImageLoaderProtocol> imageLoader = (id<RCTImageLoaderProtocol>)[self.bridge moduleForName:@"ImageLoader"
+                                                                            lazilyLoadIfNecessary:YES];
+  [imageLoader loadImageWithURLRequest:request
+                              priority:RCTImageLoaderPriorityPrefetch
+                              callback:^(NSError *error, UIImage *image) {
+                                if (error) {
+                                  reject(@"E_PREFETCH_FAILURE", nil, error);
+                                  return;
+                                }
+                                resolve(@YES);
+                              }];
 }
 
-RCT_EXPORT_METHOD(queryCache:(NSArray *)requests
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(queryCache
+                  : (NSArray *)requests resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
   resolve([[self.bridge moduleForName:@"ImageLoader"] getImageCacheStatus:requests]);
 }
diff --git a/Libraries/Image/RCTLocalAssetImageLoader.mm b/Libraries/Image/RCTLocalAssetImageLoader.mm
index ec1527c6fbbd..a79b4666b185 100644
--- a/Libraries/Image/RCTLocalAssetImageLoader.mm
+++ b/Libraries/Image/RCTLocalAssetImageLoader.mm
@@ -15,7 +15,7 @@
 
 #import "RCTImagePlugins.h"
 
-@interface RCTLocalAssetImageLoader() <RCTTurboModule>
+@interface RCTLocalAssetImageLoader () <RCTTurboModule>
 @end
 
 @implementation RCTLocalAssetImageLoader
@@ -41,13 +41,13 @@ - (BOOL)shouldCacheLoadedImages
   return NO;
 }
 
- - (nullable RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL
-                                                        size:(CGSize)size
-                                                       scale:(CGFloat)scale
-                                                  resizeMode:(RCTResizeMode)resizeMode
-                                             progressHandler:(RCTImageLoaderProgressBlock)progressHandler
-                                          partialLoadHandler:(RCTImageLoaderPartialLoadBlock)partialLoadHandler
-                                           completionHandler:(RCTImageLoaderCompletionBlock)completionHandler
+- (nullable RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL
+                                                       size:(CGSize)size
+                                                      scale:(CGFloat)scale
+                                                 resizeMode:(RCTResizeMode)resizeMode
+                                            progressHandler:(RCTImageLoaderProgressBlock)progressHandler
+                                         partialLoadHandler:(RCTImageLoaderPartialLoadBlock)partialLoadHandler
+                                          completionHandler:(RCTImageLoaderCompletionBlock)completionHandler
 {
   UIImage *image = RCTImageFromLocalAssetURL(imageURL);
   if (image) {
@@ -64,13 +64,15 @@ - (nullable RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL
   return nil;
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   return nullptr;
 }
 
 @end
 
-Class RCTLocalAssetImageLoaderCls(void) {
+Class RCTLocalAssetImageLoaderCls(void)
+{
   return RCTLocalAssetImageLoader.class;
 }
diff --git a/Libraries/Image/RCTResizeMode.h b/Libraries/Image/RCTResizeMode.h
index 322ce53d0b93..38d1f6e486e4 100644
--- a/Libraries/Image/RCTResizeMode.h
+++ b/Libraries/Image/RCTResizeMode.h
@@ -15,7 +15,7 @@ typedef NS_ENUM(NSInteger, RCTResizeMode) {
   RCTResizeModeRepeat = -1, // Use negative values to avoid conflicts with iOS enum values.
 };
 
-@interface RCTConvert(RCTResizeMode)
+@interface RCTConvert (RCTResizeMode)
 
 + (RCTResizeMode)RCTResizeMode:(id)json;
 
diff --git a/Libraries/Image/RCTResizeMode.m b/Libraries/Image/RCTResizeMode.m
index 75d7ecefa867..c35c32e3fd16 100644
--- a/Libraries/Image/RCTResizeMode.m
+++ b/Libraries/Image/RCTResizeMode.m
@@ -7,14 +7,18 @@
 
 #import <React/RCTResizeMode.h>
 
-@implementation RCTConvert(RCTResizeMode)
+@implementation RCTConvert (RCTResizeMode)
 
-RCT_ENUM_CONVERTER(RCTResizeMode, (@{
-  @"cover": @(RCTResizeModeCover),
-  @"contain": @(RCTResizeModeContain),
-  @"stretch": @(RCTResizeModeStretch),
-  @"center": @(RCTResizeModeCenter),
-  @"repeat": @(RCTResizeModeRepeat),
-}), RCTResizeModeStretch, integerValue)
+RCT_ENUM_CONVERTER(
+    RCTResizeMode,
+    (@{
+      @"cover" : @(RCTResizeModeCover),
+      @"contain" : @(RCTResizeModeContain),
+      @"stretch" : @(RCTResizeModeStretch),
+      @"center" : @(RCTResizeModeCenter),
+      @"repeat" : @(RCTResizeModeRepeat),
+    }),
+    RCTResizeModeStretch,
+    integerValue)
 
 @end
diff --git a/Libraries/Image/RCTUIImageViewAnimated.m b/Libraries/Image/RCTUIImageViewAnimated.m
index 9e1cd1eb5c47..f532ce51a63d 100644
--- a/Libraries/Image/RCTUIImageViewAnimated.m
+++ b/Libraries/Image/RCTUIImageViewAnimated.m
@@ -5,17 +5,19 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTUIImageViewAnimated.h>
 #import <React/RCTDisplayWeakRefreshable.h>
+#import <React/RCTUIImageViewAnimated.h>
 
 #import <mach/mach.h>
 #import <objc/runtime.h>
 
-static NSUInteger RCTDeviceTotalMemory() {
+static NSUInteger RCTDeviceTotalMemory()
+{
   return (NSUInteger)[[NSProcessInfo processInfo] physicalMemory];
 }
 
-static NSUInteger RCTDeviceFreeMemory() {
+static NSUInteger RCTDeviceFreeMemory()
+{
   mach_port_t host_port = mach_host_self();
   mach_msg_type_number_t host_size = sizeof(vm_statistics_data_t) / sizeof(integer_t);
   vm_size_t page_size;
@@ -23,9 +25,11 @@ static NSUInteger RCTDeviceFreeMemory() {
   kern_return_t kern;
 
   kern = host_page_size(host_port, &page_size);
-  if (kern != KERN_SUCCESS) return 0;
+  if (kern != KERN_SUCCESS)
+    return 0;
   kern = host_statistics(host_port, HOST_VM_INFO, (host_info_t)&vm_stat, &host_size);
-  if (kern != KERN_SUCCESS) return 0;
+  if (kern != KERN_SUCCESS)
+    return 0;
   return (vm_stat.free_count - vm_stat.speculative_count) * page_size;
 }
 
@@ -55,8 +59,10 @@ - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
     self.lock = dispatch_semaphore_create(1);
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didReceiveMemoryWarning:) name:UIApplicationDidReceiveMemoryWarningNotification object:nil];
-
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(didReceiveMemoryWarning:)
+                                                 name:UIApplicationDidReceiveMemoryWarningNotification
+                                               object:nil];
   }
   return self;
 }
@@ -136,7 +142,7 @@ - (NSOperationQueue *)fetchQueue
   return _fetchQueue;
 }
 
-- (NSMutableDictionary<NSNumber *,UIImage *> *)frameBuffer
+- (NSMutableDictionary<NSNumber *, UIImage *> *)frameBuffer
 {
   if (!_frameBuffer) {
     _frameBuffer = [NSMutableDictionary dictionary];
@@ -146,15 +152,16 @@ - (NSOperationQueue *)fetchQueue
 
 - (CADisplayLink *)displayLink
 {
-  // We only need a displayLink in the case of animated images, so short-circuit this code and don't create one for most of the use cases.
-  // Since this class is used for all RCTImageView's, this is especially important.
+  // We only need a displayLink in the case of animated images, so short-circuit this code and don't create one for most
+  // of the use cases. Since this class is used for all RCTImageView's, this is especially important.
   if (!_animatedImage) {
     return nil;
   }
 
   if (!_displayLink) {
     _displayLink = [RCTDisplayWeakRefreshable displayLinkWithWeakRefreshable:self];
-    NSString *runLoopMode = [NSProcessInfo processInfo].activeProcessorCount > 1 ? NSRunLoopCommonModes : NSDefaultRunLoopMode;
+    NSString *runLoopMode =
+        [NSProcessInfo processInfo].activeProcessorCount > 1 ? NSRunLoopCommonModes : NSDefaultRunLoopMode;
     [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:runLoopMode];
   }
   return _displayLink;
@@ -289,7 +296,8 @@ - (void)displayLayer:(CALayer *)layer
 - (void)calculateMaxBufferCount
 {
   NSUInteger bytes = CGImageGetBytesPerRow(self.currentFrame.CGImage) * CGImageGetHeight(self.currentFrame.CGImage);
-  if (bytes == 0) bytes = 1024;
+  if (bytes == 0)
+    bytes = 1024;
 
   NSUInteger max = 0;
   if (self.maxBufferSize > 0) {
@@ -327,7 +335,7 @@ - (void)didReceiveMemoryWarning:(NSNotification *)notification
     dispatch_semaphore_wait(self.lock, DISPATCH_TIME_FOREVER);
     NSArray *keys = self.frameBuffer.allKeys;
     // only keep the next frame for later rendering
-    for (NSNumber * key in keys) {
+    for (NSNumber *key in keys) {
       if (![key isEqualToNumber:currentFrameIndex]) {
         [self.frameBuffer removeObjectForKey:key];
       }
diff --git a/Libraries/Image/TextInlineImageNativeComponent.js b/Libraries/Image/TextInlineImageNativeComponent.js
index 2ba778b217cc..1ce6818b113c 100644
--- a/Libraries/Image/TextInlineImageNativeComponent.js
+++ b/Libraries/Image/TextInlineImageNativeComponent.js
@@ -10,19 +10,20 @@
 
 'use strict';
 
+import type {ViewProps} from '../Components/View/ViewPropTypes';
 import type {
   HostComponent,
   PartialViewConfig,
 } from '../Renderer/shims/ReactNativeTypes';
-import type {ViewProps} from '../Components/View/ViewPropTypes';
+import type {ColorValue} from '../StyleSheet/StyleSheet';
 import type {ImageResizeMode} from './ImageResizeMode';
+
 import * as NativeComponentRegistry from '../NativeComponent/NativeComponentRegistry';
-import type {ColorValue} from '../StyleSheet/StyleSheet';
 
 type NativeProps = $ReadOnly<{
   ...ViewProps,
   resizeMode?: ?ImageResizeMode,
-  src?: ?$ReadOnlyArray<?$ReadOnly<{uri: string, ...}>>,
+  src?: ?$ReadOnlyArray<?$ReadOnly<{uri?: ?string, ...}>>,
   tintColor?: ?ColorValue,
   headers?: ?{[string]: string},
 }>;
diff --git a/Libraries/Image/TextInlineImageNativeComponent.js.flow b/Libraries/Image/TextInlineImageNativeComponent.js.flow
new file mode 100644
index 000000000000..6726b15d47a2
--- /dev/null
+++ b/Libraries/Image/TextInlineImageNativeComponent.js.flow
@@ -0,0 +1,27 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
+import type {ViewProps} from '../Components/View/ViewPropTypes';
+import type {ImageResizeMode} from './ImageResizeMode';
+import * as NativeComponentRegistry from '../NativeComponent/NativeComponentRegistry';
+import type {ColorValue} from '../StyleSheet/StyleSheet';
+
+type NativeProps = $ReadOnly<{
+  ...ViewProps,
+  resizeMode?: ?ImageResizeMode,
+  src?: ?$ReadOnlyArray<?$ReadOnly<{uri?: ?string, ...}>>,
+  tintColor?: ?ColorValue,
+  headers?: ?{[string]: string},
+}>;
+
+declare export default HostComponent<NativeProps>;
diff --git a/Libraries/Image/__tests__/AssetUtils-test.js b/Libraries/Image/__tests__/AssetUtils-test.js
index 4da66686a28d..926092a927ef 100644
--- a/Libraries/Image/__tests__/AssetUtils-test.js
+++ b/Libraries/Image/__tests__/AssetUtils-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 import {getUrlCacheBreaker, setUrlCacheBreaker} from '../AssetUtils';
diff --git a/Libraries/Image/__tests__/Image-test.js b/Libraries/Image/__tests__/Image-test.js
index eec7d4b3c6bb..6eb4600f191c 100644
--- a/Libraries/Image/__tests__/Image-test.js
+++ b/Libraries/Image/__tests__/Image-test.js
@@ -4,16 +4,16 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
-const Image = require('../Image');
 const render = require('../../../jest/renderer');
+const Image = require('../Image');
+const React = require('react');
 
 describe('<Image />', () => {
   it('should render as <Image> when mocked', () => {
diff --git a/Libraries/Image/__tests__/ImageBackground-test.js b/Libraries/Image/__tests__/ImageBackground-test.js
new file mode 100644
index 000000000000..85e1122b5d2a
--- /dev/null
+++ b/Libraries/Image/__tests__/ImageBackground-test.js
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall react_native
+ */
+
+'use strict';
+
+const render = require('../../../jest/renderer');
+const ImageBackground = require('../ImageBackground');
+const React = require('react');
+
+describe('<ImageBackground />', () => {
+  it('should render as <ImageBackground> when mocked', () => {
+    const instance = render.create(
+      <ImageBackground
+        style={{width: 150, height: 50}}
+        source={{uri: 'foo-bar.jpg'}}
+      />,
+    );
+    expect(instance).toMatchSnapshot();
+  });
+
+  it('should shallow render as <ImageBackground> when mocked', () => {
+    const output = render.shallow(
+      <ImageBackground
+        style={{width: 150, height: 50}}
+        source={{uri: 'foo-bar.jpg'}}
+      />,
+    );
+    expect(output).toMatchSnapshot();
+  });
+
+  it('should shallow render as <ForwardRef(ImageBackground)> when not mocked', () => {
+    jest.dontMock('../ImageBackground');
+
+    const output = render.shallow(
+      <ImageBackground
+        style={{width: 150, height: 50}}
+        source={{uri: 'foo-bar.jpg'}}
+      />,
+    );
+    expect(output).toMatchSnapshot();
+  });
+
+  it('should render as <RCTImageView> when not mocked', () => {
+    jest.dontMock('../ImageBackground');
+
+    const instance = render.create(
+      <ImageBackground
+        style={{width: 150, height: 50}}
+        source={{uri: 'foo-bar.jpg'}}
+      />,
+    );
+    expect(instance).toMatchSnapshot();
+  });
+
+  it('should be set importantForAccessibility in <View> and <Image>', () => {
+    const instance = render.create(
+      <ImageBackground
+        importantForAccessibility={'no'}
+        style={{width: 150, height: 50}}
+        source={{uri: 'foo-bar.jpg'}}
+      />,
+    );
+    expect(instance).toMatchSnapshot();
+  });
+});
diff --git a/Libraries/Image/__tests__/ImageSourceUtils-test.js b/Libraries/Image/__tests__/ImageSourceUtils-test.js
new file mode 100644
index 000000000000..dc3f599bf72d
--- /dev/null
+++ b/Libraries/Image/__tests__/ImageSourceUtils-test.js
@@ -0,0 +1,145 @@
+/**
+ * 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
+ * @oncall react_native
+ */
+
+const {getImageSourcesFromImageProps} = require('../ImageSourceUtils');
+
+describe('ImageSourceUtils', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('source prop provided', () => {
+    const imageProps = {source: require('./img/img1.png')};
+    const sources = getImageSourcesFromImageProps(imageProps);
+
+    expect(sources).toBeDefined();
+  });
+
+  it('should ignore source when src is provided', () => {
+    let uri = 'imageURI';
+    const imageProps = {source: require('./img/img1.png'), src: uri};
+    const sources = getImageSourcesFromImageProps(imageProps);
+
+    expect(sources).toBeDefined();
+    expect(sources).toHaveLength(1);
+    expect(sources[0].uri).toBe(uri);
+  });
+
+  it('should ignore source and src when srcSet is provided', () => {
+    let uri = 'imageURI';
+
+    let uri1 = 'uri1';
+    let scale1 = '1x';
+
+    let uri2 = 'uri2';
+    let scale2 = '2x';
+
+    const imageProps = {
+      source: require('./img/img1.png'),
+      src: uri,
+      srcSet: `${uri1} ${scale1}, ${uri2} ${scale2}`,
+    };
+    const sources = getImageSourcesFromImageProps(imageProps);
+
+    expect(sources).toBeDefined();
+    expect(sources).toHaveLength(2);
+    expect(sources[0]).toEqual(expect.objectContaining({uri: uri1, scale: 1}));
+    expect(sources[1]).toEqual(expect.objectContaining({uri: uri2, scale: 2}));
+  });
+
+  it('should use src as default when 1x scale is not provided in srcSet', () => {
+    let uri = 'imageURI';
+
+    let uri1 = 'uri1';
+    let scale1 = '3x';
+
+    let uri2 = 'uri2';
+    let scale2 = '2x';
+
+    const imageProps = {
+      src: uri,
+      srcSet: `${uri1} ${scale1}, ${uri2} ${scale2}`,
+    };
+    const sources = getImageSourcesFromImageProps(imageProps);
+
+    expect(sources).toBeDefined();
+    expect(sources).toHaveLength(3);
+    expect(sources[0]).toEqual(expect.objectContaining({uri: uri1, scale: 3}));
+    expect(sources[1]).toEqual(expect.objectContaining({uri: uri2, scale: 2}));
+    expect(sources[2]).toEqual(expect.objectContaining({uri: uri, scale: 1}));
+  });
+
+  it('should use 1x as default scale if only url is provided in srcSet', () => {
+    let uri1 = 'uri1';
+    let scale1 = '2x';
+
+    let uri2 = 'uri2';
+
+    const imageProps = {
+      srcSet: `${uri1} ${scale1}, ${uri2}`,
+    };
+    const sources = getImageSourcesFromImageProps(imageProps);
+
+    expect(sources).toBeDefined();
+    expect(sources).toHaveLength(2);
+    expect(sources[0]).toEqual(expect.objectContaining({uri: uri1, scale: 2}));
+    expect(sources[1]).toEqual(expect.objectContaining({uri: uri2, scale: 1}));
+  });
+
+  it('should warn when an unsupported scale is provided in srcSet', () => {
+    const mockWarn = jest.spyOn(console, 'warn');
+    let uri1 = 'uri1';
+    let scale1 = '300w';
+
+    let uri2 = 'uri2';
+
+    const imageProps = {
+      srcSet: `${uri1} ${scale1}, ${uri2}`,
+    };
+    const sources = getImageSourcesFromImageProps(imageProps);
+
+    expect(sources).toBeDefined();
+    expect(sources).toHaveLength(1);
+    expect(mockWarn).toHaveBeenCalled();
+  });
+
+  it('should contain crossorigin headers when provided with src', () => {
+    let uri = 'imageURI';
+
+    const imageProps = {
+      src: uri,
+      crossOrigin: 'use-credentials',
+    };
+    const sources = getImageSourcesFromImageProps(imageProps);
+
+    expect(sources).toBeDefined();
+    expect(sources).toHaveLength(1);
+    expect(sources[0]).toHaveProperty('headers', {
+      ['Access-Control-Allow-Credentials']: 'true',
+    });
+  });
+
+  it('should contain referrerPolicy headers when provided with src', () => {
+    let uri = 'imageURI';
+
+    let referrerPolicy = 'origin-when-cross-origin';
+    const imageProps = {
+      src: uri,
+      referrerPolicy: referrerPolicy,
+    };
+    const sources = getImageSourcesFromImageProps(imageProps);
+
+    expect(sources).toBeDefined();
+    expect(sources).toHaveLength(1);
+    expect(sources[0]).toHaveProperty('headers', {
+      ['Referrer-Policy']: referrerPolicy,
+    });
+  });
+});
diff --git a/Libraries/Image/__tests__/__snapshots__/Image-test.js.snap b/Libraries/Image/__tests__/__snapshots__/Image-test.js.snap
index ddb928125e21..ebf417842d2c 100644
--- a/Libraries/Image/__tests__/__snapshots__/Image-test.js.snap
+++ b/Libraries/Image/__tests__/__snapshots__/Image-test.js.snap
@@ -12,6 +12,15 @@ exports[`<Image /> should render as <Image> when mocked 1`] = `
 
 exports[`<Image /> should render as <RCTImageView> when not mocked 1`] = `
 <RCTImageView
+  accessibilityState={
+    Object {
+      "busy": undefined,
+      "checked": undefined,
+      "disabled": undefined,
+      "expanded": undefined,
+      "selected": undefined,
+    }
+  }
   internal_analyticTag={null}
   resizeMode="cover"
   source={
diff --git a/Libraries/Image/__tests__/__snapshots__/ImageBackground-test.js.snap b/Libraries/Image/__tests__/__snapshots__/ImageBackground-test.js.snap
new file mode 100644
index 000000000000..348e31269bae
--- /dev/null
+++ b/Libraries/Image/__tests__/__snapshots__/ImageBackground-test.js.snap
@@ -0,0 +1,143 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<ImageBackground /> should be set importantForAccessibility in <View> and <Image> 1`] = `
+<View
+  accessibilityIgnoresInvertColors={true}
+  importantForAccessibility="no"
+  style={
+    Object {
+      "height": 50,
+      "width": 150,
+    }
+  }
+>
+  <Image
+    importantForAccessibility="no"
+    source={
+      Object {
+        "uri": "foo-bar.jpg",
+      }
+    }
+    style={
+      Array [
+        Object {
+          "bottom": 0,
+          "left": 0,
+          "position": "absolute",
+          "right": 0,
+          "top": 0,
+        },
+        Object {
+          "height": 50,
+          "width": 150,
+        },
+        undefined,
+      ]
+    }
+  />
+</View>
+`;
+
+exports[`<ImageBackground /> should render as <ImageBackground> when mocked 1`] = `
+<View
+  accessibilityIgnoresInvertColors={true}
+  style={
+    Object {
+      "height": 50,
+      "width": 150,
+    }
+  }
+>
+  <Image
+    source={
+      Object {
+        "uri": "foo-bar.jpg",
+      }
+    }
+    style={
+      Array [
+        Object {
+          "bottom": 0,
+          "left": 0,
+          "position": "absolute",
+          "right": 0,
+          "top": 0,
+        },
+        Object {
+          "height": 50,
+          "width": 150,
+        },
+        undefined,
+      ]
+    }
+  />
+</View>
+`;
+
+exports[`<ImageBackground /> should render as <RCTImageView> when not mocked 1`] = `
+<View
+  accessibilityIgnoresInvertColors={true}
+  style={
+    Object {
+      "height": 50,
+      "width": 150,
+    }
+  }
+>
+  <Image
+    source={
+      Object {
+        "uri": "foo-bar.jpg",
+      }
+    }
+    style={
+      Array [
+        Object {
+          "bottom": 0,
+          "left": 0,
+          "position": "absolute",
+          "right": 0,
+          "top": 0,
+        },
+        Object {
+          "height": 50,
+          "width": 150,
+        },
+        undefined,
+      ]
+    }
+  />
+</View>
+`;
+
+exports[`<ImageBackground /> should shallow render as <ForwardRef(ImageBackground)> when not mocked 1`] = `
+<ImageBackground
+  source={
+    Object {
+      "uri": "foo-bar.jpg",
+    }
+  }
+  style={
+    Object {
+      "height": 50,
+      "width": 150,
+    }
+  }
+/>
+`;
+
+exports[`<ImageBackground /> should shallow render as <ImageBackground> when mocked 1`] = `
+<ImageBackground
+  source={
+    Object {
+      "uri": "foo-bar.jpg",
+    }
+  }
+  style={
+    Object {
+      "height": 50,
+      "width": 150,
+    }
+  }
+/>
+`;
diff --git a/Libraries/Image/__tests__/assetRelativePathInSnapshot-test.js b/Libraries/Image/__tests__/assetRelativePathInSnapshot-test.js
index a3b6ae47b93b..89f3075f9bc4 100644
--- a/Libraries/Image/__tests__/assetRelativePathInSnapshot-test.js
+++ b/Libraries/Image/__tests__/assetRelativePathInSnapshot-test.js
@@ -5,17 +5,17 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
 jest.disableAutomock();
 
+const View = require('../../Components/View/View');
+const Image = require('../Image');
 const React = require('react');
 const ReactTestRenderer = require('react-test-renderer');
-const Image = require('../Image');
-const View = require('../../Components/View/View');
 
 it('renders assets based on relative path', () => {
   expect(
diff --git a/Libraries/Image/__tests__/resolveAssetSource-test.js b/Libraries/Image/__tests__/resolveAssetSource-test.js
index 364fb779a547..475e62374199 100644
--- a/Libraries/Image/__tests__/resolveAssetSource-test.js
+++ b/Libraries/Image/__tests__/resolveAssetSource-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Image/nativeImageSource.js b/Libraries/Image/nativeImageSource.js
index c6272c8e43ab..7785b56786f8 100644
--- a/Libraries/Image/nativeImageSource.js
+++ b/Libraries/Image/nativeImageSource.js
@@ -8,10 +8,10 @@
  * @format
  */
 
-import Platform from '../Utilities/Platform';
-
 import type {ImageURISource} from './ImageSource';
 
+import Platform from '../Utilities/Platform';
+
 type NativeImageSourceSpec = $ReadOnly<{|
   android?: string,
   ios?: string,
diff --git a/Libraries/Image/resolveAssetSource.js b/Libraries/Image/resolveAssetSource.js
index 40ea0f0f9e9a..8848a0f18c10 100644
--- a/Libraries/Image/resolveAssetSource.js
+++ b/Libraries/Image/resolveAssetSource.js
@@ -12,11 +12,11 @@
 
 'use strict';
 
-const AssetRegistry = require('@react-native/assets/registry');
+import type {ResolvedAssetSource} from './AssetSourceResolver';
+
 const AssetSourceResolver = require('./AssetSourceResolver');
 const {pickScale} = require('./AssetUtils');
-
-import type {ResolvedAssetSource} from './AssetSourceResolver';
+const AssetRegistry = require('@react-native/assets/registry');
 
 let _customSourceTransformer, _serverURL, _scriptURL;
 
@@ -105,6 +105,6 @@ function resolveAssetSource(source: any): ?ResolvedAssetSource {
   return resolver.defaultAsset();
 }
 
+resolveAssetSource.pickScale = pickScale;
+resolveAssetSource.setCustomSourceTransformer = setCustomSourceTransformer;
 module.exports = resolveAssetSource;
-module.exports.pickScale = pickScale;
-module.exports.setCustomSourceTransformer = setCustomSourceTransformer;
diff --git a/Libraries/Inspector/BorderBox.js b/Libraries/Inspector/BorderBox.js
index c178f25ff51a..ede1bc58f347 100644
--- a/Libraries/Inspector/BorderBox.js
+++ b/Libraries/Inspector/BorderBox.js
@@ -10,8 +10,8 @@
 
 'use strict';
 
-const React = require('react');
 const View = require('../Components/View/View');
+const React = require('react');
 
 class BorderBox extends React.Component<$FlowFixMeProps> {
   render(): $FlowFixMe | React.Node {
diff --git a/Libraries/Inspector/BoxInspector.js b/Libraries/Inspector/BoxInspector.js
index 1cc41c173800..4da88e666f4e 100644
--- a/Libraries/Inspector/BoxInspector.js
+++ b/Libraries/Inspector/BoxInspector.js
@@ -10,12 +10,11 @@
 
 'use strict';
 
-const React = require('react');
+const View = require('../Components/View/View');
 const StyleSheet = require('../StyleSheet/StyleSheet');
 const Text = require('../Text/Text');
-const View = require('../Components/View/View');
-
 const resolveBoxStyle = require('./resolveBoxStyle');
+const React = require('react');
 
 const blank = {
   top: 0,
@@ -49,7 +48,7 @@ class BoxInspector extends React.Component<$FlowFixMeProps> {
 }
 
 class BoxContainer extends React.Component<$FlowFixMeProps> {
-  render() {
+  render(): React.Node {
     const box = this.props.box;
     return (
       <View style={styles.box}>
diff --git a/Libraries/Inspector/DevtoolsOverlay.js b/Libraries/Inspector/DevtoolsOverlay.js
new file mode 100644
index 000000000000..a4711672f6c5
--- /dev/null
+++ b/Libraries/Inspector/DevtoolsOverlay.js
@@ -0,0 +1,213 @@
+/**
+ * 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
+ */
+
+import type {PressEvent} from '../Types/CoreEventTypes';
+import type {HostRef} from './getInspectorDataForViewAtPoint';
+
+import View from '../Components/View/View';
+import ReactNativeFeatureFlags from '../ReactNative/ReactNativeFeatureFlags';
+import StyleSheet from '../StyleSheet/StyleSheet';
+import Dimensions from '../Utilities/Dimensions';
+import ElementBox from './ElementBox';
+import * as React from 'react';
+
+const {findNodeHandle} = require('../ReactNative/RendererProxy');
+const getInspectorDataForViewAtPoint = require('./getInspectorDataForViewAtPoint');
+
+const {useEffect, useState, useCallback, useRef} = React;
+
+const hook = window.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+
+export default function DevtoolsOverlay({
+  inspectedView,
+}: {
+  inspectedView: ?HostRef,
+}): React.Node {
+  const [inspected, setInspected] = useState<null | {
+    frame: {+height: any, +left: any, +top: any, +width: any},
+  }>(null);
+  const [isInspecting, setIsInspecting] = useState(false);
+  const devToolsAgentRef = useRef(null);
+
+  useEffect(() => {
+    let devToolsAgent = null;
+    let hideTimeoutId = null;
+
+    function onAgentHideNativeHighlight() {
+      // we wait to actually hide in order to avoid flicker
+      clearTimeout(hideTimeoutId);
+      hideTimeoutId = setTimeout(() => {
+        setInspected(null);
+      }, 100);
+    }
+
+    function onAgentShowNativeHighlight(node: any) {
+      clearTimeout(hideTimeoutId);
+      // Shape of `node` is different in Fabric.
+      const component = node.canonical ?? node;
+      if (!component || !component.measure) {
+        return;
+      }
+
+      component.measure((x, y, width, height, left, top) => {
+        setInspected({
+          frame: {left, top, width, height},
+        });
+      });
+    }
+
+    function cleanup() {
+      const currentAgent = devToolsAgent;
+      if (currentAgent != null) {
+        currentAgent.removeListener(
+          'hideNativeHighlight',
+          onAgentHideNativeHighlight,
+        );
+        currentAgent.removeListener(
+          'showNativeHighlight',
+          onAgentShowNativeHighlight,
+        );
+        currentAgent.removeListener('shutdown', cleanup);
+        currentAgent.removeListener(
+          'startInspectingNative',
+          onStartInspectingNative,
+        );
+        currentAgent.removeListener(
+          'stopInspectingNative',
+          onStopInspectingNative,
+        );
+        devToolsAgent = null;
+      }
+      devToolsAgentRef.current = null;
+    }
+
+    function onStartInspectingNative() {
+      setIsInspecting(true);
+    }
+
+    function onStopInspectingNative() {
+      setIsInspecting(false);
+    }
+
+    function _attachToDevtools(agent: Object) {
+      devToolsAgent = agent;
+      devToolsAgentRef.current = agent;
+      agent.addListener('hideNativeHighlight', onAgentHideNativeHighlight);
+      agent.addListener('showNativeHighlight', onAgentShowNativeHighlight);
+      agent.addListener('shutdown', cleanup);
+      agent.addListener('startInspectingNative', onStartInspectingNative);
+      agent.addListener('stopInspectingNative', onStopInspectingNative);
+    }
+
+    hook.on('react-devtools', _attachToDevtools);
+    if (hook.reactDevtoolsAgent) {
+      _attachToDevtools(hook.reactDevtoolsAgent);
+    }
+    return () => {
+      hook.off('react-devtools', _attachToDevtools);
+      cleanup();
+    };
+  }, []);
+
+  const findViewForLocation = useCallback(
+    (x: number, y: number) => {
+      const agent = devToolsAgentRef.current;
+      if (agent == null) {
+        return;
+      }
+      getInspectorDataForViewAtPoint(inspectedView, x, y, viewData => {
+        const {touchedViewTag, closestInstance, frame} = viewData;
+        if (closestInstance != null || touchedViewTag != null) {
+          if (closestInstance != null) {
+            // Fabric
+            agent.selectNode(closestInstance);
+          } else {
+            agent.selectNode(findNodeHandle(touchedViewTag));
+          }
+          setInspected({
+            frame,
+          });
+          return true;
+        }
+        return false;
+      });
+    },
+    [inspectedView],
+  );
+
+  const stopInspecting = useCallback(() => {
+    const agent = devToolsAgentRef.current;
+    if (agent == null) {
+      return;
+    }
+    agent.stopInspectingNative(true);
+    setIsInspecting(false);
+    setInspected(null);
+  }, []);
+
+  const onPointerMove = useCallback(
+    e => {
+      findViewForLocation(e.nativeEvent.x, e.nativeEvent.y);
+    },
+    [findViewForLocation],
+  );
+
+  const onResponderMove = useCallback(
+    e => {
+      findViewForLocation(
+        e.nativeEvent.touches[0].locationX,
+        e.nativeEvent.touches[0].locationY,
+      );
+    },
+    [findViewForLocation],
+  );
+
+  const shouldSetResponser = useCallback(
+    (e: PressEvent): boolean => {
+      onResponderMove(e);
+      return true;
+    },
+    [onResponderMove],
+  );
+
+  let highlight = inspected ? <ElementBox frame={inspected.frame} /> : null;
+  if (isInspecting) {
+    const events = ReactNativeFeatureFlags.shouldEmitW3CPointerEvents
+      ? {
+          onPointerMove,
+          onPointerDown: onPointerMove,
+          onPointerUp: stopInspecting,
+        }
+      : {
+          onStartShouldSetResponder: shouldSetResponser,
+          onResponderMove: onResponderMove,
+          onResponderRelease: stopInspecting,
+        };
+    return (
+      <View
+        nativeID="devToolsInspectorOverlay"
+        style={[styles.inspector, {height: Dimensions.get('window').height}]}
+        {...events}>
+        {highlight}
+      </View>
+    );
+  }
+  return highlight;
+}
+
+const styles = StyleSheet.create({
+  inspector: {
+    backgroundColor: 'transparent',
+    position: 'absolute',
+    left: 0,
+    top: 0,
+    right: 0,
+  },
+});
diff --git a/Libraries/Inspector/ElementBox.js b/Libraries/Inspector/ElementBox.js
index 738be209c6bf..f5064cb40aea 100644
--- a/Libraries/Inspector/ElementBox.js
+++ b/Libraries/Inspector/ElementBox.js
@@ -10,14 +10,13 @@
 
 'use strict';
 
-const BorderBox = require('./BorderBox');
-const Dimensions = require('../Utilities/Dimensions');
-const React = require('react');
-const StyleSheet = require('../StyleSheet/StyleSheet');
 const View = require('../Components/View/View');
-
 const flattenStyle = require('../StyleSheet/flattenStyle');
+const StyleSheet = require('../StyleSheet/StyleSheet');
+const Dimensions = require('../Utilities/Dimensions');
+const BorderBox = require('./BorderBox');
 const resolveBoxStyle = require('./resolveBoxStyle');
+const React = require('react');
 
 class ElementBox extends React.Component<$FlowFixMeProps> {
   render(): React.Node {
diff --git a/Libraries/Inspector/ElementProperties.js b/Libraries/Inspector/ElementProperties.js
index fea53f9327a9..b9c7c1597440 100644
--- a/Libraries/Inspector/ElementProperties.js
+++ b/Libraries/Inspector/ElementProperties.js
@@ -10,20 +10,19 @@
 
 'use strict';
 
-const BoxInspector = require('./BoxInspector');
-const React = require('react');
-const StyleInspector = require('./StyleInspector');
-const StyleSheet = require('../StyleSheet/StyleSheet');
-const Text = require('../Text/Text');
+import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
+
 const TouchableHighlight = require('../Components/Touchable/TouchableHighlight');
 const TouchableWithoutFeedback = require('../Components/Touchable/TouchableWithoutFeedback');
 const View = require('../Components/View/View');
-
+const openFileInEditor = require('../Core/Devtools/openFileInEditor');
 const flattenStyle = require('../StyleSheet/flattenStyle');
+const StyleSheet = require('../StyleSheet/StyleSheet');
+const Text = require('../Text/Text');
 const mapWithSeparator = require('../Utilities/mapWithSeparator');
-const openFileInEditor = require('../Core/Devtools/openFileInEditor');
-
-import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
+const BoxInspector = require('./BoxInspector');
+const StyleInspector = require('./StyleInspector');
+const React = require('react');
 
 type Props = $ReadOnly<{|
   hierarchy: Array<{|name: string|}>,
@@ -66,7 +65,7 @@ class ElementProperties extends React.Component<Props> {
           <View style={styles.breadcrumb}>
             {mapWithSeparator(
               this.props.hierarchy,
-              (hierarchyItem, i) => (
+              (hierarchyItem, i): React.MixedElement => (
                 <TouchableHighlight
                   key={'item-' + i}
                   style={[styles.breadItem, i === selection && styles.selected]}
@@ -75,7 +74,7 @@ class ElementProperties extends React.Component<Props> {
                   <Text style={styles.breadItemText}>{hierarchyItem.name}</Text>
                 </TouchableHighlight>
               ),
-              i => (
+              (i): React.MixedElement => (
                 <Text key={'sep-' + i} style={styles.breadSep}>
                   &#9656;
                 </Text>
diff --git a/Libraries/Inspector/Inspector.js b/Libraries/Inspector/Inspector.js
index 1134e25429ff..d660528e938a 100644
--- a/Libraries/Inspector/Inspector.js
+++ b/Libraries/Inspector/Inspector.js
@@ -10,80 +10,28 @@
 
 'use strict';
 
+import type {TouchedViewDataAtPoint} from '../Renderer/shims/ReactNativeTypes';
+import type {HostRef} from './getInspectorDataForViewAtPoint';
+
+const ReactNativeStyleAttributes = require('../Components/View/ReactNativeStyleAttributes');
+const View = require('../Components/View/View');
+const PressabilityDebug = require('../Pressability/PressabilityDebug');
+const {findNodeHandle} = require('../ReactNative/RendererProxy');
+const StyleSheet = require('../StyleSheet/StyleSheet');
 const Dimensions = require('../Utilities/Dimensions');
+const Platform = require('../Utilities/Platform');
+const getInspectorDataForViewAtPoint = require('./getInspectorDataForViewAtPoint');
 const InspectorOverlay = require('./InspectorOverlay');
 const InspectorPanel = require('./InspectorPanel');
-const Platform = require('../Utilities/Platform');
-const PressabilityDebug = require('../Pressability/PressabilityDebug');
 const React = require('react');
-const ReactNative = require('../Renderer/shims/ReactNative');
-const StyleSheet = require('../StyleSheet/StyleSheet');
-const View = require('../Components/View/View');
-const ReactNativeStyleAttributes = require('../Components/View/ReactNativeStyleAttributes');
-
-const invariant = require('invariant');
-
-import type {
-  HostComponent,
-  TouchedViewDataAtPoint,
-} from '../Renderer/shims/ReactNativeTypes';
-
-type HostRef = React.ElementRef<HostComponent<mixed>>;
-
-export type ReactRenderer = {
-  rendererConfig: {
-    getInspectorDataForViewAtPoint: (
-      inspectedView: ?HostRef,
-      locationX: number,
-      locationY: number,
-      callback: Function,
-    ) => void,
-    ...
-  },
-};
 
 const hook = window.__REACT_DEVTOOLS_GLOBAL_HOOK__;
-const renderers = findRenderers();
 
 // Required for React DevTools to view/edit React Native styles in Flipper.
 // Flipper doesn't inject these values when initializing DevTools.
 hook.resolveRNStyle = require('../StyleSheet/flattenStyle');
 hook.nativeStyleEditorValidAttributes = Object.keys(ReactNativeStyleAttributes);
 
-function findRenderers(): $ReadOnlyArray<ReactRenderer> {
-  const allRenderers = Array.from(hook.renderers.values());
-  invariant(
-    allRenderers.length >= 1,
-    'Expected to find at least one React Native renderer on DevTools hook.',
-  );
-  return allRenderers;
-}
-
-function getInspectorDataForViewAtPoint(
-  inspectedView: ?HostRef,
-  locationX: number,
-  locationY: number,
-  callback: (viewData: TouchedViewDataAtPoint) => void,
-) {
-  // Check all renderers for inspector data.
-  for (let i = 0; i < renderers.length; i++) {
-    const renderer = renderers[i];
-    if (renderer?.rendererConfig?.getInspectorDataForViewAtPoint != null) {
-      renderer.rendererConfig.getInspectorDataForViewAtPoint(
-        inspectedView,
-        locationX,
-        locationY,
-        viewData => {
-          // Only return with non-empty view data since only one renderer will have this view.
-          if (viewData && viewData.hierarchy.length > 0) {
-            callback(viewData);
-          }
-        },
-      );
-    }
-  }
-}
-
 class Inspector extends React.Component<
   {
     inspectedView: ?HostRef,
@@ -144,8 +92,6 @@ class Inspector extends React.Component<
   }
 
   _attachToDevtools = (agent: Object) => {
-    agent.addListener('hideNativeHighlight', this._onAgentHideNativeHighlight);
-    agent.addListener('showNativeHighlight', this._onAgentShowNativeHighlight);
     agent.addListener('shutdown', this._onAgentShutdown);
 
     this.setState({
@@ -153,45 +99,9 @@ class Inspector extends React.Component<
     });
   };
 
-  _onAgentHideNativeHighlight = () => {
-    if (this.state.inspected === null) {
-      return;
-    }
-    // we wait to actually hide in order to avoid flicker
-    this._hideTimeoutID = setTimeout(() => {
-      this.setState({
-        inspected: null,
-      });
-    }, 100);
-  };
-
-  _onAgentShowNativeHighlight = (node: any) => {
-    clearTimeout(this._hideTimeoutID);
-
-    // Shape of `node` is different in Fabric.
-    const component = node.canonical ?? node;
-
-    component.measure((x, y, width, height, left, top) => {
-      this.setState({
-        hierarchy: [],
-        inspected: {
-          frame: {left, top, width, height},
-        },
-      });
-    });
-  };
-
   _onAgentShutdown = () => {
     const agent = this.state.devtoolsAgent;
     if (agent != null) {
-      agent.removeListener(
-        'hideNativeHighlight',
-        this._onAgentHideNativeHighlight,
-      );
-      agent.removeListener(
-        'showNativeHighlight',
-        this._onAgentShowNativeHighlight,
-      );
       agent.removeListener('shutdown', this._onAgentShutdown);
 
       this.setState({devtoolsAgent: null});
@@ -200,10 +110,9 @@ class Inspector extends React.Component<
 
   setSelection(i: number) {
     const hierarchyItem = this.state.hierarchy[i];
-    // we pass in ReactNative.findNodeHandle as the method is injected
-    const {measure, props, source} = hierarchyItem.getInspectorData(
-      ReactNative.findNodeHandle,
-    );
+    // we pass in findNodeHandle as the method is injected
+    const {measure, props, source} =
+      hierarchyItem.getInspectorData(findNodeHandle);
 
     measure((x, y, width, height, left, top) => {
       this.setState({
@@ -227,15 +136,19 @@ class Inspector extends React.Component<
         frame,
         pointerY,
         touchedViewTag,
+        closestInstance,
       } = viewData;
 
       // Sync the touched view with React DevTools.
       // Note: This is Paper only. To support Fabric,
       // DevTools needs to be updated to not rely on view tags.
-      if (this.state.devtoolsAgent && touchedViewTag) {
-        this.state.devtoolsAgent.selectNode(
-          ReactNative.findNodeHandle(touchedViewTag),
-        );
+      if (this.state.devtoolsAgent) {
+        if (closestInstance != null) {
+          // Fabric
+          this.state.devtoolsAgent.selectNode(closestInstance);
+        } else if (touchedViewTag != null) {
+          this.state.devtoolsAgent.selectNode(findNodeHandle(touchedViewTag));
+        }
       }
 
       this.setState({
@@ -259,6 +172,7 @@ class Inspector extends React.Component<
           this._setTouchedViewData(viewData);
           this._setTouchedViewData = null;
         }
+        return false;
       },
     );
   }
diff --git a/Libraries/Inspector/InspectorOverlay.js b/Libraries/Inspector/InspectorOverlay.js
index d0e8401045b4..f6bb0b7b098e 100644
--- a/Libraries/Inspector/InspectorOverlay.js
+++ b/Libraries/Inspector/InspectorOverlay.js
@@ -10,14 +10,14 @@
 
 'use strict';
 
+import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
+import type {PressEvent} from '../Types/CoreEventTypes';
+
+const View = require('../Components/View/View');
+const StyleSheet = require('../StyleSheet/StyleSheet');
 const Dimensions = require('../Utilities/Dimensions');
 const ElementBox = require('./ElementBox');
 const React = require('react');
-const StyleSheet = require('../StyleSheet/StyleSheet');
-const View = require('../Components/View/View');
-
-import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
-import type {PressEvent} from '../Types/CoreEventTypes';
 
 type Inspected = $ReadOnly<{|
   frame?: Object,
diff --git a/Libraries/Inspector/InspectorPanel.js b/Libraries/Inspector/InspectorPanel.js
index b708912a9fd1..6f40146db8a3 100644
--- a/Libraries/Inspector/InspectorPanel.js
+++ b/Libraries/Inspector/InspectorPanel.js
@@ -10,17 +10,19 @@
 
 'use strict';
 
+import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
+
+import SafeAreaView from '../Components/SafeAreaView/SafeAreaView';
+
+const ScrollView = require('../Components/ScrollView/ScrollView');
+const TouchableHighlight = require('../Components/Touchable/TouchableHighlight');
+const View = require('../Components/View/View');
+const StyleSheet = require('../StyleSheet/StyleSheet');
+const Text = require('../Text/Text');
 const ElementProperties = require('./ElementProperties');
 const NetworkOverlay = require('./NetworkOverlay');
 const PerformanceOverlay = require('./PerformanceOverlay');
 const React = require('react');
-const ScrollView = require('../Components/ScrollView/ScrollView');
-const StyleSheet = require('../StyleSheet/StyleSheet');
-const Text = require('../Text/Text');
-const TouchableHighlight = require('../Components/Touchable/TouchableHighlight');
-const View = require('../Components/View/View');
-
-import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
 
 type Props = $ReadOnly<{|
   devtoolsIsOpen: boolean,
@@ -84,7 +86,7 @@ class InspectorPanel extends React.Component<Props> {
       contents = <View style={styles.waiting}>{this.renderWaiting()}</View>;
     }
     return (
-      <View style={styles.container}>
+      <SafeAreaView style={styles.container}>
         {!this.props.devtoolsIsOpen && contents}
         <View style={styles.buttonRow}>
           <InspectorPanelButton
@@ -108,7 +110,7 @@ class InspectorPanel extends React.Component<Props> {
             onClick={this.props.setTouchTargeting}
           />
         </View>
-      </View>
+      </SafeAreaView>
     );
   }
 }
@@ -120,7 +122,7 @@ type InspectorPanelButtonProps = $ReadOnly<{|
 |}>;
 
 class InspectorPanelButton extends React.Component<InspectorPanelButtonProps> {
-  render() {
+  render(): React.Node {
     return (
       <TouchableHighlight
         onPress={() => this.props.onClick(!this.props.pressed)}
diff --git a/Libraries/Inspector/NetworkOverlay.js b/Libraries/Inspector/NetworkOverlay.js
index 79f2f301a43c..169318cea27f 100644
--- a/Libraries/Inspector/NetworkOverlay.js
+++ b/Libraries/Inspector/NetworkOverlay.js
@@ -95,7 +95,11 @@ class NetworkOverlay extends React.Component<Props, State> {
   // scroll to the bottom as new network requests come in, or if the user has
   // intentionally scrolled away from the bottom - to instead flash the scroll bar
   // and keep the current position
-  _requestsListViewScrollMetrics = {
+  _requestsListViewScrollMetrics: {
+    contentLength: number,
+    offset: number,
+    visibleLength: number,
+  } = {
     offset: 0,
     visibleLength: 0,
     contentLength: 0,
@@ -147,7 +151,7 @@ class NetworkOverlay extends React.Component<Props, State> {
       this.setState(({requests}) => {
         const networkRequestInfo = requests[xhrIndex];
         if (!networkRequestInfo.requestHeaders) {
-          networkRequestInfo.requestHeaders = {};
+          networkRequestInfo.requestHeaders = ({}: {[any]: any});
         }
         networkRequestInfo.requestHeaders[header] = value;
         return {requests};
@@ -363,7 +367,7 @@ class NetworkOverlay extends React.Component<Props, State> {
     );
   };
 
-  _renderItemDetail(id: number) {
+  _renderItemDetail(id: number): React.Node {
     const requestItem = this.state.requests[id];
     const details = Object.keys(requestItem).map(key => {
       if (key === 'id') {
diff --git a/Libraries/Inspector/PerformanceOverlay.js b/Libraries/Inspector/PerformanceOverlay.js
index ddd87c49cc59..d1e8bbca30a4 100644
--- a/Libraries/Inspector/PerformanceOverlay.js
+++ b/Libraries/Inspector/PerformanceOverlay.js
@@ -10,11 +10,11 @@
 
 'use strict';
 
-const PerformanceLogger = require('../Utilities/GlobalPerformanceLogger');
-const React = require('react');
+const View = require('../Components/View/View');
 const StyleSheet = require('../StyleSheet/StyleSheet');
 const Text = require('../Text/Text');
-const View = require('../Components/View/View');
+const PerformanceLogger = require('../Utilities/GlobalPerformanceLogger');
+const React = require('react');
 
 class PerformanceOverlay extends React.Component<{...}> {
   render(): React.Node {
diff --git a/Libraries/Inspector/StyleInspector.js b/Libraries/Inspector/StyleInspector.js
index 0380be173df8..bb5af029d8c4 100644
--- a/Libraries/Inspector/StyleInspector.js
+++ b/Libraries/Inspector/StyleInspector.js
@@ -10,10 +10,10 @@
 
 'use strict';
 
-const React = require('react');
+const View = require('../Components/View/View');
 const StyleSheet = require('../StyleSheet/StyleSheet');
 const Text = require('../Text/Text');
-const View = require('../Components/View/View');
+const React = require('react');
 
 class StyleInspector extends React.Component<$FlowFixMeProps> {
   render(): React.Node {
diff --git a/Libraries/Inspector/getInspectorDataForViewAtPoint.js b/Libraries/Inspector/getInspectorDataForViewAtPoint.js
new file mode 100644
index 000000000000..af6fc4ec1b94
--- /dev/null
+++ b/Libraries/Inspector/getInspectorDataForViewAtPoint.js
@@ -0,0 +1,71 @@
+/**
+ * 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
+ */
+
+import type {
+  HostComponent,
+  TouchedViewDataAtPoint,
+} from '../Renderer/shims/ReactNativeTypes';
+
+const invariant = require('invariant');
+const React = require('react');
+
+export type HostRef = React.ElementRef<HostComponent<mixed>>;
+export type ReactRenderer = {
+  rendererConfig: {
+    getInspectorDataForViewAtPoint: (
+      inspectedView: ?HostRef,
+      locationX: number,
+      locationY: number,
+      callback: Function,
+    ) => void,
+    ...
+  },
+};
+
+const hook = window.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+const renderers = findRenderers();
+
+function findRenderers(): $ReadOnlyArray<ReactRenderer> {
+  const allRenderers = Array.from(hook.renderers.values());
+  invariant(
+    allRenderers.length >= 1,
+    'Expected to find at least one React Native renderer on DevTools hook.',
+  );
+  return allRenderers;
+}
+
+module.exports = function getInspectorDataForViewAtPoint(
+  inspectedView: ?HostRef,
+  locationX: number,
+  locationY: number,
+  callback: (viewData: TouchedViewDataAtPoint) => boolean,
+) {
+  let shouldBreak = false;
+  // Check all renderers for inspector data.
+  for (let i = 0; i < renderers.length; i++) {
+    if (shouldBreak) {
+      break;
+    }
+    const renderer = renderers[i];
+    if (renderer?.rendererConfig?.getInspectorDataForViewAtPoint != null) {
+      renderer.rendererConfig.getInspectorDataForViewAtPoint(
+        inspectedView,
+        locationX,
+        locationY,
+        viewData => {
+          // Only return with non-empty view data since only one renderer will have this view.
+          if (viewData && viewData.hierarchy.length > 0) {
+            shouldBreak = callback(viewData);
+          }
+        },
+      );
+    }
+  }
+};
diff --git a/Libraries/Interaction/BridgeSpyStallHandler.js b/Libraries/Interaction/BridgeSpyStallHandler.js
index 25cc22b42bec..783875c9835e 100644
--- a/Libraries/Interaction/BridgeSpyStallHandler.js
+++ b/Libraries/Interaction/BridgeSpyStallHandler.js
@@ -11,10 +11,10 @@
 'use strict';
 
 import type {SpyData} from '../BatchedBridge/MessageQueue';
-const JSEventLoopWatchdog = require('./JSEventLoopWatchdog');
 
 const MessageQueue = require('../BatchedBridge/MessageQueue');
 const infoLog = require('../Utilities/infoLog');
+const JSEventLoopWatchdog = require('./JSEventLoopWatchdog');
 
 const BridgeSpyStallHandler = {
   register: function () {
diff --git a/Libraries/Interaction/InteractionManager.d.ts b/Libraries/Interaction/InteractionManager.d.ts
new file mode 100644
index 000000000000..8b739e17b7ac
--- /dev/null
+++ b/Libraries/Interaction/InteractionManager.d.ts
@@ -0,0 +1,74 @@
+/**
+ * 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
+ */
+
+import {EmitterSubscription} from '../vendor/emitter/EventEmitter';
+
+export type Handle = number;
+
+export type SimpleTask = {
+  name: string;
+  gen: () => void;
+};
+export type PromiseTask = {
+  name: string;
+  gen: () => Promise<any>;
+};
+
+export interface InteractionManagerStatic {
+  Events: {
+    interactionStart: string;
+    interactionComplete: string;
+  };
+
+  /**
+   * Adds a listener to be invoked when events of the specified type are
+   * emitted. An optional calling context may be provided. The data arguments
+   * emitted will be passed to the listener function.
+   *
+   * @param eventType - Name of the event to listen to
+   * @param listener - Function to invoke when the specified event is
+   *   emitted
+   * @param context - Optional context object to use when invoking the
+   *   listener
+   */
+  addListener(
+    eventType: string,
+    listener: (...args: any[]) => any,
+    context?: any,
+  ): EmitterSubscription;
+
+  /**
+   * Schedule a function to run after all interactions have completed.
+   * Returns a cancellable
+   */
+  runAfterInteractions(task?: (() => any) | SimpleTask | PromiseTask): {
+    then: (onfulfilled?: () => any, onrejected?: () => any) => Promise<any>;
+    done: (...args: any[]) => any;
+    cancel: () => void;
+  };
+
+  /**
+   * Notify manager that an interaction has started.
+   */
+  createInteractionHandle(): Handle;
+
+  /**
+   * Notify manager that an interaction has completed.
+   */
+  clearInteractionHandle(handle: Handle): void;
+
+  /**
+   * A positive number will use setTimeout to schedule any tasks after
+   * the eventLoopRunningTime hits the deadline value, otherwise all
+   * tasks will be executed in one setImmediate batch (default).
+   */
+  setDeadline(deadline: number): void;
+}
+
+export const InteractionManager: InteractionManagerStatic;
diff --git a/Libraries/Interaction/InteractionManager.js b/Libraries/Interaction/InteractionManager.js
index 3c80412db8a8..7415f84266e3 100644
--- a/Libraries/Interaction/InteractionManager.js
+++ b/Libraries/Interaction/InteractionManager.js
@@ -8,16 +8,16 @@
  * @flow strict-local
  */
 
-const BatchedBridge = require('../BatchedBridge/BatchedBridge');
-const TaskQueue = require('./TaskQueue');
+import type {Task} from './TaskQueue';
+
+import EventEmitter from '../vendor/emitter/EventEmitter';
 
+const BatchedBridge = require('../BatchedBridge/BatchedBridge');
 const infoLog = require('../Utilities/infoLog');
+const TaskQueue = require('./TaskQueue');
 const invariant = require('invariant');
 
-import EventEmitter from '../vendor/emitter/EventEmitter';
-
 export type Handle = number;
-import type {Task} from './TaskQueue';
 
 const _emitter = new EventEmitter<{
   interactionComplete: [],
@@ -150,9 +150,9 @@ const InteractionManager = {
   },
 };
 
-const _interactionSet = new Set();
-const _addInteractionSet = new Set();
-const _deleteInteractionSet = new Set();
+const _interactionSet = new Set<number | Handle>();
+const _addInteractionSet = new Set<number | Handle>();
+const _deleteInteractionSet = new Set<Handle>();
 const _taskQueue = new TaskQueue({onMoreTasks: _scheduleUpdate});
 let _nextUpdateHandle: $FlowFixMe | TimeoutID = 0;
 let _inc = 0;
diff --git a/Libraries/Interaction/NativeFrameRateLogger.js b/Libraries/Interaction/NativeFrameRateLogger.js
index 16ac155bfb6c..69bf692d672a 100644
--- a/Libraries/Interaction/NativeFrameRateLogger.js
+++ b/Libraries/Interaction/NativeFrameRateLogger.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Interaction/PanResponder.d.ts b/Libraries/Interaction/PanResponder.d.ts
new file mode 100644
index 000000000000..8a2d4f2a0ef1
--- /dev/null
+++ b/Libraries/Interaction/PanResponder.d.ts
@@ -0,0 +1,202 @@
+/**
+ * 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
+ */
+
+import {GestureResponderHandlers} from '../../types/public/ReactNativeRenderer';
+import {GestureResponderEvent} from '../Types/CoreEventTypes';
+
+export interface PanResponderGestureState {
+  /**
+   *  ID of the gestureState- persisted as long as there at least one touch on
+   */
+  stateID: number;
+
+  /**
+   *  the latest screen coordinates of the recently-moved touch
+   */
+  moveX: number;
+
+  /**
+   *  the latest screen coordinates of the recently-moved touch
+   */
+  moveY: number;
+
+  /**
+   * the screen coordinates of the responder grant
+   */
+  x0: number;
+
+  /**
+   * the screen coordinates of the responder grant
+   */
+  y0: number;
+
+  /**
+   * accumulated distance of the gesture since the touch started
+   */
+  dx: number;
+
+  /**
+   * accumulated distance of the gesture since the touch started
+   */
+  dy: number;
+
+  /**
+   * current velocity of the gesture
+   */
+  vx: number;
+
+  /**
+   * current velocity of the gesture
+   */
+  vy: number;
+
+  /**
+   * Number of touches currently on screen
+   */
+  numberActiveTouches: number;
+
+  // All `gestureState` accounts for timeStamps up until:
+  _accountsForMovesUpTo: number;
+}
+
+/**
+ * @see documentation of GestureResponderHandlers
+ */
+export interface PanResponderCallbacks {
+  onMoveShouldSetPanResponder?:
+    | ((
+        e: GestureResponderEvent,
+        gestureState: PanResponderGestureState,
+      ) => boolean)
+    | undefined;
+  onStartShouldSetPanResponder?:
+    | ((
+        e: GestureResponderEvent,
+        gestureState: PanResponderGestureState,
+      ) => boolean)
+    | undefined;
+  onPanResponderGrant?:
+    | ((
+        e: GestureResponderEvent,
+        gestureState: PanResponderGestureState,
+      ) => void)
+    | undefined;
+  onPanResponderMove?:
+    | ((
+        e: GestureResponderEvent,
+        gestureState: PanResponderGestureState,
+      ) => void)
+    | undefined;
+  onPanResponderRelease?:
+    | ((
+        e: GestureResponderEvent,
+        gestureState: PanResponderGestureState,
+      ) => void)
+    | undefined;
+  onPanResponderTerminate?:
+    | ((
+        e: GestureResponderEvent,
+        gestureState: PanResponderGestureState,
+      ) => void)
+    | undefined;
+
+  onMoveShouldSetPanResponderCapture?:
+    | ((
+        e: GestureResponderEvent,
+        gestureState: PanResponderGestureState,
+      ) => boolean)
+    | undefined;
+  onStartShouldSetPanResponderCapture?:
+    | ((
+        e: GestureResponderEvent,
+        gestureState: PanResponderGestureState,
+      ) => boolean)
+    | undefined;
+  onPanResponderReject?:
+    | ((
+        e: GestureResponderEvent,
+        gestureState: PanResponderGestureState,
+      ) => void)
+    | undefined;
+  onPanResponderStart?:
+    | ((
+        e: GestureResponderEvent,
+        gestureState: PanResponderGestureState,
+      ) => void)
+    | undefined;
+  onPanResponderEnd?:
+    | ((
+        e: GestureResponderEvent,
+        gestureState: PanResponderGestureState,
+      ) => void)
+    | undefined;
+  onPanResponderTerminationRequest?:
+    | ((
+        e: GestureResponderEvent,
+        gestureState: PanResponderGestureState,
+      ) => boolean)
+    | undefined;
+  onShouldBlockNativeResponder?:
+    | ((
+        e: GestureResponderEvent,
+        gestureState: PanResponderGestureState,
+      ) => boolean)
+    | undefined;
+}
+
+export interface PanResponderInstance {
+  panHandlers: GestureResponderHandlers;
+}
+
+/**
+ * PanResponder reconciles several touches into a single gesture.
+ * It makes single-touch gestures resilient to extra touches,
+ * and can be used to recognize simple multi-touch gestures.
+ *
+ * It provides a predictable wrapper of the responder handlers provided by the gesture responder system.
+ * For each handler, it provides a new gestureState object alongside the normal event.
+ */
+export interface PanResponderStatic {
+  /**
+   * @param config Enhanced versions of all of the responder callbacks
+   * that provide not only the typical `ResponderSyntheticEvent`, but also the
+   * `PanResponder` gesture state.  Simply replace the word `Responder` with
+   * `PanResponder` in each of the typical `onResponder*` callbacks. For
+   * example, the `config` object would look like:
+   *
+   *  - `onMoveShouldSetPanResponder: (e, gestureState) => {...}`
+   *  - `onMoveShouldSetPanResponderCapture: (e, gestureState) => {...}`
+   *  - `onStartShouldSetPanResponder: (e, gestureState) => {...}`
+   *  - `onStartShouldSetPanResponderCapture: (e, gestureState) => {...}`
+   *  - `onPanResponderReject: (e, gestureState) => {...}`
+   *  - `onPanResponderGrant: (e, gestureState) => {...}`
+   *  - `onPanResponderStart: (e, gestureState) => {...}`
+   *  - `onPanResponderEnd: (e, gestureState) => {...}`
+   *  - `onPanResponderRelease: (e, gestureState) => {...}`
+   *  - `onPanResponderMove: (e, gestureState) => {...}`
+   *  - `onPanResponderTerminate: (e, gestureState) => {...}`
+   *  - `onPanResponderTerminationRequest: (e, gestureState) => {...}`
+   *  - `onShouldBlockNativeResponder: (e, gestureState) => {...}`
+   *
+   *  In general, for events that have capture equivalents, we update the
+   *  gestureState once in the capture phase and can use it in the bubble phase
+   *  as well.
+   *
+   *  Be careful with onStartShould* callbacks. They only reflect updated
+   *  `gestureState` for start/end events that bubble/capture to the Node.
+   *  Once the node is the responder, you can rely on every start/end event
+   *  being processed by the gesture and `gestureState` being updated
+   *  accordingly. (numberActiveTouches) may not be totally accurate unless you
+   *  are the responder.
+   */
+  create(config: PanResponderCallbacks): PanResponderInstance;
+}
+
+export const PanResponder: PanResponderStatic;
+export type PanResponder = PanResponderStatic;
diff --git a/Libraries/Interaction/PanResponder.flow.js b/Libraries/Interaction/PanResponder.flow.js
new file mode 100644
index 000000000000..3db37a406125
--- /dev/null
+++ b/Libraries/Interaction/PanResponder.flow.js
@@ -0,0 +1,257 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+import type {PressEvent} from '../Types/CoreEventTypes';
+
+/**
+ * `PanResponder` reconciles several touches into a single gesture. It makes
+ * single-touch gestures resilient to extra touches, and can be used to
+ * recognize simple multi-touch gestures.
+ *
+ * By default, `PanResponder` holds an `InteractionManager` handle to block
+ * long-running JS events from interrupting active gestures.
+ *
+ * It provides a predictable wrapper of the responder handlers provided by the
+ * [gesture responder system](docs/gesture-responder-system.html).
+ * For each handler, it provides a new `gestureState` object alongside the
+ * native event object:
+ *
+ * ```
+ * onPanResponderMove: (event, gestureState) => {}
+ * ```
+ *
+ * A native event is a synthetic touch event with the following form:
+ *
+ *  - `nativeEvent`
+ *      + `changedTouches` - Array of all touch events that have changed since the last event
+ *      + `identifier` - The ID of the touch
+ *      + `locationX` - The X position of the touch, relative to the element
+ *      + `locationY` - The Y position of the touch, relative to the element
+ *      + `pageX` - The X position of the touch, relative to the root element
+ *      + `pageY` - The Y position of the touch, relative to the root element
+ *      + `target` - The node id of the element receiving the touch event
+ *      + `timestamp` - A time identifier for the touch, useful for velocity calculation
+ *      + `touches` - Array of all current touches on the screen
+ *
+ * A `gestureState` object has the following:
+ *
+ *  - `stateID` - ID of the gestureState- persisted as long as there at least
+ *     one touch on screen
+ *  - `moveX` - the latest screen coordinates of the recently-moved touch
+ *  - `moveY` - the latest screen coordinates of the recently-moved touch
+ *  - `x0` - the screen coordinates of the responder grant
+ *  - `y0` - the screen coordinates of the responder grant
+ *  - `dx` - accumulated distance of the gesture since the touch started
+ *  - `dy` - accumulated distance of the gesture since the touch started
+ *  - `vx` - current velocity of the gesture
+ *  - `vy` - current velocity of the gesture
+ *  - `numberActiveTouches` - Number of touches currently on screen
+ *
+ * ### Basic Usage
+ *
+ * ```
+ *   componentWillMount: function() {
+ *     this._panResponder = PanResponder.create({
+ *       // Ask to be the responder:
+ *       onStartShouldSetPanResponder: (evt, gestureState) => true,
+ *       onStartShouldSetPanResponderCapture: (evt, gestureState) => true,
+ *       onMoveShouldSetPanResponder: (evt, gestureState) => true,
+ *       onMoveShouldSetPanResponderCapture: (evt, gestureState) => true,
+ *
+ *       onPanResponderGrant: (evt, gestureState) => {
+ *         // The gesture has started. Show visual feedback so the user knows
+ *         // what is happening!
+ *
+ *         // gestureState.d{x,y} will be set to zero now
+ *       },
+ *       onPanResponderMove: (evt, gestureState) => {
+ *         // The most recent move distance is gestureState.move{X,Y}
+ *
+ *         // The accumulated gesture distance since becoming responder is
+ *         // gestureState.d{x,y}
+ *       },
+ *       onPanResponderTerminationRequest: (evt, gestureState) => true,
+ *       onPanResponderRelease: (evt, gestureState) => {
+ *         // The user has released all touches while this view is the
+ *         // responder. This typically means a gesture has succeeded
+ *       },
+ *       onPanResponderTerminate: (evt, gestureState) => {
+ *         // Another component has become the responder, so this gesture
+ *         // should be cancelled
+ *       },
+ *       onShouldBlockNativeResponder: (evt, gestureState) => {
+ *         // Returns whether this component should block native components from becoming the JS
+ *         // responder. Returns true by default. Is currently only supported on android.
+ *         return true;
+ *       },
+ *     });
+ *   },
+ *
+ *   render: function() {
+ *     return (
+ *       <View {...this._panResponder.panHandlers} />
+ *     );
+ *   },
+ *
+ * ```
+ *
+ * ### Working Example
+ *
+ * To see it in action, try the
+ * [PanResponder example in RNTester](https://github.com/facebook/react-native/blob/HEAD/packages/rn-tester/js/examples/PanResponder/PanResponderExample.js)
+ */
+
+export type GestureState = {|
+  /**
+   * ID of the gestureState - persisted as long as there at least one touch on screen
+   */
+  stateID: number,
+
+  /**
+   * The latest screen coordinates of the recently-moved touch
+   */
+  moveX: number,
+
+  /**
+   * The latest screen coordinates of the recently-moved touch
+   */
+  moveY: number,
+
+  /**
+   * The screen coordinates of the responder grant
+   */
+  x0: number,
+
+  /**
+   * The screen coordinates of the responder grant
+   */
+  y0: number,
+
+  /**
+   * Accumulated distance of the gesture since the touch started
+   */
+  dx: number,
+
+  /**
+   * Accumulated distance of the gesture since the touch started
+   */
+  dy: number,
+
+  /**
+   * Current velocity of the gesture
+   */
+  vx: number,
+
+  /**
+   * Current velocity of the gesture
+   */
+  vy: number,
+
+  /**
+   * Number of touches currently on screen
+   */
+  numberActiveTouches: number,
+
+  /**
+   * All `gestureState` accounts for timeStamps up until this value
+   *
+   * @private
+   */
+  _accountsForMovesUpTo: number,
+|};
+
+type ActiveCallback = (
+  event: PressEvent,
+  gestureState: GestureState,
+) => boolean;
+
+type PassiveCallback = (event: PressEvent, gestureState: GestureState) => mixed;
+
+type PanHandlers = {|
+  onMoveShouldSetResponder: (event: PressEvent) => boolean,
+  onMoveShouldSetResponderCapture: (event: PressEvent) => boolean,
+  onResponderEnd: (event: PressEvent) => void,
+  onResponderGrant: (event: PressEvent) => boolean,
+  onResponderMove: (event: PressEvent) => void,
+  onResponderReject: (event: PressEvent) => void,
+  onResponderRelease: (event: PressEvent) => void,
+  onResponderStart: (event: PressEvent) => void,
+  onResponderTerminate: (event: PressEvent) => void,
+  onResponderTerminationRequest: (event: PressEvent) => boolean,
+  onStartShouldSetResponder: (event: PressEvent) => boolean,
+  onStartShouldSetResponderCapture: (event: PressEvent) => boolean,
+|};
+
+type PanResponderConfig = $ReadOnly<{|
+  onMoveShouldSetPanResponder?: ?ActiveCallback,
+  onMoveShouldSetPanResponderCapture?: ?ActiveCallback,
+  onStartShouldSetPanResponder?: ?ActiveCallback,
+  onStartShouldSetPanResponderCapture?: ?ActiveCallback,
+  /**
+   * The body of `onResponderGrant` returns a bool, but the vast majority of
+   * callsites return void and this TODO notice is found in it:
+   *   TODO: t7467124 investigate if this can be removed
+   */
+  onPanResponderGrant?: ?(PassiveCallback | ActiveCallback),
+  onPanResponderReject?: ?PassiveCallback,
+  onPanResponderStart?: ?PassiveCallback,
+  onPanResponderEnd?: ?PassiveCallback,
+  onPanResponderRelease?: ?PassiveCallback,
+  onPanResponderMove?: ?PassiveCallback,
+  onPanResponderTerminate?: ?PassiveCallback,
+  onPanResponderTerminationRequest?: ?ActiveCallback,
+  onShouldBlockNativeResponder?: ?ActiveCallback,
+|}>;
+
+export type PanResponderType = {
+  _initializeGestureState: (gestureState: GestureState) => void,
+  _updateGestureStateOnMove: (
+    gestureState: GestureState,
+    touchHistory: $PropertyType<PressEvent, 'touchHistory'>,
+  ) => void,
+  /**
+   * @param {object} config Enhanced versions of all of the responder callbacks
+   * that provide not only the typical `ResponderSyntheticEvent`, but also the
+   * `PanResponder` gesture state.  Simply replace the word `Responder` with
+   * `PanResponder` in each of the typical `onResponder*` callbacks. For
+   * example, the `config` object would look like:
+   *
+   *  - `onMoveShouldSetPanResponder: (e, gestureState) => {...}`
+   *  - `onMoveShouldSetPanResponderCapture: (e, gestureState) => {...}`
+   *  - `onStartShouldSetPanResponder: (e, gestureState) => {...}`
+   *  - `onStartShouldSetPanResponderCapture: (e, gestureState) => {...}`
+   *  - `onPanResponderReject: (e, gestureState) => {...}`
+   *  - `onPanResponderGrant: (e, gestureState) => {...}`
+   *  - `onPanResponderStart: (e, gestureState) => {...}`
+   *  - `onPanResponderEnd: (e, gestureState) => {...}`
+   *  - `onPanResponderRelease: (e, gestureState) => {...}`
+   *  - `onPanResponderMove: (e, gestureState) => {...}`
+   *  - `onPanResponderTerminate: (e, gestureState) => {...}`
+   *  - `onPanResponderTerminationRequest: (e, gestureState) => {...}`
+   *  - `onShouldBlockNativeResponder: (e, gestureState) => {...}`
+   *
+   *  In general, for events that have capture equivalents, we update the
+   *  gestureState once in the capture phase and can use it in the bubble phase
+   *  as well.
+   *
+   *  Be careful with onStartShould* callbacks. They only reflect updated
+   *  `gestureState` for start/end events that bubble/capture to the Node.
+   *  Once the node is the responder, you can rely on every start/end event
+   *  being processed by the gesture and `gestureState` being updated
+   *  accordingly. (numberActiveTouches) may not be totally accurate unless you
+   *  are the responder.
+   */
+  create: (config: PanResponderConfig) => {
+    getInteractionHandle: () => ?number,
+    panHandlers: PanHandlers,
+  },
+};
diff --git a/Libraries/Interaction/PanResponder.js b/Libraries/Interaction/PanResponder.js
index 8d2ae033bf45..02658c1cf0c7 100644
--- a/Libraries/Interaction/PanResponder.js
+++ b/Libraries/Interaction/PanResponder.js
@@ -10,11 +10,12 @@
 
 'use strict';
 
+import type {PressEvent} from '../Types/CoreEventTypes';
+import type {PanResponderType} from './PanResponder.flow.js';
+
 const InteractionManager = require('./InteractionManager');
 const TouchHistoryMath = require('./TouchHistoryMath');
 
-import type {PressEvent} from '../Types/CoreEventTypes';
-
 const currentCentroidXOfTouchesChangedAfter =
   TouchHistoryMath.currentCentroidXOfTouchesChangedAfter;
 const currentCentroidYOfTouchesChangedAfter =
@@ -226,7 +227,7 @@ type PanResponderConfig = $ReadOnly<{|
   onShouldBlockNativeResponder?: ?ActiveCallback,
 |}>;
 
-const PanResponder = {
+const PanResponder: PanResponderType = {
   /**
    *
    * A graphical explanation of the touch data flow:
diff --git a/Libraries/Interaction/__tests__/Batchinator-test.js b/Libraries/Interaction/__tests__/Batchinator-test.js
index 8c49e3888a30..e8261b3515e2 100644
--- a/Libraries/Interaction/__tests__/Batchinator-test.js
+++ b/Libraries/Interaction/__tests__/Batchinator-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Interaction/__tests__/InteractionManager-test.js b/Libraries/Interaction/__tests__/InteractionManager-test.js
index 3b551e84b3f9..b0757356d8c1 100644
--- a/Libraries/Interaction/__tests__/InteractionManager-test.js
+++ b/Libraries/Interaction/__tests__/InteractionManager-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
@@ -168,7 +168,7 @@ describe('promise tasks', () => {
   }
   beforeEach(() => {
     jest.resetModules();
-    jest.useFakeTimers();
+    jest.useFakeTimers('legacy');
     InteractionManager = require('../InteractionManager');
     BatchedBridge = require('../../BatchedBridge/BatchedBridge');
     sequenceId = 0;
diff --git a/Libraries/Interaction/__tests__/TaskQueue-test.js b/Libraries/Interaction/__tests__/TaskQueue-test.js
index 9f52942b0366..cfd19fffa09d 100644
--- a/Libraries/Interaction/__tests__/TaskQueue-test.js
+++ b/Libraries/Interaction/__tests__/TaskQueue-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/JSInspector/JSInspector.js b/Libraries/JSInspector/JSInspector.js
index 00bce964f3d9..0a6388e3d3dd 100644
--- a/Libraries/JSInspector/JSInspector.js
+++ b/Libraries/JSInspector/JSInspector.js
@@ -19,9 +19,6 @@ interface Agent {
 // Flow doesn't support static declarations in interface
 type AgentClass = Class<Agent> & {DOMAIN: string, ...};
 
-declare function __registerInspectorAgent(type: AgentClass): void;
-declare function __inspectorTimestamp(): number;
-
 const JSInspector = {
   registerAgent(type: AgentClass) {
     if (global.__registerInspectorAgent) {
diff --git a/Libraries/JSInspector/NetworkAgent.js b/Libraries/JSInspector/NetworkAgent.js
index 4782c6e24504..0448bb5125bb 100644
--- a/Libraries/JSInspector/NetworkAgent.js
+++ b/Libraries/JSInspector/NetworkAgent.js
@@ -10,11 +10,11 @@
 
 'use strict';
 
+import type EventSender from './InspectorAgent';
+
+const XMLHttpRequest = require('../Network/XMLHttpRequest');
 const InspectorAgent = require('./InspectorAgent');
 const JSInspector = require('./JSInspector');
-const XMLHttpRequest = require('../Network/XMLHttpRequest');
-
-import type EventSender from './InspectorAgent';
 
 type RequestId = string;
 
diff --git a/Libraries/LayoutAnimation/LayoutAnimation.d.ts b/Libraries/LayoutAnimation/LayoutAnimation.d.ts
new file mode 100644
index 000000000000..38ba92f73d52
--- /dev/null
+++ b/Libraries/LayoutAnimation/LayoutAnimation.d.ts
@@ -0,0 +1,84 @@
+/**
+ * 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 type LayoutAnimationType =
+  | 'spring'
+  | 'linear'
+  | 'easeInEaseOut'
+  | 'easeIn'
+  | 'easeOut'
+  | 'keyboard';
+
+export type LayoutAnimationTypes = {
+  [type in LayoutAnimationType]: type;
+};
+
+export type LayoutAnimationProperty =
+  | 'opacity'
+  | 'scaleX'
+  | 'scaleY'
+  | 'scaleXY';
+
+export type LayoutAnimationProperties = {
+  [prop in LayoutAnimationProperty]: prop;
+};
+
+export interface LayoutAnimationAnim {
+  duration?: number | undefined;
+  delay?: number | undefined;
+  springDamping?: number | undefined;
+  initialVelocity?: number | undefined;
+  type?: LayoutAnimationType | undefined;
+  property?: LayoutAnimationProperty | undefined;
+}
+
+export interface LayoutAnimationConfig {
+  duration: number;
+  create?: LayoutAnimationAnim | undefined;
+  update?: LayoutAnimationAnim | undefined;
+  delete?: LayoutAnimationAnim | undefined;
+}
+
+/** Automatically animates views to their new positions when the next layout happens.
+ * A common way to use this API is to call LayoutAnimation.configureNext before
+ * calling setState. */
+export interface LayoutAnimationStatic {
+  /** Schedules an animation to happen on the next layout.
+   * @param config Specifies animation properties:
+   * `duration` in milliseconds
+   * `create`, config for animating in new views (see Anim type)
+   * `update`, config for animating views that have been updated (see Anim type)
+   * @param onAnimationDidEnd Called when the animation finished. Only supported on iOS.
+   */
+  configureNext: (
+    config: LayoutAnimationConfig,
+    onAnimationDidEnd?: () => void,
+    onAnimationDidFail?: () => void,
+  ) => void;
+  /** Helper for creating a config for configureNext. */
+  create: (
+    duration: number,
+    type?: LayoutAnimationType,
+    creationProp?: LayoutAnimationProperty,
+  ) => LayoutAnimationConfig;
+  Types: LayoutAnimationTypes;
+  Properties: LayoutAnimationProperties;
+  configChecker: (shapeTypes: {[key: string]: any}) => any;
+  Presets: {
+    easeInEaseOut: LayoutAnimationConfig;
+    linear: LayoutAnimationConfig;
+    spring: LayoutAnimationConfig;
+  };
+  easeInEaseOut: (onAnimationDidEnd?: () => void) => void;
+  linear: (onAnimationDidEnd?: () => void) => void;
+  spring: (onAnimationDidEnd?: () => void) => void;
+}
+
+export const LayoutAnimation: LayoutAnimationStatic;
+export type LayoutAnimation = LayoutAnimationStatic;
diff --git a/Libraries/LayoutAnimation/LayoutAnimation.js b/Libraries/LayoutAnimation/LayoutAnimation.js
index 561ef2f71d99..a8c20e3960c7 100644
--- a/Libraries/LayoutAnimation/LayoutAnimation.js
+++ b/Libraries/LayoutAnimation/LayoutAnimation.js
@@ -10,16 +10,17 @@
 
 'use strict';
 
-const UIManager = require('../ReactNative/UIManager');
 import type {Spec as FabricUIManagerSpec} from '../ReactNative/FabricUIManager';
 import type {
   LayoutAnimationConfig as LayoutAnimationConfig_,
-  LayoutAnimationType,
   LayoutAnimationProperty,
+  LayoutAnimationType,
 } from '../Renderer/shims/ReactNativeTypes';
 
-import Platform from '../Utilities/Platform';
 import ReactNativeFeatureFlags from '../ReactNative/ReactNativeFeatureFlags';
+import Platform from '../Utilities/Platform';
+
+const UIManager = require('../ReactNative/UIManager');
 
 // Reexport type
 export type LayoutAnimationConfig = LayoutAnimationConfig_;
diff --git a/Libraries/Linking/Linking.d.ts b/Libraries/Linking/Linking.d.ts
new file mode 100644
index 000000000000..36dbe9f558f9
--- /dev/null
+++ b/Libraries/Linking/Linking.d.ts
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+import {NativeEventEmitter} from '../EventEmitter/NativeEventEmitter';
+import {EmitterSubscription} from '../vendor/emitter/EventEmitter';
+
+export interface LinkingStatic extends NativeEventEmitter {
+  /**
+   * Add a handler to Linking changes by listening to the `url` event type
+   * and providing the handler
+   */
+  addEventListener(
+    type: 'url',
+    handler: (event: {url: string}) => void,
+  ): EmitterSubscription;
+
+  /**
+   * Try to open the given url with any of the installed apps.
+   * You can use other URLs, like a location (e.g. "geo:37.484847,-122.148386"), a contact, or any other URL that can be opened with the installed apps.
+   * NOTE: This method will fail if the system doesn't know how to open the specified URL. If you're passing in a non-http(s) URL, it's best to check {@code canOpenURL} first.
+   * NOTE: For web URLs, the protocol ("http://", "https://") must be set accordingly!
+   */
+  openURL(url: string): Promise<any>;
+
+  /**
+   * Determine whether or not an installed app can handle a given URL.
+   * NOTE: For web URLs, the protocol ("http://", "https://") must be set accordingly!
+   * NOTE: As of iOS 9, your app needs to provide the LSApplicationQueriesSchemes key inside Info.plist.
+   * @param URL the URL to open
+   */
+  canOpenURL(url: string): Promise<boolean>;
+
+  /**
+   * If the app launch was triggered by an app link with, it will give the link url, otherwise it will give null
+   * NOTE: To support deep linking on Android, refer http://developer.android.com/training/app-indexing/deep-linking.html#handling-intents
+   */
+  getInitialURL(): Promise<string | null>;
+
+  /**
+   * Open the Settings app and displays the app’s custom settings, if it has any.
+   */
+  openSettings(): Promise<void>;
+
+  /**
+   * Sends an Android Intent - a broad surface to express Android functions.  Useful for deep-linking to settings pages,
+   * opening an SMS app with a message draft in place, and more.  See https://developer.android.com/reference/kotlin/android/content/Intent?hl=en
+   */
+  sendIntent(
+    action: string,
+    extras?: Array<{key: string; value: string | number | boolean}>,
+  ): Promise<void>;
+}
+
+export const Linking: LinkingStatic;
+export type Linking = LinkingStatic;
diff --git a/Libraries/Linking/Linking.js b/Libraries/Linking/Linking.js
index 63575220f57c..a59fa72973a3 100644
--- a/Libraries/Linking/Linking.js
+++ b/Libraries/Linking/Linking.js
@@ -9,11 +9,12 @@
  */
 
 import type {EventSubscription} from '../vendor/emitter/EventEmitter';
+
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import InteractionManager from '../Interaction/InteractionManager';
 import Platform from '../Utilities/Platform';
-import NativeLinkingManager from './NativeLinkingManager';
 import NativeIntentAndroid from './NativeIntentAndroid';
+import NativeLinkingManager from './NativeLinkingManager';
 import invariant from 'invariant';
 import nullthrows from 'nullthrows';
 
@@ -123,7 +124,7 @@ class Linking extends NativeEventEmitter<LinkingEventDefinitions> {
     }
   }
 
-  _validateURL(url: string) {
+  _validateURL(url: string): void {
     invariant(
       typeof url === 'string',
       'Invalid URL: should be a string. Was: ' + url,
diff --git a/Libraries/Linking/NativeIntentAndroid.js b/Libraries/Linking/NativeIntentAndroid.js
index 0fb643f379c4..7a9f9b7bfe9a 100644
--- a/Libraries/Linking/NativeIntentAndroid.js
+++ b/Libraries/Linking/NativeIntentAndroid.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Linking/NativeLinkingManager.js b/Libraries/Linking/NativeLinkingManager.js
index 79350c661ba1..8f4eb239f424 100644
--- a/Libraries/Linking/NativeLinkingManager.js
+++ b/Libraries/Linking/NativeLinkingManager.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/LinkingIOS/RCTLinkingManager.h b/Libraries/LinkingIOS/RCTLinkingManager.h
index 4eea247f440e..b92bc1ec9c32 100644
--- a/Libraries/LinkingIOS/RCTLinkingManager.h
+++ b/Libraries/LinkingIOS/RCTLinkingManager.h
@@ -25,10 +25,10 @@
 + (BOOL)application:(nonnull UIApplication *)application
     continueUserActivity:(nonnull NSUserActivity *)userActivity
       restorationHandler:
-        #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 12000) /* __IPHONE_12_0 */
-            (nonnull void (^)(NSArray<id<UIUserActivityRestoring>> *_Nullable))restorationHandler;
-        #else
-            (nonnull void (^)(NSArray *_Nullable))restorationHandler;
-        #endif
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 12000) /* __IPHONE_12_0 */
+          (nonnull void (^)(NSArray<id<UIUserActivityRestoring>> *_Nullable))restorationHandler;
+#else
+          (nonnull void (^)(NSArray *_Nullable))restorationHandler;
+#endif
 
 @end
diff --git a/Libraries/LinkingIOS/RCTLinkingManager.mm b/Libraries/LinkingIOS/RCTLinkingManager.mm
index dc45866b7a01..cfa907844620 100644
--- a/Libraries/LinkingIOS/RCTLinkingManager.mm
+++ b/Libraries/LinkingIOS/RCTLinkingManager.mm
@@ -9,8 +9,8 @@
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTBridge.h>
-#import <React/RCTUtils.h>
 #import <React/RCTLog.h>
+#import <React/RCTUtils.h>
 
 #import "RCTLinkingPlugins.h"
 
@@ -18,13 +18,11 @@
 
 static void postNotificationWithURL(NSURL *URL, id sender)
 {
-  NSDictionary<NSString *, id> *payload = @{@"url": URL.absoluteString};
-  [[NSNotificationCenter defaultCenter] postNotificationName:kOpenURLNotification
-                                                      object:sender
-                                                    userInfo:payload];
+  NSDictionary<NSString *, id> *payload = @{@"url" : URL.absoluteString};
+  [[NSNotificationCenter defaultCenter] postNotificationName:kOpenURLNotification object:sender userInfo:payload];
 }
 
-@interface RCTLinkingManager() <NativeLinkingManagerSpec>
+@interface RCTLinkingManager () <NativeLinkingManagerSpec>
 @end
 
 @implementation RCTLinkingManager
@@ -51,12 +49,12 @@ - (void)stopObserving
 
 - (NSArray<NSString *> *)supportedEvents
 {
-  return @[@"url"];
+  return @[ @"url" ];
 }
 
 + (BOOL)application:(UIApplication *)app
             openURL:(NSURL *)URL
-            options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
+            options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options
 {
   postNotificationWithURL(URL, self);
   return YES;
@@ -64,27 +62,27 @@ + (BOOL)application:(UIApplication *)app
 
 // Corresponding api deprecated in iOS 9
 + (BOOL)application:(UIApplication *)application
-            openURL:(NSURL *)URL
-  sourceApplication:(NSString *)sourceApplication
-         annotation:(id)annotation
+              openURL:(NSURL *)URL
+    sourceApplication:(NSString *)sourceApplication
+           annotation:(id)annotation
 {
   postNotificationWithURL(URL, self);
   return YES;
 }
 
 + (BOOL)application:(UIApplication *)application
-continueUserActivity:(NSUserActivity *)userActivity
-  restorationHandler:
-    #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 12000) /* __IPHONE_12_0 */
-        (nonnull void (^)(NSArray<id<UIUserActivityRestoring>> *_Nullable))restorationHandler {
-    #else
-        (nonnull void (^)(NSArray *_Nullable))restorationHandler {
-    #endif
+    continueUserActivity:(NSUserActivity *)userActivity
+      restorationHandler:
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 12000) /* __IPHONE_12_0 */
+          (nonnull void (^)(NSArray<id<UIUserActivityRestoring>> *_Nullable))restorationHandler
+{
+#else
+          (nonnull void (^)(NSArray *_Nullable))restorationHandler
+{
+#endif
   if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
-    NSDictionary *payload = @{@"url": userActivity.webpageURL.absoluteString};
-    [[NSNotificationCenter defaultCenter] postNotificationName:kOpenURLNotification
-                                                        object:self
-                                                      userInfo:payload];
+    NSDictionary *payload = @{@"url" : userActivity.webpageURL.absoluteString};
+    [[NSNotificationCenter defaultCenter] postNotificationName:kOpenURLNotification object:self userInfo:payload];
   }
   return YES;
 }
@@ -94,33 +92,37 @@ - (void)handleOpenURLNotification:(NSNotification *)notification
   [self sendEventWithName:@"url" body:notification.userInfo];
 }
 
-RCT_EXPORT_METHOD(openURL:(NSURL *)URL
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(openURL
+                  : (NSURL *)URL resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
-  [RCTSharedApplication() openURL:URL options:@{} completionHandler:^(BOOL success) {
-    if (success) {
-      resolve(@YES);
-    } else {
-      #if TARGET_OS_SIMULATOR
-        // Simulator-specific code
-        if([URL.absoluteString hasPrefix:@"tel:"]){
-          RCTLogWarn(@"Unable to open the Phone app in the simulator for telephone URLs. URL:  %@", URL);
-          resolve(@NO);
+  [RCTSharedApplication() openURL:URL
+      options:@{}
+      completionHandler:^(BOOL success) {
+        if (success) {
+          resolve(@YES);
         } else {
+#if TARGET_OS_SIMULATOR
+          // Simulator-specific code
+          if ([URL.absoluteString hasPrefix:@"tel:"]) {
+            RCTLogWarn(@"Unable to open the Phone app in the simulator for telephone URLs. URL:  %@", URL);
+            resolve(@NO);
+          } else {
+            reject(RCTErrorUnspecified, [NSString stringWithFormat:@"Unable to open URL: %@", URL], nil);
+          }
+#else
+          // Device-specific code
           reject(RCTErrorUnspecified, [NSString stringWithFormat:@"Unable to open URL: %@", URL], nil);
+#endif
         }
-      #else
-        // Device-specific code
-        reject(RCTErrorUnspecified, [NSString stringWithFormat:@"Unable to open URL: %@", URL], nil);
-      #endif
-    }
-  }];
+      }];
 }
 
-RCT_EXPORT_METHOD(canOpenURL:(NSURL *)URL
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(__unused RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(canOpenURL
+                  : (NSURL *)URL resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (__unused RCTPromiseRejectBlock)reject)
 {
   if (RCTRunningInAppExtension()) {
     // Technically Today widgets can open urls, but supporting that would require
@@ -138,25 +140,31 @@ - (void)handleOpenURLNotification:(NSNotification *)notification
     // On iOS 9 and above canOpenURL returns NO without a helpful error.
     // Check if a custom scheme is being used, and if it exists in LSApplicationQueriesSchemes
     NSArray *querySchemes = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"LSApplicationQueriesSchemes"];
-    if (querySchemes != nil && ([querySchemes containsObject:scheme] || [querySchemes containsObject:[scheme lowercaseString]])) {
+    if (querySchemes != nil &&
+        ([querySchemes containsObject:scheme] || [querySchemes containsObject:[scheme lowercaseString]])) {
       resolve(@NO);
     } else {
-      reject(RCTErrorUnspecified, [NSString stringWithFormat:@"Unable to open URL: %@. Add %@ to LSApplicationQueriesSchemes in your Info.plist.", URL, scheme], nil);
+      reject(
+          RCTErrorUnspecified,
+          [NSString
+              stringWithFormat:@"Unable to open URL: %@. Add %@ to LSApplicationQueriesSchemes in your Info.plist.",
+                               URL,
+                               scheme],
+          nil);
     }
   } else {
     resolve(@NO);
   }
 }
 
-RCT_EXPORT_METHOD(getInitialURL:(RCTPromiseResolveBlock)resolve
-                  reject:(__unused RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getInitialURL : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject)
 {
   NSURL *initialURL = nil;
   if (self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey]) {
     initialURL = self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey];
   } else {
     NSDictionary *userActivityDictionary =
-      self.bridge.launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey];
+        self.bridge.launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey];
     if ([userActivityDictionary[UIApplicationLaunchOptionsUserActivityTypeKey] isEqual:NSUserActivityTypeBrowsingWeb]) {
       initialURL = ((NSUserActivity *)userActivityDictionary[@"UIApplicationLaunchOptionsUserActivityKey"]).webpageURL;
     }
@@ -164,34 +172,38 @@ - (void)handleOpenURLNotification:(NSNotification *)notification
   resolve(RCTNullIfNil(initialURL.absoluteString));
 }
 
-RCT_EXPORT_METHOD(openSettings:(RCTPromiseResolveBlock)resolve
-                  reject:(__unused RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(openSettings : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject)
 {
   NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
-  [RCTSharedApplication() openURL:url options:@{} completionHandler:^(BOOL success) {
-    if (success) {
-      resolve(nil);
-    } else {
-      reject(RCTErrorUnspecified, @"Unable to open app settings", nil);
-    }
-  }];
+  [RCTSharedApplication() openURL:url
+      options:@{}
+      completionHandler:^(BOOL success) {
+        if (success) {
+          resolve(nil);
+        } else {
+          reject(RCTErrorUnspecified, @"Unable to open app settings", nil);
+        }
+      }];
 }
 
-RCT_EXPORT_METHOD(sendIntent:(NSString *)action
-                  extras:(NSArray *_Nullable)extras
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(sendIntent
+                  : (NSString *)action extras
+                  : (NSArray *_Nullable)extras resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   return std::make_shared<facebook::react::NativeLinkingManagerSpecJSI>(params);
 }
 
 @end
 
-Class RCTLinkingManagerCls(void) {
+Class RCTLinkingManagerCls(void)
+{
   return RCTLinkingManager.class;
 }
diff --git a/Libraries/Lists/CellRenderMask.js b/Libraries/Lists/CellRenderMask.js
index ddcb96d21c46..6258838c1164 100644
--- a/Libraries/Lists/CellRenderMask.js
+++ b/Libraries/Lists/CellRenderMask.js
@@ -45,16 +45,22 @@ export class CellRenderMask {
     return this._regions;
   }
 
-  addCells(cells: {first: number, last: number}) {
+  addCells(cells: {first: number, last: number}): void {
     invariant(
       cells.first >= 0 &&
         cells.first < this._numCells &&
-        cells.last >= 0 &&
+        cells.last >= -1 &&
         cells.last < this._numCells &&
-        cells.last >= cells.first,
+        cells.last >= cells.first - 1,
       'CellRenderMask.addCells called with invalid cell range',
     );
 
+    // VirtualizedList uses inclusive ranges, where zero-count states are
+    // possible. E.g. [0, -1] for no cells, starting at 0.
+    if (cells.last < cells.first) {
+      return;
+    }
+
     const [firstIntersect, firstIntersectIdx] = this._findRegion(cells.first);
     const [lastIntersect, lastIntersectIdx] = this._findRegion(cells.last);
 
@@ -110,6 +116,10 @@ export class CellRenderMask {
     );
   }
 
+  numCells(): number {
+    return this._numCells;
+  }
+
   equals(other: CellRenderMask): boolean {
     return (
       this._numCells === other._numCells &&
diff --git a/Libraries/Lists/ChildListCollection.js b/Libraries/Lists/ChildListCollection.js
new file mode 100644
index 000000000000..9c12031f6a19
--- /dev/null
+++ b/Libraries/Lists/ChildListCollection.js
@@ -0,0 +1,72 @@
+/**
+ * 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 invariant from 'invariant';
+
+export default class ChildListCollection<TList> {
+  _cellKeyToChildren: Map<string, Set<TList>> = new Map();
+  _childrenToCellKey: Map<TList, string> = new Map();
+
+  add(list: TList, cellKey: string): void {
+    invariant(
+      !this._childrenToCellKey.has(list),
+      'Trying to add already present child list',
+    );
+
+    const cellLists = this._cellKeyToChildren.get(cellKey) ?? new Set();
+    cellLists.add(list);
+    this._cellKeyToChildren.set(cellKey, cellLists);
+
+    this._childrenToCellKey.set(list, cellKey);
+  }
+
+  remove(list: TList): void {
+    const cellKey = this._childrenToCellKey.get(list);
+    invariant(cellKey != null, 'Trying to remove non-present child list');
+    this._childrenToCellKey.delete(list);
+
+    const cellLists = this._cellKeyToChildren.get(cellKey);
+    invariant(cellLists, '_cellKeyToChildren should contain cellKey');
+    cellLists.delete(list);
+
+    if (cellLists.size === 0) {
+      this._cellKeyToChildren.delete(cellKey);
+    }
+  }
+
+  forEach(fn: TList => void): void {
+    for (const listSet of this._cellKeyToChildren.values()) {
+      for (const list of listSet) {
+        fn(list);
+      }
+    }
+  }
+
+  forEachInCell(cellKey: string, fn: TList => void): void {
+    const listSet = this._cellKeyToChildren.get(cellKey) ?? [];
+    for (const list of listSet) {
+      fn(list);
+    }
+  }
+
+  anyInCell(cellKey: string, fn: TList => boolean): boolean {
+    const listSet = this._cellKeyToChildren.get(cellKey) ?? [];
+    for (const list of listSet) {
+      if (fn(list)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  size(): number {
+    return this._childrenToCellKey.size;
+  }
+}
diff --git a/Libraries/Lists/FillRateHelper.js b/Libraries/Lists/FillRateHelper.js
index 1a13a1933b1a..87482e73f6be 100644
--- a/Libraries/Lists/FillRateHelper.js
+++ b/Libraries/Lists/FillRateHelper.js
@@ -10,6 +10,8 @@
 
 'use strict';
 
+import type {FrameMetricProps} from './VirtualizedListProps';
+
 export type FillRateInfo = Info;
 
 class Info {
@@ -47,12 +49,12 @@ let _sampleRate = DEBUG ? 1 : null;
  * `SceneTracker.getActiveScene` to determine the context of the events.
  */
 class FillRateHelper {
-  _anyBlankStartTime = (null: ?number);
+  _anyBlankStartTime: ?number = null;
   _enabled = false;
-  _getFrameMetrics: (index: number) => ?FrameMetrics;
-  _info = new Info();
-  _mostlyBlankStartTime = (null: ?number);
-  _samplesStartTime = (null: ?number);
+  _getFrameMetrics: (index: number, props: FrameMetricProps) => ?FrameMetrics;
+  _info: Info = new Info();
+  _mostlyBlankStartTime: ?number = null;
+  _samplesStartTime: ?number = null;
 
   static addListener(callback: FillRateInfo => void): {
     remove: () => void,
@@ -77,7 +79,9 @@ class FillRateHelper {
     _minSampleCount = minSampleCount;
   }
 
-  constructor(getFrameMetrics: (index: number) => ?FrameMetrics) {
+  constructor(
+    getFrameMetrics: (index: number, props: FrameMetricProps) => ?FrameMetrics,
+  ) {
     this._getFrameMetrics = getFrameMetrics;
     this._enabled = (_sampleRate || 0) > Math.random();
     this._resetData();
@@ -124,6 +128,7 @@ class FillRateHelper {
         mostly_blank_time_frac: this._info.mostly_blank_ms / total_time_spent,
       };
       for (const key in derived) {
+        // $FlowFixMe[prop-missing]
         derived[key] = Math.round(1000 * derived[key]) / 1000;
       }
       console.debug('FillRateHelper deactivateAndFlush: ', {derived, info});
@@ -134,12 +139,11 @@ class FillRateHelper {
 
   computeBlankness(
     props: {
-      data: any,
-      getItemCount: (data: any) => number,
+      ...FrameMetricProps,
       initialNumToRender?: ?number,
       ...
     },
-    state: {
+    cellsAroundViewport: {
       first: number,
       last: number,
       ...
@@ -155,6 +159,7 @@ class FillRateHelper {
     if (
       !this._enabled ||
       props.getItemCount(props.data) === 0 ||
+      cellsAroundViewport.last < cellsAroundViewport.first ||
       this._samplesStartTime == null
     ) {
       return 0;
@@ -180,10 +185,13 @@ class FillRateHelper {
     this._mostlyBlankStartTime = null;
 
     let blankTop = 0;
-    let first = state.first;
-    let firstFrame = this._getFrameMetrics(first);
-    while (first <= state.last && (!firstFrame || !firstFrame.inLayout)) {
-      firstFrame = this._getFrameMetrics(first);
+    let first = cellsAroundViewport.first;
+    let firstFrame = this._getFrameMetrics(first, props);
+    while (
+      first <= cellsAroundViewport.last &&
+      (!firstFrame || !firstFrame.inLayout)
+    ) {
+      firstFrame = this._getFrameMetrics(first, props);
       first++;
     }
     // Only count blankTop if we aren't rendering the first item, otherwise we will count the header
@@ -195,10 +203,13 @@ class FillRateHelper {
       );
     }
     let blankBottom = 0;
-    let last = state.last;
-    let lastFrame = this._getFrameMetrics(last);
-    while (last >= state.first && (!lastFrame || !lastFrame.inLayout)) {
-      lastFrame = this._getFrameMetrics(last);
+    let last = cellsAroundViewport.last;
+    let lastFrame = this._getFrameMetrics(last, props);
+    while (
+      last >= cellsAroundViewport.first &&
+      (!lastFrame || !lastFrame.inLayout)
+    ) {
+      lastFrame = this._getFrameMetrics(last, props);
       last--;
     }
     // Only count blankBottom if we aren't rendering the last item, otherwise we will count the
diff --git a/Libraries/Lists/FlatList.d.ts b/Libraries/Lists/FlatList.d.ts
new file mode 100644
index 000000000000..3d9cf32840eb
--- /dev/null
+++ b/Libraries/Lists/FlatList.d.ts
@@ -0,0 +1,251 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import type {
+  ListRenderItem,
+  ViewToken,
+  VirtualizedListProps,
+} from './VirtualizedList';
+import type {ScrollViewComponent} from '../Components/ScrollView/ScrollView';
+import {StyleProp} from '../StyleSheet/StyleSheet';
+import {ViewStyle} from '../StyleSheet/StyleSheetTypes';
+import {View} from '../Components/View/View';
+
+export interface FlatListProps<ItemT> extends VirtualizedListProps<ItemT> {
+  /**
+   * Optional custom style for multi-item rows generated when numColumns > 1
+   */
+  columnWrapperStyle?: StyleProp<ViewStyle> | undefined;
+
+  /**
+   * Determines when the keyboard should stay visible after a tap.
+   * - 'never' (the default), tapping outside of the focused text input when the keyboard is up dismisses the keyboard. When this happens, children won't receive the tap.
+   * - 'always', the keyboard will not dismiss automatically, and the scroll view will not catch taps, but children of the scroll view can catch taps.
+   * - 'handled', the keyboard will not dismiss automatically when the tap was handled by a children, (or captured by an ancestor).
+   * - false, deprecated, use 'never' instead
+   * - true, deprecated, use 'always' instead
+   */
+  keyboardShouldPersistTaps?:
+    | boolean
+    | 'always'
+    | 'never'
+    | 'handled'
+    | undefined;
+
+  /**
+   * For simplicity, data is just a plain array. If you want to use something else,
+   * like an immutable list, use the underlying VirtualizedList directly.
+   */
+  data: ReadonlyArray<ItemT> | null | undefined;
+
+  /**
+   * A marker property for telling the list to re-render (since it implements PureComponent).
+   * If any of your `renderItem`, Header, Footer, etc. functions depend on anything outside of the `data` prop,
+   * stick it here and treat it immutably.
+   */
+  extraData?: any;
+
+  /**
+   * `getItemLayout` is an optional optimization that lets us skip measurement of dynamic
+   * content if you know the height of items a priori. getItemLayout is the most efficient,
+   * and is easy to use if you have fixed height items, for example:
+   * ```
+   * getItemLayout={(data, index) => (
+   *   {length: ITEM_HEIGHT, offset: ITEM_HEIGHT * index, index}
+   * )}
+   * ```
+   * Remember to include separator length (height or width) in your offset calculation if you specify
+   * `ItemSeparatorComponent`.
+   */
+  getItemLayout?:
+    | ((
+        data: Array<ItemT> | null | undefined,
+        index: number,
+      ) => {length: number; offset: number; index: number})
+    | undefined;
+
+  /**
+   * If true, renders items next to each other horizontally instead of stacked vertically.
+   */
+  horizontal?: boolean | null | undefined;
+
+  /**
+   * How many items to render in the initial batch
+   */
+  initialNumToRender?: number | undefined;
+
+  /**
+   * Instead of starting at the top with the first item, start at initialScrollIndex
+   */
+  initialScrollIndex?: number | null | undefined;
+
+  /**
+   * Used to extract a unique key for a given item at the specified index. Key is used for caching
+   * and as the react key to track item re-ordering. The default extractor checks `item.key`, then
+   * falls back to using the index, like React does.
+   */
+  keyExtractor?: ((item: ItemT, index: number) => string) | undefined;
+
+  /**
+   * Uses legacy MetroListView instead of default VirtualizedSectionList
+   */
+  legacyImplementation?: boolean | undefined;
+
+  /**
+   * Multiple columns can only be rendered with `horizontal={false}` and will zig-zag like a `flexWrap` layout.
+   * Items should all be the same height - masonry layouts are not supported.
+   */
+  numColumns?: number | undefined;
+
+  /**
+   * Called once when the scroll position gets within onEndReachedThreshold of the rendered content.
+   */
+  onEndReached?: ((info: {distanceFromEnd: number}) => void) | null | undefined;
+
+  /**
+   * How far from the end (in units of visible length of the list) the bottom edge of the
+   * list must be from the end of the content to trigger the `onEndReached` callback.
+   * Thus a value of 0.5 will trigger `onEndReached` when the end of the content is
+   * within half the visible length of the list.
+   */
+  onEndReachedThreshold?: number | null | undefined;
+
+  /**
+   * If provided, a standard RefreshControl will be added for "Pull to Refresh" functionality.
+   * Make sure to also set the refreshing prop correctly.
+   */
+  onRefresh?: (() => void) | null | undefined;
+
+  /**
+   * Called when the viewability of rows changes, as defined by the `viewablePercentThreshold` prop.
+   */
+  onViewableItemsChanged?:
+    | ((info: {
+        viewableItems: Array<ViewToken>;
+        changed: Array<ViewToken>;
+      }) => void)
+    | null
+    | undefined;
+
+  /**
+   * Set this true while waiting for new data from a refresh.
+   */
+  refreshing?: boolean | null | undefined;
+
+  /**
+   * Takes an item from data and renders it into the list. Typical usage:
+   * ```
+   * _renderItem = ({item}) => (
+   *   <TouchableOpacity onPress={() => this._onPress(item)}>
+   *     <Text>{item.title}</Text>
+   *   <TouchableOpacity/>
+   * );
+   * ...
+   * <FlatList data={[{title: 'Title Text', key: 'item1'}]} renderItem={this._renderItem} />
+   * ```
+   * Provides additional metadata like `index` if you need it.
+   */
+  renderItem: ListRenderItem<ItemT> | null | undefined;
+
+  /**
+   * See `ViewabilityHelper` for flow type and further documentation.
+   */
+  viewabilityConfig?: any;
+
+  /**
+   * Note: may have bugs (missing content) in some circumstances - use at your own risk.
+   *
+   * This may improve scroll performance for large lists.
+   */
+  removeClippedSubviews?: boolean | undefined;
+
+  /**
+   * Fades out the edges of the scroll content.
+   *
+   * If the value is greater than 0, the fading edges will be set accordingly
+   * to the current scroll direction and position,
+   * indicating if there is more content to show.
+   *
+   * The default value is 0.
+   * @platform android
+   */
+  fadingEdgeLength?: number | undefined;
+}
+
+export class FlatList<ItemT = any> extends React.Component<
+  FlatListProps<ItemT>
+> {
+  /**
+   * Scrolls to the end of the content. May be janky without `getItemLayout` prop.
+   */
+  scrollToEnd: (params?: {animated?: boolean | null | undefined}) => void;
+
+  /**
+   * Scrolls to the item at the specified index such that it is positioned in the viewable area
+   * such that viewPosition 0 places it at the top, 1 at the bottom, and 0.5 centered in the middle.
+   * Cannot scroll to locations outside the render window without specifying the getItemLayout prop.
+   */
+  scrollToIndex: (params: {
+    animated?: boolean | null | undefined;
+    index: number;
+    viewOffset?: number | undefined;
+    viewPosition?: number | undefined;
+  }) => void;
+
+  /**
+   * Requires linear scan through data - use `scrollToIndex` instead if possible.
+   * May be janky without `getItemLayout` prop.
+   */
+  scrollToItem: (params: {
+    animated?: boolean | null | undefined;
+    item: ItemT;
+    viewOffset?: number | undefined;
+    viewPosition?: number | undefined;
+  }) => void;
+
+  /**
+   * Scroll to a specific content pixel offset, like a normal `ScrollView`.
+   */
+  scrollToOffset: (params: {
+    animated?: boolean | null | undefined;
+    offset: number;
+  }) => void;
+
+  /**
+   * Tells the list an interaction has occurred, which should trigger viewability calculations,
+   * e.g. if waitForInteractions is true and the user has not scrolled. This is typically called
+   * by taps on items or by navigation actions.
+   */
+  recordInteraction: () => void;
+
+  /**
+   * Displays the scroll indicators momentarily.
+   */
+  flashScrollIndicators: () => void;
+
+  /**
+   * Provides a handle to the underlying scroll responder.
+   */
+  getScrollResponder: () => JSX.Element | null | undefined;
+
+  /**
+   * Provides a reference to the underlying host component
+   */
+  getNativeScrollRef: () =>
+    | React.ElementRef<typeof View>
+    | React.ElementRef<typeof ScrollViewComponent>
+    | null
+    | undefined;
+
+  getScrollableNode: () => any;
+
+  // TODO: use `unknown` instead of `any` for Typescript >= 3.0
+  setNativeProps: (props: {[key: string]: any}) => void;
+}
diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js
index a56962691c09..56748eaf7524 100644
--- a/Libraries/Lists/FlatList.js
+++ b/Libraries/Lists/FlatList.js
@@ -8,26 +8,26 @@
  * @format
  */
 
-const Platform = require('../Utilities/Platform');
-const deepDiffer = require('../Utilities/differ/deepDiffer');
-const React = require('react');
-const View = require('../Components/View/View');
-const VirtualizedList = require('./VirtualizedList');
-const StyleSheet = require('../StyleSheet/StyleSheet');
-
-const invariant = require('invariant');
-
 import typeof ScrollViewNativeComponent from '../Components/ScrollView/ScrollViewNativeComponent';
-import {type ScrollResponderType} from '../Components/ScrollView/ScrollView';
 import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
 import type {
-  ViewToken,
   ViewabilityConfigCallbackPair,
+  ViewToken,
 } from './ViewabilityHelper';
-import type {RenderItemType, RenderItemProps} from './VirtualizedList';
+import type {RenderItemProps, RenderItemType} from './VirtualizedList';
+
+import {type ScrollResponderType} from '../Components/ScrollView/ScrollView';
+import VirtualizedList from './VirtualizedList';
 import {keyExtractor as defaultKeyExtractor} from './VirtualizeUtils';
 import memoizeOne from 'memoize-one';
 
+const View = require('../Components/View/View');
+const StyleSheet = require('../StyleSheet/StyleSheet');
+const deepDiffer = require('../Utilities/differ/deepDiffer');
+const Platform = require('../Utilities/Platform');
+const invariant = require('invariant');
+const React = require('react');
+
 type RequiredProps<ItemT> = {|
   /**
    * For simplicity, data is just a plain array. If you want to use something else, like an
@@ -334,6 +334,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
   scrollToItem(params: {
     animated?: ?boolean,
     item: ItemT,
+    viewOffset?: number,
     viewPosition?: number,
     ...
   }) {
@@ -433,6 +434,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
     }
   }
 
+  // $FlowFixMe[missing-local-annot]
   componentDidUpdate(prevProps: Props<ItemT>) {
     invariant(
       prevProps.numColumns === this.props.numColumns,
@@ -463,6 +465,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
     this._listRef = ref;
   };
 
+  // $FlowFixMe[missing-local-annot]
   _checkProps(props: Props<ItemT>) {
     const {
       // $FlowFixMe[prop-missing] this prop doesn't exist, is only used for an invariant
@@ -494,13 +497,15 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
     );
   }
 
+  // $FlowFixMe[missing-local-annot]
   _getItem = (data: Array<ItemT>, index: number) => {
     const numColumns = numColumnsOrDefault(this.props.numColumns);
     if (numColumns > 1) {
       const ret = [];
       for (let kk = 0; kk < numColumns; kk++) {
-        const item = data[index * numColumns + kk];
-        if (item != null) {
+        const itemIndex = index * numColumns + kk;
+        if (itemIndex < data.length) {
+          const item = data[itemIndex];
           ret.push(item);
         }
       }
@@ -511,7 +516,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
   };
 
   _getItemCount = (data: ?Array<ItemT>): number => {
-    if (data) {
+    if (Array.isArray(data)) {
       const numColumns = numColumnsOrDefault(this.props.numColumns);
       return numColumns > 1 ? Math.ceil(data.length / numColumns) : data.length;
     } else {
@@ -519,29 +524,26 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
     }
   };
 
-  _keyExtractor = (items: ItemT | Array<ItemT>, index: number) => {
+  _keyExtractor = (items: ItemT | Array<ItemT>, index: number): string => {
     const numColumns = numColumnsOrDefault(this.props.numColumns);
     const keyExtractor = this.props.keyExtractor ?? defaultKeyExtractor;
 
     if (numColumns > 1) {
-      if (Array.isArray(items)) {
-        return items
-          .map((item, kk) =>
-            keyExtractor(((item: $FlowFixMe): ItemT), index * numColumns + kk),
-          )
-          .join(':');
-      } else {
-        invariant(
-          Array.isArray(items),
-          'FlatList: Encountered internal consistency error, expected each item to consist of an ' +
-            'array with 1-%s columns; instead, received a single item.',
-          numColumns,
-        );
-      }
-    } else {
-      // $FlowFixMe[incompatible-call] Can't call keyExtractor with an array
-      return keyExtractor(items, index);
+      invariant(
+        Array.isArray(items),
+        'FlatList: Encountered internal consistency error, expected each item to consist of an ' +
+          'array with 1-%s columns; instead, received a single item.',
+        numColumns,
+      );
+      return items
+        .map((item, kk) =>
+          keyExtractor(((item: $FlowFixMe): ItemT), index * numColumns + kk),
+        )
+        .join(':');
     }
+
+    // $FlowFixMe[incompatible-call] Can't call keyExtractor with an array
+    return keyExtractor(items, index);
   };
 
   _pushMultiColumnViewable(arr: Array<ViewToken>, v: ViewToken): void {
@@ -560,6 +562,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
       changed: Array<ViewToken>,
       ...
     }) => void,
+    // $FlowFixMe[missing-local-annot]
   ) {
     return (info: {
       viewableItems: Array<ViewToken>,
@@ -569,8 +572,8 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
       const numColumns = numColumnsOrDefault(this.props.numColumns);
       if (onViewableItemsChanged) {
         if (numColumns > 1) {
-          const changed = [];
-          const viewableItems = [];
+          const changed: Array<ViewToken> = [];
+          const viewableItems: Array<ViewToken> = [];
           info.viewableItems.forEach(v =>
             this._pushMultiColumnViewable(viewableItems, v),
           );
@@ -589,14 +592,11 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
     columnWrapperStyle: ?ViewStyleProp,
     numColumns: ?number,
     extraData: ?any,
+    // $FlowFixMe[missing-local-annot]
   ) => {
     const cols = numColumnsOrDefault(numColumns);
 
-    let virtualizedListRenderKey = ListItemComponent
-      ? 'ListItemComponent'
-      : 'renderItem';
-
-    const renderer = (props: RenderItemProps<ItemT>): React.Node => {
+    const render = (props: RenderItemProps<ItemT>): React.Node => {
       if (ListItemComponent) {
         // $FlowFixMe[not-a-component] Component isn't valid
         // $FlowFixMe[incompatible-type-arg] Component isn't valid
@@ -610,39 +610,39 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
       }
     };
 
-    return {
-      /* $FlowFixMe[invalid-computed-prop] (>=0.111.0 site=react_native_fb)
-       * This comment suppresses an error found when Flow v0.111 was deployed.
-       * To see the error, delete this comment and run Flow. */
-      [virtualizedListRenderKey]: (info: RenderItemProps<ItemT>) => {
-        if (cols > 1) {
-          const {item, index} = info;
-          invariant(
-            Array.isArray(item),
-            'Expected array of items with numColumns > 1',
-          );
-          return (
-            <View style={StyleSheet.compose(styles.row, columnWrapperStyle)}>
-              {item.map((it, kk) => {
-                const element = renderer({
-                  // $FlowFixMe[incompatible-call]
-                  item: it,
-                  index: index * cols + kk,
-                  separators: info.separators,
-                });
-                return element != null ? (
-                  <React.Fragment key={kk}>{element}</React.Fragment>
-                ) : null;
-              })}
-            </View>
-          );
-        } else {
-          return renderer(info);
-        }
-      },
+    const renderProp = (info: RenderItemProps<ItemT>) => {
+      if (cols > 1) {
+        const {item, index} = info;
+        invariant(
+          Array.isArray(item),
+          'Expected array of items with numColumns > 1',
+        );
+        return (
+          <View style={StyleSheet.compose(styles.row, columnWrapperStyle)}>
+            {item.map((it, kk) => {
+              const element = render({
+                // $FlowFixMe[incompatible-call]
+                item: it,
+                index: index * cols + kk,
+                separators: info.separators,
+              });
+              return element != null ? (
+                <React.Fragment key={kk}>{element}</React.Fragment>
+              ) : null;
+            })}
+          </View>
+        );
+      } else {
+        return render(info);
+      }
     };
+
+    return ListItemComponent
+      ? {ListItemComponent: renderProp}
+      : {renderItem: renderProp};
   };
 
+  // $FlowFixMe[missing-local-annot]
   _memoizedRenderer = memoizeOne(this._renderer);
 
   render(): React.Node {
@@ -657,6 +657,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
     const renderer = strictMode ? this._memoizedRenderer : this._renderer;
 
     return (
+      // $FlowFixMe[incompatible-exact] - `restProps` (`Props`) is inexact.
       <VirtualizedList
         {...restProps}
         getItem={this._getItem}
diff --git a/Libraries/Lists/FlatList.js.flow b/Libraries/Lists/FlatList.js.flow
new file mode 100644
index 000000000000..4a0ee0be1d72
--- /dev/null
+++ b/Libraries/Lists/FlatList.js.flow
@@ -0,0 +1,115 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+const React = require('react');
+const View = require('../Components/View/View');
+
+import typeof ScrollViewNativeComponent from '../Components/ScrollView/ScrollViewNativeComponent';
+import {type ScrollResponderType} from '../Components/ScrollView/ScrollView';
+import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
+import type {
+  ViewToken,
+  ViewabilityConfigCallbackPair,
+} from './ViewabilityHelper';
+import type {RenderItemType, RenderItemProps} from './VirtualizedList';
+import typeof VirtualizedList from './VirtualizedList';
+
+type RequiredProps<ItemT> = {|
+  /**
+   * For simplicity, data is just a plain array. If you want to use something else, like an
+   * immutable list, use the underlying `VirtualizedList` directly.
+   */
+  data: ?$ReadOnlyArray<ItemT>,
+|};
+type OptionalProps<ItemT> = {|
+  renderItem?: ?RenderItemType<ItemT>,
+  columnWrapperStyle?: ViewStyleProp,
+  extraData?: any,
+  getItemLayout?: (
+    data: ?Array<ItemT>,
+    index: number,
+  ) => {
+    length: number,
+    offset: number,
+    index: number,
+    ...
+  },
+  horizontal?: ?boolean,
+  initialNumToRender?: ?number,
+  initialScrollIndex?: ?number,
+  inverted?: ?boolean,
+  keyExtractor?: ?(item: ItemT, index: number) => string,
+  numColumns?: number,
+  removeClippedSubviews?: boolean,
+  fadingEdgeLength?: ?number,
+  strictMode?: boolean,
+|};
+
+/**
+ * Default Props Helper Functions
+ * Use the following helper functions for default values
+ */
+type FlatListProps<ItemT> = {|
+  ...RequiredProps<ItemT>,
+  ...OptionalProps<ItemT>,
+|};
+
+type VirtualizedListProps = React.ElementConfig<VirtualizedList>;
+
+export type Props<ItemT> = {
+  ...$Diff<
+    VirtualizedListProps,
+    {
+      getItem: $PropertyType<VirtualizedListProps, 'getItem'>,
+      getItemCount: $PropertyType<VirtualizedListProps, 'getItemCount'>,
+      getItemLayout: $PropertyType<VirtualizedListProps, 'getItemLayout'>,
+      renderItem: $PropertyType<VirtualizedListProps, 'renderItem'>,
+      keyExtractor: $PropertyType<VirtualizedListProps, 'keyExtractor'>,
+      ...
+    },
+  >,
+  ...FlatListProps<ItemT>,
+  ...
+};
+
+declare class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
+  scrollToEnd(params?: ?{animated?: ?boolean, ...}): void;
+
+  scrollToIndex(params: {
+    animated?: ?boolean,
+    index: number,
+    viewOffset?: number,
+    viewPosition?: number,
+    ...
+  }): void;
+  scrollToItem(params: {
+    animated?: ?boolean,
+    item: ItemT,
+    viewPosition?: number,
+    ...
+  }): void;
+  scrollToOffset(params: {animated?: ?boolean, offset: number, ...}): void;
+  recordInteraction(): void;
+
+  /**
+   * Displays the scroll indicators momentarily.
+   *
+   * @platform ios
+   */
+  flashScrollIndicators(): void;
+  getScrollResponder(): ?ScrollResponderType;
+  getNativeScrollRef():
+    | ?React.ElementRef<typeof View>
+    | ?React.ElementRef<ScrollViewNativeComponent>;
+  getScrollableNode(): any;
+  setNativeProps(props: {[string]: mixed, ...}): void;
+}
+
+module.exports = FlatList;
diff --git a/Libraries/Lists/SectionList.d.ts b/Libraries/Lists/SectionList.d.ts
new file mode 100644
index 000000000000..ae1b10df46a1
--- /dev/null
+++ b/Libraries/Lists/SectionList.d.ts
@@ -0,0 +1,258 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import type {
+  ListRenderItemInfo,
+  VirtualizedListWithoutRenderItemProps,
+} from './VirtualizedList';
+import type {
+  ScrollView,
+  ScrollViewProps,
+} from '../Components/ScrollView/ScrollView';
+import {NodeHandle} from '../ReactNative/RendererProxy';
+import {StyleProp} from '../StyleSheet/StyleSheet';
+import {ViewStyle} from '../StyleSheet/StyleSheetTypes';
+
+/**
+ * @see https://reactnative.dev/docs/sectionlist
+ */
+
+type DefaultSectionT = {
+  [key: string]: any;
+};
+
+export interface SectionBase<ItemT, SectionT = DefaultSectionT> {
+  data: ReadonlyArray<ItemT>;
+
+  key?: string | undefined;
+
+  renderItem?: SectionListRenderItem<ItemT, SectionT> | undefined;
+
+  ItemSeparatorComponent?: React.ComponentType<any> | null | undefined;
+
+  keyExtractor?: ((item: ItemT, index: number) => string) | undefined;
+}
+
+export type SectionListData<ItemT, SectionT = DefaultSectionT> = SectionBase<
+  ItemT,
+  SectionT
+> &
+  SectionT;
+
+/**
+ * @see https://reactnative.dev/docs/sectionlist.html#props
+ */
+
+export interface SectionListRenderItemInfo<ItemT, SectionT = DefaultSectionT>
+  extends ListRenderItemInfo<ItemT> {
+  section: SectionListData<ItemT, SectionT>;
+}
+
+export type SectionListRenderItem<ItemT, SectionT = DefaultSectionT> = (
+  info: SectionListRenderItemInfo<ItemT, SectionT>,
+) => React.ReactElement | null;
+
+export interface SectionListProps<ItemT, SectionT = DefaultSectionT>
+  extends VirtualizedListWithoutRenderItemProps<ItemT> {
+  /**
+   * Rendered in between each section.
+   */
+  SectionSeparatorComponent?:
+    | React.ComponentType<any>
+    | React.ReactElement
+    | null
+    | undefined;
+
+  /**
+   * A marker property for telling the list to re-render (since it implements PureComponent).
+   * If any of your `renderItem`, Header, Footer, etc. functions depend on anything outside of the `data` prop,
+   * stick it here and treat it immutably.
+   */
+  extraData?: any;
+
+  /**
+   * `getItemLayout` is an optional optimization that lets us skip measurement of dynamic
+   * content if you know the height of items a priori. getItemLayout is the most efficient,
+   * and is easy to use if you have fixed height items, for example:
+   * ```
+   * getItemLayout={(data, index) => (
+   *   {length: ITEM_HEIGHT, offset: ITEM_HEIGHT * index, index}
+   * )}
+   * ```
+   */
+  getItemLayout?:
+    | ((
+        data: SectionListData<ItemT, SectionT>[] | null,
+        index: number,
+      ) => {length: number; offset: number; index: number})
+    | undefined;
+
+  /**
+   * How many items to render in the initial batch
+   */
+  initialNumToRender?: number | undefined;
+
+  /**
+   * Reverses the direction of scroll. Uses scale transforms of -1.
+   */
+  inverted?: boolean | null | undefined;
+
+  /**
+   * Used to extract a unique key for a given item at the specified index. Key is used for caching
+   * and as the react key to track item re-ordering. The default extractor checks `item.key`, then
+   * falls back to using the index, like React does.
+   */
+  keyExtractor?: ((item: ItemT, index: number) => string) | undefined;
+
+  /**
+   * Called once when the scroll position gets within onEndReachedThreshold of the rendered content.
+   */
+  onEndReached?: ((info: {distanceFromEnd: number}) => void) | null | undefined;
+
+  /**
+   * How far from the end (in units of visible length of the list) the bottom edge of the
+   * list must be from the end of the content to trigger the `onEndReached` callback.
+   * Thus a value of 0.5 will trigger `onEndReached` when the end of the content is
+   * within half the visible length of the list.
+   */
+  onEndReachedThreshold?: number | null | undefined;
+
+  /**
+   * If provided, a standard RefreshControl will be added for "Pull to Refresh" functionality.
+   * Make sure to also set the refreshing prop correctly.
+   */
+  onRefresh?: (() => void) | null | undefined;
+
+  /**
+   * Used to handle failures when scrolling to an index that has not been measured yet.
+   * Recommended action is to either compute your own offset and `scrollTo` it, or scroll as far
+   * as possible and then try again after more items have been rendered.
+   */
+  onScrollToIndexFailed?:
+    | ((info: {
+        index: number;
+        highestMeasuredFrameIndex: number;
+        averageItemLength: number;
+      }) => void)
+    | undefined;
+
+  /**
+   * Set this true while waiting for new data from a refresh.
+   */
+  refreshing?: boolean | null | undefined;
+
+  /**
+   * Default renderer for every item in every section. Can be over-ridden on a per-section basis.
+   */
+  renderItem?: SectionListRenderItem<ItemT, SectionT> | undefined;
+
+  /**
+   * Rendered at the top of each section. Sticky headers are not yet supported.
+   */
+  renderSectionHeader?:
+    | ((info: {
+        section: SectionListData<ItemT, SectionT>;
+      }) => React.ReactElement | null)
+    | undefined;
+
+  /**
+   * Rendered at the bottom of each section.
+   */
+  renderSectionFooter?:
+    | ((info: {
+        section: SectionListData<ItemT, SectionT>;
+      }) => React.ReactElement | null)
+    | undefined;
+
+  /**
+   * An array of objects with data for each section.
+   */
+  sections: ReadonlyArray<SectionListData<ItemT, SectionT>>;
+
+  /**
+   * Render a custom scroll component, e.g. with a differently styled `RefreshControl`.
+   */
+  renderScrollComponent?:
+    | ((props: ScrollViewProps) => React.ReactElement<ScrollViewProps>)
+    | undefined;
+
+  /**
+   * Note: may have bugs (missing content) in some circumstances - use at your own risk.
+   *
+   * This may improve scroll performance for large lists.
+   */
+  removeClippedSubviews?: boolean | undefined;
+
+  /**
+   * Makes section headers stick to the top of the screen until the next one pushes it off.
+   * Only enabled by default on iOS because that is the platform standard there.
+   */
+  stickySectionHeadersEnabled?: boolean | undefined;
+
+  /**
+   * Uses legacy MetroListView instead of default VirtualizedSectionList
+   */
+  legacyImplementation?: boolean | undefined;
+}
+
+export interface SectionListScrollParams {
+  animated?: boolean | undefined;
+  itemIndex: number;
+  sectionIndex: number;
+  viewOffset?: number | undefined;
+  viewPosition?: number | undefined;
+}
+
+export class SectionList<
+  ItemT = any,
+  SectionT = DefaultSectionT,
+> extends React.Component<SectionListProps<ItemT, SectionT>> {
+  /**
+   * Scrolls to the item at the specified sectionIndex and itemIndex (within the section)
+   * positioned in the viewable area such that viewPosition 0 places it at the top
+   * (and may be covered by a sticky header), 1 at the bottom, and 0.5 centered in the middle.
+   */
+  scrollToLocation(params: SectionListScrollParams): void;
+
+  /**
+   * Tells the list an interaction has occurred, which should trigger viewability calculations, e.g.
+   * if `waitForInteractions` is true and the user has not scrolled. This is typically called by
+   * taps on items or by navigation actions.
+   */
+  recordInteraction(): void;
+
+  /**
+   * Displays the scroll indicators momentarily.
+   *
+   * @platform ios
+   */
+  flashScrollIndicators(): void;
+
+  /**
+   * Provides a handle to the underlying scroll responder.
+   */
+  getScrollResponder(): ScrollView | undefined;
+
+  /**
+   * Provides a handle to the underlying scroll node.
+   */
+  getScrollableNode(): NodeHandle | undefined;
+}
+
+/* This definition is deprecated because it extends the wrong base type */
+export interface SectionListStatic<ItemT, SectionT = DefaultSectionT>
+  extends React.ComponentClass<SectionListProps<ItemT, SectionT>> {
+  /**
+   * Scrolls to the item at the specified sectionIndex and itemIndex (within the section)
+   * positioned in the viewable area such that viewPosition 0 places it at the top
+   * (and may be covered by a sticky header), 1 at the bottom, and 0.5 centered in the middle.
+   */
+  scrollToLocation?(params: SectionListScrollParams): void;
+}
diff --git a/Libraries/Lists/SectionList.js b/Libraries/Lists/SectionList.js
index 2b1299cadf2d..3520b31eca98 100644
--- a/Libraries/Lists/SectionList.js
+++ b/Libraries/Lists/SectionList.js
@@ -10,17 +10,17 @@
 
 'use strict';
 
-import Platform from '../Utilities/Platform';
-import * as React from 'react';
-import VirtualizedSectionList from './VirtualizedSectionList';
-
 import type {ScrollResponderType} from '../Components/ScrollView/ScrollView';
 import type {
-  SectionBase as _SectionBase,
   Props as VirtualizedSectionListProps,
   ScrollToLocationParamsType,
+  SectionBase as _SectionBase,
 } from './VirtualizedSectionList';
 
+import Platform from '../Utilities/Platform';
+import VirtualizedSectionList from './VirtualizedSectionList';
+import * as React from 'react';
+
 type Item = any;
 
 export type SectionBase<SectionItemT> = _SectionBase<SectionItemT>;
diff --git a/Libraries/Lists/SectionListModern.js b/Libraries/Lists/SectionListModern.js
index f2c400c6db9f..c7856e13d9a6 100644
--- a/Libraries/Lists/SectionListModern.js
+++ b/Libraries/Lists/SectionListModern.js
@@ -10,17 +10,17 @@
 
 'use strict';
 
-import Platform from '../Utilities/Platform';
-import React, {useRef, forwardRef, useImperativeHandle} from 'react';
-import VirtualizedSectionList from './VirtualizedSectionList';
-
 import type {ScrollResponderType} from '../Components/ScrollView/ScrollView';
 import type {
-  SectionBase as _SectionBase,
   Props as VirtualizedSectionListProps,
   ScrollToLocationParamsType,
+  SectionBase as _SectionBase,
 } from './VirtualizedSectionList';
-import type {Element, ElementRef, AbstractComponent} from 'react';
+import type {AbstractComponent, Element, ElementRef} from 'react';
+
+import Platform from '../Utilities/Platform';
+import VirtualizedSectionList from './VirtualizedSectionList';
+import React, {forwardRef, useImperativeHandle, useRef} from 'react';
 
 type Item = any;
 
diff --git a/Libraries/Lists/StateSafePureComponent.js b/Libraries/Lists/StateSafePureComponent.js
new file mode 100644
index 000000000000..77db4b4e5c3c
--- /dev/null
+++ b/Libraries/Lists/StateSafePureComponent.js
@@ -0,0 +1,85 @@
+/**
+ * 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 invariant from 'invariant';
+import * as React from 'react';
+
+/**
+ * `setState` is called asynchronously, and should not rely on the value of
+ * `this.props` or `this.state`:
+ * https://reactjs.org/docs/state-and-lifecycle.html#state-updates-may-be-asynchronous
+ *
+ * SafePureComponent adds runtime enforcement, to catch cases where these
+ * variables are read in a state updater function, instead of the ones passed
+ * in.
+ */
+export default class StateSafePureComponent<
+  Props,
+  State: interface {},
+> extends React.PureComponent<Props, State> {
+  _inAsyncStateUpdate = false;
+
+  constructor(props: Props) {
+    super(props);
+    this._installSetStateHooks();
+  }
+
+  setState(
+    partialState: ?($Shape<State> | ((State, Props) => ?$Shape<State>)),
+    callback?: () => mixed,
+  ): void {
+    if (typeof partialState === 'function') {
+      super.setState((state, props) => {
+        this._inAsyncStateUpdate = true;
+        let ret;
+        try {
+          ret = partialState(state, props);
+        } catch (err) {
+          throw err;
+        } finally {
+          this._inAsyncStateUpdate = false;
+        }
+        return ret;
+      }, callback);
+    } else {
+      super.setState(partialState, callback);
+    }
+  }
+
+  _installSetStateHooks() {
+    const that = this;
+    let {props, state} = this;
+
+    Object.defineProperty(this, 'props', {
+      get() {
+        invariant(
+          !that._inAsyncStateUpdate,
+          '"this.props" should not be accessed during state updates',
+        );
+        return props;
+      },
+      set(newProps: Props) {
+        props = newProps;
+      },
+    });
+    Object.defineProperty(this, 'state', {
+      get() {
+        invariant(
+          !that._inAsyncStateUpdate,
+          '"this.state" should not be acceessed during state updates',
+        );
+        return state;
+      },
+      set(newState: State) {
+        state = newState;
+      },
+    });
+  }
+}
diff --git a/Libraries/Lists/ViewabilityHelper.js b/Libraries/Lists/ViewabilityHelper.js
index ae91b25ab68d..33a9811825af 100644
--- a/Libraries/Lists/ViewabilityHelper.js
+++ b/Libraries/Lists/ViewabilityHelper.js
@@ -10,6 +10,8 @@
 
 'use strict';
 
+import type {FrameMetricProps} from './VirtualizedListProps';
+
 const invariant = require('invariant');
 
 export type ViewToken = {
@@ -99,10 +101,13 @@ class ViewabilityHelper {
    * Determines which items are viewable based on the current metrics and config.
    */
   computeViewableItems(
-    itemCount: number,
+    props: FrameMetricProps,
     scrollOffset: number,
     viewportHeight: number,
-    getFrameMetrics: (index: number) => ?{
+    getFrameMetrics: (
+      index: number,
+      props: FrameMetricProps,
+    ) => ?{
       length: number,
       offset: number,
       ...
@@ -114,6 +119,7 @@ class ViewabilityHelper {
       ...
     },
   ): Array<number> {
+    const itemCount = props.getItemCount(props.data);
     const {itemVisiblePercentThreshold, viewAreaCoveragePercentThreshold} =
       this._config;
     const viewAreaMode = viewAreaCoveragePercentThreshold != null;
@@ -140,7 +146,7 @@ class ViewabilityHelper {
       return [];
     }
     for (let idx = first; idx <= last; idx++) {
-      const metrics = getFrameMetrics(idx);
+      const metrics = getFrameMetrics(idx, props);
       if (!metrics) {
         continue;
       }
@@ -172,15 +178,22 @@ class ViewabilityHelper {
    * `onViewableItemsChanged` as appropriate.
    */
   onUpdate(
-    itemCount: number,
+    props: FrameMetricProps,
     scrollOffset: number,
     viewportHeight: number,
-    getFrameMetrics: (index: number) => ?{
+    getFrameMetrics: (
+      index: number,
+      props: FrameMetricProps,
+    ) => ?{
       length: number,
       offset: number,
       ...
     },
-    createViewToken: (index: number, isViewable: boolean) => ViewToken,
+    createViewToken: (
+      index: number,
+      isViewable: boolean,
+      props: FrameMetricProps,
+    ) => ViewToken,
     onViewableItemsChanged: ({
       viewableItems: Array<ViewToken>,
       changed: Array<ViewToken>,
@@ -193,17 +206,18 @@ class ViewabilityHelper {
       ...
     },
   ): void {
+    const itemCount = props.getItemCount(props.data);
     if (
       (this._config.waitForInteraction && !this._hasInteracted) ||
       itemCount === 0 ||
-      !getFrameMetrics(0)
+      !getFrameMetrics(0, props)
     ) {
       return;
     }
-    let viewableIndices = [];
+    let viewableIndices: Array<number> = [];
     if (itemCount) {
       viewableIndices = this.computeViewableItems(
-        itemCount,
+        props,
         scrollOffset,
         viewportHeight,
         getFrameMetrics,
@@ -220,12 +234,13 @@ class ViewabilityHelper {
     }
     this._viewableIndices = viewableIndices;
     if (this._config.minimumViewTime) {
-      const handle = setTimeout(() => {
+      const handle: TimeoutID = setTimeout(() => {
         /* $FlowFixMe[incompatible-call] (>=0.63.0 site=react_native_fb) This
          * comment suppresses an error found when Flow v0.63 was deployed. To
          * see the error delete this comment and run Flow. */
         this._timers.delete(handle);
         this._onUpdateSync(
+          props,
           viewableIndices,
           onViewableItemsChanged,
           createViewToken,
@@ -237,6 +252,7 @@ class ViewabilityHelper {
       this._timers.add(handle);
     } else {
       this._onUpdateSync(
+        props,
         viewableIndices,
         onViewableItemsChanged,
         createViewToken,
@@ -259,13 +275,18 @@ class ViewabilityHelper {
   }
 
   _onUpdateSync(
+    props: FrameMetricProps,
     viewableIndicesToCheck: Array<number>,
     onViewableItemsChanged: ({
       changed: Array<ViewToken>,
       viewableItems: Array<ViewToken>,
       ...
     }) => void,
-    createViewToken: (index: number, isViewable: boolean) => ViewToken,
+    createViewToken: (
+      index: number,
+      isViewable: boolean,
+      props: FrameMetricProps,
+    ) => ViewToken,
   ) {
     // Filter out indices that have gone out of view since this call was scheduled.
     viewableIndicesToCheck = viewableIndicesToCheck.filter(ii =>
@@ -274,7 +295,7 @@ class ViewabilityHelper {
     const prevItems = this._viewableItems;
     const nextItems = new Map(
       viewableIndicesToCheck.map(ii => {
-        const viewable = createViewToken(ii, true);
+        const viewable = createViewToken(ii, true, props);
         return [viewable.key, viewable];
       }),
     );
diff --git a/Libraries/Lists/VirtualizeUtils.js b/Libraries/Lists/VirtualizeUtils.js
index 70e48ff1a207..3a70d9f68309 100644
--- a/Libraries/Lists/VirtualizeUtils.js
+++ b/Libraries/Lists/VirtualizeUtils.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-import invariant from 'invariant';
+import type {FrameMetricProps} from './VirtualizedListProps';
 
 /**
  * Used to find the indices of the frames that overlap the given offsets. Useful for finding the
@@ -19,14 +19,18 @@ import invariant from 'invariant';
  */
 export function elementsThatOverlapOffsets(
   offsets: Array<number>,
-  itemCount: number,
-  getFrameMetrics: (index: number) => {
+  props: FrameMetricProps,
+  getFrameMetrics: (
+    index: number,
+    props: FrameMetricProps,
+  ) => {
     length: number,
     offset: number,
     ...
   },
   zoomScale: number = 1,
 ): Array<number> {
+  const itemCount = props.getItemCount(props.data);
   const result = [];
   for (let offsetIndex = 0; offsetIndex < offsets.length; offsetIndex++) {
     const currentOffset = offsets[offsetIndex];
@@ -36,7 +40,7 @@ export function elementsThatOverlapOffsets(
     while (left <= right) {
       // eslint-disable-next-line no-bitwise
       const mid = left + ((right - left) >>> 1);
-      const frame = getFrameMetrics(mid);
+      const frame = getFrameMetrics(mid, props);
       const scaledOffsetStart = frame.offset * zoomScale;
       const scaledOffsetEnd = (frame.offset + frame.length) * zoomScale;
 
@@ -95,16 +99,17 @@ export function newRangeCount(
  * biased in the direction of scroll.
  */
 export function computeWindowedRenderLimits(
-  data: any,
-  getItemCount: (data: any) => number,
+  props: FrameMetricProps,
   maxToRenderPerBatch: number,
   windowSize: number,
   prev: {
     first: number,
     last: number,
-    ...
   },
-  getFrameMetricsApprox: (index: number) => {
+  getFrameMetricsApprox: (
+    index: number,
+    props: FrameMetricProps,
+  ) => {
     length: number,
     offset: number,
     ...
@@ -120,11 +125,10 @@ export function computeWindowedRenderLimits(
 ): {
   first: number,
   last: number,
-  ...
 } {
-  const itemCount = getItemCount(data);
+  const itemCount = props.getItemCount(props.data);
   if (itemCount === 0) {
-    return prev;
+    return {first: 0, last: -1};
   }
   const {offset, velocity, visibleLength, zoomScale = 1} = scrollMetrics;
 
@@ -148,7 +152,7 @@ export function computeWindowedRenderLimits(
   const overscanEnd = Math.max(0, visibleEnd + leadFactor * overscanLength);
 
   const lastItemOffset =
-    getFrameMetricsApprox(itemCount - 1).offset * zoomScale;
+    getFrameMetricsApprox(itemCount - 1, props).offset * zoomScale;
   if (lastItemOffset < overscanBegin) {
     // Entire list is before our overscan window
     return {
@@ -160,7 +164,7 @@ export function computeWindowedRenderLimits(
   // Find the indices that correspond to the items at the render boundaries we're targeting.
   let [overscanFirst, first, last, overscanLast] = elementsThatOverlapOffsets(
     [overscanBegin, visibleBegin, visibleEnd, overscanEnd],
-    itemCount,
+    props,
     getFrameMetricsApprox,
     zoomScale,
   );
diff --git a/Libraries/Lists/VirtualizedList.d.ts b/Libraries/Lists/VirtualizedList.d.ts
new file mode 100644
index 000000000000..eaef385999f5
--- /dev/null
+++ b/Libraries/Lists/VirtualizedList.d.ts
@@ -0,0 +1,347 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import type {LayoutChangeEvent} from '../../types';
+import {StyleProp} from '../StyleSheet/StyleSheet';
+import {ViewStyle} from '../StyleSheet/StyleSheetTypes';
+import type {
+  ScrollResponderMixin,
+  ScrollView,
+  ScrollViewProps,
+} from '../Components/ScrollView/ScrollView';
+import type {View} from '../Components/View/View';
+
+export interface ViewToken {
+  item: any;
+  key: string;
+  index: number | null;
+  isViewable: boolean;
+  section?: any;
+}
+
+export interface ViewabilityConfig {
+  /**
+   * Minimum amount of time (in milliseconds) that an item must be physically viewable before the
+   * viewability callback will be fired. A high number means that scrolling through content without
+   * stopping will not mark the content as viewable.
+   */
+  minimumViewTime?: number | undefined;
+
+  /**
+   * Percent of viewport that must be covered for a partially occluded item to count as
+   * "viewable", 0-100. Fully visible items are always considered viewable. A value of 0 means
+   * that a single pixel in the viewport makes the item viewable, and a value of 100 means that
+   * an item must be either entirely visible or cover the entire viewport to count as viewable.
+   */
+  viewAreaCoveragePercentThreshold?: number | undefined;
+
+  /**
+   * Similar to `viewAreaCoveragePercentThreshold`, but considers the percent of the item that is visible,
+   * rather than the fraction of the viewable area it covers.
+   */
+  itemVisiblePercentThreshold?: number | undefined;
+
+  /**
+   * Nothing is considered viewable until the user scrolls or `recordInteraction` is called after
+   * render.
+   */
+  waitForInteraction?: boolean | undefined;
+}
+
+export interface ViewabilityConfigCallbackPair {
+  viewabilityConfig: ViewabilityConfig;
+  onViewableItemsChanged:
+    | ((info: {
+        viewableItems: Array<ViewToken>;
+        changed: Array<ViewToken>;
+      }) => void)
+    | null;
+}
+
+export type ViewabilityConfigCallbackPairs = ViewabilityConfigCallbackPair[];
+
+/**
+ * @see https://reactnative.dev/docs/flatlist#props
+ */
+
+export interface ListRenderItemInfo<ItemT> {
+  item: ItemT;
+
+  index: number;
+
+  separators: {
+    highlight: () => void;
+    unhighlight: () => void;
+    updateProps: (select: 'leading' | 'trailing', newProps: any) => void;
+  };
+}
+
+export type ListRenderItem<ItemT> = (
+  info: ListRenderItemInfo<ItemT>,
+) => React.ReactElement | null;
+
+/**
+ * @see https://reactnative.dev/docs/virtualizedlist
+ */
+export class VirtualizedList<ItemT> extends React.Component<
+  VirtualizedListProps<ItemT>
+> {
+  scrollToEnd: (params?: {animated?: boolean | undefined}) => void;
+  scrollToIndex: (params: {
+    animated?: boolean | undefined;
+    index: number;
+    viewOffset?: number | undefined;
+    viewPosition?: number | undefined;
+  }) => void;
+  scrollToItem: (params: {
+    animated?: boolean | undefined;
+    item: ItemT;
+    viewOffset?: number | undefined;
+    viewPosition?: number | undefined;
+  }) => void;
+
+  /**
+   * Scroll to a specific content pixel offset in the list.
+   * Param `offset` expects the offset to scroll to. In case of horizontal is true, the
+   * offset is the x-value, in any other case the offset is the y-value.
+   * Param `animated` (true by default) defines whether the list should do an animation while scrolling.
+   */
+  scrollToOffset: (params: {
+    animated?: boolean | undefined;
+    offset: number;
+  }) => void;
+
+  recordInteraction: () => void;
+
+  getScrollRef: () =>
+    | React.ElementRef<typeof ScrollView>
+    | React.ElementRef<typeof View>
+    | null;
+
+  getScrollResponder: () => ScrollResponderMixin | null;
+}
+
+/**
+ * @see https://reactnative.dev/docs/virtualizedlist#props
+ */
+
+export interface VirtualizedListProps<ItemT>
+  extends VirtualizedListWithoutRenderItemProps<ItemT> {
+  renderItem: ListRenderItem<ItemT> | null | undefined;
+}
+
+export interface VirtualizedListWithoutRenderItemProps<ItemT>
+  extends ScrollViewProps {
+  /**
+   * Rendered in between each item, but not at the top or bottom
+   */
+  ItemSeparatorComponent?: React.ComponentType<any> | null | undefined;
+
+  /**
+   * Rendered when the list is empty. Can be a React Component Class, a render function, or
+   * a rendered element.
+   */
+  ListEmptyComponent?:
+    | React.ComponentType<any>
+    | React.ReactElement
+    | null
+    | undefined;
+
+  /**
+   * Rendered at the bottom of all the items. Can be a React Component Class, a render function, or
+   * a rendered element.
+   */
+  ListFooterComponent?:
+    | React.ComponentType<any>
+    | React.ReactElement
+    | null
+    | undefined;
+
+  /**
+   * Styling for internal View for ListFooterComponent
+   */
+  ListFooterComponentStyle?: StyleProp<ViewStyle> | undefined;
+
+  /**
+   * Rendered at the top of all the items. Can be a React Component Class, a render function, or
+   * a rendered element.
+   */
+  ListHeaderComponent?:
+    | React.ComponentType<any>
+    | React.ReactElement
+    | null
+    | undefined;
+
+  /**
+   * Styling for internal View for ListHeaderComponent
+   */
+  ListHeaderComponentStyle?: StyleProp<ViewStyle> | undefined;
+
+  /**
+   * The default accessor functions assume this is an Array<{key: string}> but you can override
+   * getItem, getItemCount, and keyExtractor to handle any type of index-based data.
+   */
+  data?: any;
+
+  /**
+   * `debug` will turn on extra logging and visual overlays to aid with debugging both usage and
+   * implementation, but with a significant perf hit.
+   */
+  debug?: boolean | undefined;
+
+  /**
+   * DEPRECATED: Virtualization provides significant performance and memory optimizations, but fully
+   * unmounts react instances that are outside of the render window. You should only need to disable
+   * this for debugging purposes.
+   */
+  disableVirtualization?: boolean | undefined;
+
+  /**
+   * A marker property for telling the list to re-render (since it implements `PureComponent`). If
+   * any of your `renderItem`, Header, Footer, etc. functions depend on anything outside of the
+   * `data` prop, stick it here and treat it immutably.
+   */
+  extraData?: any;
+
+  /**
+   * A generic accessor for extracting an item from any sort of data blob.
+   */
+  getItem?: ((data: any, index: number) => ItemT) | undefined;
+
+  /**
+   * Determines how many items are in the data blob.
+   */
+  getItemCount?: ((data: any) => number) | undefined;
+
+  getItemLayout?:
+    | ((
+        data: any,
+        index: number,
+      ) => {
+        length: number;
+        offset: number;
+        index: number;
+      })
+    | undefined;
+
+  horizontal?: boolean | null | undefined;
+
+  /**
+   * How many items to render in the initial batch. This should be enough to fill the screen but not
+   * much more. Note these items will never be unmounted as part of the windowed rendering in order
+   * to improve perceived performance of scroll-to-top actions.
+   */
+  initialNumToRender?: number | undefined;
+
+  /**
+   * Instead of starting at the top with the first item, start at `initialScrollIndex`. This
+   * disables the "scroll to top" optimization that keeps the first `initialNumToRender` items
+   * always rendered and immediately renders the items starting at this initial index. Requires
+   * `getItemLayout` to be implemented.
+   */
+  initialScrollIndex?: number | null | undefined;
+
+  /**
+   * Reverses the direction of scroll. Uses scale transforms of -1.
+   */
+  inverted?: boolean | null | undefined;
+
+  keyExtractor?: ((item: ItemT, index: number) => string) | undefined;
+
+  /**
+   * The maximum number of items to render in each incremental render batch. The more rendered at
+   * once, the better the fill rate, but responsiveness my suffer because rendering content may
+   * interfere with responding to button taps or other interactions.
+   */
+  maxToRenderPerBatch?: number | undefined;
+
+  onEndReached?: ((info: {distanceFromEnd: number}) => void) | null | undefined;
+
+  onEndReachedThreshold?: number | null | undefined;
+
+  onLayout?: ((event: LayoutChangeEvent) => void) | undefined;
+
+  /**
+   * If provided, a standard RefreshControl will be added for "Pull to Refresh" functionality. Make
+   * sure to also set the `refreshing` prop correctly.
+   */
+  onRefresh?: (() => void) | null | undefined;
+
+  /**
+   * Used to handle failures when scrolling to an index that has not been measured yet.
+   * Recommended action is to either compute your own offset and `scrollTo` it, or scroll as far
+   * as possible and then try again after more items have been rendered.
+   */
+  onScrollToIndexFailed?:
+    | ((info: {
+        index: number;
+        highestMeasuredFrameIndex: number;
+        averageItemLength: number;
+      }) => void)
+    | undefined;
+
+  /**
+   * Called when the viewability of rows changes, as defined by the
+   * `viewabilityConfig` prop.
+   */
+  onViewableItemsChanged?:
+    | ((info: {
+        viewableItems: Array<ViewToken>;
+        changed: Array<ViewToken>;
+      }) => void)
+    | null
+    | undefined;
+
+  /**
+   * Set this when offset is needed for the loading indicator to show correctly.
+   * @platform android
+   */
+  progressViewOffset?: number | undefined;
+
+  /**
+   * Set this true while waiting for new data from a refresh.
+   */
+  refreshing?: boolean | null | undefined;
+
+  /**
+   * Note: may have bugs (missing content) in some circumstances - use at your own risk.
+   *
+   * This may improve scroll performance for large lists.
+   */
+  removeClippedSubviews?: boolean | undefined;
+
+  /**
+   * Render a custom scroll component, e.g. with a differently styled `RefreshControl`.
+   */
+  renderScrollComponent?:
+    | ((props: ScrollViewProps) => React.ReactElement<ScrollViewProps>)
+    | undefined;
+
+  /**
+   * Amount of time between low-pri item render batches, e.g. for rendering items quite a ways off
+   * screen. Similar fill rate/responsiveness tradeoff as `maxToRenderPerBatch`.
+   */
+  updateCellsBatchingPeriod?: number | undefined;
+
+  viewabilityConfig?: ViewabilityConfig | undefined;
+
+  viewabilityConfigCallbackPairs?: ViewabilityConfigCallbackPairs | undefined;
+
+  /**
+   * Determines the maximum number of items rendered outside of the visible area, in units of
+   * visible lengths. So if your list fills the screen, then `windowSize={21}` (the default) will
+   * render the visible screen area plus up to 10 screens above and 10 below the viewport. Reducing
+   * this number will reduce memory consumption and may improve performance, but will increase the
+   * chance that fast scrolling may reveal momentary blank areas of unrendered content.
+   */
+  windowSize?: number | undefined;
+
+  CellRendererComponent?: React.ComponentType<any> | undefined;
+}
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 69e63090ea32..2629142d951b 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -11,15 +11,32 @@
 import type {ScrollResponderType} from '../Components/ScrollView/ScrollView';
 import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
 import type {LayoutEvent, ScrollEvent} from '../Types/CoreEventTypes';
+import type {ViewToken} from './ViewabilityHelper';
 import type {
-  ViewabilityConfig,
-  ViewabilityConfigCallbackPair,
-  ViewToken,
-} from './ViewabilityHelper';
-
+  FrameMetricProps,
+  Item,
+  Props,
+  RenderItemProps,
+  RenderItemType,
+  Separators,
+} from './VirtualizedListProps';
+
+import RefreshControl from '../Components/RefreshControl/RefreshControl';
+import ScrollView from '../Components/ScrollView/ScrollView';
+import View from '../Components/View/View';
+import Batchinator from '../Interaction/Batchinator';
+import {findNodeHandle} from '../ReactNative/RendererProxy';
+import flattenStyle from '../StyleSheet/flattenStyle';
+import StyleSheet from '../StyleSheet/StyleSheet';
+import clamp from '../Utilities/clamp';
+import infoLog from '../Utilities/infoLog';
+import {CellRenderMask} from './CellRenderMask';
+import ChildListCollection from './ChildListCollection';
+import FillRateHelper from './FillRateHelper';
+import StateSafePureComponent from './StateSafePureComponent';
+import ViewabilityHelper from './ViewabilityHelper';
+import CellRenderer from './VirtualizedListCellRenderer';
 import {
-  type ChildListState,
-  type ListDebugInfo,
   VirtualizedListCellContextProvider,
   VirtualizedListContext,
   VirtualizedListContextProvider,
@@ -28,41 +45,15 @@ import {
   computeWindowedRenderLimits,
   keyExtractor as defaultKeyExtractor,
 } from './VirtualizeUtils';
+import invariant from 'invariant';
 import * as React from 'react';
 
-const RefreshControl = require('../Components/RefreshControl/RefreshControl');
-const ScrollView = require('../Components/ScrollView/ScrollView');
-const View = require('../Components/View/View');
-const Batchinator = require('../Interaction/Batchinator');
-const ReactNative = require('../Renderer/shims/ReactNative');
-const flattenStyle = require('../StyleSheet/flattenStyle');
-const StyleSheet = require('../StyleSheet/StyleSheet');
-const infoLog = require('../Utilities/infoLog');
-const FillRateHelper = require('./FillRateHelper');
-const ViewabilityHelper = require('./ViewabilityHelper');
-const invariant = require('invariant');
+export type {RenderItemProps, RenderItemType, Separators};
 
 const ON_END_REACHED_EPSILON = 0.001;
 
-type Item = any;
-
-export type Separators = {
-  highlight: () => void,
-  unhighlight: () => void,
-  updateProps: (select: 'leading' | 'trailing', newProps: Object) => void,
-  ...
-};
-
-export type RenderItemProps<ItemT> = {
-  item: ItemT,
-  index: number,
-  separators: Separators,
-  ...
-};
-
-export type RenderItemType<ItemT> = (
-  info: RenderItemProps<ItemT>,
-) => React.Node;
+let _usedIndexForKey = false;
+let _keylessItemComponentName: string = '';
 
 type ViewabilityHelperCallbackTuple = {
   viewabilityHelper: ViewabilityHelper,
@@ -74,246 +65,9 @@ type ViewabilityHelperCallbackTuple = {
   ...
 };
 
-type RequiredProps = {|
-  /**
-   * The default accessor functions assume this is an Array<{key: string} | {id: string}> but you can override
-   * getItem, getItemCount, and keyExtractor to handle any type of index-based data.
-   */
-  data?: any,
-  /**
-   * A generic accessor for extracting an item from any sort of data blob.
-   */
-  getItem: (data: any, index: number) => ?Item,
-  /**
-   * Determines how many items are in the data blob.
-   */
-  getItemCount: (data: any) => number,
-|};
-type OptionalProps = {|
-  renderItem?: ?RenderItemType<Item>,
-  /**
-   * `debug` will turn on extra logging and visual overlays to aid with debugging both usage and
-   * implementation, but with a significant perf hit.
-   */
-  debug?: ?boolean,
-  /**
-   * DEPRECATED: Virtualization provides significant performance and memory optimizations, but fully
-   * unmounts react instances that are outside of the render window. You should only need to disable
-   * this for debugging purposes. Defaults to false.
-   */
-  disableVirtualization?: ?boolean,
-  /**
-   * A marker property for telling the list to re-render (since it implements `PureComponent`). If
-   * any of your `renderItem`, Header, Footer, etc. functions depend on anything outside of the
-   * `data` prop, stick it here and treat it immutably.
-   */
-  extraData?: any,
-  // e.g. height, y
-  getItemLayout?: (
-    data: any,
-    index: number,
-  ) => {
-    length: number,
-    offset: number,
-    index: number,
-    ...
-  },
-  horizontal?: ?boolean,
-  /**
-   * How many items to render in the initial batch. This should be enough to fill the screen but not
-   * much more. Note these items will never be unmounted as part of the windowed rendering in order
-   * to improve perceived performance of scroll-to-top actions.
-   */
-  initialNumToRender?: ?number,
-  /**
-   * Instead of starting at the top with the first item, start at `initialScrollIndex`. This
-   * disables the "scroll to top" optimization that keeps the first `initialNumToRender` items
-   * always rendered and immediately renders the items starting at this initial index. Requires
-   * `getItemLayout` to be implemented.
-   */
-  initialScrollIndex?: ?number,
-  /**
-   * Reverses the direction of scroll. Uses scale transforms of -1.
-   */
-  inverted?: ?boolean,
-  keyExtractor?: ?(item: Item, index: number) => string,
-  /**
-   * Each cell is rendered using this element. Can be a React Component Class,
-   * or a render function. Defaults to using View.
-   */
-  CellRendererComponent?: ?React.ComponentType<any>,
-  /**
-   * Rendered in between each item, but not at the top or bottom. By default, `highlighted` and
-   * `leadingItem` props are provided. `renderItem` provides `separators.highlight`/`unhighlight`
-   * which will update the `highlighted` prop, but you can also add custom props with
-   * `separators.updateProps`.
-   */
-  ItemSeparatorComponent?: ?React.ComponentType<any>,
-  /**
-   * Takes an item from `data` and renders it into the list. Example usage:
-   *
-   *     <FlatList
-   *       ItemSeparatorComponent={Platform.OS !== 'android' && ({highlighted}) => (
-   *         <View style={[style.separator, highlighted && {marginLeft: 0}]} />
-   *       )}
-   *       data={[{title: 'Title Text', key: 'item1'}]}
-   *       ListItemComponent={({item, separators}) => (
-   *         <TouchableHighlight
-   *           onPress={() => this._onPress(item)}
-   *           onShowUnderlay={separators.highlight}
-   *           onHideUnderlay={separators.unhighlight}>
-   *           <View style={{backgroundColor: 'white'}}>
-   *             <Text>{item.title}</Text>
-   *           </View>
-   *         </TouchableHighlight>
-   *       )}
-   *     />
-   *
-   * Provides additional metadata like `index` if you need it, as well as a more generic
-   * `separators.updateProps` function which let's you set whatever props you want to change the
-   * rendering of either the leading separator or trailing separator in case the more common
-   * `highlight` and `unhighlight` (which set the `highlighted: boolean` prop) are insufficient for
-   * your use-case.
-   */
-  ListItemComponent?: ?(React.ComponentType<any> | React.Element<any>),
-  /**
-   * Rendered when the list is empty. Can be a React Component Class, a render function, or
-   * a rendered element.
-   */
-  ListEmptyComponent?: ?(React.ComponentType<any> | React.Element<any>),
-  /**
-   * Rendered at the bottom of all the items. Can be a React Component Class, a render function, or
-   * a rendered element.
-   */
-  ListFooterComponent?: ?(React.ComponentType<any> | React.Element<any>),
-  /**
-   * Styling for internal View for ListFooterComponent
-   */
-  ListFooterComponentStyle?: ViewStyleProp,
-  /**
-   * Rendered at the top of all the items. Can be a React Component Class, a render function, or
-   * a rendered element.
-   */
-  ListHeaderComponent?: ?(React.ComponentType<any> | React.Element<any>),
-  /**
-   * Styling for internal View for ListHeaderComponent
-   */
-  ListHeaderComponentStyle?: ViewStyleProp,
-  /**
-   * A unique identifier for this list. If there are multiple VirtualizedLists at the same level of
-   * nesting within another VirtualizedList, this key is necessary for virtualization to
-   * work properly.
-   */
-  listKey?: string,
-  /**
-   * The maximum number of items to render in each incremental render batch. The more rendered at
-   * once, the better the fill rate, but responsiveness may suffer because rendering content may
-   * interfere with responding to button taps or other interactions.
-   */
-  maxToRenderPerBatch?: ?number,
-  /**
-   * Called once when the scroll position gets within `onEndReachedThreshold` of the rendered
-   * content.
-   */
-  onEndReached?: ?(info: {distanceFromEnd: number, ...}) => void,
-  /**
-   * How far from the end (in units of visible length of the list) the bottom edge of the
-   * list must be from the end of the content to trigger the `onEndReached` callback.
-   * Thus a value of 0.5 will trigger `onEndReached` when the end of the content is
-   * within half the visible length of the list. A value of 0 will not trigger until scrolling
-   * to the very end of the list.
-   */
-  onEndReachedThreshold?: ?number,
-  /**
-   * If provided, a standard RefreshControl will be added for "Pull to Refresh" functionality. Make
-   * sure to also set the `refreshing` prop correctly.
-   */
-  onRefresh?: ?() => void,
-  /**
-   * Used to handle failures when scrolling to an index that has not been measured yet. Recommended
-   * action is to either compute your own offset and `scrollTo` it, or scroll as far as possible and
-   * then try again after more items have been rendered.
-   */
-  onScrollToIndexFailed?: ?(info: {
-    index: number,
-    highestMeasuredFrameIndex: number,
-    averageItemLength: number,
-    ...
-  }) => void,
-  /**
-   * Called when the viewability of rows changes, as defined by the
-   * `viewabilityConfig` prop.
-   */
-  onViewableItemsChanged?: ?(info: {
-    viewableItems: Array<ViewToken>,
-    changed: Array<ViewToken>,
-    ...
-  }) => void,
-  persistentScrollbar?: ?boolean,
-  /**
-   * Set this when offset is needed for the loading indicator to show correctly.
-   */
-  progressViewOffset?: number,
-  /**
-   * A custom refresh control element. When set, it overrides the default
-   * <RefreshControl> component built internally. The onRefresh and refreshing
-   * props are also ignored. Only works for vertical VirtualizedList.
-   */
-  refreshControl?: ?React.Element<any>,
-  /**
-   * Set this true while waiting for new data from a refresh.
-   */
-  refreshing?: ?boolean,
-  /**
-   * Note: may have bugs (missing content) in some circumstances - use at your own risk.
-   *
-   * This may improve scroll performance for large lists.
-   */
-  removeClippedSubviews?: boolean,
-  /**
-   * Render a custom scroll component, e.g. with a differently styled `RefreshControl`.
-   */
-  renderScrollComponent?: (props: Object) => React.Element<any>,
-  /**
-   * Amount of time between low-pri item render batches, e.g. for rendering items quite a ways off
-   * screen. Similar fill rate/responsiveness tradeoff as `maxToRenderPerBatch`.
-   */
-  updateCellsBatchingPeriod?: ?number,
-  /**
-   * See `ViewabilityHelper` for flow type and further documentation.
-   */
-  viewabilityConfig?: ViewabilityConfig,
-  /**
-   * List of ViewabilityConfig/onViewableItemsChanged pairs. A specific onViewableItemsChanged
-   * will be called when its corresponding ViewabilityConfig's conditions are met.
-   */
-  viewabilityConfigCallbackPairs?: Array<ViewabilityConfigCallbackPair>,
-  /**
-   * Determines the maximum number of items rendered outside of the visible area, in units of
-   * visible lengths. So if your list fills the screen, then `windowSize={21}` (the default) will
-   * render the visible screen area plus up to 10 screens above and 10 below the viewport. Reducing
-   * this number will reduce memory consumption and may improve performance, but will increase the
-   * chance that fast scrolling may reveal momentary blank areas of unrendered content.
-   */
-  windowSize?: ?number,
-  /**
-   * The legacy implementation is no longer supported.
-   */
-  legacyImplementation?: empty,
-|};
-
-type Props = {|
-  ...React.ElementConfig<typeof ScrollView>,
-  ...RequiredProps,
-  ...OptionalProps,
-|};
-
-let _usedIndexForKey = false;
-let _keylessItemComponentName: string = '';
-
 type State = {
-  first: number,
-  last: number,
+  renderMask: CellRenderMask,
+  cellsAroundViewport: {first: number, last: number},
 };
 
 /**
@@ -351,6 +105,19 @@ function windowSizeOrDefault(windowSize: ?number) {
   return windowSize ?? 21;
 }
 
+function findLastWhere<T>(
+  arr: $ReadOnlyArray<T>,
+  predicate: (element: T) => boolean,
+): T | null {
+  for (let i = arr.length - 1; i >= 0; i--) {
+    if (predicate(arr[i])) {
+      return arr[i];
+    }
+  }
+
+  return null;
+}
+
 /**
  * Base implementation for the more convenient [`<FlatList>`](https://reactnative.dev/docs/flatlist)
  * and [`<SectionList>`](https://reactnative.dev/docs/sectionlist) components, which are also better
@@ -380,14 +147,17 @@ function windowSizeOrDefault(windowSize: ?number) {
  * - As an effort to remove defaultProps, use helper functions when referencing certain props
  *
  */
-class VirtualizedList extends React.PureComponent<Props, State> {
+export default class VirtualizedList extends StateSafePureComponent<
+  Props,
+  State,
+> {
   static contextType: typeof VirtualizedListContext = VirtualizedListContext;
 
   // scrollToEnd may be janky without getItemLayout prop
   scrollToEnd(params?: ?{animated?: ?boolean, ...}) {
     const animated = params ? params.animated : true;
     const veryLast = this.props.getItemCount(this.props.data) - 1;
-    const frame = this.__getFrameMetricsApprox(veryLast);
+    const frame = this.__getFrameMetricsApprox(veryLast, this.props);
     const offset = Math.max(
       0,
       frame.offset +
@@ -423,7 +193,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     viewOffset?: number,
     viewPosition?: number,
     ...
-  }) {
+  }): $FlowFixMe {
     const {
       data,
       horizontal,
@@ -461,11 +231,11 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       });
       return;
     }
-    const frame = this.__getFrameMetricsApprox(index);
+    const frame = this.__getFrameMetricsApprox(Math.floor(index), this.props);
     const offset =
       Math.max(
         0,
-        frame.offset -
+        this._getOffsetApprox(index, this.props) -
           (viewPosition || 0) *
             (this._scrollMetrics.visibleLength - frame.length),
       ) - (viewOffset || 0);
@@ -493,6 +263,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   scrollToItem(params: {
     animated?: ?boolean,
     item: Item,
+    viewOffset?: number,
     viewPosition?: number,
     ...
   }) {
@@ -542,12 +313,12 @@ class VirtualizedList extends React.PureComponent<Props, State> {
 
   recordInteraction() {
     this._nestedChildLists.forEach(childList => {
-      childList.ref && childList.ref.recordInteraction();
+      childList.recordInteraction();
     });
     this._viewabilityTuples.forEach(t => {
       t.viewabilityHelper.recordInteraction();
     });
-    this._updateViewableItems(this.props.data);
+    this._updateViewableItems(this.props, this.state.cellsAroundViewport);
   }
 
   flashScrollIndicators() {
@@ -573,7 +344,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     if (this._scrollRef && this._scrollRef.getScrollableNode) {
       return this._scrollRef.getScrollableNode();
     } else {
-      return ReactNative.findNodeHandle(this._scrollRef);
+      return findNodeHandle(this._scrollRef);
     }
   }
 
@@ -597,19 +368,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     return this.context?.cellKey || 'rootList';
   }
 
-  _getListKey(): string {
-    return this.props.listKey || this._getCellKey();
-  }
-
-  _getDebugInfo(): ListDebugInfo {
-    return {
-      listKey: this._getListKey(),
-      cellKey: this._getCellKey(),
-      horizontal: horizontalOrDefault(this.props.horizontal),
-      parent: this.context?.debugInfo,
-    };
-  }
-
+  // $FlowFixMe[missing-local-annot]
   _getScrollMetrics = () => {
     return this._scrollMetrics;
   };
@@ -618,6 +377,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     return this._hasMore;
   }
 
+  // $FlowFixMe[missing-local-annot]
   _getOutermostParentListRef = () => {
     if (this._isNestedWithSameOrientation()) {
       return this.context.getOutermostParentListRef();
@@ -626,56 +386,20 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     }
   };
 
-  _getNestedChildState = (key: string): ?ChildListState => {
-    const existingChildData = this._nestedChildLists.get(key);
-    return existingChildData && existingChildData.state;
-  };
-
   _registerAsNestedChild = (childList: {
     cellKey: string,
-    key: string,
-    ref: VirtualizedList,
-    parentDebugInfo: ListDebugInfo,
-    ...
-  }): ?ChildListState => {
-    // Register the mapping between this child key and the cellKey for its cell
-    const childListsInCell =
-      this._cellKeysToChildListKeys.get(childList.cellKey) || new Set();
-    childListsInCell.add(childList.key);
-    this._cellKeysToChildListKeys.set(childList.cellKey, childListsInCell);
-    const existingChildData = this._nestedChildLists.get(childList.key);
-    if (existingChildData && existingChildData.ref !== null) {
-      console.error(
-        'A VirtualizedList contains a cell which itself contains ' +
-          'more than one VirtualizedList of the same orientation as the parent ' +
-          'list. You must pass a unique listKey prop to each sibling list.\n\n' +
-          describeNestedLists({
-            ...childList,
-            // We're called from the child's componentDidMount, so it's safe to
-            // read the child's props here (albeit weird).
-            horizontal: !!childList.ref.props.horizontal,
-          }),
-      );
-    }
-    this._nestedChildLists.set(childList.key, {
-      ref: childList.ref,
-      state: null,
-    });
-
+    ref: React.ElementRef<typeof VirtualizedList>,
+  }): void => {
+    this._nestedChildLists.add(childList.ref, childList.cellKey);
     if (this._hasInteracted) {
       childList.ref.recordInteraction();
     }
   };
 
   _unregisterAsNestedChild = (childList: {
-    key: string,
-    state: ChildListState,
-    ...
+    ref: React.ElementRef<typeof VirtualizedList>,
   }): void => {
-    this._nestedChildLists.set(childList.key, {
-      ref: null,
-      state: childList.state,
-    });
+    this._nestedChildLists.remove(childList.ref);
   };
 
   state: State;
@@ -693,6 +417,11 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       'VirtualizedList: The windowSize prop must be present and set to a value greater than 0.',
     );
 
+    invariant(
+      props.getItemCount,
+      'VirtualizedList: The "getItemCount" prop must be provided',
+    );
+
     this._fillRateHelper = new FillRateHelper(this._getFrameMetrics);
     this._updateCellsToRenderBatcher = new Batchinator(
       this._updateCellsToRender,
@@ -716,55 +445,210 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       }
     }
 
-    let initialState = {
-      first: this.props.initialScrollIndex || 0,
+    invariant(
+      !this.context,
+      'Unexpectedly saw VirtualizedListContext available in ctor',
+    );
+
+    const initialRenderRegion = VirtualizedList._initialRenderRegion(props);
+
+    this.state = {
+      cellsAroundViewport: initialRenderRegion,
+      renderMask: VirtualizedList._createRenderMask(props, initialRenderRegion),
+    };
+  }
+
+  static _createRenderMask(
+    props: Props,
+    cellsAroundViewport: {first: number, last: number},
+    additionalRegions?: ?$ReadOnlyArray<{first: number, last: number}>,
+  ): CellRenderMask {
+    const itemCount = props.getItemCount(props.data);
+
+    invariant(
+      cellsAroundViewport.first >= 0 &&
+        cellsAroundViewport.last >= cellsAroundViewport.first - 1 &&
+        cellsAroundViewport.last < itemCount,
+      `Invalid cells around viewport "[${cellsAroundViewport.first}, ${cellsAroundViewport.last}]" was passed to VirtualizedList._createRenderMask`,
+    );
+
+    const renderMask = new CellRenderMask(itemCount);
+
+    if (itemCount > 0) {
+      const allRegions = [cellsAroundViewport, ...(additionalRegions ?? [])];
+      for (const region of allRegions) {
+        renderMask.addCells(region);
+      }
+
+      // The initially rendered cells are retained as part of the
+      // "scroll-to-top" optimization
+      if (props.initialScrollIndex == null || props.initialScrollIndex <= 0) {
+        const initialRegion = VirtualizedList._initialRenderRegion(props);
+        renderMask.addCells(initialRegion);
+      }
+
+      // The layout coordinates of sticker headers may be off-screen while the
+      // actual header is on-screen. Keep the most recent before the viewport
+      // rendered, even if its layout coordinates are not in viewport.
+      const stickyIndicesSet = new Set(props.stickyHeaderIndices);
+      VirtualizedList._ensureClosestStickyHeader(
+        props,
+        stickyIndicesSet,
+        renderMask,
+        cellsAroundViewport.first,
+      );
+    }
+
+    return renderMask;
+  }
+
+  static _initialRenderRegion(props: Props): {first: number, last: number} {
+    const itemCount = props.getItemCount(props.data);
+    const scrollIndex = Math.floor(Math.max(0, props.initialScrollIndex ?? 0));
+
+    return {
+      first: scrollIndex,
       last:
         Math.min(
-          this.props.getItemCount(this.props.data),
-          (this.props.initialScrollIndex || 0) +
-            initialNumToRenderOrDefault(this.props.initialNumToRender),
+          itemCount,
+          scrollIndex + initialNumToRenderOrDefault(props.initialNumToRender),
         ) - 1,
     };
+  }
 
-    if (this._isNestedWithSameOrientation()) {
-      const storedState = this.context.getNestedChildState(this._getListKey());
-      if (storedState) {
-        initialState = storedState;
-        this.state = storedState;
-        this._frames = storedState.frames;
+  static _ensureClosestStickyHeader(
+    props: Props,
+    stickyIndicesSet: Set<number>,
+    renderMask: CellRenderMask,
+    cellIdx: number,
+  ) {
+    const stickyOffset = props.ListHeaderComponent ? 1 : 0;
+
+    for (let itemIdx = cellIdx - 1; itemIdx >= 0; itemIdx--) {
+      if (stickyIndicesSet.has(itemIdx + stickyOffset)) {
+        renderMask.addCells({first: itemIdx, last: itemIdx});
+        break;
       }
     }
+  }
+
+  _adjustCellsAroundViewport(
+    props: Props,
+    cellsAroundViewport: {first: number, last: number},
+  ): {first: number, last: number} {
+    const {data, getItemCount} = props;
+    const onEndReachedThreshold = onEndReachedThresholdOrDefault(
+      props.onEndReachedThreshold,
+    );
+    this._updateViewableItems(props, cellsAroundViewport);
+
+    const {contentLength, offset, visibleLength} = this._scrollMetrics;
+    const distanceFromEnd = contentLength - visibleLength - offset;
 
-    this.state = initialState;
+    // Wait until the scroll view metrics have been set up. And until then,
+    // we will trust the initialNumToRender suggestion
+    if (visibleLength <= 0 || contentLength <= 0) {
+      return cellsAroundViewport.last >= getItemCount(data)
+        ? VirtualizedList._constrainToItemCount(cellsAroundViewport, props)
+        : cellsAroundViewport;
+    }
+
+    let newCellsAroundViewport: {first: number, last: number};
+    if (props.disableVirtualization) {
+      const renderAhead =
+        distanceFromEnd < onEndReachedThreshold * visibleLength
+          ? maxToRenderPerBatchOrDefault(props.maxToRenderPerBatch)
+          : 0;
+
+      newCellsAroundViewport = {
+        first: 0,
+        last: Math.min(
+          cellsAroundViewport.last + renderAhead,
+          getItemCount(data) - 1,
+        ),
+      };
+    } else {
+      // If we have a non-zero initialScrollIndex and run this before we've scrolled,
+      // we'll wipe out the initialNumToRender rendered elements starting at initialScrollIndex.
+      // So let's wait until we've scrolled the view to the right place. And until then,
+      // we will trust the initialScrollIndex suggestion.
+
+      // Thus, we want to recalculate the windowed render limits if any of the following hold:
+      // - initialScrollIndex is undefined or is 0
+      // - initialScrollIndex > 0 AND scrolling is complete
+      // - initialScrollIndex > 0 AND the end of the list is visible (this handles the case
+      //   where the list is shorter than the visible area)
+      if (
+        props.initialScrollIndex &&
+        !this._scrollMetrics.offset &&
+        Math.abs(distanceFromEnd) >= Number.EPSILON
+      ) {
+        return cellsAroundViewport.last >= getItemCount(data)
+          ? VirtualizedList._constrainToItemCount(cellsAroundViewport, props)
+          : cellsAroundViewport;
+      }
+
+      newCellsAroundViewport = computeWindowedRenderLimits(
+        props,
+        maxToRenderPerBatchOrDefault(props.maxToRenderPerBatch),
+        windowSizeOrDefault(props.windowSize),
+        cellsAroundViewport,
+        this.__getFrameMetricsApprox,
+        this._scrollMetrics,
+      );
+      invariant(
+        newCellsAroundViewport.last < getItemCount(data),
+        'computeWindowedRenderLimits() should return range in-bounds',
+      );
+    }
+
+    if (this._nestedChildLists.size() > 0) {
+      // If some cell in the new state has a child list in it, we should only render
+      // up through that item, so that we give that list a chance to render.
+      // Otherwise there's churn from multiple child lists mounting and un-mounting
+      // their items.
+
+      // Will this prevent rendering if the nested list doesn't realize the end?
+      const childIdx = this._findFirstChildWithMore(
+        newCellsAroundViewport.first,
+        newCellsAroundViewport.last,
+      );
+
+      newCellsAroundViewport.last = childIdx ?? newCellsAroundViewport.last;
+    }
+
+    return newCellsAroundViewport;
+  }
+
+  _findFirstChildWithMore(first: number, last: number): number | null {
+    for (let ii = first; ii <= last; ii++) {
+      const cellKeyForIndex = this._indicesToKeys.get(ii);
+      if (
+        cellKeyForIndex != null &&
+        this._nestedChildLists.anyInCell(cellKeyForIndex, childList =>
+          childList.hasMore(),
+        )
+      ) {
+        return ii;
+      }
+    }
+
+    return null;
   }
 
   componentDidMount() {
     if (this._isNestedWithSameOrientation()) {
       this.context.registerAsNestedChild({
-        cellKey: this._getCellKey(),
-        key: this._getListKey(),
         ref: this,
-        // NOTE: When the child mounts (here) it's not necessarily safe to read
-        // the parent's props. This is why we explicitly propagate debugInfo
-        // "down" via context and "up" again via this method call on the
-        // parent.
-        parentDebugInfo: this.context.debugInfo,
+        cellKey: this.context.cellKey,
       });
     }
   }
 
   componentWillUnmount() {
     if (this._isNestedWithSameOrientation()) {
-      this.context.unregisterAsNestedChild({
-        key: this._getListKey(),
-        state: {
-          first: this.state.first,
-          last: this.state.last,
-          frames: this._frames,
-        },
-      });
+      this.context.unregisterAsNestedChild({ref: this});
     }
-    this._updateViewableItems(null);
     this._updateCellsToRenderBatcher.dispose({abort: true});
     this._viewabilityTuples.forEach(tuple => {
       tuple.viewabilityHelper.dispose();
@@ -773,18 +657,21 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   }
 
   static getDerivedStateFromProps(newProps: Props, prevState: State): State {
-    const {data, getItemCount} = newProps;
-    const maxToRenderPerBatch = maxToRenderPerBatchOrDefault(
-      newProps.maxToRenderPerBatch,
-    );
     // first and last could be stale (e.g. if a new, shorter items props is passed in), so we make
     // sure we're rendering a reasonable range here.
+    const itemCount = newProps.getItemCount(newProps.data);
+    if (itemCount === prevState.renderMask.numCells()) {
+      return prevState;
+    }
+
+    const constrainedCells = VirtualizedList._constrainToItemCount(
+      prevState.cellsAroundViewport,
+      newProps,
+    );
+
     return {
-      first: Math.max(
-        0,
-        Math.min(prevState.first, getItemCount(data) - 1 - maxToRenderPerBatch),
-      ),
-      last: Math.max(0, Math.min(prevState.last, getItemCount(data) - 1)),
+      cellsAroundViewport: constrainedCells,
+      renderMask: VirtualizedList._createRenderMask(newProps, constrainedCells),
     };
   }
 
@@ -815,7 +702,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     last = Math.min(end, last);
     for (let ii = first; ii <= last; ii++) {
       const item = getItem(data, ii);
-      const key = this._keyExtractor(item, ii);
+      const key = this._keyExtractor(item, ii, this.props);
       this._indicesToKeys.set(ii, key);
       if (stickyIndicesFromProps.has(ii + stickyOffset)) {
         stickyHeaderIndices.push(cells.length);
@@ -837,6 +724,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           prevCellKey={prevCellKey}
           onCellLayout={this._onCellLayout}
           onUpdateSeparators={this._onUpdateSeparators}
+          onCellFocusCapture={e => this._onCellFocusCapture(key)}
           onUnmount={this._onCellUnmount}
           ref={ref => {
             this._cellRefs[key] = ref;
@@ -848,6 +736,23 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     }
   }
 
+  static _constrainToItemCount(
+    cells: {first: number, last: number},
+    props: Props,
+  ): {first: number, last: number} {
+    const itemCount = props.getItemCount(props.data);
+    const last = Math.min(itemCount - 1, cells.last);
+
+    const maxToRenderPerBatch = maxToRenderPerBatchOrDefault(
+      props.maxToRenderPerBatch,
+    );
+
+    return {
+      first: clamp(0, itemCount - 1 - maxToRenderPerBatch, cells.first),
+      last,
+    };
+  }
+
   _onUpdateSeparators = (keys: Array<?string>, newProps: Object) => {
     keys.forEach(key => {
       const ref = key != null && this._cellRefs[key];
@@ -855,10 +760,6 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     });
   };
 
-  _isVirtualizationDisabled(): boolean {
-    return this.props.disableVirtualization || false;
-  }
-
   _isNestedWithSameOrientation(): boolean {
     const nestedContext = this.context;
     return !!(
@@ -870,9 +771,17 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   _getSpacerKey = (isVertical: boolean): string =>
     isVertical ? 'height' : 'width';
 
-  _keyExtractor(item: Item, index: number) {
-    if (this.props.keyExtractor != null) {
-      return this.props.keyExtractor(item, index);
+  _keyExtractor(
+    item: Item,
+    index: number,
+    props: {
+      keyExtractor?: ?(item: Item, index: number) => string,
+      ...
+    },
+    // $FlowFixMe[missing-local-annot]
+  ) {
+    if (props.keyExtractor != null) {
+      return props.keyExtractor(item, index);
     }
 
     const key = defaultKeyExtractor(item, index);
@@ -898,15 +807,16 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     const {ListEmptyComponent, ListFooterComponent, ListHeaderComponent} =
       this.props;
     const {data, horizontal} = this.props;
-    const isVirtualizationDisabled = this._isVirtualizationDisabled();
     const inversionStyle = this.props.inverted
       ? horizontalOrDefault(this.props.horizontal)
         ? styles.horizontallyInverted
         : styles.verticallyInverted
       : null;
-    const cells = [];
+    const cells: Array<any | React.Node> = [];
     const stickyIndicesFromProps = new Set(this.props.stickyHeaderIndices);
     const stickyHeaderIndices = [];
+
+    // 1. Add cell for ListHeaderComponent
     if (ListHeaderComponent) {
       if (stickyIndicesFromProps.has(0)) {
         stickyHeaderIndices.push(0);
@@ -936,103 +846,10 @@ class VirtualizedList extends React.PureComponent<Props, State> {
         </VirtualizedListCellContextProvider>,
       );
     }
+
+    // 2a. Add a cell for ListEmptyComponent if applicable
     const itemCount = this.props.getItemCount(data);
-    if (itemCount > 0) {
-      _usedIndexForKey = false;
-      _keylessItemComponentName = '';
-      const spacerKey = this._getSpacerKey(!horizontal);
-      const lastInitialIndex = this.props.initialScrollIndex
-        ? -1
-        : initialNumToRenderOrDefault(this.props.initialNumToRender) - 1;
-      const {first, last} = this.state;
-      this._pushCells(
-        cells,
-        stickyHeaderIndices,
-        stickyIndicesFromProps,
-        0,
-        lastInitialIndex,
-        inversionStyle,
-      );
-      const firstAfterInitial = Math.max(lastInitialIndex + 1, first);
-      if (!isVirtualizationDisabled && first > lastInitialIndex + 1) {
-        let insertedStickySpacer = false;
-        if (stickyIndicesFromProps.size > 0) {
-          const stickyOffset = ListHeaderComponent ? 1 : 0;
-          // See if there are any sticky headers in the virtualized space that we need to render.
-          for (let ii = firstAfterInitial - 1; ii > lastInitialIndex; ii--) {
-            if (stickyIndicesFromProps.has(ii + stickyOffset)) {
-              const initBlock = this.__getFrameMetricsApprox(lastInitialIndex);
-              const stickyBlock = this.__getFrameMetricsApprox(ii);
-              const leadSpace =
-                stickyBlock.offset -
-                initBlock.offset -
-                (this.props.initialScrollIndex ? 0 : initBlock.length);
-              cells.push(
-                <View key="$sticky_lead" style={{[spacerKey]: leadSpace}} />,
-              );
-              this._pushCells(
-                cells,
-                stickyHeaderIndices,
-                stickyIndicesFromProps,
-                ii,
-                ii,
-                inversionStyle,
-              );
-              const trailSpace =
-                this.__getFrameMetricsApprox(first).offset -
-                (stickyBlock.offset + stickyBlock.length);
-              cells.push(
-                <View key="$sticky_trail" style={{[spacerKey]: trailSpace}} />,
-              );
-              insertedStickySpacer = true;
-              break;
-            }
-          }
-        }
-        if (!insertedStickySpacer) {
-          const initBlock = this.__getFrameMetricsApprox(lastInitialIndex);
-          const firstSpace =
-            this.__getFrameMetricsApprox(first).offset -
-            (initBlock.offset + initBlock.length);
-          cells.push(
-            <View key="$lead_spacer" style={{[spacerKey]: firstSpace}} />,
-          );
-        }
-      }
-      this._pushCells(
-        cells,
-        stickyHeaderIndices,
-        stickyIndicesFromProps,
-        firstAfterInitial,
-        last,
-        inversionStyle,
-      );
-      if (!this._hasWarned.keys && _usedIndexForKey) {
-        console.warn(
-          'VirtualizedList: missing keys for items, make sure to specify a key or id property on each ' +
-            'item or provide a custom keyExtractor.',
-          _keylessItemComponentName,
-        );
-        this._hasWarned.keys = true;
-      }
-      if (!isVirtualizationDisabled && last < itemCount - 1) {
-        const lastFrame = this.__getFrameMetricsApprox(last);
-        // Without getItemLayout, we limit our tail spacer to the _highestMeasuredFrameIndex to
-        // prevent the user for hyperscrolling into un-measured area because otherwise content will
-        // likely jump around as it renders in above the viewport.
-        const end = this.props.getItemLayout
-          ? itemCount - 1
-          : Math.min(itemCount - 1, this._highestMeasuredFrameIndex);
-        const endFrame = this.__getFrameMetricsApprox(end);
-        const tailSpacerLength =
-          endFrame.offset +
-          endFrame.length -
-          (lastFrame.offset + lastFrame.length);
-        cells.push(
-          <View key="$tail_spacer" style={{[spacerKey]: tailSpacerLength}} />,
-        );
-      }
-    } else if (ListEmptyComponent) {
+    if (itemCount === 0 && ListEmptyComponent) {
       const element: React.Element<any> = ((React.isValidElement(
         ListEmptyComponent,
       ) ? (
@@ -1055,6 +872,73 @@ class VirtualizedList extends React.PureComponent<Props, State> {
         }),
       );
     }
+
+    // 2b. Add cells and spacers for each item
+    if (itemCount > 0) {
+      _usedIndexForKey = false;
+      _keylessItemComponentName = '';
+      const spacerKey = this._getSpacerKey(!horizontal);
+
+      const renderRegions = this.state.renderMask.enumerateRegions();
+      const lastSpacer = findLastWhere(renderRegions, r => r.isSpacer);
+
+      for (const section of renderRegions) {
+        if (section.isSpacer) {
+          // Legacy behavior is to avoid spacers when virtualization is
+          // disabled (including head spacers on initial render).
+          if (this.props.disableVirtualization) {
+            continue;
+          }
+
+          // Without getItemLayout, we limit our tail spacer to the _highestMeasuredFrameIndex to
+          // prevent the user for hyperscrolling into un-measured area because otherwise content will
+          // likely jump around as it renders in above the viewport.
+          const isLastSpacer = section === lastSpacer;
+          const constrainToMeasured = isLastSpacer && !this.props.getItemLayout;
+          const last = constrainToMeasured
+            ? clamp(
+                section.first - 1,
+                section.last,
+                this._highestMeasuredFrameIndex,
+              )
+            : section.last;
+
+          const firstMetrics = this.__getFrameMetricsApprox(
+            section.first,
+            this.props,
+          );
+          const lastMetrics = this.__getFrameMetricsApprox(last, this.props);
+          const spacerSize =
+            lastMetrics.offset + lastMetrics.length - firstMetrics.offset;
+          cells.push(
+            <View
+              key={`$spacer-${section.first}`}
+              style={{[spacerKey]: spacerSize}}
+            />,
+          );
+        } else {
+          this._pushCells(
+            cells,
+            stickyHeaderIndices,
+            stickyIndicesFromProps,
+            section.first,
+            section.last,
+            inversionStyle,
+          );
+        }
+      }
+
+      if (!this._hasWarned.keys && _usedIndexForKey) {
+        console.warn(
+          'VirtualizedList: missing keys for items, make sure to specify a key or id property on each ' +
+            'item or provide a custom keyExtractor.',
+          _keylessItemComponentName,
+        );
+        this._hasWarned.keys = true;
+      }
+    }
+
+    // 3. Add cell for ListFooterComponent
     if (ListFooterComponent) {
       const element = React.isValidElement(ListFooterComponent) ? (
         ListFooterComponent
@@ -1081,6 +965,8 @@ class VirtualizedList extends React.PureComponent<Props, State> {
         </VirtualizedListCellContextProvider>,
       );
     }
+
+    // 4. Render the ScrollView
     const scrollProps = {
       ...this.props,
       onContentSizeChange: this._onContentSizeChange,
@@ -1103,8 +989,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
         : this.props.style,
     };
 
-    this._hasMore =
-      this.state.last < this.props.getItemCount(this.props.data) - 1;
+    this._hasMore = this.state.cellsAroundViewport.last < itemCount - 1;
 
     const innerRet = (
       <VirtualizedListContextProvider
@@ -1113,10 +998,8 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           getScrollMetrics: this._getScrollMetrics,
           horizontal: horizontalOrDefault(this.props.horizontal),
           getOutermostParentListRef: this._getOutermostParentListRef,
-          getNestedChildState: this._getNestedChildState,
           registerAsNestedChild: this._registerAsNestedChild,
           unregisterAsNestedChild: this._unregisterAsNestedChild,
-          debugInfo: this._getDebugInfo(),
         }}>
         {React.cloneElement(
           (
@@ -1140,7 +1023,8 @@ class VirtualizedList extends React.PureComponent<Props, State> {
               !scrollContext.horizontal ===
                 !horizontalOrDefault(this.props.horizontal) &&
               !this._hasWarned.nesting &&
-              this.context == null
+              this.context == null &&
+              this.props.scrollEnabled !== false
             ) {
               // TODO (T46547044): use React.warn once 16.9 is sync'd: https://github.com/facebook/react/pull/15170
               console.error(
@@ -1192,9 +1076,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   }
 
   _averageCellLength = 0;
-  // Maps a cell key to the set of keys for all outermost child lists within that cell
-  _cellKeysToChildListKeys: Map<string, Set<string>> = new Map();
-  _cellRefs: {[string]: null | CellRenderer} = {};
+  _cellRefs: {[string]: null | CellRenderer<any>} = {};
   _fillRateHelper: FillRateHelper;
   _frames: {
     [string]: {
@@ -1214,16 +1096,12 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   _hiPriInProgress: boolean = false; // flag to prevent infinite hiPri cell limit update
   _highestMeasuredFrameIndex = 0;
   _indicesToKeys: Map<number, string> = new Map();
-  _nestedChildLists: Map<
-    string,
-    {
-      ref: ?VirtualizedList,
-      state: ?ChildListState,
-      ...
-    },
-  > = new Map();
+  _lastFocusedCellKey: ?string = null;
+  _nestedChildLists: ChildListCollection<VirtualizedList> =
+    new ChildListCollection();
   _offsetFromParentVirtualizedList: number = 0;
   _prevParentOffset: number = 0;
+  // $FlowFixMe[missing-local-annot]
   _scrollMetrics = {
     contentLength: 0,
     dOffset: 0,
@@ -1250,7 +1128,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   _computeBlankness() {
     this._fillRateHelper.computeBlankness(
       this.props,
-      this.state,
+      this.state.cellsAroundViewport,
       this._scrollMetrics,
     );
   }
@@ -1271,6 +1149,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       );
       return (
         // $FlowFixMe[prop-missing] Invalid prop usage
+        // $FlowFixMe[incompatible-use]
         <ScrollView
           {...props}
           refreshControl={
@@ -1289,6 +1168,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       );
     } else {
       // $FlowFixMe[prop-missing] Invalid prop usage
+      // $FlowFixMe[incompatible-use]
       return <ScrollView {...props} />;
     }
   };
@@ -1325,9 +1205,25 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     this._triggerRemeasureForChildListsInCell(cellKey);
 
     this._computeBlankness();
-    this._updateViewableItems(this.props.data);
+    this._updateViewableItems(this.props, this.state.cellsAroundViewport);
   };
 
+  _onCellFocusCapture(cellKey: string) {
+    this._lastFocusedCellKey = cellKey;
+    const renderMask = VirtualizedList._createRenderMask(
+      this.props,
+      this.state.cellsAroundViewport,
+      this._getNonViewportRenderRegions(this.props),
+    );
+
+    this.setState(state => {
+      if (!renderMask.equals(state.renderMask)) {
+        return {renderMask};
+      }
+      return null;
+    });
+  }
+
   _onCellUnmount = (cellKey: string) => {
     const curr = this._frames[cellKey];
     if (curr) {
@@ -1336,15 +1232,9 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   };
 
   _triggerRemeasureForChildListsInCell(cellKey: string): void {
-    const childListKeys = this._cellKeysToChildListKeys.get(cellKey);
-    if (childListKeys) {
-      for (let childKey of childListKeys) {
-        const childList = this._nestedChildLists.get(childKey);
-        childList &&
-          childList.ref &&
-          childList.ref.measureLayoutRelativeToContainingList();
-      }
-    }
+    this._nestedChildLists.forEachInCell(cellKey, childList => {
+      childList.measureLayoutRelativeToContainingList();
+    });
   }
 
   measureLayoutRelativeToContainingList(): void {
@@ -1378,15 +1268,8 @@ class VirtualizedList extends React.PureComponent<Props, State> {
 
             // If metrics of the scrollView changed, then we triggered remeasure for child list
             // to ensure VirtualizedList has the right information.
-            this._cellKeysToChildListKeys.forEach(childListKeys => {
-              if (childListKeys) {
-                for (let childKey of childListKeys) {
-                  const childList = this._nestedChildLists.get(childKey);
-                  childList &&
-                    childList.ref &&
-                    childList.ref.measureLayoutRelativeToContainingList();
-                }
-              }
+            this._nestedChildLists.forEach(childList => {
+              childList.measureLayoutRelativeToContainingList();
             });
           }
         },
@@ -1437,6 +1320,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     this._headerLength = this._selectLength(e.nativeEvent.layout);
   };
 
+  // $FlowFixMe[missing-local-annot]
   _renderDebugOverlay() {
     const normalize =
       this._scrollMetrics.visibleLength /
@@ -1444,7 +1328,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     const framesInLayout = [];
     const itemCount = this.props.getItemCount(this.props.data);
     for (let ii = 0; ii < itemCount; ii++) {
-      const frame = this.__getFrameMetricsApprox(ii);
+      const frame = this.__getFrameMetricsApprox(ii, this.props);
       /* $FlowFixMe[prop-missing] (>=0.68.0 site=react_native_fb) This comment
        * suppresses an error found when Flow v0.68 was deployed. To see the
        * error delete this comment and run Flow. */
@@ -1452,8 +1336,14 @@ class VirtualizedList extends React.PureComponent<Props, State> {
         framesInLayout.push(frame);
       }
     }
-    const windowTop = this.__getFrameMetricsApprox(this.state.first).offset;
-    const frameLast = this.__getFrameMetricsApprox(this.state.last);
+    const windowTop = this.__getFrameMetricsApprox(
+      this.state.cellsAroundViewport.first,
+      this.props,
+    ).offset;
+    const frameLast = this.__getFrameMetricsApprox(
+      this.state.cellsAroundViewport.last,
+      this.props,
+    );
     const windowLen = frameLast.offset + frameLast.length - windowTop;
     const visTop = this._scrollMetrics.offset;
     const visLen = this._scrollMetrics.visibleLength;
@@ -1537,7 +1427,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       onEndReachedThreshold != null ? onEndReachedThreshold * visibleLength : 2;
     if (
       onEndReached &&
-      this.state.last === getItemCount(data) - 1 &&
+      this.state.cellsAroundViewport.last === getItemCount(data) - 1 &&
       distanceFromEnd <= threshold &&
       this._scrollMetrics.contentLength !== this._sentEndForContentLength
     ) {
@@ -1582,7 +1472,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     visibleLength: number,
     offset: number,
     ...
-  }) => {
+  }): $FlowFixMe => {
     // Offset of the top of the nested list relative to the top of its parent's viewport
     const offset = metrics.offset - this._offsetFromParentVirtualizedList;
     // Child's visible length is the same as its parent's
@@ -1600,7 +1490,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
 
   _onScroll = (e: Object) => {
     this._nestedChildLists.forEach(childList => {
-      childList.ref && childList.ref._onScroll(e);
+      childList._onScroll(e);
     });
     if (this.props.onScroll) {
       this.props.onScroll(e);
@@ -1656,7 +1546,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       visibleLength,
       zoomScale,
     };
-    this._updateViewableItems(this.props.data);
+    this._updateViewableItems(this.props, this.state.cellsAroundViewport);
     if (!this.props) {
       return;
     }
@@ -1669,7 +1559,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   };
 
   _scheduleCellsToRenderUpdate() {
-    const {first, last} = this.state;
+    const {first, last} = this.state.cellsAroundViewport;
     const {offset, visibleLength, velocity} = this._scrollMetrics;
     const itemCount = this.props.getItemCount(this.props.data);
     let hiPri = false;
@@ -1680,15 +1570,17 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     // Mark as high priority if we're close to the start of the first item
     // But only if there are items before the first rendered item
     if (first > 0) {
-      const distTop = offset - this.__getFrameMetricsApprox(first).offset;
+      const distTop =
+        offset - this.__getFrameMetricsApprox(first, this.props).offset;
       hiPri =
         hiPri || distTop < 0 || (velocity < -2 && distTop < scrollingThreshold);
     }
     // Mark as high priority if we're close to the end of the last item
     // But only if there are items after the last rendered item
-    if (last < itemCount - 1) {
+    if (last >= 0 && last < itemCount - 1) {
       const distBottom =
-        this.__getFrameMetricsApprox(last).offset - (offset + visibleLength);
+        this.__getFrameMetricsApprox(last, this.props).offset -
+        (offset + visibleLength);
       hiPri =
         hiPri ||
         distBottom < 0 ||
@@ -1719,7 +1611,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
 
   _onScrollBeginDrag = (e: ScrollEvent): void => {
     this._nestedChildLists.forEach(childList => {
-      childList.ref && childList.ref._onScrollBeginDrag(e);
+      childList._onScrollBeginDrag(e);
     });
     this._viewabilityTuples.forEach(tuple => {
       tuple.viewabilityHelper.recordInteraction();
@@ -1730,7 +1622,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
 
   _onScrollEndDrag = (e: ScrollEvent): void => {
     this._nestedChildLists.forEach(childList => {
-      childList.ref && childList.ref._onScrollEndDrag(e);
+      childList._onScrollEndDrag(e);
     });
     const {velocity} = e.nativeEvent;
     if (velocity) {
@@ -1742,14 +1634,14 @@ class VirtualizedList extends React.PureComponent<Props, State> {
 
   _onMomentumScrollBegin = (e: ScrollEvent): void => {
     this._nestedChildLists.forEach(childList => {
-      childList.ref && childList.ref._onMomentumScrollBegin(e);
+      childList._onMomentumScrollBegin(e);
     });
     this.props.onMomentumScrollBegin && this.props.onMomentumScrollBegin(e);
   };
 
   _onMomentumScrollEnd = (e: ScrollEvent): void => {
     this._nestedChildLists.forEach(childList => {
-      childList.ref && childList.ref._onMomentumScrollEnd(e);
+      childList._onMomentumScrollEnd(e);
     });
     this._scrollMetrics.velocity = 0;
     this._computeBlankness();
@@ -1757,126 +1649,80 @@ class VirtualizedList extends React.PureComponent<Props, State> {
   };
 
   _updateCellsToRender = () => {
-    const {
-      data,
-      getItemCount,
-      onEndReachedThreshold: _onEndReachedThreshold,
-    } = this.props;
-    const onEndReachedThreshold = onEndReachedThresholdOrDefault(
-      _onEndReachedThreshold,
-    );
-    const isVirtualizationDisabled = this._isVirtualizationDisabled();
-    this._updateViewableItems(data);
-    if (!data) {
-      return;
-    }
-    this.setState(state => {
-      let newState: ?(
-        | {first: number, last: number, ...}
-        | $TEMPORARY$object<{first: number, last: number}>
+    this.setState((state, props) => {
+      const cellsAroundViewport = this._adjustCellsAroundViewport(
+        props,
+        state.cellsAroundViewport,
       );
-      const {contentLength, offset, visibleLength} = this._scrollMetrics;
-      const distanceFromEnd = contentLength - visibleLength - offset;
-      if (!isVirtualizationDisabled) {
-        // If we run this with bogus data, we'll force-render window {first: 0, last: 0},
-        // and wipe out the initialNumToRender rendered elements.
-        // So let's wait until the scroll view metrics have been set up. And until then,
-        // we will trust the initialNumToRender suggestion
-        if (visibleLength > 0 && contentLength > 0) {
-          // If we have a non-zero initialScrollIndex and run this before we've scrolled,
-          // we'll wipe out the initialNumToRender rendered elements starting at initialScrollIndex.
-          // So let's wait until we've scrolled the view to the right place. And until then,
-          // we will trust the initialScrollIndex suggestion.
-
-          // Thus, we want to recalculate the windowed render limits if any of the following hold:
-          // - initialScrollIndex is undefined or is 0
-          // - initialScrollIndex > 0 AND scrolling is complete
-          // - initialScrollIndex > 0 AND the end of the list is visible (this handles the case
-          //   where the list is shorter than the visible area)
-          if (
-            !this.props.initialScrollIndex ||
-            this._scrollMetrics.offset ||
-            Math.abs(distanceFromEnd) < Number.EPSILON
-          ) {
-            newState = computeWindowedRenderLimits(
-              this.props.data,
-              this.props.getItemCount,
-              maxToRenderPerBatchOrDefault(this.props.maxToRenderPerBatch),
-              windowSizeOrDefault(this.props.windowSize),
-              state,
-              this.__getFrameMetricsApprox,
-              this._scrollMetrics,
-            );
-          }
-        }
-      } else {
-        const renderAhead =
-          distanceFromEnd < onEndReachedThreshold * visibleLength
-            ? maxToRenderPerBatchOrDefault(this.props.maxToRenderPerBatch)
-            : 0;
-        newState = {
-          first: 0,
-          last: Math.min(state.last + renderAhead, getItemCount(data) - 1),
-        };
-      }
-      if (newState && this._nestedChildLists.size > 0) {
-        const newFirst = newState.first;
-        const newLast = newState.last;
-        // If some cell in the new state has a child list in it, we should only render
-        // up through that item, so that we give that list a chance to render.
-        // Otherwise there's churn from multiple child lists mounting and un-mounting
-        // their items.
-        for (let ii = newFirst; ii <= newLast; ii++) {
-          const cellKeyForIndex = this._indicesToKeys.get(ii);
-          const childListKeys =
-            cellKeyForIndex &&
-            this._cellKeysToChildListKeys.get(cellKeyForIndex);
-          if (!childListKeys) {
-            continue;
-          }
-          let someChildHasMore = false;
-          // For each cell, need to check whether any child list in it has more elements to render
-          for (let childKey of childListKeys) {
-            const childList = this._nestedChildLists.get(childKey);
-            if (childList && childList.ref && childList.ref.hasMore()) {
-              someChildHasMore = true;
-              break;
-            }
-          }
-          if (someChildHasMore) {
-            newState.last = ii;
-            break;
-          }
-        }
-      }
+      const renderMask = VirtualizedList._createRenderMask(
+        props,
+        cellsAroundViewport,
+        this._getNonViewportRenderRegions(props),
+      );
+
       if (
-        newState != null &&
-        newState.first === state.first &&
-        newState.last === state.last
+        cellsAroundViewport.first === state.cellsAroundViewport.first &&
+        cellsAroundViewport.last === state.cellsAroundViewport.last &&
+        renderMask.equals(state.renderMask)
       ) {
-        newState = null;
+        return null;
       }
-      return newState;
+
+      return {cellsAroundViewport, renderMask};
     });
   };
 
-  _createViewToken = (index: number, isViewable: boolean) => {
-    const {data, getItem} = this.props;
+  _createViewToken = (
+    index: number,
+    isViewable: boolean,
+    props: FrameMetricProps,
+    // $FlowFixMe[missing-local-annot]
+  ) => {
+    const {data, getItem} = props;
     const item = getItem(data, index);
-    return {index, item, key: this._keyExtractor(item, index), isViewable};
+    return {
+      index,
+      item,
+      key: this._keyExtractor(item, index, props),
+      isViewable,
+    };
   };
 
-  __getFrameMetricsApprox: (index: number) => {
+  /**
+   * Gets an approximate offset to an item at a given index. Supports
+   * fractional indices.
+   */
+  _getOffsetApprox = (index: number, props: FrameMetricProps): number => {
+    if (Number.isInteger(index)) {
+      return this.__getFrameMetricsApprox(index, props).offset;
+    } else {
+      const frameMetrics = this.__getFrameMetricsApprox(
+        Math.floor(index),
+        props,
+      );
+      const remainder = index - Math.floor(index);
+      return frameMetrics.offset + remainder * frameMetrics.length;
+    }
+  };
+
+  __getFrameMetricsApprox: (
+    index: number,
+    props: FrameMetricProps,
+  ) => {
     length: number,
     offset: number,
     ...
-  } = index => {
-    const frame = this._getFrameMetrics(index);
+  } = (index, props) => {
+    const frame = this._getFrameMetrics(index, props);
     if (frame && frame.index === index) {
       // check for invalid frames due to row re-ordering
       return frame;
     } else {
-      const {getItemLayout} = this.props;
+      const {data, getItemCount, getItemLayout} = props;
+      invariant(
+        index >= 0 && index < getItemCount(data),
+        'Tried to get frame for out of range index ' + index,
+      );
       invariant(
         !getItemLayout,
         'Should not have to estimate frames when a measurement metrics function is provided',
@@ -1890,6 +1736,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
 
   _getFrameMetrics = (
     index: number,
+    props: FrameMetricProps,
   ): ?{
     length: number,
     offset: number,
@@ -1897,13 +1744,13 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     inLayout?: boolean,
     ...
   } => {
-    const {data, getItem, getItemCount, getItemLayout} = this.props;
+    const {data, getItem, getItemCount, getItemLayout} = props;
     invariant(
-      getItemCount(data) > index,
+      index >= 0 && index < getItemCount(data),
       'Tried to get frame for out of range index ' + index,
     );
     const item = getItem(data, index);
-    const frame = item && this._frames[this._keyExtractor(item, index)];
+    const frame = item && this._frames[this._keyExtractor(item, index, props)];
     if (!frame || frame.index !== index) {
       if (getItemLayout) {
         /* $FlowFixMe[prop-missing] (>=0.63.0 site=react_native_fb) This comment
@@ -1915,260 +1762,83 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     return frame;
   };
 
-  _updateViewableItems(data: any) {
-    const {getItemCount} = this.props;
+  _getNonViewportRenderRegions = (
+    props: FrameMetricProps,
+  ): $ReadOnlyArray<{
+    first: number,
+    last: number,
+  }> => {
+    // Keep a viewport's worth of content around the last focused cell to allow
+    // random navigation around it without any blanking. E.g. tabbing from one
+    // focused item out of viewport to another.
+    if (
+      !(this._lastFocusedCellKey && this._cellRefs[this._lastFocusedCellKey])
+    ) {
+      return [];
+    }
+
+    const lastFocusedCellRenderer = this._cellRefs[this._lastFocusedCellKey];
+    const focusedCellIndex = lastFocusedCellRenderer.props.index;
+    const itemCount = props.getItemCount(props.data);
+
+    // The cell may have been unmounted and have a stale index
+    if (
+      focusedCellIndex >= itemCount ||
+      this._indicesToKeys.get(focusedCellIndex) !== this._lastFocusedCellKey
+    ) {
+      return [];
+    }
 
+    let first = focusedCellIndex;
+    let heightOfCellsBeforeFocused = 0;
+    for (
+      let i = first - 1;
+      i >= 0 && heightOfCellsBeforeFocused < this._scrollMetrics.visibleLength;
+      i--
+    ) {
+      first--;
+      heightOfCellsBeforeFocused += this.__getFrameMetricsApprox(
+        i,
+        props,
+      ).length;
+    }
+
+    let last = focusedCellIndex;
+    let heightOfCellsAfterFocused = 0;
+    for (
+      let i = last + 1;
+      i < itemCount &&
+      heightOfCellsAfterFocused < this._scrollMetrics.visibleLength;
+      i++
+    ) {
+      last++;
+      heightOfCellsAfterFocused += this.__getFrameMetricsApprox(
+        i,
+        props,
+      ).length;
+    }
+
+    return [{first, last}];
+  };
+
+  _updateViewableItems(
+    props: FrameMetricProps,
+    cellsAroundViewport: {first: number, last: number},
+  ) {
     this._viewabilityTuples.forEach(tuple => {
       tuple.viewabilityHelper.onUpdate(
-        getItemCount(data),
+        props,
         this._scrollMetrics.offset,
         this._scrollMetrics.visibleLength,
         this._getFrameMetrics,
         this._createViewToken,
         tuple.onViewableItemsChanged,
-        this.state,
+        cellsAroundViewport,
       );
     });
   }
 }
 
-type CellRendererProps = {
-  CellRendererComponent?: ?React.ComponentType<any>,
-  ItemSeparatorComponent: ?React.ComponentType<
-    any | {highlighted: boolean, leadingItem: ?Item},
-  >,
-  ListItemComponent?: ?(React.ComponentType<any> | React.Element<any>),
-  cellKey: string,
-  debug?: ?boolean,
-  fillRateHelper: FillRateHelper,
-  getItemLayout?: (
-    data: any,
-    index: number,
-  ) => {
-    length: number,
-    offset: number,
-    index: number,
-    ...
-  },
-  horizontal: ?boolean,
-  index: number,
-  inversionStyle: ViewStyleProp,
-  item: Item,
-  // This is extracted by ScrollViewStickyHeader
-  onCellLayout: (event: Object, cellKey: string, index: number) => void,
-  onUnmount: (cellKey: string) => void,
-  onUpdateSeparators: (cellKeys: Array<?string>, props: Object) => void,
-  prevCellKey: ?string,
-  renderItem?: ?RenderItemType<Item>,
-  ...
-};
-
-type CellRendererState = {
-  separatorProps: $ReadOnly<{|
-    highlighted: boolean,
-    leadingItem: ?Item,
-  |}>,
-  ...
-};
-
-class CellRenderer extends React.Component<
-  CellRendererProps,
-  CellRendererState,
-> {
-  state = {
-    separatorProps: {
-      highlighted: false,
-      leadingItem: this.props.item,
-    },
-  };
-
-  static getDerivedStateFromProps(
-    props: CellRendererProps,
-    prevState: CellRendererState,
-  ): ?CellRendererState {
-    return {
-      separatorProps: {
-        ...prevState.separatorProps,
-        leadingItem: props.item,
-      },
-    };
-  }
-
-  // TODO: consider factoring separator stuff out of VirtualizedList into FlatList since it's not
-  // reused by SectionList and we can keep VirtualizedList simpler.
-  _separators = {
-    highlight: () => {
-      const {cellKey, prevCellKey} = this.props;
-      this.props.onUpdateSeparators([cellKey, prevCellKey], {
-        highlighted: true,
-      });
-    },
-    unhighlight: () => {
-      const {cellKey, prevCellKey} = this.props;
-      this.props.onUpdateSeparators([cellKey, prevCellKey], {
-        highlighted: false,
-      });
-    },
-    updateProps: (select: 'leading' | 'trailing', newProps: Object) => {
-      const {cellKey, prevCellKey} = this.props;
-      this.props.onUpdateSeparators(
-        [select === 'leading' ? prevCellKey : cellKey],
-        newProps,
-      );
-    },
-  };
-
-  updateSeparatorProps(newProps: Object) {
-    this.setState(state => ({
-      separatorProps: {...state.separatorProps, ...newProps},
-    }));
-  }
-
-  componentWillUnmount() {
-    this.props.onUnmount(this.props.cellKey);
-  }
-
-  _onLayout = (nativeEvent: LayoutEvent): void => {
-    this.props.onCellLayout &&
-      this.props.onCellLayout(
-        nativeEvent,
-        this.props.cellKey,
-        this.props.index,
-      );
-  };
-
-  _renderElement(
-    renderItem: any,
-    ListItemComponent: any,
-    item: any,
-    index: any,
-  ) {
-    if (renderItem && ListItemComponent) {
-      console.warn(
-        'VirtualizedList: Both ListItemComponent and renderItem props are present. ListItemComponent will take' +
-          ' precedence over renderItem.',
-      );
-    }
-
-    if (ListItemComponent) {
-      /* $FlowFixMe[not-a-component] (>=0.108.0 site=react_native_fb) This
-       * comment suppresses an error found when Flow v0.108 was deployed. To
-       * see the error, delete this comment and run Flow. */
-      /* $FlowFixMe[incompatible-type-arg] (>=0.108.0 site=react_native_fb)
-       * This comment suppresses an error found when Flow v0.108 was deployed.
-       * To see the error, delete this comment and run Flow. */
-      return React.createElement(ListItemComponent, {
-        item,
-        index,
-        separators: this._separators,
-      });
-    }
-
-    if (renderItem) {
-      return renderItem({
-        item,
-        index,
-        separators: this._separators,
-      });
-    }
-
-    invariant(
-      false,
-      'VirtualizedList: Either ListItemComponent or renderItem props are required but none were found.',
-    );
-  }
-
-  render() {
-    const {
-      CellRendererComponent,
-      ItemSeparatorComponent,
-      ListItemComponent,
-      debug,
-      fillRateHelper,
-      getItemLayout,
-      horizontal,
-      item,
-      index,
-      inversionStyle,
-      renderItem,
-    } = this.props;
-    const element = this._renderElement(
-      renderItem,
-      ListItemComponent,
-      item,
-      index,
-    );
-
-    const onLayout =
-      (getItemLayout && !debug && !fillRateHelper.enabled()) ||
-      !this.props.onCellLayout
-        ? undefined
-        : this._onLayout;
-    // NOTE: that when this is a sticky header, `onLayout` will get automatically extracted and
-    // called explicitly by `ScrollViewStickyHeader`.
-    const itemSeparator = React.isValidElement(ItemSeparatorComponent)
-      ? ItemSeparatorComponent
-      : ItemSeparatorComponent && (
-          <ItemSeparatorComponent {...this.state.separatorProps} />
-        );
-    const cellStyle = inversionStyle
-      ? horizontal
-        ? [styles.rowReverse, inversionStyle]
-        : [styles.columnReverse, inversionStyle]
-      : horizontal
-      ? [styles.row, inversionStyle]
-      : inversionStyle;
-    const result = !CellRendererComponent ? (
-      /* $FlowFixMe[incompatible-type-arg] (>=0.89.0 site=react_native_fb) *
-        This comment suppresses an error found when Flow v0.89 was deployed. *
-        To see the error, delete this comment and run Flow. */
-      <View style={cellStyle} onLayout={onLayout}>
-        {element}
-        {itemSeparator}
-      </View>
-    ) : (
-      <CellRendererComponent
-        {...this.props}
-        style={cellStyle}
-        onLayout={onLayout}>
-        {element}
-        {itemSeparator}
-      </CellRendererComponent>
-    );
-
-    return (
-      <VirtualizedListCellContextProvider cellKey={this.props.cellKey}>
-        {result}
-      </VirtualizedListCellContextProvider>
-    );
-  }
-}
-
-function describeNestedLists(childList: {
-  +cellKey: string,
-  +key: string,
-  +ref: VirtualizedList,
-  +parentDebugInfo: ListDebugInfo,
-  +horizontal: boolean,
-  ...
-}) {
-  let trace =
-    'VirtualizedList trace:\n' +
-    `  Child (${childList.horizontal ? 'horizontal' : 'vertical'}):\n` +
-    `    listKey: ${childList.key}\n` +
-    `    cellKey: ${childList.cellKey}`;
-
-  let debugInfo: ?ListDebugInfo = childList.parentDebugInfo;
-  while (debugInfo) {
-    trace +=
-      `\n  Parent (${debugInfo.horizontal ? 'horizontal' : 'vertical'}):\n` +
-      `    listKey: ${debugInfo.listKey}\n` +
-      `    cellKey: ${debugInfo.cellKey}`;
-    debugInfo = debugInfo.parent;
-  }
-  return trace;
-}
-
 const styles = StyleSheet.create({
   verticallyInverted: {
     transform: [{scaleY: -1}],
@@ -2176,15 +1846,6 @@ const styles = StyleSheet.create({
   horizontallyInverted: {
     transform: [{scaleX: -1}],
   },
-  row: {
-    flexDirection: 'row',
-  },
-  rowReverse: {
-    flexDirection: 'row-reverse',
-  },
-  columnReverse: {
-    flexDirection: 'column-reverse',
-  },
   debug: {
     flex: 1,
   },
@@ -2214,5 +1875,3 @@ const styles = StyleSheet.create({
     borderWidth: 2,
   },
 });
-
-module.exports = VirtualizedList;
diff --git a/Libraries/Lists/VirtualizedListCellRenderer.js b/Libraries/Lists/VirtualizedListCellRenderer.js
new file mode 100644
index 000000000000..e45e08283df7
--- /dev/null
+++ b/Libraries/Lists/VirtualizedListCellRenderer.js
@@ -0,0 +1,259 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
+import type {FocusEvent, LayoutEvent} from '../Types/CoreEventTypes';
+import type FillRateHelper from './FillRateHelper';
+import type {RenderItemType} from './VirtualizedListProps';
+
+import View from '../Components/View/View';
+import StyleSheet from '../StyleSheet/StyleSheet';
+import {VirtualizedListCellContextProvider} from './VirtualizedListContext.js';
+import invariant from 'invariant';
+import * as React from 'react';
+
+export type Props<ItemT> = {
+  CellRendererComponent?: ?React.ComponentType<any>,
+  ItemSeparatorComponent: ?React.ComponentType<
+    any | {highlighted: boolean, leadingItem: ?ItemT},
+  >,
+  ListItemComponent?: ?(React.ComponentType<any> | React.Element<any>),
+  cellKey: string,
+  debug?: ?boolean,
+  fillRateHelper: FillRateHelper,
+  getItemLayout?: (
+    data: any,
+    index: number,
+  ) => {
+    length: number,
+    offset: number,
+    index: number,
+    ...
+  },
+  horizontal: ?boolean,
+  index: number,
+  inversionStyle: ViewStyleProp,
+  item: ItemT,
+  onCellLayout: (event: LayoutEvent, cellKey: string, index: number) => void,
+  onCellFocusCapture?: (event: FocusEvent) => void,
+  onUnmount: (cellKey: string) => void,
+  onUpdateSeparators: (
+    cellKeys: Array<?string>,
+    props: $Shape<SeparatorProps<ItemT>>,
+  ) => void,
+  prevCellKey: ?string,
+  renderItem?: ?RenderItemType<ItemT>,
+  ...
+};
+
+type SeparatorProps<ItemT> = $ReadOnly<{|
+  highlighted: boolean,
+  leadingItem: ?ItemT,
+|}>;
+
+type State<ItemT> = {
+  separatorProps: SeparatorProps<ItemT>,
+  ...
+};
+
+export default class CellRenderer<ItemT> extends React.Component<
+  Props<ItemT>,
+  State<ItemT>,
+> {
+  state: State<ItemT> = {
+    separatorProps: {
+      highlighted: false,
+      leadingItem: this.props.item,
+    },
+  };
+
+  static getDerivedStateFromProps(
+    props: Props<ItemT>,
+    prevState: State<ItemT>,
+  ): ?State<ItemT> {
+    return {
+      separatorProps: {
+        ...prevState.separatorProps,
+        leadingItem: props.item,
+      },
+    };
+  }
+
+  // TODO: consider factoring separator stuff out of VirtualizedList into FlatList since it's not
+  // reused by SectionList and we can keep VirtualizedList simpler.
+  // $FlowFixMe[missing-local-annot]
+  _separators = {
+    highlight: () => {
+      const {cellKey, prevCellKey} = this.props;
+      this.props.onUpdateSeparators([cellKey, prevCellKey], {
+        highlighted: true,
+      });
+    },
+    unhighlight: () => {
+      const {cellKey, prevCellKey} = this.props;
+      this.props.onUpdateSeparators([cellKey, prevCellKey], {
+        highlighted: false,
+      });
+    },
+    updateProps: (
+      select: 'leading' | 'trailing',
+      newProps: SeparatorProps<ItemT>,
+    ) => {
+      const {cellKey, prevCellKey} = this.props;
+      this.props.onUpdateSeparators(
+        [select === 'leading' ? prevCellKey : cellKey],
+        newProps,
+      );
+    },
+  };
+
+  updateSeparatorProps(newProps: SeparatorProps<ItemT>) {
+    this.setState(state => ({
+      separatorProps: {...state.separatorProps, ...newProps},
+    }));
+  }
+
+  componentWillUnmount() {
+    this.props.onUnmount(this.props.cellKey);
+  }
+
+  _onLayout = (nativeEvent: LayoutEvent): void => {
+    this.props.onCellLayout &&
+      this.props.onCellLayout(
+        nativeEvent,
+        this.props.cellKey,
+        this.props.index,
+      );
+  };
+
+  _renderElement(
+    renderItem: ?RenderItemType<ItemT>,
+    ListItemComponent: any,
+    item: ItemT,
+    index: number,
+  ): React.Node {
+    if (renderItem && ListItemComponent) {
+      console.warn(
+        'VirtualizedList: Both ListItemComponent and renderItem props are present. ListItemComponent will take' +
+          ' precedence over renderItem.',
+      );
+    }
+
+    if (ListItemComponent) {
+      /* $FlowFixMe[not-a-component] (>=0.108.0 site=react_native_fb) This
+       * comment suppresses an error found when Flow v0.108 was deployed. To
+       * see the error, delete this comment and run Flow. */
+      /* $FlowFixMe[incompatible-type-arg] (>=0.108.0 site=react_native_fb)
+       * This comment suppresses an error found when Flow v0.108 was deployed.
+       * To see the error, delete this comment and run Flow. */
+      return React.createElement(ListItemComponent, {
+        item,
+        index,
+        separators: this._separators,
+      });
+    }
+
+    if (renderItem) {
+      return renderItem({
+        item,
+        index,
+        separators: this._separators,
+      });
+    }
+
+    invariant(
+      false,
+      'VirtualizedList: Either ListItemComponent or renderItem props are required but none were found.',
+    );
+  }
+
+  render(): React.Node {
+    const {
+      CellRendererComponent,
+      ItemSeparatorComponent,
+      ListItemComponent,
+      debug,
+      fillRateHelper,
+      getItemLayout,
+      horizontal,
+      item,
+      index,
+      inversionStyle,
+      onCellFocusCapture,
+      renderItem,
+    } = this.props;
+    const element = this._renderElement(
+      renderItem,
+      ListItemComponent,
+      item,
+      index,
+    );
+
+    const onLayout =
+      (getItemLayout && !debug && !fillRateHelper.enabled()) ||
+      !this.props.onCellLayout
+        ? undefined
+        : this._onLayout;
+    // NOTE: that when this is a sticky header, `onLayout` will get automatically extracted and
+    // called explicitly by `ScrollViewStickyHeader`.
+    const itemSeparator = React.isValidElement(ItemSeparatorComponent)
+      ? ItemSeparatorComponent
+      : ItemSeparatorComponent && (
+          <ItemSeparatorComponent {...this.state.separatorProps} />
+        );
+    const cellStyle = inversionStyle
+      ? horizontal
+        ? [styles.rowReverse, inversionStyle]
+        : [styles.columnReverse, inversionStyle]
+      : horizontal
+      ? [styles.row, inversionStyle]
+      : inversionStyle;
+    const result = !CellRendererComponent ? (
+      <View
+        style={cellStyle}
+        onLayout={onLayout}
+        onFocusCapture={onCellFocusCapture}
+        /* $FlowFixMe[incompatible-type-arg] (>=0.89.0 site=react_native_fb) *
+        This comment suppresses an error found when Flow v0.89 was deployed. *
+        To see the error, delete this comment and run Flow. */
+      >
+        {element}
+        {itemSeparator}
+      </View>
+    ) : (
+      <CellRendererComponent
+        {...this.props}
+        style={cellStyle}
+        onLayout={onLayout}
+        onFocusCapture={onCellFocusCapture}>
+        {element}
+        {itemSeparator}
+      </CellRendererComponent>
+    );
+
+    return (
+      <VirtualizedListCellContextProvider cellKey={this.props.cellKey}>
+        {result}
+      </VirtualizedListCellContextProvider>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  row: {
+    flexDirection: 'row',
+  },
+  rowReverse: {
+    flexDirection: 'row-reverse',
+  },
+  columnReverse: {
+    flexDirection: 'column-reverse',
+  },
+});
diff --git a/Libraries/Lists/VirtualizedListContext.js b/Libraries/Lists/VirtualizedListContext.js
index 308f6a20d19a..bca5724498a3 100644
--- a/Libraries/Lists/VirtualizedListContext.js
+++ b/Libraries/Lists/VirtualizedListContext.js
@@ -8,34 +8,10 @@
  * @format
  */
 
-import type VirtualizedList from './VirtualizedList.js';
-import * as React from 'react';
-import {useMemo, useContext} from 'react';
-
-type Frame = $ReadOnly<{
-  offset: number,
-  length: number,
-  index: number,
-  inLayout: boolean,
-}>;
-
-export type ChildListState = $ReadOnly<{
-  first: number,
-  last: number,
-  frames: {[key: number]: Frame},
-}>;
+import typeof VirtualizedList from './VirtualizedList';
 
-// Data propagated through nested lists (regardless of orientation) that is
-// useful for producing diagnostics for usage errors involving nesting (e.g
-// missing/duplicate keys).
-export type ListDebugInfo = $ReadOnly<{
-  cellKey: string,
-  listKey: string,
-  parent: ?ListDebugInfo,
-  // We include all ancestors regardless of orientation, so this is not always
-  // identical to the child's orientation.
-  horizontal: boolean,
-}>;
+import * as React from 'react';
+import {useContext, useMemo} from 'react';
 
 type Context = $ReadOnly<{
   cellKey: ?string,
@@ -50,19 +26,14 @@ type Context = $ReadOnly<{
     zoomScale: number,
   },
   horizontal: ?boolean,
-  getOutermostParentListRef: () => VirtualizedList,
-  getNestedChildState: string => ?ChildListState,
+  getOutermostParentListRef: () => React.ElementRef<VirtualizedList>,
   registerAsNestedChild: ({
     cellKey: string,
-    key: string,
-    ref: VirtualizedList,
-    parentDebugInfo: ListDebugInfo,
-  }) => ?ChildListState,
+    ref: React.ElementRef<VirtualizedList>,
+  }) => void,
   unregisterAsNestedChild: ({
-    key: string,
-    state: ChildListState,
+    ref: React.ElementRef<VirtualizedList>,
   }) => void,
-  debugInfo: ListDebugInfo,
 }>;
 
 export const VirtualizedListContext: React.Context<?Context> =
@@ -103,27 +74,15 @@ export function VirtualizedListContextProvider({
       getScrollMetrics: value.getScrollMetrics,
       horizontal: value.horizontal,
       getOutermostParentListRef: value.getOutermostParentListRef,
-      getNestedChildState: value.getNestedChildState,
       registerAsNestedChild: value.registerAsNestedChild,
       unregisterAsNestedChild: value.unregisterAsNestedChild,
-      debugInfo: {
-        cellKey: value.debugInfo.cellKey,
-        horizontal: value.debugInfo.horizontal,
-        listKey: value.debugInfo.listKey,
-        parent: value.debugInfo.parent,
-      },
     }),
     [
       value.getScrollMetrics,
       value.horizontal,
       value.getOutermostParentListRef,
-      value.getNestedChildState,
       value.registerAsNestedChild,
       value.unregisterAsNestedChild,
-      value.debugInfo.cellKey,
-      value.debugInfo.horizontal,
-      value.debugInfo.listKey,
-      value.debugInfo.parent,
     ],
   );
   return (
diff --git a/Libraries/Lists/VirtualizedListProps.js b/Libraries/Lists/VirtualizedListProps.js
new file mode 100644
index 000000000000..59e57f2bb6df
--- /dev/null
+++ b/Libraries/Lists/VirtualizedListProps.js
@@ -0,0 +1,279 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+import typeof ScrollView from '../Components/ScrollView/ScrollView';
+import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
+import type {
+  ViewabilityConfig,
+  ViewabilityConfigCallbackPair,
+  ViewToken,
+} from './ViewabilityHelper';
+
+import * as React from 'react';
+
+export type Item = any;
+
+export type Separators = {
+  highlight: () => void,
+  unhighlight: () => void,
+  updateProps: (select: 'leading' | 'trailing', newProps: Object) => void,
+  ...
+};
+
+export type RenderItemProps<ItemT> = {
+  item: ItemT,
+  index: number,
+  separators: Separators,
+  ...
+};
+
+export type RenderItemType<ItemT> = (
+  info: RenderItemProps<ItemT>,
+) => React.Node;
+
+type RequiredProps = {|
+  /**
+   * The default accessor functions assume this is an Array<{key: string} | {id: string}> but you can override
+   * getItem, getItemCount, and keyExtractor to handle any type of index-based data.
+   */
+  data?: any,
+  /**
+   * A generic accessor for extracting an item from any sort of data blob.
+   */
+  getItem: (data: any, index: number) => ?Item,
+  /**
+   * Determines how many items are in the data blob.
+   */
+  getItemCount: (data: any) => number,
+|};
+type OptionalProps = {|
+  renderItem?: ?RenderItemType<Item>,
+  /**
+   * `debug` will turn on extra logging and visual overlays to aid with debugging both usage and
+   * implementation, but with a significant perf hit.
+   */
+  debug?: ?boolean,
+  /**
+   * DEPRECATED: Virtualization provides significant performance and memory optimizations, but fully
+   * unmounts react instances that are outside of the render window. You should only need to disable
+   * this for debugging purposes. Defaults to false.
+   */
+  disableVirtualization?: ?boolean,
+  /**
+   * A marker property for telling the list to re-render (since it implements `PureComponent`). If
+   * any of your `renderItem`, Header, Footer, etc. functions depend on anything outside of the
+   * `data` prop, stick it here and treat it immutably.
+   */
+  extraData?: any,
+  // e.g. height, y
+  getItemLayout?: (
+    data: any,
+    index: number,
+  ) => {
+    length: number,
+    offset: number,
+    index: number,
+    ...
+  },
+  horizontal?: ?boolean,
+  /**
+   * How many items to render in the initial batch. This should be enough to fill the screen but not
+   * much more. Note these items will never be unmounted as part of the windowed rendering in order
+   * to improve perceived performance of scroll-to-top actions.
+   */
+  initialNumToRender?: ?number,
+  /**
+   * Instead of starting at the top with the first item, start at `initialScrollIndex`. This
+   * disables the "scroll to top" optimization that keeps the first `initialNumToRender` items
+   * always rendered and immediately renders the items starting at this initial index. Requires
+   * `getItemLayout` to be implemented.
+   */
+  initialScrollIndex?: ?number,
+  /**
+   * Reverses the direction of scroll. Uses scale transforms of -1.
+   */
+  inverted?: ?boolean,
+  keyExtractor?: ?(item: Item, index: number) => string,
+  /**
+   * Each cell is rendered using this element. Can be a React Component Class,
+   * or a render function. Defaults to using View.
+   */
+  CellRendererComponent?: ?React.ComponentType<any>,
+  /**
+   * Rendered in between each item, but not at the top or bottom. By default, `highlighted` and
+   * `leadingItem` props are provided. `renderItem` provides `separators.highlight`/`unhighlight`
+   * which will update the `highlighted` prop, but you can also add custom props with
+   * `separators.updateProps`.
+   */
+  ItemSeparatorComponent?: ?React.ComponentType<any>,
+  /**
+   * Takes an item from `data` and renders it into the list. Example usage:
+   *
+   *     <FlatList
+   *       ItemSeparatorComponent={Platform.OS !== 'android' && ({highlighted}) => (
+   *         <View style={[style.separator, highlighted && {marginLeft: 0}]} />
+   *       )}
+   *       data={[{title: 'Title Text', key: 'item1'}]}
+   *       ListItemComponent={({item, separators}) => (
+   *         <TouchableHighlight
+   *           onPress={() => this._onPress(item)}
+   *           onShowUnderlay={separators.highlight}
+   *           onHideUnderlay={separators.unhighlight}>
+   *           <View style={{backgroundColor: 'white'}}>
+   *             <Text>{item.title}</Text>
+   *           </View>
+   *         </TouchableHighlight>
+   *       )}
+   *     />
+   *
+   * Provides additional metadata like `index` if you need it, as well as a more generic
+   * `separators.updateProps` function which let's you set whatever props you want to change the
+   * rendering of either the leading separator or trailing separator in case the more common
+   * `highlight` and `unhighlight` (which set the `highlighted: boolean` prop) are insufficient for
+   * your use-case.
+   */
+  ListItemComponent?: ?(React.ComponentType<any> | React.Element<any>),
+  /**
+   * Rendered when the list is empty. Can be a React Component Class, a render function, or
+   * a rendered element.
+   */
+  ListEmptyComponent?: ?(React.ComponentType<any> | React.Element<any>),
+  /**
+   * Rendered at the bottom of all the items. Can be a React Component Class, a render function, or
+   * a rendered element.
+   */
+  ListFooterComponent?: ?(React.ComponentType<any> | React.Element<any>),
+  /**
+   * Styling for internal View for ListFooterComponent
+   */
+  ListFooterComponentStyle?: ViewStyleProp,
+  /**
+   * Rendered at the top of all the items. Can be a React Component Class, a render function, or
+   * a rendered element.
+   */
+  ListHeaderComponent?: ?(React.ComponentType<any> | React.Element<any>),
+  /**
+   * Styling for internal View for ListHeaderComponent
+   */
+  ListHeaderComponentStyle?: ViewStyleProp,
+  /**
+   * The maximum number of items to render in each incremental render batch. The more rendered at
+   * once, the better the fill rate, but responsiveness may suffer because rendering content may
+   * interfere with responding to button taps or other interactions.
+   */
+  maxToRenderPerBatch?: ?number,
+  /**
+   * Called once when the scroll position gets within `onEndReachedThreshold` of the rendered
+   * content.
+   */
+  onEndReached?: ?(info: {distanceFromEnd: number, ...}) => void,
+  /**
+   * How far from the end (in units of visible length of the list) the bottom edge of the
+   * list must be from the end of the content to trigger the `onEndReached` callback.
+   * Thus a value of 0.5 will trigger `onEndReached` when the end of the content is
+   * within half the visible length of the list. A value of 0 will not trigger until scrolling
+   * to the very end of the list.
+   */
+  onEndReachedThreshold?: ?number,
+  /**
+   * If provided, a standard RefreshControl will be added for "Pull to Refresh" functionality. Make
+   * sure to also set the `refreshing` prop correctly.
+   */
+  onRefresh?: ?() => void,
+  /**
+   * Used to handle failures when scrolling to an index that has not been measured yet. Recommended
+   * action is to either compute your own offset and `scrollTo` it, or scroll as far as possible and
+   * then try again after more items have been rendered.
+   */
+  onScrollToIndexFailed?: ?(info: {
+    index: number,
+    highestMeasuredFrameIndex: number,
+    averageItemLength: number,
+    ...
+  }) => void,
+  /**
+   * Called when the viewability of rows changes, as defined by the
+   * `viewabilityConfig` prop.
+   */
+  onViewableItemsChanged?: ?(info: {
+    viewableItems: Array<ViewToken>,
+    changed: Array<ViewToken>,
+    ...
+  }) => void,
+  persistentScrollbar?: ?boolean,
+  /**
+   * Set this when offset is needed for the loading indicator to show correctly.
+   */
+  progressViewOffset?: number,
+  /**
+   * A custom refresh control element. When set, it overrides the default
+   * <RefreshControl> component built internally. The onRefresh and refreshing
+   * props are also ignored. Only works for vertical VirtualizedList.
+   */
+  refreshControl?: ?React.Element<any>,
+  /**
+   * Set this true while waiting for new data from a refresh.
+   */
+  refreshing?: ?boolean,
+  /**
+   * Note: may have bugs (missing content) in some circumstances - use at your own risk.
+   *
+   * This may improve scroll performance for large lists.
+   */
+  removeClippedSubviews?: boolean,
+  /**
+   * Render a custom scroll component, e.g. with a differently styled `RefreshControl`.
+   */
+  renderScrollComponent?: (props: Object) => React.Element<any>,
+  /**
+   * Amount of time between low-pri item render batches, e.g. for rendering items quite a ways off
+   * screen. Similar fill rate/responsiveness tradeoff as `maxToRenderPerBatch`.
+   */
+  updateCellsBatchingPeriod?: ?number,
+  /**
+   * See `ViewabilityHelper` for flow type and further documentation.
+   */
+  viewabilityConfig?: ViewabilityConfig,
+  /**
+   * List of ViewabilityConfig/onViewableItemsChanged pairs. A specific onViewableItemsChanged
+   * will be called when its corresponding ViewabilityConfig's conditions are met.
+   */
+  viewabilityConfigCallbackPairs?: Array<ViewabilityConfigCallbackPair>,
+  /**
+   * Determines the maximum number of items rendered outside of the visible area, in units of
+   * visible lengths. So if your list fills the screen, then `windowSize={21}` (the default) will
+   * render the visible screen area plus up to 10 screens above and 10 below the viewport. Reducing
+   * this number will reduce memory consumption and may improve performance, but will increase the
+   * chance that fast scrolling may reveal momentary blank areas of unrendered content.
+   */
+  windowSize?: ?number,
+  /**
+   * The legacy implementation is no longer supported.
+   */
+  legacyImplementation?: empty,
+|};
+
+export type Props = {|
+  ...React.ElementConfig<ScrollView>,
+  ...RequiredProps,
+  ...OptionalProps,
+|};
+
+/**
+ * Subset of properties needed to calculate frame metrics
+ */
+export type FrameMetricProps = {
+  data: RequiredProps['data'],
+  getItemCount: RequiredProps['getItemCount'],
+  getItem: RequiredProps['getItem'],
+  getItemLayout?: OptionalProps['getItemLayout'],
+  keyExtractor?: OptionalProps['keyExtractor'],
+  ...
+};
diff --git a/Libraries/Lists/VirtualizedSectionList.js b/Libraries/Lists/VirtualizedSectionList.js
index f17d6e992a55..6d9aecdc432d 100644
--- a/Libraries/Lists/VirtualizedSectionList.js
+++ b/Libraries/Lists/VirtualizedSectionList.js
@@ -10,10 +10,11 @@
 
 import type {ViewToken} from './ViewabilityHelper';
 
+import View from '../Components/View/View';
+import VirtualizedList from './VirtualizedList';
 import {keyExtractor as defaultKeyExtractor} from './VirtualizeUtils';
 import invariant from 'invariant';
 import * as React from 'react';
-import {View, VirtualizedList} from 'react-native';
 
 type Item = any;
 
@@ -140,6 +141,7 @@ class VirtualizedSectionList<
     if (params.itemIndex > 0 && this.props.stickySectionHeadersEnabled) {
       const frame = this._listRef.__getFrameMetricsApprox(
         index - params.itemIndex,
+        this._listRef.props,
       );
       viewOffset += frame.length;
     }
@@ -171,7 +173,7 @@ class VirtualizedSectionList<
     const listHeaderOffset = this.props.ListHeaderComponent ? 1 : 0;
 
     const stickyHeaderIndices = this.props.stickySectionHeadersEnabled
-      ? []
+      ? ([]: Array<number>)
       : undefined;
 
     let itemCount = 0;
@@ -236,6 +238,7 @@ class VirtualizedSectionList<
     return null;
   }
 
+  // $FlowFixMe[missing-local-annot]
   _keyExtractor = (item: Item, index: number) => {
     const info = this._subExtractor(index);
     return (info && info.key) || String(index);
@@ -339,7 +342,7 @@ class VirtualizedSectionList<
   };
 
   _renderItem =
-    (listItemCount: number) =>
+    (listItemCount: number): $FlowFixMe =>
     // eslint-disable-next-line react/no-unstable-nested-components
     ({item, index}: {item: Item, index: number, ...}) => {
       const info = this._subExtractor(index);
diff --git a/Libraries/Lists/__flowtests__/SectionList-flowtest.js b/Libraries/Lists/__flowtests__/SectionList-flowtest.js
index da9eb38f9fcc..4112d87a6fde 100644
--- a/Libraries/Lists/__flowtests__/SectionList-flowtest.js
+++ b/Libraries/Lists/__flowtests__/SectionList-flowtest.js
@@ -10,8 +10,8 @@
 
 'use strict';
 
-import * as React from 'react';
 import SectionList from '../SectionList';
+import * as React from 'react';
 
 function renderMyListItem(info: {
   item: {title: string, ...},
diff --git a/Libraries/Lists/__tests__/CellRenderMask-test.js b/Libraries/Lists/__tests__/CellRenderMask-test.js
index bef5cc3fa3e3..7230b7e76132 100644
--- a/Libraries/Lists/__tests__/CellRenderMask-test.js
+++ b/Libraries/Lists/__tests__/CellRenderMask-test.js
@@ -30,8 +30,8 @@ describe('CellRenderMask', () => {
   it('throws when adding invalid cell ranges', () => {
     const renderMask = new CellRenderMask(5);
 
-    expect(() => renderMask.addCells({first: -1, last: 0})).toThrow();
-    expect(() => renderMask.addCells({first: 1, last: 0})).toThrow();
+    expect(() => renderMask.addCells({first: -2, last: -1})).toThrow();
+    expect(() => renderMask.addCells({first: -2, last: 0})).toThrow();
     expect(() => renderMask.addCells({first: 0, last: 5})).toThrow();
     expect(() => renderMask.addCells({first: 6, last: 7})).toThrow();
   });
@@ -76,6 +76,15 @@ describe('CellRenderMask', () => {
     ]);
   });
 
+  it('allows adding empty cell range', () => {
+    const renderMask = new CellRenderMask(5);
+    renderMask.addCells({first: 0, last: -1});
+
+    expect(renderMask.enumerateRegions()).toEqual([
+      {first: 0, last: 4, isSpacer: true},
+    ]);
+  });
+
   it('correctly replaces fragmented cell ranges', () => {
     const renderMask = new CellRenderMask(10);
 
diff --git a/Libraries/Lists/__tests__/FillRateHelper-test.js b/Libraries/Lists/__tests__/FillRateHelper-test.js
index 63d0d0f4ba7a..c74915a20ee5 100644
--- a/Libraries/Lists/__tests__/FillRateHelper-test.js
+++ b/Libraries/Lists/__tests__/FillRateHelper-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Lists/__tests__/FlatList-test.js b/Libraries/Lists/__tests__/FlatList-test.js
index d8b523fd2203..bc7c9d1faf16 100644
--- a/Libraries/Lists/__tests__/FlatList-test.js
+++ b/Libraries/Lists/__tests__/FlatList-test.js
@@ -5,16 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
+const FlatList = require('../FlatList');
 const React = require('react');
 const ReactTestRenderer = require('react-test-renderer');
 
-const FlatList = require('../FlatList');
-
 describe('FlatList', () => {
   it('renders simple list', () => {
     const component = ReactTestRenderer.create(
@@ -152,4 +151,35 @@ describe('FlatList', () => {
     expect(scrollRef.measureLayout).toBeInstanceOf(jest.fn().constructor);
     expect(scrollRef.measureInWindow).toBeInstanceOf(jest.fn().constructor);
   });
+
+  it('calls renderItem for all data items', () => {
+    const data = [
+      {key: 'i1'},
+      null,
+      undefined,
+      {key: 'i2'},
+      null,
+      undefined,
+      {key: 'i3'},
+    ];
+
+    const renderItemInOneColumn = jest.fn();
+    ReactTestRenderer.create(
+      <FlatList data={data} renderItem={renderItemInOneColumn} />,
+    );
+
+    expect(renderItemInOneColumn).toHaveBeenCalledTimes(7);
+
+    const renderItemInThreeColumns = jest.fn();
+
+    ReactTestRenderer.create(
+      <FlatList
+        data={data}
+        renderItem={renderItemInThreeColumns}
+        numColumns={3}
+      />,
+    );
+
+    expect(renderItemInThreeColumns).toHaveBeenCalledTimes(7);
+  });
 });
diff --git a/Libraries/Lists/__tests__/SectionList-test.js b/Libraries/Lists/__tests__/SectionList-test.js
index 34ee7e9a4f43..9eb6e340e30d 100644
--- a/Libraries/Lists/__tests__/SectionList-test.js
+++ b/Libraries/Lists/__tests__/SectionList-test.js
@@ -5,16 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
+import SectionList from '../SectionList';
 import * as React from 'react';
 import ReactTestRenderer from 'react-test-renderer';
 
-import SectionList from '../SectionList';
-
 describe('SectionList', () => {
   it('renders empty list', () => {
     const component = ReactTestRenderer.create(
diff --git a/Libraries/Lists/__tests__/ViewabilityHelper-test.js b/Libraries/Lists/__tests__/ViewabilityHelper-test.js
index 3f0a1cedad5c..1d755eac39b8 100644
--- a/Libraries/Lists/__tests__/ViewabilityHelper-test.js
+++ b/Libraries/Lists/__tests__/ViewabilityHelper-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
@@ -14,6 +14,10 @@ const ViewabilityHelper = require('../ViewabilityHelper');
 
 let rowFrames;
 let data;
+const props = {
+  data,
+  getItemCount: () => data.length,
+};
 function getFrameMetrics(index: number) {
   const frame = rowFrames[data[index].key];
   return {length: frame.height, offset: frame.y};
@@ -34,9 +38,9 @@ describe('computeViewableItems', function () {
       d: {y: 150, height: 50},
     };
     data = [{key: 'a'}, {key: 'b'}, {key: 'c'}, {key: 'd'}];
-    expect(
-      helper.computeViewableItems(data.length, 0, 200, getFrameMetrics),
-    ).toEqual([0, 1, 2, 3]);
+    expect(helper.computeViewableItems(props, 0, 200, getFrameMetrics)).toEqual(
+      [0, 1, 2, 3],
+    );
   });
 
   it('returns top 2 rows as viewable (1. entirely visible and 2. majority)', function () {
@@ -50,9 +54,9 @@ describe('computeViewableItems', function () {
       d: {y: 250, height: 50},
     };
     data = [{key: 'a'}, {key: 'b'}, {key: 'c'}, {key: 'd'}];
-    expect(
-      helper.computeViewableItems(data.length, 0, 200, getFrameMetrics),
-    ).toEqual([0, 1]);
+    expect(helper.computeViewableItems(props, 0, 200, getFrameMetrics)).toEqual(
+      [0, 1],
+    );
   });
 
   it('returns only 2nd row as viewable (majority)', function () {
@@ -67,7 +71,7 @@ describe('computeViewableItems', function () {
     };
     data = [{key: 'a'}, {key: 'b'}, {key: 'c'}, {key: 'd'}];
     expect(
-      helper.computeViewableItems(data.length, 25, 200, getFrameMetrics),
+      helper.computeViewableItems(props, 25, 200, getFrameMetrics),
     ).toEqual([1]);
   });
 
@@ -77,9 +81,9 @@ describe('computeViewableItems', function () {
     });
     rowFrames = {};
     data = [];
-    expect(
-      helper.computeViewableItems(data.length, 0, 200, getFrameMetrics),
-    ).toEqual([]);
+    expect(helper.computeViewableItems(props, 0, 200, getFrameMetrics)).toEqual(
+      [],
+    );
   });
 
   it('handles different view area coverage percent thresholds', function () {
@@ -92,39 +96,39 @@ describe('computeViewableItems', function () {
     data = [{key: 'a'}, {key: 'b'}, {key: 'c'}, {key: 'd'}];
 
     let helper = new ViewabilityHelper({viewAreaCoveragePercentThreshold: 0});
+    expect(helper.computeViewableItems(props, 0, 50, getFrameMetrics)).toEqual([
+      0,
+    ]);
+    expect(helper.computeViewableItems(props, 1, 50, getFrameMetrics)).toEqual([
+      0, 1,
+    ]);
     expect(
-      helper.computeViewableItems(data.length, 0, 50, getFrameMetrics),
-    ).toEqual([0]);
-    expect(
-      helper.computeViewableItems(data.length, 1, 50, getFrameMetrics),
-    ).toEqual([0, 1]);
-    expect(
-      helper.computeViewableItems(data.length, 199, 50, getFrameMetrics),
+      helper.computeViewableItems(props, 199, 50, getFrameMetrics),
     ).toEqual([1, 2]);
     expect(
-      helper.computeViewableItems(data.length, 250, 50, getFrameMetrics),
+      helper.computeViewableItems(props, 250, 50, getFrameMetrics),
     ).toEqual([2]);
 
     helper = new ViewabilityHelper({viewAreaCoveragePercentThreshold: 100});
+    expect(helper.computeViewableItems(props, 0, 200, getFrameMetrics)).toEqual(
+      [0, 1],
+    );
+    expect(helper.computeViewableItems(props, 1, 200, getFrameMetrics)).toEqual(
+      [1],
+    );
     expect(
-      helper.computeViewableItems(data.length, 0, 200, getFrameMetrics),
-    ).toEqual([0, 1]);
-    expect(
-      helper.computeViewableItems(data.length, 1, 200, getFrameMetrics),
-    ).toEqual([1]);
-    expect(
-      helper.computeViewableItems(data.length, 400, 200, getFrameMetrics),
+      helper.computeViewableItems(props, 400, 200, getFrameMetrics),
     ).toEqual([2]);
     expect(
-      helper.computeViewableItems(data.length, 600, 200, getFrameMetrics),
+      helper.computeViewableItems(props, 600, 200, getFrameMetrics),
     ).toEqual([3]);
 
     helper = new ViewabilityHelper({viewAreaCoveragePercentThreshold: 10});
     expect(
-      helper.computeViewableItems(data.length, 30, 200, getFrameMetrics),
+      helper.computeViewableItems(props, 30, 200, getFrameMetrics),
     ).toEqual([0, 1, 2]);
     expect(
-      helper.computeViewableItems(data.length, 31, 200, getFrameMetrics),
+      helper.computeViewableItems(props, 31, 200, getFrameMetrics),
     ).toEqual([1, 2]);
   });
 
@@ -137,30 +141,30 @@ describe('computeViewableItems', function () {
     };
     data = [{key: 'a'}, {key: 'b'}, {key: 'c'}, {key: 'd'}];
     let helper = new ViewabilityHelper({itemVisiblePercentThreshold: 0});
-    expect(
-      helper.computeViewableItems(data.length, 0, 50, getFrameMetrics),
-    ).toEqual([0]);
-    expect(
-      helper.computeViewableItems(data.length, 1, 50, getFrameMetrics),
-    ).toEqual([0, 1]);
+    expect(helper.computeViewableItems(props, 0, 50, getFrameMetrics)).toEqual([
+      0,
+    ]);
+    expect(helper.computeViewableItems(props, 1, 50, getFrameMetrics)).toEqual([
+      0, 1,
+    ]);
 
     helper = new ViewabilityHelper({itemVisiblePercentThreshold: 100});
-    expect(
-      helper.computeViewableItems(data.length, 0, 250, getFrameMetrics),
-    ).toEqual([0, 1, 2]);
-    expect(
-      helper.computeViewableItems(data.length, 1, 250, getFrameMetrics),
-    ).toEqual([1, 2]);
+    expect(helper.computeViewableItems(props, 0, 250, getFrameMetrics)).toEqual(
+      [0, 1, 2],
+    );
+    expect(helper.computeViewableItems(props, 1, 250, getFrameMetrics)).toEqual(
+      [1, 2],
+    );
 
     helper = new ViewabilityHelper({itemVisiblePercentThreshold: 10});
     expect(
-      helper.computeViewableItems(data.length, 184, 20, getFrameMetrics),
+      helper.computeViewableItems(props, 184, 20, getFrameMetrics),
     ).toEqual([1]);
     expect(
-      helper.computeViewableItems(data.length, 185, 20, getFrameMetrics),
+      helper.computeViewableItems(props, 185, 20, getFrameMetrics),
     ).toEqual([1, 2]);
     expect(
-      helper.computeViewableItems(data.length, 186, 20, getFrameMetrics),
+      helper.computeViewableItems(props, 186, 20, getFrameMetrics),
     ).toEqual([2]);
   });
 });
@@ -174,7 +178,7 @@ describe('onUpdate', function () {
     data = [{key: 'a'}];
     const onViewableItemsChanged = jest.fn();
     helper.onUpdate(
-      data.length,
+      props,
       0,
       200,
       getFrameMetrics,
@@ -188,7 +192,7 @@ describe('onUpdate', function () {
       viewableItems: [{isViewable: true, key: 'a'}],
     });
     helper.onUpdate(
-      data.length,
+      props,
       0,
       200,
       getFrameMetrics,
@@ -197,7 +201,7 @@ describe('onUpdate', function () {
     );
     expect(onViewableItemsChanged.mock.calls.length).toBe(1); // nothing changed!
     helper.onUpdate(
-      data.length,
+      props,
       100,
       200,
       getFrameMetrics,
@@ -221,7 +225,7 @@ describe('onUpdate', function () {
     data = [{key: 'a'}, {key: 'b'}];
     const onViewableItemsChanged = jest.fn();
     helper.onUpdate(
-      data.length,
+      props,
       0,
       200,
       getFrameMetrics,
@@ -235,7 +239,7 @@ describe('onUpdate', function () {
       viewableItems: [{isViewable: true, key: 'a'}],
     });
     helper.onUpdate(
-      data.length,
+      props,
       100,
       200,
       getFrameMetrics,
@@ -253,7 +257,7 @@ describe('onUpdate', function () {
       ],
     });
     helper.onUpdate(
-      data.length,
+      props,
       200,
       200,
       getFrameMetrics,
@@ -280,7 +284,7 @@ describe('onUpdate', function () {
     data = [{key: 'a'}, {key: 'b'}];
     const onViewableItemsChanged = jest.fn();
     helper.onUpdate(
-      data.length,
+      props,
       0,
       200,
       getFrameMetrics,
@@ -314,7 +318,7 @@ describe('onUpdate', function () {
     data = [{key: 'a'}, {key: 'b'}];
     const onViewableItemsChanged = jest.fn();
     helper.onUpdate(
-      data.length,
+      props,
       0,
       200,
       getFrameMetrics,
@@ -322,7 +326,7 @@ describe('onUpdate', function () {
       onViewableItemsChanged,
     );
     helper.onUpdate(
-      data.length,
+      props,
       300, // scroll past item 'a'
       200,
       getFrameMetrics,
@@ -355,7 +359,7 @@ describe('onUpdate', function () {
     data = [{key: 'a'}, {key: 'b'}];
     const onViewableItemsChanged = jest.fn();
     helper.onUpdate(
-      data.length,
+      props,
       0,
       100,
       getFrameMetrics,
@@ -367,7 +371,7 @@ describe('onUpdate', function () {
     helper.recordInteraction();
 
     helper.onUpdate(
-      data.length,
+      props,
       20,
       100,
       getFrameMetrics,
@@ -394,7 +398,7 @@ describe('onUpdate', function () {
     data = [{key: 'a'}, {key: 'b'}];
     const onViewableItemsChanged = jest.fn();
     helper.onUpdate(
-      data.length,
+      props,
       0,
       200,
       getFrameMetrics,
@@ -419,7 +423,7 @@ describe('onUpdate', function () {
     helper.resetViewableIndices();
 
     helper.onUpdate(
-      data.length,
+      props,
       0,
       200,
       getFrameMetrics,
diff --git a/Libraries/Lists/__tests__/VirtualizeUtils-test.js b/Libraries/Lists/__tests__/VirtualizeUtils-test.js
index 5f4de3e52e1c..29f169eb6304 100644
--- a/Libraries/Lists/__tests__/VirtualizeUtils-test.js
+++ b/Libraries/Lists/__tests__/VirtualizeUtils-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
@@ -49,7 +49,7 @@ describe('elementsThatOverlapOffsets', function () {
       };
     }
     expect(
-      elementsThatOverlapOffsets(offsets, 100, getFrameMetrics, 1),
+      elementsThatOverlapOffsets(offsets, fakeProps(100), getFrameMetrics, 1),
     ).toEqual([0, 2, 3, 4]);
   });
   it('handles variable length', function () {
@@ -62,7 +62,12 @@ describe('elementsThatOverlapOffsets', function () {
       {offset: 950, length: 150},
     ];
     expect(
-      elementsThatOverlapOffsets(offsets, frames.length, ii => frames[ii], 1),
+      elementsThatOverlapOffsets(
+        offsets,
+        fakeProps(frames.length),
+        ii => frames[ii],
+        1,
+      ),
     ).toEqual([1, 1, 3]);
   });
   it('handles frame boundaries', function () {
@@ -74,7 +79,7 @@ describe('elementsThatOverlapOffsets', function () {
       };
     }
     expect(
-      elementsThatOverlapOffsets(offsets, 100, getFrameMetrics, 1),
+      elementsThatOverlapOffsets(offsets, fakeProps(100), getFrameMetrics, 1),
     ).toEqual([0, 0, 1, 2]);
   });
   it('handles out of bounds', function () {
@@ -85,7 +90,19 @@ describe('elementsThatOverlapOffsets', function () {
       {offset: 250, length: 100},
     ];
     expect(
-      elementsThatOverlapOffsets(offsets, frames.length, ii => frames[ii], 1),
+      elementsThatOverlapOffsets(
+        offsets,
+        fakeProps(frames.length),
+        ii => frames[ii],
+        1,
+      ),
     ).toEqual([undefined, 1]);
   });
 });
+
+function fakeProps(length) {
+  return {
+    data: new Array(length).fill({}),
+    getItemCount: () => length,
+  };
+}
diff --git a/Libraries/Lists/__tests__/VirtualizedList-test.js b/Libraries/Lists/__tests__/VirtualizedList-test.js
index d4a56e5636fc..969d72b90142 100644
--- a/Libraries/Lists/__tests__/VirtualizedList-test.js
+++ b/Libraries/Lists/__tests__/VirtualizedList-test.js
@@ -5,15 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
-const ReactTestRenderer = require('react-test-renderer');
-
-const VirtualizedList = require('../VirtualizedList');
+import VirtualizedList from '../VirtualizedList';
+import React from 'react';
+import ReactTestRenderer from 'react-test-renderer';
 
 describe('VirtualizedList', () => {
   it('renders simple list', () => {
@@ -411,74 +410,6 @@ describe('VirtualizedList', () => {
     expect(onEndReached).toHaveBeenCalled();
   });
 
-  it('provides a trace when a listKey collision occurs', () => {
-    const errors = [];
-    jest.spyOn(console, 'error').mockImplementation((...args) => {
-      // Silence the DEV-only React error boundary warning.
-      if ((args[0] || '').startsWith('The above error occurred in the ')) {
-        return;
-      }
-      errors.push(args);
-    });
-    const commonProps = {
-      data: [{key: 'cell0'}],
-      getItem: (data, index) => data[index],
-      getItemCount: data => data.length,
-      renderItem: ({item}) => <item value={item.key} />,
-    };
-    try {
-      ReactTestRenderer.create(
-        <VirtualizedList
-          {...commonProps}
-          horizontal={false}
-          listKey="level0"
-          renderItem={() => (
-            <VirtualizedList
-              {...commonProps}
-              horizontal={true}
-              listKey="level1"
-              renderItem={() => (
-                <>
-                  {/* Force a collision */}
-                  <VirtualizedList
-                    {...commonProps}
-                    horizontal={true}
-                    listKey="level2"
-                  />
-                  <VirtualizedList
-                    {...commonProps}
-                    horizontal={true}
-                    listKey="level2"
-                  />
-                </>
-              )}
-            />
-          )}
-        />,
-      );
-      expect(errors).toMatchInlineSnapshot(`
-        Array [
-          Array [
-            "A VirtualizedList contains a cell which itself contains more than one VirtualizedList of the same orientation as the parent list. You must pass a unique listKey prop to each sibling list.
-
-        VirtualizedList trace:
-          Child (horizontal):
-            listKey: level2
-            cellKey: cell0
-          Parent (horizontal):
-            listKey: level1
-            cellKey: cell0
-          Parent (vertical):
-            listKey: level0
-            cellKey: rootList",
-          ],
-        ]
-      `);
-    } finally {
-      console.error.mockRestore();
-    }
-  });
-
   it('throws if using scrollToIndex with index less than 0', () => {
     const component = ReactTestRenderer.create(
       <VirtualizedList
@@ -560,7 +491,7 @@ describe('VirtualizedList', () => {
 
     // The initial render is specified to be the length of items provided.
     // Expect that all sticky items (1 every 3) are passed to the underlying
-    // scrollview, indices offset by 1 to account for the the header component.
+    // scrollview, indices offset by 1 to account for the header component.
     expect(component).toMatchSnapshot();
   });
 
@@ -692,6 +623,24 @@ it('unmounts sticky headers moved below viewport', () => {
   expect(component).toMatchSnapshot();
 });
 
+it('gracefully handles negaitve initialScrollIndex', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  const component = ReactTestRenderer.create(
+    <VirtualizedList
+      initialScrollIndex={-1}
+      initialNumToRender={4}
+      {...baseItemProps(items)}
+      {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+    />,
+  );
+
+  // Existing code assumes we handle this in some way. Do something reasonable
+  // here.
+  expect(component).toMatchSnapshot();
+});
+
 it('renders offset cells in initial render when initialScrollIndex set', () => {
   const items = generateItems(10);
   const ITEM_HEIGHT = 10;
@@ -709,6 +658,220 @@ it('renders offset cells in initial render when initialScrollIndex set', () => {
   expect(component).toMatchSnapshot();
 });
 
+it('scrolls after content sizing with integer initialScrollIndex', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  const listRef = React.createRef(null);
+
+  const component = ReactTestRenderer.create(
+    <VirtualizedList
+      initialScrollIndex={1}
+      initialNumToRender={4}
+      ref={listRef}
+      {...baseItemProps(items)}
+      {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+    />,
+  );
+
+  const {scrollTo} = listRef.current.getScrollRef();
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+    performAllBatches();
+  });
+
+  expect(scrollTo).toHaveBeenLastCalledWith({y: 10, animated: false});
+});
+
+it('scrolls after content sizing with near-zero initialScrollIndex', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  const listRef = React.createRef(null);
+
+  const component = ReactTestRenderer.create(
+    <VirtualizedList
+      initialScrollIndex={0.0001}
+      initialNumToRender={4}
+      ref={listRef}
+      {...baseItemProps(items)}
+      {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+    />,
+  );
+
+  const {scrollTo} = listRef.current.getScrollRef();
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+    performAllBatches();
+  });
+
+  expect(scrollTo).toHaveBeenLastCalledWith({y: 0.001, animated: false});
+});
+
+it('scrolls after content sizing with near-end initialScrollIndex', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  const listRef = React.createRef(null);
+
+  const component = ReactTestRenderer.create(
+    <VirtualizedList
+      initialScrollIndex={9.9999}
+      initialNumToRender={4}
+      ref={listRef}
+      {...baseItemProps(items)}
+      {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+    />,
+  );
+
+  const {scrollTo} = listRef.current.getScrollRef();
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+    performAllBatches();
+  });
+
+  expect(scrollTo).toHaveBeenLastCalledWith({y: 99.999, animated: false});
+});
+
+it('scrolls after content sizing with fractional initialScrollIndex (getItemLayout())', () => {
+  const items = generateItems(10);
+  const itemHeights = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+  const getItemLayout = (_, index) => ({
+    length: itemHeights[index],
+    offset: itemHeights.slice(0, index).reduce((a, b) => a + b, 0),
+    index,
+  });
+
+  const listRef = React.createRef(null);
+
+  const component = ReactTestRenderer.create(
+    <VirtualizedList
+      initialScrollIndex={1.5}
+      initialNumToRender={4}
+      ref={listRef}
+      getItemLayout={getItemLayout}
+      {...baseItemProps(items)}
+    />,
+  );
+
+  const {scrollTo} = listRef.current.getScrollRef();
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+    performAllBatches();
+  });
+
+  expect(scrollTo).toHaveBeenLastCalledWith({y: 2.0, animated: false});
+});
+
+it('scrolls after content sizing with fractional initialScrollIndex (cached layout)', () => {
+  const items = generateItems(10);
+  const listRef = React.createRef(null);
+
+  const component = ReactTestRenderer.create(
+    <VirtualizedList
+      initialScrollIndex={1.5}
+      initialNumToRender={4}
+      ref={listRef}
+      {...baseItemProps(items)}
+    />,
+  );
+
+  const {scrollTo} = listRef.current.getScrollRef();
+
+  ReactTestRenderer.act(() => {
+    let y = 0;
+    for (let i = 0; i < 10; ++i) {
+      const height = i + 1;
+      simulateCellLayout(component, items, i, {
+        width: 10,
+        height,
+        x: 0,
+        y,
+      });
+      y += height;
+    }
+
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+    performAllBatches();
+  });
+
+  expect(scrollTo).toHaveBeenLastCalledWith({y: 2.0, animated: false});
+});
+
+it('scrolls after content sizing with fractional initialScrollIndex (layout estimation)', () => {
+  const items = generateItems(10);
+  const listRef = React.createRef(null);
+
+  const component = ReactTestRenderer.create(
+    <VirtualizedList
+      initialScrollIndex={1.5}
+      initialNumToRender={4}
+      ref={listRef}
+      {...baseItemProps(items)}
+    />,
+  );
+
+  const {scrollTo} = listRef.current.getScrollRef();
+
+  ReactTestRenderer.act(() => {
+    let y = 0;
+    for (let i = 5; i < 10; ++i) {
+      const height = i + 1;
+      simulateCellLayout(component, items, i, {
+        width: 10,
+        height,
+        x: 0,
+        y,
+      });
+      y += height;
+    }
+
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+    performAllBatches();
+  });
+
+  expect(scrollTo).toHaveBeenLastCalledWith({y: 12, animated: false});
+});
+
+it('initially renders nothing when initialNumToRender is 0', () => {
+  const items = generateItems(10);
+  const ITEM_HEIGHT = 10;
+
+  const component = ReactTestRenderer.create(
+    <VirtualizedList
+      initialNumToRender={0}
+      {...baseItemProps(items)}
+      {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+    />,
+  );
+
+  // Only a spacer should be present (a single item is present in the legacy
+  // implementation)
+  expect(component).toMatchSnapshot();
+});
+
 it('does not over-render when there is less than initialNumToRender cells', () => {
   const items = generateItems(10);
   const ITEM_HEIGHT = 10;
@@ -862,6 +1025,80 @@ it('does not adjust render area until content area layed out', () => {
   expect(component).toMatchSnapshot();
 });
 
+it('does not move render area when initialScrollIndex is > 0 and offset not yet known', () => {
+  const items = generateItems(20);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={5}
+        initialScrollIndex={1}
+        windowSize={10}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 100},
+    });
+    performAllBatches();
+  });
+
+  // 5 cells should be present starting at index 1, since we have not seen a
+  // scroll event yet for current position.
+  expect(component).toMatchSnapshot();
+});
+
+it('clamps render area when items removed for initialScrollIndex > 0 and scroller position not yet known', () => {
+  const items = generateItems(20);
+  const lessItems = generateItems(15);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={5}
+        initialScrollIndex={14}
+        windowSize={10}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    component.update(
+      <VirtualizedList
+        initialNumToRender={5}
+        initialScrollIndex={14}
+        windowSize={10}
+        {...baseItemProps(lessItems)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 100},
+    });
+    performAllBatches();
+  });
+
+  // The initial render range should be adjusted to not overflow the list
+  expect(component).toMatchSnapshot();
+});
+
 it('adjusts render area with non-zero initialScrollIndex', () => {
   const items = generateItems(20);
   const ITEM_HEIGHT = 10;
@@ -1498,6 +1735,184 @@ it('calls _onCellLayout properly', () => {
   expect(mock).not.toHaveBeenCalledWith(event, 'i3', 2);
 });
 
+it('keeps viewport below last focused rendered', () => {
+  const items = generateItems(20);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={1}
+        windowSize={1}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+
+    performAllBatches();
+  });
+
+  ReactTestRenderer.act(() => {
+    component.getInstance()._onCellFocusCapture(3);
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateScroll(component, {x: 0, y: 150});
+    performAllBatches();
+  });
+
+  // Cells 1-8 should remain rendered after scrolling to the bottom of the list
+  expect(component).toMatchSnapshot();
+});
+
+it('virtualizes away last focused item if focus changes to a new cell', () => {
+  const items = generateItems(20);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={1}
+        windowSize={1}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+
+    performAllBatches();
+  });
+
+  ReactTestRenderer.act(() => {
+    component.getInstance()._onCellFocusCapture(3);
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateScroll(component, {x: 0, y: 150});
+    performAllBatches();
+  });
+
+  ReactTestRenderer.act(() => {
+    component.getInstance()._onCellFocusCapture(17);
+  });
+
+  // Cells 1-8 should no longer be rendered after focus is moved to the end of
+  // the list
+  expect(component).toMatchSnapshot();
+});
+
+it('keeps viewport above last focused rendered', () => {
+  const items = generateItems(20);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={1}
+        windowSize={1}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+
+    performAllBatches();
+  });
+
+  ReactTestRenderer.act(() => {
+    component.getInstance()._onCellFocusCapture(3);
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateScroll(component, {x: 0, y: 150});
+    performAllBatches();
+  });
+
+  ReactTestRenderer.act(() => {
+    component.getInstance()._onCellFocusCapture(17);
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateScroll(component, {x: 0, y: 0});
+    performAllBatches();
+  });
+
+  // Cells 12-19 should remain rendered after scrolling to the top of the list
+  expect(component).toMatchSnapshot();
+});
+
+it('virtualizes away last focused index if item removed', () => {
+  const items = generateItems(20);
+  const ITEM_HEIGHT = 10;
+
+  let component;
+  ReactTestRenderer.act(() => {
+    component = ReactTestRenderer.create(
+      <VirtualizedList
+        initialNumToRender={1}
+        windowSize={1}
+        {...baseItemProps(items)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateLayout(component, {
+      viewport: {width: 10, height: 50},
+      content: {width: 10, height: 200},
+    });
+
+    performAllBatches();
+  });
+
+  ReactTestRenderer.act(() => {
+    component.getInstance()._onCellFocusCapture(3);
+  });
+
+  ReactTestRenderer.act(() => {
+    simulateScroll(component, {x: 0, y: 150});
+    performAllBatches();
+  });
+
+  const itemsWithoutFocused = [...items.slice(0, 3), ...items.slice(4)];
+  ReactTestRenderer.act(() => {
+    component.update(
+      <VirtualizedList
+        initialNumToRender={1}
+        windowSize={1}
+        {...baseItemProps(itemsWithoutFocused)}
+        {...fixedHeightItemLayoutProps(ITEM_HEIGHT)}
+      />,
+    );
+  });
+
+  // Cells 1-8 should no longer be rendered
+  expect(component).toMatchSnapshot();
+});
+
 function generateItems(count) {
   return Array(count)
     .fill()
@@ -1559,7 +1974,11 @@ function simulateContentLayout(component, dimensions) {
 
 function simulateCellLayout(component, items, itemIndex, dimensions) {
   const instance = component.getInstance();
-  const cellKey = instance._keyExtractor(items[itemIndex], itemIndex);
+  const cellKey = instance._keyExtractor(
+    items[itemIndex],
+    itemIndex,
+    instance.props,
+  );
   instance._onCellLayout(
     {nativeEvent: {layout: dimensions, zoomScale: 1}},
     cellKey,
diff --git a/Libraries/Lists/__tests__/VirtualizedSectionList-test.js b/Libraries/Lists/__tests__/VirtualizedSectionList-test.js
index dbba7f9b3eb7..d103fa5c680e 100644
--- a/Libraries/Lists/__tests__/VirtualizedSectionList-test.js
+++ b/Libraries/Lists/__tests__/VirtualizedSectionList-test.js
@@ -4,18 +4,17 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
  * @flow
- * @emails oncall+react_native
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
+const VirtualizedSectionList = require('../VirtualizedSectionList');
 const React = require('react');
 const ReactTestRenderer = require('react-test-renderer');
 
-const VirtualizedSectionList = require('../VirtualizedSectionList');
-
 describe('VirtualizedSectionList', () => {
   it('renders simple list', () => {
     const component = ReactTestRenderer.create(
diff --git a/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
index c8b33bb98df2..03e7c9533385 100644
--- a/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
@@ -58,6 +58,7 @@ exports[`FlatList renders all the bells and whistles 1`] = `
       <header />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <View
@@ -77,6 +78,7 @@ exports[`FlatList renders all the bells and whistles 1`] = `
       <separator />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <View
@@ -96,6 +98,7 @@ exports[`FlatList renders all the bells and whistles 1`] = `
       <separator />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <View
@@ -197,6 +200,7 @@ exports[`FlatList renders simple list (multiple columns) 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -216,6 +220,7 @@ exports[`FlatList renders simple list (multiple columns) 1`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -268,6 +273,7 @@ exports[`FlatList renders simple list 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -276,6 +282,7 @@ exports[`FlatList renders simple list 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -284,6 +291,7 @@ exports[`FlatList renders simple list 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -328,6 +336,7 @@ exports[`FlatList renders simple list using ListItemComponent (multiple columns)
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -347,6 +356,7 @@ exports[`FlatList renders simple list using ListItemComponent (multiple columns)
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -399,6 +409,7 @@ exports[`FlatList renders simple list using ListItemComponent 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -407,6 +418,7 @@ exports[`FlatList renders simple list using ListItemComponent 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -415,6 +427,7 @@ exports[`FlatList renders simple list using ListItemComponent 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
diff --git a/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
index 8e63455db938..ea1021883c1d 100644
--- a/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
@@ -37,10 +37,12 @@ exports[`SectionList rendering empty section headers is fine 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -49,6 +51,7 @@ exports[`SectionList rendering empty section headers is fine 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -57,6 +60,7 @@ exports[`SectionList rendering empty section headers is fine 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
@@ -94,6 +98,7 @@ exports[`SectionList renders a footer when there is no data 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -102,6 +107,7 @@ exports[`SectionList renders a footer when there is no data 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -143,10 +149,12 @@ exports[`SectionList renders a footer when there is no data and no header 1`] =
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -242,6 +250,7 @@ exports[`SectionList renders all the bells and whistles 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -250,6 +259,7 @@ exports[`SectionList renders all the bells and whistles 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -266,6 +276,7 @@ exports[`SectionList renders all the bells and whistles 1`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -279,6 +290,7 @@ exports[`SectionList renders all the bells and whistles 1`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -287,6 +299,7 @@ exports[`SectionList renders all the bells and whistles 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -295,6 +308,7 @@ exports[`SectionList renders all the bells and whistles 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -311,6 +325,7 @@ exports[`SectionList renders all the bells and whistles 1`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -324,6 +339,7 @@ exports[`SectionList renders all the bells and whistles 1`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -332,6 +348,7 @@ exports[`SectionList renders all the bells and whistles 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -340,6 +357,7 @@ exports[`SectionList renders all the bells and whistles 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -356,6 +374,7 @@ exports[`SectionList renders all the bells and whistles 1`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -369,6 +388,7 @@ exports[`SectionList renders all the bells and whistles 1`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
diff --git a/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap
index 7c8cbb8edd6f..0ff96454a0dd 100644
--- a/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap
@@ -70,6 +70,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when ListHeaderCom
       <Header />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -78,6 +79,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when ListHeaderCom
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -85,6 +87,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when ListHeaderCom
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -92,6 +95,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when ListHeaderCom
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -100,6 +104,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when ListHeaderCom
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -107,6 +112,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when ListHeaderCom
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -114,6 +120,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when ListHeaderCom
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -122,6 +129,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when ListHeaderCom
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -129,6 +137,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when ListHeaderCom
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -136,6 +145,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when ListHeaderCom
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -211,6 +221,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when all in initia
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -219,6 +230,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when all in initia
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -226,6 +238,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when all in initia
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -233,6 +246,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when all in initia
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -241,6 +255,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when all in initia
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -248,6 +263,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when all in initia
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -255,6 +271,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when all in initia
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -263,6 +280,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when all in initia
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -270,6 +288,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when all in initia
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -277,6 +296,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when all in initia
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -350,6 +370,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when partially in
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -358,6 +379,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when partially in
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -365,6 +387,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when partially in
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -372,6 +395,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when partially in
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -380,6 +404,7 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when partially in
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -424,6 +449,7 @@ exports[`VirtualizedList handles nested lists 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -453,6 +479,7 @@ exports[`VirtualizedList handles nested lists 1`] = `
         stickyHeaderIndices={Array []}
       >
         <View
+          onFocusCapture={[Function]}
           onLayout={[Function]}
           style={null}
         >
@@ -461,6 +488,7 @@ exports[`VirtualizedList handles nested lists 1`] = `
           />
         </View>
         <View
+          onFocusCapture={[Function]}
           onLayout={[Function]}
           style={null}
         >
@@ -471,6 +499,7 @@ exports[`VirtualizedList handles nested lists 1`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -501,6 +530,7 @@ exports[`VirtualizedList handles nested lists 1`] = `
       >
         <View>
           <View
+            onFocusCapture={[Function]}
             onLayout={[Function]}
             style={
               Array [
@@ -516,6 +546,7 @@ exports[`VirtualizedList handles nested lists 1`] = `
             />
           </View>
           <View
+            onFocusCapture={[Function]}
             onLayout={[Function]}
             style={
               Array [
@@ -568,6 +599,7 @@ exports[`VirtualizedList handles separators correctly 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -584,6 +616,7 @@ exports[`VirtualizedList handles separators correctly 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -600,6 +633,7 @@ exports[`VirtualizedList handles separators correctly 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -642,6 +676,7 @@ exports[`VirtualizedList handles separators correctly 2`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -658,6 +693,7 @@ exports[`VirtualizedList handles separators correctly 2`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -674,6 +710,7 @@ exports[`VirtualizedList handles separators correctly 2`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -716,6 +753,7 @@ exports[`VirtualizedList handles separators correctly 3`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -732,6 +770,7 @@ exports[`VirtualizedList handles separators correctly 3`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -749,6 +788,7 @@ exports[`VirtualizedList handles separators correctly 3`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -850,16 +890,15 @@ exports[`VirtualizedList keeps sticky headers above viewport visualized 1`] = `
     Array [
       0,
       2,
-      4,
-      7,
-      10,
-      13,
+      5,
+      8,
     ]
   }
   windowSize={1}
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -870,63 +909,28 @@ exports[`VirtualizedList keeps sticky headers above viewport visualized 1`] = `
     <View
       style={
         Object {
-          "height": 50,
+          "height": 110,
         }
       }
     />
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
         sticky={true}
-        value={6}
+        value={12}
       />
     </View>
     <View
       style={
         Object {
-          "height": 20,
+          "height": 10,
         }
       }
     />
     <View
-      style={null}
-    >
-      <MockCellItem
-        sticky={true}
-        value={9}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={10}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={11}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        sticky={true}
-        value={12}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={13}
-      />
-    </View>
-    <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -934,6 +938,7 @@ exports[`VirtualizedList keeps sticky headers above viewport visualized 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -942,6 +947,7 @@ exports[`VirtualizedList keeps sticky headers above viewport visualized 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -949,6 +955,7 @@ exports[`VirtualizedList keeps sticky headers above viewport visualized 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -956,6 +963,7 @@ exports[`VirtualizedList keeps sticky headers above viewport visualized 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -964,6 +972,7 @@ exports[`VirtualizedList keeps sticky headers above viewport visualized 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1053,6 +1062,7 @@ exports[`VirtualizedList renders all the bells and whistles 1`] = `
       <header />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={
         Array [
           Object {
@@ -1074,6 +1084,7 @@ exports[`VirtualizedList renders all the bells and whistles 1`] = `
       <separator />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={
         Array [
           Object {
@@ -1095,6 +1106,7 @@ exports[`VirtualizedList renders all the bells and whistles 1`] = `
       <separator />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={
         Array [
           Object {
@@ -1116,6 +1128,7 @@ exports[`VirtualizedList renders all the bells and whistles 1`] = `
       <separator />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={
         Array [
           Object {
@@ -1137,6 +1150,7 @@ exports[`VirtualizedList renders all the bells and whistles 1`] = `
       <separator />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={
         Array [
           Object {
@@ -1274,6 +1288,7 @@ exports[`VirtualizedList renders list with empty component 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -1334,6 +1349,7 @@ exports[`VirtualizedList renders simple list 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -1342,6 +1358,7 @@ exports[`VirtualizedList renders simple list 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -1350,6 +1367,7 @@ exports[`VirtualizedList renders simple list 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -1391,6 +1409,7 @@ exports[`VirtualizedList renders simple list using ListItemComponent 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -1399,6 +1418,7 @@ exports[`VirtualizedList renders simple list using ListItemComponent 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -1407,6 +1427,7 @@ exports[`VirtualizedList renders simple list using ListItemComponent 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -1481,6 +1502,7 @@ exports[`VirtualizedList renders sticky headers in viewport on batched render 1`
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1489,6 +1511,7 @@ exports[`VirtualizedList renders sticky headers in viewport on batched render 1`
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1496,6 +1519,7 @@ exports[`VirtualizedList renders sticky headers in viewport on batched render 1`
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1503,6 +1527,7 @@ exports[`VirtualizedList renders sticky headers in viewport on batched render 1`
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1511,6 +1536,7 @@ exports[`VirtualizedList renders sticky headers in viewport on batched render 1`
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1552,6 +1578,7 @@ exports[`VirtualizedList test getItem functionality where data is not an Array 1
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -1588,6 +1615,7 @@ exports[`VirtualizedList warns if both renderItem or ListItemComponent are speci
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -1686,6 +1714,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1693,6 +1722,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1700,6 +1730,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1707,6 +1738,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1714,6 +1746,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1721,6 +1754,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1728,6 +1762,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1735,6 +1770,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1742,6 +1778,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1749,6 +1786,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1756,6 +1794,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1763,6 +1802,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1770,6 +1810,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1777,6 +1818,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1784,6 +1826,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1791,6 +1834,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1798,6 +1842,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1805,6 +1850,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1812,6 +1858,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1819,6 +1866,7 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1829,6 +1877,174 @@ exports[`adjusts render area with non-zero initialScrollIndex 1`] = `
 </RCTScrollView>
 `;
 
+exports[`clamps render area when items removed for initialScrollIndex > 0 and scroller position not yet known 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+      Object {
+        "key": 10,
+      },
+      Object {
+        "key": 11,
+      },
+      Object {
+        "key": 12,
+      },
+      Object {
+        "key": 13,
+      },
+      Object {
+        "key": 14,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={5}
+  initialScrollIndex={14}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={10}
+>
+  <View>
+    <View
+      style={
+        Object {
+          "height": 40,
+        }
+      }
+    />
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={6}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={7}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={8}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={9}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={10}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={11}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={12}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={13}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={14}
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
 exports[`constrains batch render region when an item is removed 1`] = `
 <RCTScrollView
   data={
@@ -1868,6 +2084,7 @@ exports[`constrains batch render region when an item is removed 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1875,6 +2092,7 @@ exports[`constrains batch render region when an item is removed 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1882,6 +2100,7 @@ exports[`constrains batch render region when an item is removed 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1889,6 +2108,7 @@ exports[`constrains batch render region when an item is removed 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1896,6 +2116,7 @@ exports[`constrains batch render region when an item is removed 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -1993,46 +2214,12 @@ exports[`discards intitial render if initialScrollIndex != 0 1`] = `
     <View
       style={
         Object {
-          "height": 90,
+          "height": 140,
         }
       }
     />
     <View
-      style={null}
-    >
-      <MockCellItem
-        value={9}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={10}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={11}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={12}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={13}
-      />
-    </View>
-    <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2040,6 +2227,7 @@ exports[`discards intitial render if initialScrollIndex != 0 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2047,6 +2235,7 @@ exports[`discards intitial render if initialScrollIndex != 0 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2054,6 +2243,7 @@ exports[`discards intitial render if initialScrollIndex != 0 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2061,6 +2251,7 @@ exports[`discards intitial render if initialScrollIndex != 0 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2068,6 +2259,7 @@ exports[`discards intitial render if initialScrollIndex != 0 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2162,6 +2354,7 @@ exports[`does not adjust render area until content area layed out 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2169,6 +2362,7 @@ exports[`does not adjust render area until content area layed out 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2176,6 +2370,7 @@ exports[`does not adjust render area until content area layed out 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2183,6 +2378,7 @@ exports[`does not adjust render area until content area layed out 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2190,6 +2386,7 @@ exports[`does not adjust render area until content area layed out 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2207,7 +2404,7 @@ exports[`does not adjust render area until content area layed out 1`] = `
 </RCTScrollView>
 `;
 
-exports[`does not over-render when there is less than initialNumToRender cells 1`] = `
+exports[`does not move render area when initialScrollIndex is > 0 and offset not yet known 1`] = `
 <RCTScrollView
   data={
     Array [
@@ -2241,33 +2438,65 @@ exports[`does not over-render when there is less than initialNumToRender cells 1
       Object {
         "key": 9,
       },
-    ]
-  }
-  getItem={[Function]}
-  getItemCount={[Function]}
-  getItemLayout={[Function]}
-  initialNumToRender={20}
-  initialScrollIndex={4}
-  onContentSizeChange={[Function]}
-  onLayout={[Function]}
-  onMomentumScrollBegin={[Function]}
-  onMomentumScrollEnd={[Function]}
-  onScroll={[Function]}
-  onScrollBeginDrag={[Function]}
-  onScrollEndDrag={[Function]}
-  renderItem={[Function]}
-  scrollEventThrottle={50}
-  stickyHeaderIndices={Array []}
->
-  <View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={0}
-      />
-    </View>
+      Object {
+        "key": 10,
+      },
+      Object {
+        "key": 11,
+      },
+      Object {
+        "key": 12,
+      },
+      Object {
+        "key": 13,
+      },
+      Object {
+        "key": 14,
+      },
+      Object {
+        "key": 15,
+      },
+      Object {
+        "key": 16,
+      },
+      Object {
+        "key": 17,
+      },
+      Object {
+        "key": 18,
+      },
+      Object {
+        "key": 19,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={5}
+  initialScrollIndex={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={10}
+>
+  <View>
+    <View
+      style={
+        Object {
+          "height": 10,
+        }
+      }
+    />
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2275,6 +2504,7 @@ exports[`does not over-render when there is less than initialNumToRender cells 1
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2282,6 +2512,7 @@ exports[`does not over-render when there is less than initialNumToRender cells 1
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2289,6 +2520,94 @@ exports[`does not over-render when there is less than initialNumToRender cells 1
       />
     </View>
     <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 140,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`does not over-render when there is less than initialNumToRender cells 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={20}
+  initialScrollIndex={4}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      style={
+        Object {
+          "height": 40,
+        }
+      }
+    />
+    <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2296,6 +2615,7 @@ exports[`does not over-render when there is less than initialNumToRender cells 1
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2303,6 +2623,7 @@ exports[`does not over-render when there is less than initialNumToRender cells 1
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2310,6 +2631,7 @@ exports[`does not over-render when there is less than initialNumToRender cells 1
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2317,6 +2639,7 @@ exports[`does not over-render when there is less than initialNumToRender cells 1
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2324,6 +2647,7 @@ exports[`does not over-render when there is less than initialNumToRender cells 1
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2391,6 +2715,7 @@ exports[`eventually renders all items when virtualization disabled 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2398,6 +2723,7 @@ exports[`eventually renders all items when virtualization disabled 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2405,6 +2731,7 @@ exports[`eventually renders all items when virtualization disabled 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2412,6 +2739,7 @@ exports[`eventually renders all items when virtualization disabled 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2419,6 +2747,7 @@ exports[`eventually renders all items when virtualization disabled 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2426,6 +2755,7 @@ exports[`eventually renders all items when virtualization disabled 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2433,6 +2763,7 @@ exports[`eventually renders all items when virtualization disabled 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2440,6 +2771,7 @@ exports[`eventually renders all items when virtualization disabled 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2447,6 +2779,7 @@ exports[`eventually renders all items when virtualization disabled 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2454,6 +2787,7 @@ exports[`eventually renders all items when virtualization disabled 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2519,34 +2853,14 @@ exports[`expands first in viewport to render up to maxToRenderPerBatch on initia
 >
   <View>
     <View
-      style={null}
-    >
-      <MockCellItem
-        value={0}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={1}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={2}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={3}
-      />
-    </View>
+      style={
+        Object {
+          "height": 40,
+        }
+      }
+    />
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2554,6 +2868,7 @@ exports[`expands first in viewport to render up to maxToRenderPerBatch on initia
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2655,6 +2970,7 @@ exports[`expands render area by maxToRenderPerBatch on tick 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2662,6 +2978,7 @@ exports[`expands render area by maxToRenderPerBatch on tick 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2669,6 +2986,7 @@ exports[`expands render area by maxToRenderPerBatch on tick 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2676,6 +2994,7 @@ exports[`expands render area by maxToRenderPerBatch on tick 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2683,6 +3002,7 @@ exports[`expands render area by maxToRenderPerBatch on tick 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2690,6 +3010,7 @@ exports[`expands render area by maxToRenderPerBatch on tick 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2697,6 +3018,7 @@ exports[`expands render area by maxToRenderPerBatch on tick 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2714,7 +3036,7 @@ exports[`expands render area by maxToRenderPerBatch on tick 1`] = `
 </RCTScrollView>
 `;
 
-exports[`renders a zero-height tail spacer on initial render if getItemLayout not defined 1`] = `
+exports[`gracefully handles negaitve initialScrollIndex 1`] = `
 <RCTScrollView
   data={
     Array [
@@ -2752,7 +3074,9 @@ exports[`renders a zero-height tail spacer on initial render if getItemLayout no
   }
   getItem={[Function]}
   getItemCount={[Function]}
-  initialNumToRender={3}
+  getItemLayout={[Function]}
+  initialNumToRender={4}
+  initialScrollIndex={-1}
   onContentSizeChange={[Function]}
   onLayout={[Function]}
   onMomentumScrollBegin={[Function]}
@@ -2766,7 +3090,7 @@ exports[`renders a zero-height tail spacer on initial render if getItemLayout no
 >
   <View>
     <View
-      onLayout={[Function]}
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2774,7 +3098,7 @@ exports[`renders a zero-height tail spacer on initial render if getItemLayout no
       />
     </View>
     <View
-      onLayout={[Function]}
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2782,17 +3106,25 @@ exports[`renders a zero-height tail spacer on initial render if getItemLayout no
       />
     </View>
     <View
-      onLayout={[Function]}
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
         value={2}
       />
     </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
     <View
       style={
         Object {
-          "height": 0,
+          "height": 60,
         }
       }
     />
@@ -2800,7 +3132,7 @@ exports[`renders a zero-height tail spacer on initial render if getItemLayout no
 </RCTScrollView>
 `;
 
-exports[`renders full tail spacer if all cells measured 1`] = `
+exports[`initially renders nothing when initialNumToRender is 0 1`] = `
 <RCTScrollView
   data={
     Array [
@@ -2838,8 +3170,8 @@ exports[`renders full tail spacer if all cells measured 1`] = `
   }
   getItem={[Function]}
   getItemCount={[Function]}
-  initialNumToRender={3}
-  maxToRenderPerBatch={1}
+  getItemLayout={[Function]}
+  initialNumToRender={0}
   onContentSizeChange={[Function]}
   onLayout={[Function]}
   onMomentumScrollBegin={[Function]}
@@ -2850,53 +3182,12 @@ exports[`renders full tail spacer if all cells measured 1`] = `
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  windowSize={1}
 >
   <View>
-    <View
-      onLayout={[Function]}
-      style={null}
-    >
-      <MockCellItem
-        value={0}
-      />
-    </View>
-    <View
-      onLayout={[Function]}
-      style={null}
-    >
-      <MockCellItem
-        value={1}
-      />
-    </View>
-    <View
-      onLayout={[Function]}
-      style={null}
-    >
-      <MockCellItem
-        value={2}
-      />
-    </View>
-    <View
-      onLayout={[Function]}
-      style={null}
-    >
-      <MockCellItem
-        value={3}
-      />
-    </View>
-    <View
-      onLayout={[Function]}
-      style={null}
-    >
-      <MockCellItem
-        value={4}
-      />
-    </View>
     <View
       style={
         Object {
-          "height": 50,
+          "height": 100,
         }
       }
     />
@@ -2904,7 +3195,7 @@ exports[`renders full tail spacer if all cells measured 1`] = `
 </RCTScrollView>
 `;
 
-exports[`renders initialNumToRender cells when virtualization disabled 1`] = `
+exports[`keeps viewport above last focused rendered 1`] = `
 <RCTScrollView
   data={
     Array [
@@ -2938,27 +3229,529 @@ exports[`renders initialNumToRender cells when virtualization disabled 1`] = `
       Object {
         "key": 9,
       },
-    ]
-  }
-  disableVirtualization={true}
-  getItem={[Function]}
-  getItemCount={[Function]}
-  getItemLayout={[Function]}
-  initialNumToRender={5}
-  initialScrollIndex={1}
-  onContentSizeChange={[Function]}
-  onLayout={[Function]}
-  onMomentumScrollBegin={[Function]}
-  onMomentumScrollEnd={[Function]}
-  onScroll={[Function]}
-  onScrollBeginDrag={[Function]}
-  onScrollEndDrag={[Function]}
+      Object {
+        "key": 10,
+      },
+      Object {
+        "key": 11,
+      },
+      Object {
+        "key": 12,
+      },
+      Object {
+        "key": 13,
+      },
+      Object {
+        "key": 14,
+      },
+      Object {
+        "key": 15,
+      },
+      Object {
+        "key": 16,
+      },
+      Object {
+        "key": 17,
+      },
+      Object {
+        "key": 18,
+      },
+      Object {
+        "key": 19,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={1}
+>
+  <View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 70,
+        }
+      }
+    />
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={12}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={13}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={14}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={15}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={16}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={17}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={18}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={19}
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`keeps viewport below last focused rendered 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+      Object {
+        "key": 10,
+      },
+      Object {
+        "key": 11,
+      },
+      Object {
+        "key": 12,
+      },
+      Object {
+        "key": 13,
+      },
+      Object {
+        "key": 14,
+      },
+      Object {
+        "key": 15,
+      },
+      Object {
+        "key": 16,
+      },
+      Object {
+        "key": 17,
+      },
+      Object {
+        "key": 18,
+      },
+      Object {
+        "key": 19,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={1}
+>
+  <View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={6}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={7}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={8}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 50,
+        }
+      }
+    />
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={14}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={15}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={16}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={17}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={18}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={19}
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders a zero-height tail spacer on initial render if getItemLayout not defined 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  initialNumToRender={3}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 0,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders full tail spacer if all cells measured 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  initialNumToRender={3}
+  maxToRenderPerBatch={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
+  windowSize={1}
 >
   <View>
     <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2966,6 +3759,108 @@ exports[`renders initialNumToRender cells when virtualization disabled 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
+    <View
+      style={
+        Object {
+          "height": 50,
+        }
+      }
+    />
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders initialNumToRender cells when virtualization disabled 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  disableVirtualization={true}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={5}
+  initialScrollIndex={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2973,6 +3868,7 @@ exports[`renders initialNumToRender cells when virtualization disabled 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2980,6 +3876,7 @@ exports[`renders initialNumToRender cells when virtualization disabled 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2987,6 +3884,7 @@ exports[`renders initialNumToRender cells when virtualization disabled 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -2994,6 +3892,7 @@ exports[`renders initialNumToRender cells when virtualization disabled 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3060,6 +3959,7 @@ exports[`renders items before initialScrollIndex on first batch tick when virtua
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3067,6 +3967,7 @@ exports[`renders items before initialScrollIndex on first batch tick when virtua
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3074,6 +3975,7 @@ exports[`renders items before initialScrollIndex on first batch tick when virtua
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3081,6 +3983,7 @@ exports[`renders items before initialScrollIndex on first batch tick when virtua
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3088,6 +3991,7 @@ exports[`renders items before initialScrollIndex on first batch tick when virtua
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3095,24 +3999,174 @@ exports[`renders items before initialScrollIndex on first batch tick when virtua
       />
     </View>
     <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={5}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={6}
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders new items when data is updated with non-zero initialScrollIndex 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+    ]
+  }
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={5}
+  initialScrollIndex={1}
+  maxToRenderPerBatch={10}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+  windowSize={10}
+>
+  <View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={1}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={2}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+  </View>
+</RCTScrollView>
+`;
+
+exports[`renders no spacers up to initialScrollIndex on first render when virtualization disabled 1`] = `
+<RCTScrollView
+  data={
+    Array [
+      Object {
+        "key": 0,
+      },
+      Object {
+        "key": 1,
+      },
+      Object {
+        "key": 2,
+      },
+      Object {
+        "key": 3,
+      },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
+    ]
+  }
+  disableVirtualization={true}
+  getItem={[Function]}
+  getItemCount={[Function]}
+  getItemLayout={[Function]}
+  initialNumToRender={2}
+  initialScrollIndex={4}
+  maxToRenderPerBatch={1}
+  onContentSizeChange={[Function]}
+  onLayout={[Function]}
+  onMomentumScrollBegin={[Function]}
+  onMomentumScrollEnd={[Function]}
+  onScroll={[Function]}
+  onScrollBeginDrag={[Function]}
+  onScrollEndDrag={[Function]}
+  renderItem={[Function]}
+  scrollEventThrottle={50}
+  stickyHeaderIndices={Array []}
+>
+  <View>
+    <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={5}
+        value={4}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={6}
+        value={5}
       />
     </View>
   </View>
 </RCTScrollView>
 `;
 
-exports[`renders new items when data is updated with non-zero initialScrollIndex 1`] = `
+exports[`renders offset cells in initial render when initialScrollIndex set 1`] = `
 <RCTScrollView
   data={
     Array [
@@ -3128,14 +4182,31 @@ exports[`renders new items when data is updated with non-zero initialScrollIndex
       Object {
         "key": 3,
       },
+      Object {
+        "key": 4,
+      },
+      Object {
+        "key": 5,
+      },
+      Object {
+        "key": 6,
+      },
+      Object {
+        "key": 7,
+      },
+      Object {
+        "key": 8,
+      },
+      Object {
+        "key": 9,
+      },
     ]
   }
   getItem={[Function]}
   getItemCount={[Function]}
   getItemLayout={[Function]}
-  initialNumToRender={5}
-  initialScrollIndex={1}
-  maxToRenderPerBatch={10}
+  initialNumToRender={4}
+  initialScrollIndex={4}
   onContentSizeChange={[Function]}
   onLayout={[Function]}
   onMomentumScrollBegin={[Function]}
@@ -3146,42 +4217,59 @@ exports[`renders new items when data is updated with non-zero initialScrollIndex
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  windowSize={10}
 >
   <View>
     <View
+      style={
+        Object {
+          "height": 40,
+        }
+      }
+    />
+    <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={0}
+        value={4}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={1}
+        value={5}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={2}
+        value={6}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={3}
+        value={7}
       />
     </View>
+    <View
+      style={
+        Object {
+          "height": 20,
+        }
+      }
+    />
   </View>
 </RCTScrollView>
 `;
 
-exports[`renders no spacers up to initialScrollIndex on first render when virtualization disabled 1`] = `
+exports[`renders tail spacer up to last measured index if getItemLayout not defined 1`] = `
 <RCTScrollView
   data={
     Array [
@@ -3217,12 +4305,9 @@ exports[`renders no spacers up to initialScrollIndex on first render when virtua
       },
     ]
   }
-  disableVirtualization={true}
   getItem={[Function]}
   getItemCount={[Function]}
-  getItemLayout={[Function]}
-  initialNumToRender={2}
-  initialScrollIndex={4}
+  initialNumToRender={3}
   maxToRenderPerBatch={1}
   onContentSizeChange={[Function]}
   onLayout={[Function]}
@@ -3234,27 +4319,66 @@ exports[`renders no spacers up to initialScrollIndex on first render when virtua
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
+  windowSize={1}
 >
   <View>
     <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
       style={null}
     >
       <MockCellItem
-        value={4}
+        value={0}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={1}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
       style={null}
     >
       <MockCellItem
-        value={5}
+        value={2}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={3}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={4}
       />
     </View>
+    <View
+      style={
+        Object {
+          "height": 20,
+        }
+      }
+    />
   </View>
 </RCTScrollView>
 `;
 
-exports[`renders offset cells in initial render when initialScrollIndex set 1`] = `
+exports[`renders tail spacer up to last measured with irregular layout when getItemLayout undefined 1`] = `
 <RCTScrollView
   data={
     Array [
@@ -3292,9 +4416,8 @@ exports[`renders offset cells in initial render when initialScrollIndex set 1`]
   }
   getItem={[Function]}
   getItemCount={[Function]}
-  getItemLayout={[Function]}
-  initialNumToRender={4}
-  initialScrollIndex={4}
+  initialNumToRender={3}
+  maxToRenderPerBatch={1}
   onContentSizeChange={[Function]}
   onLayout={[Function]}
   onMomentumScrollBegin={[Function]}
@@ -3305,9 +4428,12 @@ exports[`renders offset cells in initial render when initialScrollIndex set 1`]
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
+  windowSize={1}
 >
   <View>
     <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3315,6 +4441,8 @@ exports[`renders offset cells in initial render when initialScrollIndex set 1`]
       />
     </View>
     <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3322,6 +4450,8 @@ exports[`renders offset cells in initial render when initialScrollIndex set 1`]
       />
     </View>
     <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3329,44 +4459,18 @@ exports[`renders offset cells in initial render when initialScrollIndex set 1`]
       />
     </View>
     <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
       style={null}
     >
       <MockCellItem
         value={3}
       />
     </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={4}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={5}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={6}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={7}
-      />
-    </View>
     <View
       style={
         Object {
-          "height": 20,
+          "height": 17,
         }
       }
     />
@@ -3374,7 +4478,7 @@ exports[`renders offset cells in initial render when initialScrollIndex set 1`]
 </RCTScrollView>
 `;
 
-exports[`renders tail spacer up to last measured index if getItemLayout not defined 1`] = `
+exports[`renders windowSize derived region at bottom 1`] = `
 <RCTScrollView
   data={
     Array [
@@ -3412,7 +4516,8 @@ exports[`renders tail spacer up to last measured index if getItemLayout not defi
   }
   getItem={[Function]}
   getItemCount={[Function]}
-  initialNumToRender={3}
+  getItemLayout={[Function]}
+  initialNumToRender={1}
   maxToRenderPerBatch={1}
   onContentSizeChange={[Function]}
   onLayout={[Function]}
@@ -3424,11 +4529,11 @@ exports[`renders tail spacer up to last measured index if getItemLayout not defi
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  windowSize={1}
+  windowSize={3}
 >
   <View>
     <View
-      onLayout={[Function]}
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3436,49 +4541,57 @@ exports[`renders tail spacer up to last measured index if getItemLayout not defi
       />
     </View>
     <View
-      onLayout={[Function]}
+      style={
+        Object {
+          "height": 40,
+        }
+      }
+    />
+    <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={1}
+        value={5}
       />
     </View>
     <View
-      onLayout={[Function]}
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={2}
+        value={6}
       />
     </View>
     <View
-      onLayout={[Function]}
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={3}
+        value={7}
       />
     </View>
     <View
-      onLayout={[Function]}
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={4}
+        value={8}
       />
     </View>
     <View
-      style={
-        Object {
-          "height": 20,
-        }
-      }
-    />
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={9}
+      />
+    </View>
   </View>
 </RCTScrollView>
 `;
 
-exports[`renders tail spacer up to last measured with irregular layout when getItemLayout undefined 1`] = `
+exports[`renders windowSize derived region at top 1`] = `
 <RCTScrollView
   data={
     Array [
@@ -3516,7 +4629,8 @@ exports[`renders tail spacer up to last measured with irregular layout when getI
   }
   getItem={[Function]}
   getItemCount={[Function]}
-  initialNumToRender={3}
+  getItemLayout={[Function]}
+  initialNumToRender={1}
   maxToRenderPerBatch={1}
   onContentSizeChange={[Function]}
   onLayout={[Function]}
@@ -3528,11 +4642,11 @@ exports[`renders tail spacer up to last measured with irregular layout when getI
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  windowSize={1}
+  windowSize={3}
 >
   <View>
     <View
-      onLayout={[Function]}
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3540,7 +4654,7 @@ exports[`renders tail spacer up to last measured with irregular layout when getI
       />
     </View>
     <View
-      onLayout={[Function]}
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3548,7 +4662,7 @@ exports[`renders tail spacer up to last measured with irregular layout when getI
       />
     </View>
     <View
-      onLayout={[Function]}
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3556,7 +4670,7 @@ exports[`renders tail spacer up to last measured with irregular layout when getI
       />
     </View>
     <View
-      onLayout={[Function]}
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3566,7 +4680,7 @@ exports[`renders tail spacer up to last measured with irregular layout when getI
     <View
       style={
         Object {
-          "height": 18,
+          "height": 60,
         }
       }
     />
@@ -3574,7 +4688,7 @@ exports[`renders tail spacer up to last measured with irregular layout when getI
 </RCTScrollView>
 `;
 
-exports[`renders windowSize derived region at bottom 1`] = `
+exports[`renders windowSize derived region in middle 1`] = `
 <RCTScrollView
   data={
     Array [
@@ -3629,6 +4743,7 @@ exports[`renders windowSize derived region at bottom 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3638,50 +4753,78 @@ exports[`renders windowSize derived region at bottom 1`] = `
     <View
       style={
         Object {
-          "height": 40,
+          "height": 10,
         }
       }
     />
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={5}
+        value={2}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={6}
+        value={3}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={7}
+        value={4}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={8}
+        value={5}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={9}
+        value={6}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={7}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={8}
       />
     </View>
+    <View
+      style={
+        Object {
+          "height": 10,
+        }
+      }
+    />
   </View>
 </RCTScrollView>
 `;
 
-exports[`renders windowSize derived region at top 1`] = `
+exports[`renders zero-height tail spacer on batch render if cells not yet measured and getItemLayout not defined 1`] = `
 <RCTScrollView
   data={
     Array [
@@ -3719,8 +4862,7 @@ exports[`renders windowSize derived region at top 1`] = `
   }
   getItem={[Function]}
   getItemCount={[Function]}
-  getItemLayout={[Function]}
-  initialNumToRender={1}
+  initialNumToRender={3}
   maxToRenderPerBatch={1}
   onContentSizeChange={[Function]}
   onLayout={[Function]}
@@ -3732,10 +4874,12 @@ exports[`renders windowSize derived region at top 1`] = `
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  windowSize={3}
+  windowSize={1}
 >
   <View>
     <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3743,6 +4887,8 @@ exports[`renders windowSize derived region at top 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3750,23 +4896,18 @@ exports[`renders windowSize derived region at top 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
+      onLayout={[Function]}
       style={null}
     >
       <MockCellItem
         value={2}
       />
     </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={3}
-      />
-    </View>
     <View
       style={
         Object {
-          "height": 60,
+          "height": 0,
         }
       }
     />
@@ -3774,7 +4915,7 @@ exports[`renders windowSize derived region at top 1`] = `
 </RCTScrollView>
 `;
 
-exports[`renders windowSize derived region in middle 1`] = `
+exports[`retains batch render region when an item is appended 1`] = `
 <RCTScrollView
   data={
     Array [
@@ -3808,6 +4949,9 @@ exports[`renders windowSize derived region in middle 1`] = `
       Object {
         "key": 9,
       },
+      Object {
+        "key": 10,
+      },
     ]
   }
   getItem={[Function]}
@@ -3825,24 +4969,26 @@ exports[`renders windowSize derived region in middle 1`] = `
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  windowSize={3}
 >
   <View>
     <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={0}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={0}
+        value={1}
       />
     </View>
     <View
-      style={
-        Object {
-          "height": 10,
-        }
-      }
-    />
-    <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3850,6 +4996,7 @@ exports[`renders windowSize derived region in middle 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3857,6 +5004,7 @@ exports[`renders windowSize derived region in middle 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3864,6 +5012,7 @@ exports[`renders windowSize derived region in middle 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3871,6 +5020,7 @@ exports[`renders windowSize derived region in middle 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3878,6 +5028,7 @@ exports[`renders windowSize derived region in middle 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3885,12 +5036,21 @@ exports[`renders windowSize derived region in middle 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
         value={8}
       />
     </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={9}
+      />
+    </View>
     <View
       style={
         Object {
@@ -3902,7 +5062,7 @@ exports[`renders windowSize derived region in middle 1`] = `
 </RCTScrollView>
 `;
 
-exports[`renders zero-height tail spacer on batch render if cells not yet measured and getItemLayout not defined 1`] = `
+exports[`retains initial render region when an item is appended 1`] = `
 <RCTScrollView
   data={
     Array [
@@ -3936,12 +5096,15 @@ exports[`renders zero-height tail spacer on batch render if cells not yet measur
       Object {
         "key": 9,
       },
+      Object {
+        "key": 10,
+      },
     ]
   }
   getItem={[Function]}
   getItemCount={[Function]}
+  getItemLayout={[Function]}
   initialNumToRender={3}
-  maxToRenderPerBatch={1}
   onContentSizeChange={[Function]}
   onLayout={[Function]}
   onMomentumScrollBegin={[Function]}
@@ -3952,11 +5115,10 @@ exports[`renders zero-height tail spacer on batch render if cells not yet measur
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
-  windowSize={1}
 >
   <View>
     <View
-      onLayout={[Function]}
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3964,7 +5126,7 @@ exports[`renders zero-height tail spacer on batch render if cells not yet measur
       />
     </View>
     <View
-      onLayout={[Function]}
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3972,7 +5134,7 @@ exports[`renders zero-height tail spacer on batch render if cells not yet measur
       />
     </View>
     <View
-      onLayout={[Function]}
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -3982,7 +5144,7 @@ exports[`renders zero-height tail spacer on batch render if cells not yet measur
     <View
       style={
         Object {
-          "height": 0,
+          "height": 80,
         }
       }
     />
@@ -3990,7 +5152,7 @@ exports[`renders zero-height tail spacer on batch render if cells not yet measur
 </RCTScrollView>
 `;
 
-exports[`retains batch render region when an item is appended 1`] = `
+exports[`retains intitial render if initialScrollIndex == 0 1`] = `
 <RCTScrollView
   data={
     Array [
@@ -4027,13 +5189,40 @@ exports[`retains batch render region when an item is appended 1`] = `
       Object {
         "key": 10,
       },
+      Object {
+        "key": 11,
+      },
+      Object {
+        "key": 12,
+      },
+      Object {
+        "key": 13,
+      },
+      Object {
+        "key": 14,
+      },
+      Object {
+        "key": 15,
+      },
+      Object {
+        "key": 16,
+      },
+      Object {
+        "key": 17,
+      },
+      Object {
+        "key": 18,
+      },
+      Object {
+        "key": 19,
+      },
     ]
   }
   getItem={[Function]}
   getItemCount={[Function]}
   getItemLayout={[Function]}
-  initialNumToRender={1}
-  maxToRenderPerBatch={1}
+  initialNumToRender={5}
+  initialScrollIndex={0}
   onContentSizeChange={[Function]}
   onLayout={[Function]}
   onMomentumScrollBegin={[Function]}
@@ -4044,9 +5233,11 @@ exports[`retains batch render region when an item is appended 1`] = `
   renderItem={[Function]}
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
+  windowSize={1}
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4054,6 +5245,7 @@ exports[`retains batch render region when an item is appended 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4061,6 +5253,7 @@ exports[`retains batch render region when an item is appended 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4068,6 +5261,7 @@ exports[`retains batch render region when an item is appended 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4075,6 +5269,7 @@ exports[`retains batch render region when an item is appended 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4082,57 +5277,71 @@ exports[`retains batch render region when an item is appended 1`] = `
       />
     </View>
     <View
+      style={
+        Object {
+          "height": 90,
+        }
+      }
+    />
+    <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={5}
+        value={14}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={6}
+        value={15}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={7}
+        value={16}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={8}
+        value={17}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={9}
+        value={18}
       />
     </View>
     <View
-      style={
-        Object {
-          "height": 10,
-        }
-      }
-    />
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={19}
+      />
+    </View>
   </View>
 </RCTScrollView>
 `;
 
-exports[`retains initial render region when an item is appended 1`] = `
+exports[`unmounts sticky headers moved below viewport 1`] = `
 <RCTScrollView
   data={
     Array [
       Object {
         "key": 0,
+        "sticky": true,
       },
       Object {
         "key": 1,
@@ -4142,6 +5351,7 @@ exports[`retains initial render region when an item is appended 1`] = `
       },
       Object {
         "key": 3,
+        "sticky": true,
       },
       Object {
         "key": 4,
@@ -4151,6 +5361,7 @@ exports[`retains initial render region when an item is appended 1`] = `
       },
       Object {
         "key": 6,
+        "sticky": true,
       },
       Object {
         "key": 7,
@@ -4160,16 +5371,47 @@ exports[`retains initial render region when an item is appended 1`] = `
       },
       Object {
         "key": 9,
+        "sticky": true,
       },
       Object {
         "key": 10,
       },
+      Object {
+        "key": 11,
+      },
+      Object {
+        "key": 12,
+        "sticky": true,
+      },
+      Object {
+        "key": 13,
+      },
+      Object {
+        "key": 14,
+      },
+      Object {
+        "key": 15,
+        "sticky": true,
+      },
+      Object {
+        "key": 16,
+      },
+      Object {
+        "key": 17,
+      },
+      Object {
+        "key": 18,
+        "sticky": true,
+      },
+      Object {
+        "key": 19,
+      },
     ]
   }
   getItem={[Function]}
   getItemCount={[Function]}
   getItemLayout={[Function]}
-  initialNumToRender={3}
+  initialNumToRender={1}
   onContentSizeChange={[Function]}
   onLayout={[Function]}
   onMomentumScrollBegin={[Function]}
@@ -4179,17 +5421,26 @@ exports[`retains initial render region when an item is appended 1`] = `
   onScrollEndDrag={[Function]}
   renderItem={[Function]}
   scrollEventThrottle={50}
-  stickyHeaderIndices={Array []}
+  stickyHeaderIndices={
+    Array [
+      0,
+      3,
+    ]
+  }
+  windowSize={1}
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
+        sticky={true}
         value={0}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4197,16 +5448,34 @@ exports[`retains initial render region when an item is appended 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
         value={2}
       />
     </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        sticky={true}
+        value={3}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={4}
+      />
+    </View>
     <View
       style={
         Object {
-          "height": 80,
+          "height": 150,
         }
       }
     />
@@ -4214,7 +5483,7 @@ exports[`retains initial render region when an item is appended 1`] = `
 </RCTScrollView>
 `;
 
-exports[`retains intitial render if initialScrollIndex == 0 1`] = `
+exports[`virtualizes away last focused index if item removed 1`] = `
 <RCTScrollView
   data={
     Array [
@@ -4227,9 +5496,6 @@ exports[`retains intitial render if initialScrollIndex == 0 1`] = `
       Object {
         "key": 2,
       },
-      Object {
-        "key": 3,
-      },
       Object {
         "key": 4,
       },
@@ -4283,8 +5549,7 @@ exports[`retains intitial render if initialScrollIndex == 0 1`] = `
   getItem={[Function]}
   getItemCount={[Function]}
   getItemLayout={[Function]}
-  initialNumToRender={5}
-  initialScrollIndex={0}
+  initialNumToRender={1}
   onContentSizeChange={[Function]}
   onLayout={[Function]}
   onMomentumScrollBegin={[Function]}
@@ -4299,48 +5564,22 @@ exports[`retains intitial render if initialScrollIndex == 0 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
         value={0}
       />
     </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={1}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={2}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={3}
-      />
-    </View>
-    <View
-      style={null}
-    >
-      <MockCellItem
-        value={4}
-      />
-    </View>
     <View
       style={
         Object {
-          "height": 40,
+          "height": 70,
         }
       }
     />
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4348,6 +5587,7 @@ exports[`retains intitial render if initialScrollIndex == 0 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4355,6 +5595,7 @@ exports[`retains intitial render if initialScrollIndex == 0 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4362,6 +5603,7 @@ exports[`retains intitial render if initialScrollIndex == 0 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4369,6 +5611,7 @@ exports[`retains intitial render if initialScrollIndex == 0 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4376,6 +5619,7 @@ exports[`retains intitial render if initialScrollIndex == 0 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4383,6 +5627,7 @@ exports[`retains intitial render if initialScrollIndex == 0 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4390,6 +5635,7 @@ exports[`retains intitial render if initialScrollIndex == 0 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4397,6 +5643,7 @@ exports[`retains intitial render if initialScrollIndex == 0 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4404,6 +5651,7 @@ exports[`retains intitial render if initialScrollIndex == 0 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4411,6 +5659,7 @@ exports[`retains intitial render if initialScrollIndex == 0 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
@@ -4421,13 +5670,12 @@ exports[`retains intitial render if initialScrollIndex == 0 1`] = `
 </RCTScrollView>
 `;
 
-exports[`unmounts sticky headers moved below viewport 1`] = `
+exports[`virtualizes away last focused item if focus changes to a new cell 1`] = `
 <RCTScrollView
   data={
     Array [
       Object {
         "key": 0,
-        "sticky": true,
       },
       Object {
         "key": 1,
@@ -4437,7 +5685,6 @@ exports[`unmounts sticky headers moved below viewport 1`] = `
       },
       Object {
         "key": 3,
-        "sticky": true,
       },
       Object {
         "key": 4,
@@ -4447,7 +5694,6 @@ exports[`unmounts sticky headers moved below viewport 1`] = `
       },
       Object {
         "key": 6,
-        "sticky": true,
       },
       Object {
         "key": 7,
@@ -4457,7 +5703,6 @@ exports[`unmounts sticky headers moved below viewport 1`] = `
       },
       Object {
         "key": 9,
-        "sticky": true,
       },
       Object {
         "key": 10,
@@ -4467,7 +5712,6 @@ exports[`unmounts sticky headers moved below viewport 1`] = `
       },
       Object {
         "key": 12,
-        "sticky": true,
       },
       Object {
         "key": 13,
@@ -4477,7 +5721,6 @@ exports[`unmounts sticky headers moved below viewport 1`] = `
       },
       Object {
         "key": 15,
-        "sticky": true,
       },
       Object {
         "key": 16,
@@ -4487,7 +5730,6 @@ exports[`unmounts sticky headers moved below viewport 1`] = `
       },
       Object {
         "key": 18,
-        "sticky": true,
       },
       Object {
         "key": 19,
@@ -4507,59 +5749,89 @@ exports[`unmounts sticky headers moved below viewport 1`] = `
   onScrollEndDrag={[Function]}
   renderItem={[Function]}
   scrollEventThrottle={50}
-  stickyHeaderIndices={
-    Array [
-      0,
-      3,
-    ]
-  }
+  stickyHeaderIndices={Array []}
   windowSize={1}
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        sticky={true}
         value={0}
       />
     </View>
     <View
+      style={
+        Object {
+          "height": 110,
+        }
+      }
+    />
+    <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={1}
+        value={12}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={2}
+        value={13}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        sticky={true}
-        value={3}
+        value={14}
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={null}
     >
       <MockCellItem
-        value={4}
+        value={15}
       />
     </View>
     <View
-      style={
-        Object {
-          "height": 150,
-        }
-      }
-    />
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={16}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={17}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={18}
+      />
+    </View>
+    <View
+      onFocusCapture={[Function]}
+      style={null}
+    >
+      <MockCellItem
+        value={19}
+      />
+    </View>
   </View>
 </RCTScrollView>
 `;
diff --git a/Libraries/Lists/__tests__/__snapshots__/VirtualizedSectionList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/VirtualizedSectionList-test.js.snap
index d0fc9fa107c2..9f2d41bf9aa5 100644
--- a/Libraries/Lists/__tests__/__snapshots__/VirtualizedSectionList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/VirtualizedSectionList-test.js.snap
@@ -33,10 +33,12 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -72,10 +74,12 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
         stickyHeaderIndices={Array []}
       >
         <View
+          onFocusCapture={[Function]}
           onLayout={[Function]}
           style={null}
         />
         <View
+          onFocusCapture={[Function]}
           onLayout={[Function]}
           style={null}
         >
@@ -84,6 +88,7 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
           />
         </View>
         <View
+          onFocusCapture={[Function]}
           onLayout={[Function]}
           style={null}
         >
@@ -92,12 +97,14 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
           />
         </View>
         <View
+          onFocusCapture={[Function]}
           onLayout={[Function]}
           style={null}
         />
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -134,6 +141,7 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
       >
         <View>
           <View
+            onFocusCapture={[Function]}
             onLayout={[Function]}
             style={
               Array [
@@ -145,6 +153,7 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
             }
           />
           <View
+            onFocusCapture={[Function]}
             onLayout={[Function]}
             style={
               Array [
@@ -160,6 +169,7 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
             />
           </View>
           <View
+            onFocusCapture={[Function]}
             onLayout={[Function]}
             style={
               Array [
@@ -175,6 +185,7 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
             />
           </View>
           <View
+            onFocusCapture={[Function]}
             onLayout={[Function]}
             style={
               Array [
@@ -189,6 +200,7 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
       </RCTScrollView>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
@@ -232,10 +244,12 @@ exports[`VirtualizedSectionList handles separators correctly 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -275,6 +289,7 @@ exports[`VirtualizedSectionList handles separators correctly 1`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -314,6 +329,7 @@ exports[`VirtualizedSectionList handles separators correctly 1`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -322,6 +338,7 @@ exports[`VirtualizedSectionList handles separators correctly 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
@@ -365,10 +382,12 @@ exports[`VirtualizedSectionList handles separators correctly 2`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -408,6 +427,7 @@ exports[`VirtualizedSectionList handles separators correctly 2`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -447,6 +467,7 @@ exports[`VirtualizedSectionList handles separators correctly 2`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -455,6 +476,7 @@ exports[`VirtualizedSectionList handles separators correctly 2`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
@@ -498,10 +520,12 @@ exports[`VirtualizedSectionList handles separators correctly 3`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -541,6 +565,7 @@ exports[`VirtualizedSectionList handles separators correctly 3`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -581,6 +606,7 @@ exports[`VirtualizedSectionList handles separators correctly 3`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -589,6 +615,7 @@ exports[`VirtualizedSectionList handles separators correctly 3`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
@@ -632,10 +659,12 @@ exports[`VirtualizedSectionList handles separators correctly 4`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -675,6 +704,7 @@ exports[`VirtualizedSectionList handles separators correctly 4`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -715,6 +745,7 @@ exports[`VirtualizedSectionList handles separators correctly 4`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -723,6 +754,7 @@ exports[`VirtualizedSectionList handles separators correctly 4`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
@@ -813,6 +845,7 @@ exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
       <header />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={
         Array [
           Object {
@@ -829,6 +862,7 @@ exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
       }
     />
     <View
+      onFocusCapture={[Function]}
       style={
         Array [
           Object {
@@ -852,6 +886,7 @@ exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       style={
         Array [
           Object {
@@ -875,6 +910,7 @@ exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       style={
         Array [
           Object {
@@ -898,6 +934,7 @@ exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       style={
         Array [
           Object {
@@ -921,6 +958,7 @@ exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
       </View>
     </View>
     <View
+      onFocusCapture={[Function]}
       style={
         Array [
           Object {
@@ -941,6 +979,7 @@ exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       style={
         Array [
           Object {
@@ -1062,10 +1101,12 @@ exports[`VirtualizedSectionList renders list with empty component 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -1074,6 +1115,7 @@ exports[`VirtualizedSectionList renders list with empty component 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
@@ -1117,10 +1159,12 @@ exports[`VirtualizedSectionList renders simple list 1`] = `
 >
   <View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -1129,6 +1173,7 @@ exports[`VirtualizedSectionList renders simple list 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -1137,6 +1182,7 @@ exports[`VirtualizedSectionList renders simple list 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     >
@@ -1145,6 +1191,7 @@ exports[`VirtualizedSectionList renders simple list 1`] = `
       />
     </View>
     <View
+      onFocusCapture={[Function]}
       onLayout={[Function]}
       style={null}
     />
diff --git a/Libraries/LogBox/Data/LogBoxData.js b/Libraries/LogBox/Data/LogBoxData.js
index 1fb9d59bbec1..6c5e160dfe0f 100644
--- a/Libraries/LogBox/Data/LogBoxData.js
+++ b/Libraries/LogBox/Data/LogBoxData.js
@@ -10,19 +10,20 @@
 
 ('use strict');
 
-import * as React from 'react';
-import LogBoxLog from './LogBoxLog';
-import {parseLogBoxException} from './parseLogBoxLog';
+import type {ExtendedError} from '../../Core/ExtendedError';
 import type {LogLevel} from './LogBoxLog';
 import type {
-  Message,
   Category,
   ComponentStack,
   ExtendedExceptionData,
+  Message,
 } from './parseLogBoxLog';
+
 import parseErrorStack from '../../Core/Devtools/parseErrorStack';
-import type {ExtendedError} from '../../Core/ExtendedError';
 import NativeLogBox from '../../NativeModules/specs/NativeLogBox';
+import LogBoxLog from './LogBoxLog';
+import {parseLogBoxException} from './parseLogBoxLog';
+import * as React from 'react';
 export type LogBoxLogs = Set<LogBoxLog>;
 export type LogData = $ReadOnly<{|
   level: LogLevel,
@@ -67,7 +68,7 @@ const observers: Set<{observer: Observer, ...}> = new Set();
 const ignorePatterns: Set<IgnorePattern> = new Set();
 let appInfo: ?() => AppInfo = null;
 let logs: LogBoxLogs = new Set();
-let updateTimeout = null;
+let updateTimeout: $FlowFixMe | null = null;
 let _isDisabled = false;
 let _selectedIndex = -1;
 
@@ -401,7 +402,7 @@ export function withSubscription(
   WrappedComponent: SubscribedComponent,
 ): React.AbstractComponent<{||}> {
   class LogBoxStateSubscription extends React.Component<Props, State> {
-    static getDerivedStateFromError() {
+    static getDerivedStateFromError(): {hasError: boolean} {
       return {hasError: true};
     }
 
@@ -413,7 +414,7 @@ export function withSubscription(
 
     _subscription: ?Subscription;
 
-    state = {
+    state: State = {
       logs: new Set(),
       isDisabled: false,
       hasError: false,
diff --git a/Libraries/LogBox/Data/LogBoxLog.js b/Libraries/LogBox/Data/LogBoxLog.js
index ab93448201c9..4c98e048c0c7 100644
--- a/Libraries/LogBox/Data/LogBoxLog.js
+++ b/Libraries/LogBox/Data/LogBoxLog.js
@@ -8,15 +8,15 @@
  * @format
  */
 
-import * as LogBoxSymbolication from './LogBoxSymbolication';
-
+import type {Stack} from './LogBoxSymbolication';
 import type {
   Category,
-  Message,
-  ComponentStack,
   CodeFrame,
+  ComponentStack,
+  Message,
 } from './parseLogBoxLog';
-import type {Stack} from './LogBoxSymbolication';
+
+import * as LogBoxSymbolication from './LogBoxSymbolication';
 
 type SymbolicationStatus = 'NONE' | 'PENDING' | 'COMPLETE' | 'FAILED';
 
diff --git a/Libraries/LogBox/Data/LogBoxSymbolication.js b/Libraries/LogBox/Data/LogBoxSymbolication.js
index bd235dd34f24..9e5aaa9ce566 100644
--- a/Libraries/LogBox/Data/LogBoxSymbolication.js
+++ b/Libraries/LogBox/Data/LogBoxSymbolication.js
@@ -8,10 +8,10 @@
  * @format
  */
 
-import symbolicateStackTrace from '../../Core/Devtools/symbolicateStackTrace';
-
-import type {StackFrame} from '../../Core/NativeExceptionsManager';
 import type {SymbolicatedStackTrace} from '../../Core/Devtools/symbolicateStackTrace';
+import type {StackFrame} from '../../Core/NativeExceptionsManager';
+
+import symbolicateStackTrace from '../../Core/Devtools/symbolicateStackTrace';
 
 export type Stack = Array<StackFrame>;
 
@@ -27,7 +27,7 @@ const sanitize = ({
   if (!Array.isArray(maybeStack)) {
     throw new Error('Expected stack to be an array.');
   }
-  const stack = [];
+  const stack: Array<StackFrame> = [];
   for (const maybeFrame of maybeStack) {
     let collapse = false;
     if ('collapse' in maybeFrame) {
diff --git a/Libraries/LogBox/Data/__tests__/LogBoxData-test.js b/Libraries/LogBox/Data/__tests__/LogBoxData-test.js
index 7b135b8d8739..e1a3d1e2bbe8 100644
--- a/Libraries/LogBox/Data/__tests__/LogBoxData-test.js
+++ b/Libraries/LogBox/Data/__tests__/LogBoxData-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
- * @format
  * @flow
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
@@ -16,8 +16,8 @@ jest.mock('../../../Core/Devtools/parseErrorStack', () => {
 
 jest.mock('../../../Core/ExceptionsManager');
 
-const LogBoxData = require('../LogBoxData');
 const ExceptionsManager: any = require('../../../Core/ExceptionsManager');
+const LogBoxData = require('../LogBoxData');
 
 const registry = () => {
   const observer = jest.fn();
diff --git a/Libraries/LogBox/Data/__tests__/LogBoxLog-test.js b/Libraries/LogBox/Data/__tests__/LogBoxLog-test.js
index bd26449ba0a9..2327492caf97 100644
--- a/Libraries/LogBox/Data/__tests__/LogBoxLog-test.js
+++ b/Libraries/LogBox/Data/__tests__/LogBoxLog-test.js
@@ -4,15 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
- * @format
  * @flow
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-import type {StackFrame} from '../../../Core/NativeExceptionsManager';
 import type {SymbolicatedStackTrace} from '../../../Core/Devtools/symbolicateStackTrace';
+import type {StackFrame} from '../../../Core/NativeExceptionsManager';
 
 jest.mock('../LogBoxSymbolication', () => {
   return {__esModule: true, symbolicate: jest.fn(), deleteStack: jest.fn()};
@@ -50,13 +50,17 @@ function getLogBoxSymbolication(): {|
 }
 
 const createStack = (methodNames: Array<string>) =>
-  methodNames.map(methodName => ({
+  methodNames.map((methodName): StackFrame => ({
     column: null,
     file: 'file://path/to/file.js',
     lineNumber: 1,
     methodName,
   }));
 
+// Adds a new task to the end of the microtask queue, so that awaiting this
+// function will run all queued immediates
+const runMicrotasks = async () => {};
+
 describe('LogBoxLog', () => {
   beforeEach(() => {
     jest.resetModules();
@@ -132,7 +136,7 @@ describe('LogBoxLog', () => {
     expect(getLogBoxSymbolication().symbolicate).not.toBeCalled();
   });
 
-  it('updates when symbolication finishes', () => {
+  it('updates when symbolication finishes', async () => {
     const log = getLogBoxLog();
 
     const callback = jest.fn();
@@ -141,7 +145,7 @@ describe('LogBoxLog', () => {
     expect(callback).toBeCalledWith('PENDING');
     expect(getLogBoxSymbolication().symbolicate).toBeCalled();
 
-    jest.runAllTicks();
+    await runMicrotasks();
 
     expect(callback).toBeCalledTimes(2);
     expect(callback).toBeCalledWith('COMPLETE');
@@ -156,13 +160,14 @@ describe('LogBoxLog', () => {
     getLogBoxSymbolication().symbolicate.mockClear();
 
     log.symbolicate(callback);
-    jest.runAllTicks();
+
+    await runMicrotasks();
 
     expect(callback).toBeCalledTimes(0);
     expect(getLogBoxSymbolication().symbolicate).not.toBeCalled();
   });
 
-  it('updates when symbolication fails', () => {
+  it('updates when symbolication fails', async () => {
     const error = new Error('...');
     getLogBoxSymbolication().symbolicate.mockImplementation(async stack => {
       throw error;
@@ -176,7 +181,7 @@ describe('LogBoxLog', () => {
     expect(callback).toBeCalledWith('PENDING');
     expect(getLogBoxSymbolication().symbolicate).toBeCalled();
 
-    jest.runAllTicks();
+    await runMicrotasks();
 
     expect(callback).toBeCalledTimes(2);
     expect(callback).toBeCalledWith('FAILED');
@@ -191,7 +196,8 @@ describe('LogBoxLog', () => {
     getLogBoxSymbolication().symbolicate.mockClear();
 
     log.symbolicate(callback);
-    jest.runAllTicks();
+
+    await runMicrotasks();
 
     expect(callback).toBeCalledTimes(0);
     expect(getLogBoxSymbolication().symbolicate).not.toBeCalled();
@@ -221,7 +227,7 @@ describe('LogBoxLog', () => {
     expect(getLogBoxSymbolication().symbolicate).not.toBeCalled();
   });
 
-  it('retry updates when symbolication finishes', () => {
+  it('retry updates when symbolication finishes', async () => {
     const log = getLogBoxLog();
 
     const callback = jest.fn();
@@ -230,7 +236,7 @@ describe('LogBoxLog', () => {
     expect(callback).toBeCalledWith('PENDING');
     expect(getLogBoxSymbolication().symbolicate).toBeCalled();
 
-    jest.runAllTicks();
+    await runMicrotasks();
 
     expect(callback).toBeCalledTimes(2);
     expect(callback).toBeCalledWith('COMPLETE');
@@ -251,7 +257,7 @@ describe('LogBoxLog', () => {
     expect(getLogBoxSymbolication().symbolicate).not.toBeCalled();
   });
 
-  it('retry updates when symbolication fails', () => {
+  it('retry updates when symbolication fails', async () => {
     const error = new Error('...');
     getLogBoxSymbolication().symbolicate.mockImplementation(async stack => {
       throw error;
@@ -265,7 +271,7 @@ describe('LogBoxLog', () => {
     expect(callback).toBeCalledWith('PENDING');
     expect(getLogBoxSymbolication().symbolicate).toBeCalled();
 
-    jest.runAllTicks();
+    await runMicrotasks();
 
     expect(callback).toBeCalledTimes(2);
     expect(callback).toBeCalledWith('FAILED');
@@ -289,7 +295,7 @@ describe('LogBoxLog', () => {
     expect(callback).toBeCalledWith('PENDING');
     expect(getLogBoxSymbolication().symbolicate).toBeCalled();
 
-    jest.runAllTicks();
+    await runMicrotasks();
 
     expect(callback).toBeCalledTimes(2);
     expect(callback).toBeCalledWith('COMPLETE');
diff --git a/Libraries/LogBox/Data/__tests__/LogBoxSymbolication-test.js b/Libraries/LogBox/Data/__tests__/LogBoxSymbolication-test.js
index 1d35a1e9867f..3d272839c59a 100644
--- a/Libraries/LogBox/Data/__tests__/LogBoxSymbolication-test.js
+++ b/Libraries/LogBox/Data/__tests__/LogBoxSymbolication-test.js
@@ -4,26 +4,27 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
- * @format
  * @flow
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
+import type {SymbolicatedStackTrace} from '../../../Core/Devtools/symbolicateStackTrace';
 import type {StackFrame} from '../../../Core/NativeExceptionsManager';
 
-jest.mock('../../../Core/Devtools/symbolicateStackTrace');
-
 const LogBoxSymbolication = require('../LogBoxSymbolication');
 
+jest.mock('../../../Core/Devtools/symbolicateStackTrace');
+
 const symbolicateStackTrace: JestMockFn<
   $ReadOnlyArray<Array<StackFrame>>,
-  Promise<Array<StackFrame>>,
+  Promise<SymbolicatedStackTrace>,
 > = (require('../../../Core/Devtools/symbolicateStackTrace'): any);
 
 const createStack = (methodNames: Array<string>) =>
-  methodNames.map(methodName => ({
+  methodNames.map((methodName): StackFrame => ({
     column: null,
     file: 'file://path/to/file.js',
     lineNumber: 1,
@@ -33,7 +34,10 @@ const createStack = (methodNames: Array<string>) =>
 describe('LogBoxSymbolication', () => {
   beforeEach(() => {
     jest.resetModules();
-    symbolicateStackTrace.mockImplementation(async stack => stack);
+    symbolicateStackTrace.mockImplementation(async stack => ({
+      stack,
+      codeFrame: null,
+    }));
   });
 
   it('symbolicates different stacks', () => {
diff --git a/Libraries/LogBox/Data/__tests__/parseLogBoxLog-test.js b/Libraries/LogBox/Data/__tests__/parseLogBoxLog-test.js
index a9f56707b9a3..c92dc50bb75e 100644
--- a/Libraries/LogBox/Data/__tests__/parseLogBoxLog-test.js
+++ b/Libraries/LogBox/Data/__tests__/parseLogBoxLog-test.js
@@ -4,14 +4,16 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
- * @format
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const {parseLogBoxLog, parseLogBoxException} = require('../parseLogBoxLog');
+import type {StackFrame} from '../../../Core/NativeExceptionsManager';
+
+const {parseLogBoxException, parseLogBoxLog} = require('../parseLogBoxLog');
 
 describe('parseLogBoxLog', () => {
   it('parses strings', () => {
@@ -230,7 +232,7 @@ describe('parseLogBoxLog', () => {
       name: '',
       isComponentError: false,
       componentStack: '',
-      stack: [],
+      stack: ([]: Array<StackFrame>),
       id: 0,
       isFatal: true,
     };
@@ -267,7 +269,7 @@ describe('parseLogBoxLog', () => {
       name: '',
       isComponentError: false,
       componentStack: '',
-      stack: [],
+      stack: ([]: Array<StackFrame>),
       id: 0,
       isFatal: true,
     };
@@ -327,7 +329,7 @@ If you are sure the module exists, try these steps:
       name: '',
       isComponentError: false,
       componentStack: '',
-      stack: [],
+      stack: ([]: Array<StackFrame>),
       id: 0,
       isFatal: true,
     };
@@ -381,7 +383,7 @@ If you are sure the module exists, try these steps:
       name: '',
       isComponentError: false,
       componentStack: '',
-      stack: [],
+      stack: ([]: Array<StackFrame>),
       id: 0,
       isFatal: true,
     };
@@ -429,7 +431,7 @@ Please follow the instructions at: fburl.com/rn-remote-assets
       name: '',
       isComponentError: false,
       componentStack: '',
-      stack: [],
+      stack: ([]: Array<StackFrame>),
       id: 0,
       isFatal: true,
     };
@@ -475,7 +477,7 @@ Please follow the instructions at: fburl.com/rn-remote-assets
       name: '',
       isComponentError: false,
       componentStack: '',
-      stack: [],
+      stack: ([]: Array<StackFrame>),
       id: 0,
       isFatal: true,
     };
diff --git a/Libraries/LogBox/Data/parseLogBoxLog.js b/Libraries/LogBox/Data/parseLogBoxLog.js
index 9771595cde4a..f0abc77961d1 100644
--- a/Libraries/LogBox/Data/parseLogBoxLog.js
+++ b/Libraries/LogBox/Data/parseLogBoxLog.js
@@ -8,15 +8,17 @@
  * @format
  */
 
-import UTFSequence from '../../UTFSequence';
-import stringifySafe from '../../Utilities/stringifySafe';
 import type {ExceptionData} from '../../Core/NativeExceptionsManager';
 import type {LogBoxLogData} from './LogBoxLog';
+
 import parseErrorStack from '../../Core/Devtools/parseErrorStack';
+import UTFSequence from '../../UTFSequence';
+import stringifySafe from '../../Utilities/stringifySafe';
 
 const BABEL_TRANSFORM_ERROR_FORMAT =
   /^(?:TransformError )?(?:SyntaxError: |ReferenceError: )(.*): (.*) \((\d+):(\d+)\)\n\n([\s\S]+)/;
 const BABEL_CODE_FRAME_ERROR_FORMAT =
+  // eslint-disable-next-line no-control-regex
   /^(?:TransformError )?(?:.*):? (?:.*?)(\/.*): ([\s\S]+?)\n([ >]{2}[\d\s]+ \|[\s\S]+|\u{001b}[\s\S]+)/u;
 const METRO_ERROR_FORMAT =
   /^(?:InternalError Metro has encountered an error:) (.*): (.*) \((\d+):(\d+)\)\n\n([\s\S]+)/u;
@@ -315,7 +317,7 @@ export function parseLogBoxLog(args: $ReadOnlyArray<mixed>): {|
   message: Message,
 |} {
   const message = args[0];
-  let argsWithoutComponentStack = [];
+  let argsWithoutComponentStack: Array<mixed> = [];
   let componentStack: ComponentStack = [];
 
   // Extract component stack from warnings like "Some warning%s".
diff --git a/Libraries/LogBox/LogBox.d.ts b/Libraries/LogBox/LogBox.d.ts
new file mode 100644
index 000000000000..527250281537
--- /dev/null
+++ b/Libraries/LogBox/LogBox.d.ts
@@ -0,0 +1,28 @@
+/**
+ * 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 LogBoxStatic {
+  /**
+   * Silence any logs that match the given strings or regexes.
+   */
+  ignoreLogs(patterns: (string | RegExp)[]): void;
+
+  /**
+   * Toggle error and warning notifications
+   * Note: this only disables notifications, uncaught errors will still open a full screen LogBox.
+   * @param ignore whether to ignore logs or not
+   */
+  ignoreAllLogs(ignore?: boolean): void;
+
+  install(): void;
+  uninstall(): void;
+}
+
+export const LogBox: LogBoxStatic;
+export type LogBox = LogBoxStatic;
diff --git a/Libraries/LogBox/LogBox.js b/Libraries/LogBox/LogBox.js
index 12c1f9552478..a597ca5acf91 100644
--- a/Libraries/LogBox/LogBox.js
+++ b/Libraries/LogBox/LogBox.js
@@ -8,12 +8,12 @@
  * @format
  */
 
-import Platform from '../Utilities/Platform';
-import RCTLog from '../Utilities/RCTLog';
-
 import type {IgnorePattern, LogData} from './Data/LogBoxData';
 import type {ExtendedExceptionData} from './Data/parseLogBoxLog';
 
+import Platform from '../Utilities/Platform';
+import RCTLog from '../Utilities/RCTLog';
+
 export type {LogData, ExtendedExceptionData, IgnorePattern};
 
 let LogBox;
@@ -143,6 +143,9 @@ if (__DEV__) {
     if (LogBoxData.isLogBoxErrorMessage(String(args[0]))) {
       originalConsoleError(...args);
       return;
+    } else {
+      // Be sure to pass LogBox warnings through.
+      originalConsoleWarn(...args);
     }
 
     try {
@@ -150,9 +153,6 @@ if (__DEV__) {
         const {category, message, componentStack} = parseLogBoxLog(args);
 
         if (!LogBoxData.isMessageIgnored(message.content)) {
-          // Be sure to pass LogBox warnings through.
-          originalConsoleWarn(...args);
-
           LogBoxData.addLog({
             level: 'warn',
             category,
@@ -205,12 +205,12 @@ if (__DEV__) {
       args[0] = `Warning: ${filterResult.finalFormat}`;
       const {category, message, componentStack} = parseLogBoxLog(args);
 
-      if (!LogBoxData.isMessageIgnored(message.content)) {
-        // Interpolate the message so they are formatted for adb and other CLIs.
-        // This is different than the message.content above because it includes component stacks.
-        const interpolated = parseInterpolation(args);
-        originalConsoleError(interpolated.message.content);
+      // Interpolate the message so they are formatted for adb and other CLIs.
+      // This is different than the message.content above because it includes component stacks.
+      const interpolated = parseInterpolation(args);
+      originalConsoleError(interpolated.message.content);
 
+      if (!LogBoxData.isMessageIgnored(message.content)) {
         LogBoxData.addLog({
           level,
           category,
diff --git a/Libraries/LogBox/LogBoxInspectorContainer.js b/Libraries/LogBox/LogBoxInspectorContainer.js
index c163ba773331..7faa55ca2413 100644
--- a/Libraries/LogBox/LogBoxInspectorContainer.js
+++ b/Libraries/LogBox/LogBoxInspectorContainer.js
@@ -8,11 +8,13 @@
  * @format
  */
 
-import * as React from 'react';
-import {View, StyleSheet} from 'react-native';
+import type LogBoxLog from './Data/LogBoxLog';
+
+import View from '../Components/View/View';
+import StyleSheet from '../StyleSheet/StyleSheet';
 import * as LogBoxData from './Data/LogBoxData';
 import LogBoxInspector from './UI/LogBoxInspector';
-import type LogBoxLog from './Data/LogBoxLog';
+import * as React from 'react';
 
 type Props = $ReadOnly<{|
   logs: $ReadOnlyArray<LogBoxLog>,
diff --git a/Libraries/LogBox/LogBoxNotificationContainer.js b/Libraries/LogBox/LogBoxNotificationContainer.js
index a1291e5f01ac..06a6afaedc30 100644
--- a/Libraries/LogBox/LogBoxNotificationContainer.js
+++ b/Libraries/LogBox/LogBoxNotificationContainer.js
@@ -8,12 +8,12 @@
  * @format
  */
 
-import * as React from 'react';
-import StyleSheet from '../StyleSheet/StyleSheet';
 import View from '../Components/View/View';
+import StyleSheet from '../StyleSheet/StyleSheet';
 import * as LogBoxData from './Data/LogBoxData';
 import LogBoxLog from './Data/LogBoxLog';
 import LogBoxLogNotification from './UI/LogBoxNotification';
+import * as React from 'react';
 
 type Props = $ReadOnly<{|
   logs: $ReadOnlyArray<LogBoxLog>,
diff --git a/Libraries/LogBox/UI/AnsiHighlight.js b/Libraries/LogBox/UI/AnsiHighlight.js
index 4095298dbbd2..5c90992058be 100644
--- a/Libraries/LogBox/UI/AnsiHighlight.js
+++ b/Libraries/LogBox/UI/AnsiHighlight.js
@@ -8,11 +8,13 @@
  * @format
  */
 
+import type {TextStyleProp} from '../../StyleSheet/StyleSheet';
+
+import View from '../../Components/View/View';
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import Text from '../../Text/Text';
 import {ansiToJson} from 'anser';
 import * as React from 'react';
-import {StyleSheet, Text, View} from 'react-native';
-
-import type {TextStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
 
 // Afterglow theme from https://iterm2colorschemes.com/
 const COLORS = {
diff --git a/Libraries/LogBox/UI/LogBoxButton.js b/Libraries/LogBox/UI/LogBoxButton.js
index 0f9f000fc6ea..f9d7361659da 100644
--- a/Libraries/LogBox/UI/LogBoxButton.js
+++ b/Libraries/LogBox/UI/LogBoxButton.js
@@ -8,15 +8,16 @@
  * @format
  */
 
-import * as React from 'react';
-import StyleSheet from '../../StyleSheet/StyleSheet';
-import TouchableWithoutFeedback from '../../Components/Touchable/TouchableWithoutFeedback';
-import View from '../../Components/View/View';
-import * as LogBoxStyle from './LogBoxStyle';
 import type {EdgeInsetsProp} from '../../StyleSheet/EdgeInsetsPropType';
 import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
 import type {PressEvent} from '../../Types/CoreEventTypes';
 
+import TouchableWithoutFeedback from '../../Components/Touchable/TouchableWithoutFeedback';
+import View from '../../Components/View/View';
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import * as LogBoxStyle from './LogBoxStyle';
+import * as React from 'react';
+
 type Props = $ReadOnly<{|
   backgroundColor: $ReadOnly<{|
     default: string,
diff --git a/Libraries/LogBox/UI/LogBoxInspector.js b/Libraries/LogBox/UI/LogBoxInspector.js
index bfca9fedccb8..68c571f51759 100644
--- a/Libraries/LogBox/UI/LogBoxInspector.js
+++ b/Libraries/LogBox/UI/LogBoxInspector.js
@@ -8,20 +8,20 @@
  * @format
  */
 
-import LogBoxInspectorCodeFrame from './LogBoxInspectorCodeFrame';
-import * as React from 'react';
+import Keyboard from '../../Components/Keyboard/Keyboard';
 import ScrollView from '../../Components/ScrollView/ScrollView';
-import StyleSheet from '../../StyleSheet/StyleSheet';
 import View from '../../Components/View/View';
+import StyleSheet from '../../StyleSheet/StyleSheet';
 import * as LogBoxData from '../Data/LogBoxData';
-import Keyboard from '../../Components/Keyboard/Keyboard';
+import LogBoxLog, {type LogLevel} from '../Data/LogBoxLog';
+import LogBoxInspectorCodeFrame from './LogBoxInspectorCodeFrame';
 import LogBoxInspectorFooter from './LogBoxInspectorFooter';
+import LogBoxInspectorHeader from './LogBoxInspectorHeader';
 import LogBoxInspectorMessageHeader from './LogBoxInspectorMessageHeader';
 import LogBoxInspectorReactFrames from './LogBoxInspectorReactFrames';
 import LogBoxInspectorStackFrames from './LogBoxInspectorStackFrames';
-import LogBoxInspectorHeader from './LogBoxInspectorHeader';
 import * as LogBoxStyle from './LogBoxStyle';
-import LogBoxLog, {type LogLevel} from '../Data/LogBoxLog';
+import * as React from 'react';
 
 type Props = $ReadOnly<{|
   onDismiss: () => void,
diff --git a/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js b/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js
index f938949b2667..eff4443bb897 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js
@@ -8,19 +8,20 @@
  * @format
  */
 
-import * as React from 'react';
-import Platform from '../../Utilities/Platform';
+import type {CodeFrame} from '../Data/parseLogBoxLog';
+
 import ScrollView from '../../Components/ScrollView/ScrollView';
-import StyleSheet from '../../StyleSheet/StyleSheet';
-import Text from '../../Text/Text';
 import View from '../../Components/View/View';
-import * as LogBoxStyle from './LogBoxStyle';
-import type {CodeFrame} from '../Data/parseLogBoxLog';
-import LogBoxButton from './LogBoxButton';
 import openFileInEditor from '../../Core/Devtools/openFileInEditor';
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import Text from '../../Text/Text';
+import Platform from '../../Utilities/Platform';
+import * as LogBoxData from '../Data/LogBoxData';
 import AnsiHighlight from './AnsiHighlight';
+import LogBoxButton from './LogBoxButton';
 import LogBoxInspectorSection from './LogBoxInspectorSection';
-import * as LogBoxData from '../Data/LogBoxData';
+import * as LogBoxStyle from './LogBoxStyle';
+import * as React from 'react';
 type Props = $ReadOnly<{|
   codeFrame: ?CodeFrame,
 |}>;
diff --git a/Libraries/LogBox/UI/LogBoxInspectorFooter.js b/Libraries/LogBox/UI/LogBoxInspectorFooter.js
index 34b0cff249f9..b67f99d5e07e 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorFooter.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorFooter.js
@@ -10,13 +10,13 @@
 
 import type {LogLevel} from '../Data/LogBoxLog';
 
-import * as React from 'react';
-import DeviceInfo from '../../Utilities/DeviceInfo';
+import View from '../../Components/View/View';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
-import View from '../../Components/View/View';
+import DeviceInfo from '../../Utilities/DeviceInfo';
 import LogBoxButton from './LogBoxButton';
 import * as LogBoxStyle from './LogBoxStyle';
+import * as React from 'react';
 
 type Props = $ReadOnly<{|
   onDismiss: () => void,
diff --git a/Libraries/LogBox/UI/LogBoxInspectorHeader.js b/Libraries/LogBox/UI/LogBoxInspectorHeader.js
index 29872981c1f9..097f152ed9f2 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorHeader.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorHeader.js
@@ -8,17 +8,18 @@
  * @format
  */
 
+import type {ImageSource} from '../../Image/ImageSource';
+import type {LogLevel} from '../Data/LogBoxLog';
+
+import StatusBar from '../../Components/StatusBar/StatusBar';
+import View from '../../Components/View/View';
 import Image from '../../Image/Image';
-import Platform from '../../Utilities/Platform';
-import * as React from 'react';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
-import View from '../../Components/View/View';
-import StatusBar from '../../Components/StatusBar/StatusBar';
+import Platform from '../../Utilities/Platform';
 import LogBoxButton from './LogBoxButton';
 import * as LogBoxStyle from './LogBoxStyle';
-import type {LogLevel} from '../Data/LogBoxLog';
-import type {ImageSource} from '../../Image/ImageSource';
+import * as React from 'react';
 type Props = $ReadOnly<{|
   onSelectIndex: (selectedIndex: number) => void,
   selectedIndex: number,
diff --git a/Libraries/LogBox/UI/LogBoxInspectorMessageHeader.js b/Libraries/LogBox/UI/LogBoxInspectorMessageHeader.js
index e8797f9506a2..7fc21e7e06db 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorMessageHeader.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorMessageHeader.js
@@ -8,14 +8,15 @@
  * @format
  */
 
-import * as React from 'react';
+import type {LogLevel} from '../Data/LogBoxLog';
+import type {Message} from '../Data/parseLogBoxLog';
+
+import View from '../../Components/View/View';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
-import View from '../../Components/View/View';
-import * as LogBoxStyle from './LogBoxStyle';
 import LogBoxMessage from './LogBoxMessage';
-import type {LogLevel} from '../Data/LogBoxLog';
-import type {Message} from '../Data/parseLogBoxLog';
+import * as LogBoxStyle from './LogBoxStyle';
+import * as React from 'react';
 
 type Props = $ReadOnly<{|
   collapsed: boolean,
diff --git a/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js b/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js
index 2a3f8f5e703d..4c1cf9b3c1c4 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js
@@ -8,16 +8,17 @@
  * @format
  */
 
-import * as React from 'react';
+import type LogBoxLog from '../Data/LogBoxLog';
+
+import View from '../../Components/View/View';
+import openFileInEditor from '../../Core/Devtools/openFileInEditor';
 import StyleSheet from '../../StyleSheet/StyleSheet';
-import Platform from '../../Utilities/Platform';
 import Text from '../../Text/Text';
-import View from '../../Components/View/View';
+import Platform from '../../Utilities/Platform';
 import LogBoxButton from './LogBoxButton';
-import * as LogBoxStyle from './LogBoxStyle';
 import LogBoxInspectorSection from './LogBoxInspectorSection';
-import openFileInEditor from '../../Core/Devtools/openFileInEditor';
-import type LogBoxLog from '../Data/LogBoxLog';
+import * as LogBoxStyle from './LogBoxStyle';
+import * as React from 'react';
 
 type Props = $ReadOnly<{|
   log: LogBoxLog,
diff --git a/Libraries/LogBox/UI/LogBoxInspectorSection.js b/Libraries/LogBox/UI/LogBoxInspectorSection.js
index d8c0a9302830..c613db556464 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorSection.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorSection.js
@@ -8,11 +8,11 @@
  * @format
  */
 
-import * as React from 'react';
+import View from '../../Components/View/View';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
-import View from '../../Components/View/View';
 import * as LogBoxStyle from './LogBoxStyle';
+import * as React from 'react';
 
 type Props = $ReadOnly<{|
   heading: string,
diff --git a/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js b/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js
index 4036783f18e9..c5eb157d180b 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js
@@ -8,15 +8,15 @@
  * @format
  */
 
+import type {PressEvent} from '../../Types/CoreEventTypes';
+
 import Animated from '../../Animated/Animated';
 import Easing from '../../Animated/Easing';
-import * as React from 'react';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
 import LogBoxButton from './LogBoxButton';
 import * as LogBoxStyle from './LogBoxStyle';
-
-import type {PressEvent} from '../../Types/CoreEventTypes';
+import * as React from 'react';
 
 type Props = $ReadOnly<{|
   onPress?: ?(event: PressEvent) => void,
diff --git a/Libraries/LogBox/UI/LogBoxInspectorStackFrame.js b/Libraries/LogBox/UI/LogBoxInspectorStackFrame.js
index fd9d73736abd..78fb0bdb7978 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorStackFrame.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorStackFrame.js
@@ -8,16 +8,16 @@
  * @format
  */
 
-import * as React from 'react';
+import type {StackFrame} from '../../Core/NativeExceptionsManager';
+import type {PressEvent} from '../../Types/CoreEventTypes';
+
+import View from '../../Components/View/View';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
-import View from '../../Components/View/View';
 import Platform from '../../Utilities/Platform';
 import LogBoxButton from './LogBoxButton';
 import * as LogBoxStyle from './LogBoxStyle';
-
-import type {PressEvent} from '../../Types/CoreEventTypes';
-import type {StackFrame} from '../../Core/NativeExceptionsManager';
+import * as React from 'react';
 
 type Props = $ReadOnly<{|
   frame: StackFrame,
diff --git a/Libraries/LogBox/UI/LogBoxInspectorStackFrames.js b/Libraries/LogBox/UI/LogBoxInspectorStackFrames.js
index 08eec15d11f4..e82d65093a4a 100644
--- a/Libraries/LogBox/UI/LogBoxInspectorStackFrames.js
+++ b/Libraries/LogBox/UI/LogBoxInspectorStackFrames.js
@@ -9,19 +9,19 @@
  */
 
 import type {StackFrame} from '../../Core/NativeExceptionsManager';
-import type {Stack} from '../Data/LogBoxSymbolication';
 import type LogBoxLog from '../Data/LogBoxLog';
+import type {Stack} from '../Data/LogBoxSymbolication';
 
-import * as React from 'react';
+import View from '../../Components/View/View';
+import openFileInEditor from '../../Core/Devtools/openFileInEditor';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
-import View from '../../Components/View/View';
 import LogBoxButton from './LogBoxButton';
+import LogBoxInspectorSection from './LogBoxInspectorSection';
 import LogBoxInspectorSourceMapStatus from './LogBoxInspectorSourceMapStatus';
 import LogBoxInspectorStackFrame from './LogBoxInspectorStackFrame';
-import LogBoxInspectorSection from './LogBoxInspectorSection';
 import * as LogBoxStyle from './LogBoxStyle';
-import openFileInEditor from '../../Core/Devtools/openFileInEditor';
+import * as React from 'react';
 
 type Props = $ReadOnly<{|
   log: LogBoxLog,
diff --git a/Libraries/LogBox/UI/LogBoxMessage.js b/Libraries/LogBox/UI/LogBoxMessage.js
index 6e1ec47474a1..02ecf3d37e6f 100644
--- a/Libraries/LogBox/UI/LogBoxMessage.js
+++ b/Libraries/LogBox/UI/LogBoxMessage.js
@@ -8,12 +8,12 @@
  * @format
  */
 
-import * as React from 'react';
-import Text from '../../Text/Text';
-
 import type {TextStyleProp} from '../../StyleSheet/StyleSheet';
 import type {Message} from '../Data/parseLogBoxLog';
 
+import Text from '../../Text/Text';
+import * as React from 'react';
+
 type Props = {
   message: Message,
   style: TextStyleProp,
diff --git a/Libraries/LogBox/UI/LogBoxNotification.js b/Libraries/LogBox/UI/LogBoxNotification.js
index 91376168ddb0..ae9163f342c4 100644
--- a/Libraries/LogBox/UI/LogBoxNotification.js
+++ b/Libraries/LogBox/UI/LogBoxNotification.js
@@ -9,16 +9,17 @@
  */
 
 import type {Message as MessageType} from '../Data/parseLogBoxLog';
-import * as React from 'react';
+
+import View from '../../Components/View/View';
 import Image from '../../Image/Image';
 import StyleSheet from '../../StyleSheet/StyleSheet';
 import Text from '../../Text/Text';
-import View from '../../Components/View/View';
-import LogBoxButton from './LogBoxButton';
-import * as LogBoxStyle from './LogBoxStyle';
+import * as LogBoxData from '../Data/LogBoxData';
 import LogBoxLog from '../Data/LogBoxLog';
+import LogBoxButton from './LogBoxButton';
 import LogBoxMessage from './LogBoxMessage';
-import * as LogBoxData from '../Data/LogBoxData';
+import * as LogBoxStyle from './LogBoxStyle';
+import * as React from 'react';
 
 type Props = $ReadOnly<{|
   log: LogBoxLog,
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxButton-test.js b/Libraries/LogBox/UI/__tests__/LogBoxButton-test.js
index 5f37c8029822..f5f6c972d3c4 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxButton-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxButton-test.js
@@ -4,16 +4,17 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
-const React = require('react');
-const LogBoxButton = require('../LogBoxButton').default;
-const render = require('../../../../jest/renderer');
 import Text from '../../../Text/Text';
 
+const render = require('../../../../jest/renderer');
+const LogBoxButton = require('../LogBoxButton').default;
+const React = require('react');
+
 describe('LogBoxButton', () => {
   it('should render only a view without an onPress', () => {
     const output = render.shallowRender(
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxInspector-test.js b/Libraries/LogBox/UI/__tests__/LogBoxInspector-test.js
index 90e7d65b216b..af725eb2143e 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxInspector-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxInspector-test.js
@@ -4,17 +4,17 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
-const LogBoxInspector = require('../LogBoxInspector').default;
-const LogBoxLog = require('../../Data/LogBoxLog').default;
 const render = require('../../../../jest/renderer');
+const LogBoxLog = require('../../Data/LogBoxLog').default;
+const LogBoxInspector = require('../LogBoxInspector').default;
+const React = require('react');
 
 const logs = [
   new LogBoxLog({
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxInspectorCodeFrame-test.js b/Libraries/LogBox/UI/__tests__/LogBoxInspectorCodeFrame-test.js
index 5e99062ab9cf..0d27cc4f5e31 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxInspectorCodeFrame-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxInspectorCodeFrame-test.js
@@ -4,16 +4,16 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
-const LogBoxInspectorCodeFrame = require('../LogBoxInspectorCodeFrame').default;
 const render = require('../../../../jest/renderer');
+const LogBoxInspectorCodeFrame = require('../LogBoxInspectorCodeFrame').default;
+const React = require('react');
 
 describe('LogBoxInspectorCodeFrame', () => {
   it('should render null for no code frame', () => {
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxInspectorFooter-test.js b/Libraries/LogBox/UI/__tests__/LogBoxInspectorFooter-test.js
index 2b533c2d19d7..500ad24f8106 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxInspectorFooter-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxInspectorFooter-test.js
@@ -4,16 +4,16 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
-const LogBoxInspectorFooter = require('../LogBoxInspectorFooter').default;
 const render = require('../../../../jest/renderer');
+const LogBoxInspectorFooter = require('../LogBoxInspectorFooter').default;
+const React = require('react');
 
 describe('LogBoxInspectorFooter', () => {
   it('should render two buttons for warning', () => {
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxInspectorHeader-test.js b/Libraries/LogBox/UI/__tests__/LogBoxInspectorHeader-test.js
index 59c0d8bc33f5..3ea9f2392c59 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxInspectorHeader-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxInspectorHeader-test.js
@@ -4,16 +4,16 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
-const LogBoxInspectorHeader = require('../LogBoxInspectorHeader').default;
 const render = require('../../../../jest/renderer');
+const LogBoxInspectorHeader = require('../LogBoxInspectorHeader').default;
+const React = require('react');
 
 describe('LogBoxInspectorHeader', () => {
   it('should render no buttons for one total', () => {
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxInspectorMesageHeader-test.js b/Libraries/LogBox/UI/__tests__/LogBoxInspectorMesageHeader-test.js
index 4c63208896f8..078f582015e2 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxInspectorMesageHeader-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxInspectorMesageHeader-test.js
@@ -4,17 +4,17 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
+const render = require('../../../../jest/renderer');
 const LogBoxInspectorMessageHeader =
   require('../LogBoxInspectorMessageHeader').default;
-const render = require('../../../../jest/renderer');
+const React = require('react');
 
 describe('LogBoxInspectorMessageHeader', () => {
   it('should render error', () => {
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxInspectorReactFrames-test.js b/Libraries/LogBox/UI/__tests__/LogBoxInspectorReactFrames-test.js
index 15827401629a..04737ad3a318 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxInspectorReactFrames-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxInspectorReactFrames-test.js
@@ -4,18 +4,18 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
+const render = require('../../../../jest/renderer');
+const LogBoxLog = require('../../Data/LogBoxLog').default;
 const LogBoxInspectorReactFrames =
   require('../LogBoxInspectorReactFrames').default;
-const LogBoxLog = require('../../Data/LogBoxLog').default;
-const render = require('../../../../jest/renderer');
+const React = require('react');
 
 describe('LogBoxInspectorReactFrames', () => {
   it('should render null for no componentStack frames', () => {
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxInspectorSection-test.js b/Libraries/LogBox/UI/__tests__/LogBoxInspectorSection-test.js
index b48f1785322d..0302f35acfc0 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxInspectorSection-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxInspectorSection-test.js
@@ -4,15 +4,16 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
-const React = require('react');
 import Text from '../../../Text/Text';
-const LogBoxInspectorSection = require('../LogBoxInspectorSection').default;
+
 const render = require('../../../../jest/renderer');
+const LogBoxInspectorSection = require('../LogBoxInspectorSection').default;
+const React = require('react');
 
 describe('LogBoxInspectorSection', () => {
   it('should render with only heading', () => {
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxInspectorSourceMapStatus-test.js b/Libraries/LogBox/UI/__tests__/LogBoxInspectorSourceMapStatus-test.js
index 51c32d2da11a..940efb2580f0 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxInspectorSourceMapStatus-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxInspectorSourceMapStatus-test.js
@@ -4,17 +4,17 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
+const render = require('../../../../jest/renderer');
 const LogBoxInspectorSourceMapStatus =
   require('../LogBoxInspectorSourceMapStatus').default;
-const render = require('../../../../jest/renderer');
+const React = require('react');
 
 describe('LogBoxInspectorSourceMapStatus', () => {
   it('should render for failed', () => {
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxInspectorStackFrame-test.js b/Libraries/LogBox/UI/__tests__/LogBoxInspectorStackFrame-test.js
index e7d14ef0b0ac..6b738788f82f 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxInspectorStackFrame-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxInspectorStackFrame-test.js
@@ -4,17 +4,17 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
+const render = require('../../../../jest/renderer');
 const LogBoxInspectorStackFrame =
   require('../LogBoxInspectorStackFrame').default;
-const render = require('../../../../jest/renderer');
+const React = require('react');
 
 describe('LogBoxInspectorStackFrame', () => {
   it('should render stack frame', () => {
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxInspectorStackFrames-test.js b/Libraries/LogBox/UI/__tests__/LogBoxInspectorStackFrames-test.js
index 8e247e699d82..c1b6b50d97f9 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxInspectorStackFrames-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxInspectorStackFrames-test.js
@@ -4,19 +4,21 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
-const React = require('react');
+import type {StackFrame} from '../../../Core/NativeExceptionsManager';
+
 import LogBoxInspectorStackFrames, {
   getCollapseMessage,
 } from '../LogBoxInspectorStackFrames';
 
-const {} = require('../LogBoxInspectorStackFrames');
-const LogBoxLog = require('../../Data/LogBoxLog').default;
 const render = require('../../../../jest/renderer');
+const LogBoxLog = require('../../Data/LogBoxLog').default;
+const {} = require('../LogBoxInspectorStackFrames');
+const React = require('react');
 
 const createLogWithFrames = (collapsedOptions: Array<?boolean>) => {
   return new LogBoxLog({
@@ -33,7 +35,7 @@ const createLogWithFrames = (collapsedOptions: Array<?boolean>) => {
 };
 
 const createCollapsedFrames = (collapsedOptions: Array<?boolean>) => {
-  return collapsedOptions.map(option => ({
+  return collapsedOptions.map((option): StackFrame => ({
     column: 1,
     file: 'dependency.js',
     lineNumber: 1,
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxMessage-test.js b/Libraries/LogBox/UI/__tests__/LogBoxMessage-test.js
index 38f48e9a2292..fba7dc725d90 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxMessage-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxMessage-test.js
@@ -4,16 +4,16 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
-const LogBoxMessage = require('../LogBoxMessage').default;
 const render = require('../../../../jest/renderer');
+const LogBoxMessage = require('../LogBoxMessage').default;
+const React = require('react');
 
 describe('LogBoxMessage', () => {
   it('should render message', () => {
diff --git a/Libraries/LogBox/UI/__tests__/LogBoxNotification-test.js b/Libraries/LogBox/UI/__tests__/LogBoxNotification-test.js
index ed6954d25328..99353fae11f5 100644
--- a/Libraries/LogBox/UI/__tests__/LogBoxNotification-test.js
+++ b/Libraries/LogBox/UI/__tests__/LogBoxNotification-test.js
@@ -4,17 +4,17 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
-const LogBoxNotification = require('../LogBoxNotification').default;
-const LogBoxLog = require('../../Data/LogBoxLog').default;
 const render = require('../../../../jest/renderer');
+const LogBoxLog = require('../../Data/LogBoxLog').default;
+const LogBoxNotification = require('../LogBoxNotification').default;
+const React = require('react');
 
 const log = new LogBoxLog({
   level: 'warn',
diff --git a/Libraries/LogBox/__tests__/LogBox-integration-test.js b/Libraries/LogBox/__tests__/LogBox-integration-test.js
index ddaaffb0261f..2385f352988d 100644
--- a/Libraries/LogBox/__tests__/LogBox-integration-test.js
+++ b/Libraries/LogBox/__tests__/LogBox-integration-test.js
@@ -5,18 +5,17 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
-const LogBoxData = require('../Data/LogBoxData');
-const TestRenderer = require('react-test-renderer');
-
-import * as React from 'react';
-
 import {
   DoesNotUseKey,
   FragmentWithProp,
 } from './__fixtures__/ReactWarningFixtures';
+import * as React from 'react';
+
+const LogBoxData = require('../Data/LogBoxData');
+const TestRenderer = require('react-test-renderer');
 
 const installLogBox = () => {
   const LogBox = require('../LogBox');
diff --git a/Libraries/LogBox/__tests__/LogBox-test.js b/Libraries/LogBox/__tests__/LogBox-test.js
index d86bd3b12b3d..2ac93a18f810 100644
--- a/Libraries/LogBox/__tests__/LogBox-test.js
+++ b/Libraries/LogBox/__tests__/LogBox-test.js
@@ -4,15 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
- * @format
  * @flow
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const LogBox = require('../LogBox');
 const LogBoxData = require('../Data/LogBoxData');
+const LogBox = require('../LogBox');
 
 declare var console: any;
 
diff --git a/Libraries/LogBox/__tests__/LogBoxInspectorContainer-test.js b/Libraries/LogBox/__tests__/LogBoxInspectorContainer-test.js
index 2e87cbbb279e..bee6be3a631a 100644
--- a/Libraries/LogBox/__tests__/LogBoxInspectorContainer-test.js
+++ b/Libraries/LogBox/__tests__/LogBoxInspectorContainer-test.js
@@ -4,19 +4,19 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
+const render = require('../../../jest/renderer');
+const LogBoxLog = require('../Data/LogBoxLog').default;
 const {
   _LogBoxNotificationContainer: LogBoxNotificationContainer,
 } = require('../LogBoxNotificationContainer');
-const LogBoxLog = require('../Data/LogBoxLog').default;
-const render = require('../../../jest/renderer');
+const React = require('react');
 
 describe('LogBoxNotificationContainer', () => {
   it('should render null with no logs', () => {
diff --git a/Libraries/LogBox/__tests__/LogBoxNotificationContainer-test.js b/Libraries/LogBox/__tests__/LogBoxNotificationContainer-test.js
index 1354c00f8c86..65ea3dab0dbb 100644
--- a/Libraries/LogBox/__tests__/LogBoxNotificationContainer-test.js
+++ b/Libraries/LogBox/__tests__/LogBoxNotificationContainer-test.js
@@ -4,19 +4,19 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
+const render = require('../../../jest/renderer');
+const LogBoxLog = require('../Data/LogBoxLog').default;
 const {
   _LogBoxInspectorContainer: LogBoxInspectorContainer,
 } = require('../LogBoxInspectorContainer');
-const LogBoxLog = require('../Data/LogBoxLog').default;
-const render = require('../../../jest/renderer');
+const React = require('react');
 
 describe('LogBoxNotificationContainer', () => {
   it('should render inspector with logs, even when disabled', () => {
diff --git a/Libraries/LogBox/__tests__/__fixtures__/ReactWarningFixtures.js b/Libraries/LogBox/__tests__/__fixtures__/ReactWarningFixtures.js
index 2cbc78487de7..51b85b1fbe1a 100644
--- a/Libraries/LogBox/__tests__/__fixtures__/ReactWarningFixtures.js
+++ b/Libraries/LogBox/__tests__/__fixtures__/ReactWarningFixtures.js
@@ -5,10 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
-import {Text} from 'react-native';
+import Text from '../../../Text/Text';
 import * as React from 'react';
 
 export const DoesNotUseKey = () => {
diff --git a/Libraries/Modal/Modal.d.ts b/Libraries/Modal/Modal.d.ts
new file mode 100644
index 000000000000..4cc2df22367b
--- /dev/null
+++ b/Libraries/Modal/Modal.d.ts
@@ -0,0 +1,104 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {ViewProps} from '../Components/View/ViewPropTypes';
+import {NativeSyntheticEvent} from '../Types/CoreEventTypes';
+
+export interface ModalBaseProps {
+  /**
+   * @deprecated Use animationType instead
+   */
+  animated?: boolean | undefined;
+  /**
+   * The `animationType` prop controls how the modal animates.
+   *
+   * - `slide` slides in from the bottom
+   * - `fade` fades into view
+   * - `none` appears without an animation
+   */
+  animationType?: 'none' | 'slide' | 'fade' | undefined;
+  /**
+   * The `transparent` prop determines whether your modal will fill the entire view.
+   * Setting this to `true` will render the modal over a transparent background.
+   */
+  transparent?: boolean | undefined;
+  /**
+   * The `visible` prop determines whether your modal is visible.
+   */
+  visible?: boolean | undefined;
+  /**
+   * The `onRequestClose` callback is called when the user taps the hardware back button on Android or the menu button on Apple TV.
+   *
+   * This is required on Apple TV and Android.
+   */
+  onRequestClose?: ((event: NativeSyntheticEvent<any>) => void) | undefined;
+  /**
+   * The `onShow` prop allows passing a function that will be called once the modal has been shown.
+   */
+  onShow?: ((event: NativeSyntheticEvent<any>) => void) | undefined;
+}
+
+export interface ModalPropsIOS {
+  /**
+   * The `presentationStyle` determines the style of modal to show
+   */
+  presentationStyle?:
+    | 'fullScreen'
+    | 'pageSheet'
+    | 'formSheet'
+    | 'overFullScreen'
+    | undefined;
+
+  /**
+   * The `supportedOrientations` prop allows the modal to be rotated to any of the specified orientations.
+   * On iOS, the modal is still restricted by what's specified in your app's Info.plist's UISupportedInterfaceOrientations field.
+   */
+  supportedOrientations?:
+    | Array<
+        | 'portrait'
+        | 'portrait-upside-down'
+        | 'landscape'
+        | 'landscape-left'
+        | 'landscape-right'
+      >
+    | undefined;
+
+  /**
+   * The `onDismiss` prop allows passing a function that will be called once the modal has been dismissed.
+   */
+  onDismiss?: (() => void) | undefined;
+
+  /**
+   * The `onOrientationChange` callback is called when the orientation changes while the modal is being displayed.
+   * The orientation provided is only 'portrait' or 'landscape'. This callback is also called on initial render, regardless of the current orientation.
+   */
+  onOrientationChange?:
+    | ((event: NativeSyntheticEvent<any>) => void)
+    | undefined;
+}
+
+export interface ModalPropsAndroid {
+  /**
+   *  Controls whether to force hardware acceleration for the underlying window.
+   */
+  hardwareAccelerated?: boolean | undefined;
+
+  /**
+   *  Determines whether your modal should go under the system statusbar.
+   */
+  statusBarTranslucent?: boolean | undefined;
+}
+
+export type ModalProps = ModalBaseProps &
+  ModalPropsIOS &
+  ModalPropsAndroid &
+  ViewProps;
+
+export class Modal extends React.Component<ModalProps> {}
diff --git a/Libraries/Modal/Modal.js b/Libraries/Modal/Modal.js
index 9140a56dbe3c..b41ec143d633 100644
--- a/Libraries/Modal/Modal.js
+++ b/Libraries/Modal/Modal.js
@@ -8,26 +8,26 @@
  * @flow strict-local
  */
 
-const AppContainer = require('../ReactNative/AppContainer');
-const I18nManager = require('../ReactNative/I18nManager');
-import ModalInjection from './ModalInjection';
-import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
-import NativeModalManager from './NativeModalManager';
-const Platform = require('../Utilities/Platform');
-const React = require('react');
-const ScrollView = require('../Components/ScrollView/ScrollView');
-const StyleSheet = require('../StyleSheet/StyleSheet');
-const View = require('../Components/View/View');
-
-const {RootTagContext} = require('../ReactNative/RootTag');
-
 import type {ViewProps} from '../Components/View/ViewPropTypes';
-import {VirtualizedListContextResetter} from '../Lists/VirtualizedListContext.js';
 import type {RootTag} from '../ReactNative/RootTag';
 import type {DirectEventHandler} from '../Types/CodegenTypes';
+
+import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
+import {VirtualizedListContextResetter} from '../Lists/VirtualizedListContext.js';
 import {type EventSubscription} from '../vendor/emitter/EventEmitter';
+import ModalInjection from './ModalInjection';
+import NativeModalManager from './NativeModalManager';
 import RCTModalHostView from './RCTModalHostViewNativeComponent';
 
+const ScrollView = require('../Components/ScrollView/ScrollView');
+const View = require('../Components/View/View');
+const AppContainer = require('../ReactNative/AppContainer');
+const I18nManager = require('../ReactNative/I18nManager');
+const {RootTagContext} = require('../ReactNative/RootTag');
+const StyleSheet = require('../StyleSheet/StyleSheet');
+const Platform = require('../Utilities/Platform');
+const React = require('react');
+
 type ModalEventDefinitions = {
   modalDismissed: [{modalID: number}],
 };
diff --git a/Libraries/Modal/NativeModalManager.js b/Libraries/Modal/NativeModalManager.js
index e69839d378f6..f85a77ac4b5c 100644
--- a/Libraries/Modal/NativeModalManager.js
+++ b/Libraries/Modal/NativeModalManager.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Modal/RCTModalHostViewNativeComponent.js b/Libraries/Modal/RCTModalHostViewNativeComponent.js
index 69fef94afd8c..a21af54ae4fe 100644
--- a/Libraries/Modal/RCTModalHostViewNativeComponent.js
+++ b/Libraries/Modal/RCTModalHostViewNativeComponent.js
@@ -8,15 +8,15 @@
  * @flow strict-local
  */
 
-import codegenNativeComponent from '../Utilities/codegenNativeComponent';
+import type {ViewProps} from '../Components/View/ViewPropTypes';
 import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
 import type {
-  WithDefault,
   DirectEventHandler,
   Int32,
+  WithDefault,
 } from '../Types/CodegenTypes';
 
-import type {ViewProps} from '../Components/View/ViewPropTypes';
+import codegenNativeComponent from '../Utilities/codegenNativeComponent';
 
 type OrientationChangeEvent = $ReadOnly<{|
   orientation: 'portrait' | 'landscape',
diff --git a/Libraries/Modal/__tests__/Modal-test.js b/Libraries/Modal/__tests__/Modal-test.js
index 7496be95c862..8a307fbccbc8 100644
--- a/Libraries/Modal/__tests__/Modal-test.js
+++ b/Libraries/Modal/__tests__/Modal-test.js
@@ -4,18 +4,17 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const React = require('react');
+const render = require('../../../jest/renderer');
 const View = require('../../Components/View/View');
 const Modal = require('../Modal');
-
-const render = require('../../../jest/renderer');
+const React = require('react');
 
 describe('<Modal />', () => {
   it('should render as <Modal> when mocked', () => {
diff --git a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h
index f9aba7d53b68..0dead277b703 100644
--- a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h
@@ -7,6 +7,6 @@
 
 #import "RCTAnimationDriver.h"
 
-@interface RCTDecayAnimation : NSObject<RCTAnimationDriver>
+@interface RCTDecayAnimation : NSObject <RCTAnimationDriver>
 
 @end
diff --git a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
index 4ead00762709..5c19386cd936 100644
--- a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
@@ -7,8 +7,8 @@
 
 #import <React/RCTDecayAnimation.h>
 
-#import <UIKit/UIKit.h>
 #import <React/RCTConvert.h>
+#import <UIKit/UIKit.h>
 
 #import <React/RCTAnimationUtils.h>
 #import <React/RCTValueAnimatedNode.h>
@@ -22,8 +22,7 @@ @interface RCTDecayAnimation ()
 
 @end
 
-@implementation RCTDecayAnimation
-{
+@implementation RCTDecayAnimation {
   CGFloat _velocity;
   CGFloat _deceleration;
   NSTimeInterval _frameStartTime;
@@ -61,7 +60,7 @@ - (void)resetAnimationConfig:(NSDictionary *)config
   _animationHasFinished = iterations.integerValue == 0;
 }
 
-RCT_NOT_IMPLEMENTED(- (instancetype)init)
+RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (void)startAnimation
 {
@@ -73,9 +72,7 @@ - (void)stopAnimation
 {
   _valueNode = nil;
   if (_callback) {
-    _callback(@[@{
-      @"finished": @(_animationHasFinished)
-    }]);
+    _callback(@[ @{@"finished" : @(_animationHasFinished)} ]);
   }
 }
 
@@ -100,8 +97,8 @@ - (void)stepAnimationWithTime:(NSTimeInterval)currentTime
   }
 
   CGFloat value = _fromValue +
-    (_velocity / (1 - _deceleration)) *
-    (1 - exp(-(1 - _deceleration) * (currentTime - _frameStartTime) * 1000.0 / RCTAnimationDragCoefficient()));
+      (_velocity / (1 - _deceleration)) *
+          (1 - exp(-(1 - _deceleration) * (currentTime - _frameStartTime) * 1000.0 / RCTAnimationDragCoefficient()));
 
   [self updateValue:value];
 
diff --git a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h
index 3791ba5a0aff..e3b18b33bd2e 100644
--- a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h
@@ -13,8 +13,7 @@
 
 @property (nonatomic, readonly, weak) RCTValueAnimatedNode *valueNode;
 
-- (instancetype)initWithEventPath:(NSArray<NSString *> *)eventPath
-                        valueNode:(RCTValueAnimatedNode *)valueNode;
+- (instancetype)initWithEventPath:(NSArray<NSString *> *)eventPath valueNode:(RCTValueAnimatedNode *)valueNode;
 
 - (void)updateWithEvent:(id<RCTEvent>)event;
 
diff --git a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m
index 35b96a8128b0..9363df28b90c 100644
--- a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m
@@ -7,13 +7,11 @@
 
 #import <React/RCTEventAnimation.h>
 
-@implementation RCTEventAnimation
-{
+@implementation RCTEventAnimation {
   NSArray<NSString *> *_eventPath;
 }
 
-- (instancetype)initWithEventPath:(NSArray<NSString *> *)eventPath
-                        valueNode:(RCTValueAnimatedNode *)valueNode
+- (instancetype)initWithEventPath:(NSArray<NSString *> *)eventPath valueNode:(RCTValueAnimatedNode *)valueNode
 {
   if ((self = [super init])) {
     _eventPath = eventPath;
diff --git a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h
index 1ce3c83ef1ef..0ac3d328a98f 100644
--- a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h
@@ -7,6 +7,6 @@
 
 #import "RCTAnimationDriver.h"
 
-@interface RCTFrameAnimation : NSObject<RCTAnimationDriver>
+@interface RCTFrameAnimation : NSObject <RCTAnimationDriver>
 
 @end
diff --git a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
index 07c9ab33f41a..d2bf4cd618b2 100644
--- a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
@@ -24,8 +24,7 @@ @interface RCTFrameAnimation ()
 
 @end
 
-@implementation RCTFrameAnimation
-{
+@implementation RCTFrameAnimation {
   NSArray<NSNumber *> *_frames;
   CGFloat _toValue;
   CGFloat _fromValue;
@@ -67,7 +66,7 @@ - (void)resetAnimationConfig:(NSDictionary *)config
   _currentLoop = 1;
 }
 
-RCT_NOT_IMPLEMENTED(- (instancetype)init)
+RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (void)startAnimation
 {
@@ -79,9 +78,7 @@ - (void)stopAnimation
 {
   _valueNode = nil;
   if (_callback) {
-    _callback(@[@{
-      @"finished": @(_animationHasFinished)
-    }]);
+    _callback(@[ @{@"finished" : @(_animationHasFinished)} ]);
   }
 }
 
@@ -128,27 +125,23 @@ - (void)stepAnimationWithTime:(NSTimeInterval)currentTime
   NSTimeInterval toInterval = (double)nextIndex * RCTSingleFrameInterval;
 
   // Interpolate between the individual frames to ensure the animations are
-  //smooth and of the proper duration regardless of the framerate.
-  CGFloat frameOutput = RCTInterpolateValue(currentDuration,
-                                            fromInterval,
-                                            toInterval,
-                                            fromFrameValue.doubleValue,
-                                            toFrameValue.doubleValue,
-                                            EXTRAPOLATE_TYPE_EXTEND,
-                                            EXTRAPOLATE_TYPE_EXTEND);
+  // smooth and of the proper duration regardless of the framerate.
+  CGFloat frameOutput = RCTInterpolateValue(
+      currentDuration,
+      fromInterval,
+      toInterval,
+      fromFrameValue.doubleValue,
+      toFrameValue.doubleValue,
+      EXTRAPOLATE_TYPE_EXTEND,
+      EXTRAPOLATE_TYPE_EXTEND);
 
   [self updateOutputWithFrameOutput:frameOutput];
 }
 
 - (void)updateOutputWithFrameOutput:(CGFloat)frameOutput
 {
-  CGFloat outputValue = RCTInterpolateValue(frameOutput,
-                                            0,
-                                            1,
-                                            _fromValue,
-                                            _toValue,
-                                            EXTRAPOLATE_TYPE_EXTEND,
-                                            EXTRAPOLATE_TYPE_EXTEND);
+  CGFloat outputValue =
+      RCTInterpolateValue(frameOutput, 0, 1, _fromValue, _toValue, EXTRAPOLATE_TYPE_EXTEND, EXTRAPOLATE_TYPE_EXTEND);
 
   _lastPosition = outputValue;
   _valueNode.value = outputValue;
diff --git a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h
index bb7554c1039b..3682d0f80bc2 100644
--- a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h
@@ -7,6 +7,6 @@
 
 #import "RCTAnimationDriver.h"
 
-@interface RCTSpringAnimation : NSObject<RCTAnimationDriver>
+@interface RCTSpringAnimation : NSObject <RCTAnimationDriver>
 
 @end
diff --git a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
index 8292ea41fee4..232916017607 100644
--- a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
@@ -26,8 +26,7 @@ @interface RCTSpringAnimation ()
 
 const NSTimeInterval MAX_DELTA_TIME = 0.064;
 
-@implementation RCTSpringAnimation
-{
+@implementation RCTSpringAnimation {
   CGFloat _toValue;
   CGFloat _fromValue;
   BOOL _overshootClamping;
@@ -87,7 +86,7 @@ - (void)resetAnimationConfig:(NSDictionary *)config
   _animationHasBegun = YES;
 }
 
-RCT_NOT_IMPLEMENTED(- (instancetype)init)
+RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (void)startAnimation
 {
@@ -99,9 +98,7 @@ - (void)stopAnimation
 {
   _valueNode = nil;
   if (_callback) {
-    _callback(@[@{
-      @"finished": @(_animationHasFinished)
-    }]);
+    _callback(@[ @{@"finished" : @(_animationHasFinished)} ]);
   }
 }
 
@@ -113,7 +110,7 @@ - (void)stepAnimationWithTime:(NSTimeInterval)currentTime
   }
 
   // calculate delta time
-  if(_animationStartTime == -1) {
+  if (_animationStartTime == -1) {
     _t = 0.0;
     _animationStartTime = currentTime;
   } else {
@@ -140,27 +137,16 @@ - (void)stepAnimationWithTime:(NSTimeInterval)currentTime
   if (zeta < 1) {
     // Under damped
     CGFloat envelope = expf(-zeta * omega0 * _t);
-    position =
-      _toValue -
-      envelope *
-      ((v0 + zeta * omega0 * x0) / omega1 * sinf(omega1 * _t) +
-        x0 * cosf(omega1 * _t));
+    position = _toValue - envelope * ((v0 + zeta * omega0 * x0) / omega1 * sinf(omega1 * _t) + x0 * cosf(omega1 * _t));
     // This looks crazy -- it's actually just the derivative of the
     // oscillation function
     velocity =
-      zeta *
-        omega0 *
-        envelope *
-        (sinf(omega1 * _t) * (v0 + zeta * omega0 * x0) / omega1 +
-          x0 * cosf(omega1 * _t)) -
-      envelope *
-        (cosf(omega1 * _t) * (v0 + zeta * omega0 * x0) -
-          omega1 * x0 * sinf(omega1 * _t));
+        zeta * omega0 * envelope * (sinf(omega1 * _t) * (v0 + zeta * omega0 * x0) / omega1 + x0 * cosf(omega1 * _t)) -
+        envelope * (cosf(omega1 * _t) * (v0 + zeta * omega0 * x0) - omega1 * x0 * sinf(omega1 * _t));
   } else {
     CGFloat envelope = expf(-omega0 * _t);
     position = _toValue - envelope * (x0 + (v0 + omega0 * x0) * _t);
-    velocity =
-      envelope * (v0 * (_t * omega0 - 1) + _t * x0 * (omega0 * omega0));
+    velocity = envelope * (v0 * (_t * omega0 - 1) + _t * x0 * (omega0 * omega0));
   }
 
   _lastPosition = position;
diff --git a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m
index e6088bbe4946..64605ff91d8e 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m
@@ -16,8 +16,7 @@ - (void)performUpdate
   if (inputNodes.count > 1) {
     RCTValueAnimatedNode *parent1 = (RCTValueAnimatedNode *)[self.parentNodes objectForKey:inputNodes[0]];
     RCTValueAnimatedNode *parent2 = (RCTValueAnimatedNode *)[self.parentNodes objectForKey:inputNodes[1]];
-    if ([parent1 isKindOfClass:[RCTValueAnimatedNode class]] &&
-        [parent2 isKindOfClass:[RCTValueAnimatedNode class]]) {
+    if ([parent1 isKindOfClass:[RCTValueAnimatedNode class]] && [parent2 isKindOfClass:[RCTValueAnimatedNode class]]) {
       self.value = parent1.value + parent2.value;
     }
   }
diff --git a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h
index a6308ee542be..8746e06b0941 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h
@@ -11,8 +11,7 @@
 
 @interface RCTAnimatedNode : NSObject
 
-- (instancetype)initWithTag:(NSNumber *)tag
-                     config:(NSDictionary<NSString *, id> *)config NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config NS_DESIGNATED_INITIALIZER;
 
 @property (nonatomic, readonly) NSNumber *nodeTag;
 @property (nonatomic, weak) RCTNativeAnimatedNodesManager *manager;
@@ -23,7 +22,7 @@
 
 @property (nonatomic, readonly) BOOL needsUpdate;
 
--(BOOL)isManagedByFabric;
+- (BOOL)isManagedByFabric;
 
 /**
  * Marks a node and its children as needing update.
diff --git a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m
index 7641c539068a..c17f29fd447c 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m
@@ -9,14 +9,12 @@
 
 #import <React/RCTDefines.h>
 
-@implementation RCTAnimatedNode
-{
+@implementation RCTAnimatedNode {
   NSMapTable<NSNumber *, RCTAnimatedNode *> *_childNodes;
   NSMapTable<NSNumber *, RCTAnimatedNode *> *_parentNodes;
 }
 
-- (instancetype)initWithTag:(NSNumber *)tag
-                     config:(NSDictionary<NSString *, id> *)config
+- (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
   if ((self = [super init])) {
     _nodeTag = tag;
@@ -25,7 +23,7 @@ - (instancetype)initWithTag:(NSNumber *)tag
   return self;
 }
 
-RCT_NOT_IMPLEMENTED(- (instancetype)init)
+RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (NSMapTable<NSNumber *, RCTAnimatedNode *> *)childNodes
 {
diff --git a/Libraries/NativeAnimation/Nodes/RCTColorAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTColorAnimatedNode.m
index 6c8d2a881116..3a86978d87d4 100644
--- a/Libraries/NativeAnimation/Nodes/RCTColorAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTColorAnimatedNode.m
@@ -19,10 +19,8 @@ - (void)performUpdate
   RCTValueAnimatedNode *bNode = (RCTValueAnimatedNode *)[self.parentNodes objectForKey:self.config[@"b"]];
   RCTValueAnimatedNode *aNode = (RCTValueAnimatedNode *)[self.parentNodes objectForKey:self.config[@"a"]];
 
-  _color = ((int)round(aNode.value * 255) & 0xff) << 24 |
-      ((int)round(rNode.value) & 0xff) << 16 |
-      ((int)round(gNode.value) & 0xff) << 8 |
-      ((int)round(bNode.value) & 0xff);
+  _color = ((int)round(aNode.value * 255) & 0xff) << 24 | ((int)round(rNode.value) & 0xff) << 16 |
+      ((int)round(gNode.value) & 0xff) << 8 | ((int)round(bNode.value) & 0xff);
 
   // TODO (T111179606): Support platform colors for color animations
 }
diff --git a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m
index 4d226f19886a..a8d118a200f3 100644
--- a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m
@@ -9,16 +9,14 @@
 
 #import <React/RCTLog.h>
 
-@implementation RCTDiffClampAnimatedNode
-{
+@implementation RCTDiffClampAnimatedNode {
   NSNumber *_inputNodeTag;
   CGFloat _min;
   CGFloat _max;
   CGFloat _lastValue;
 }
 
-- (instancetype)initWithTag:(NSNumber *)tag
-                     config:(NSDictionary<NSString *, id> *)config
+- (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
   if (self = [super initWithTag:tag config:config]) {
     _inputNodeTag = config[@"input"];
@@ -49,6 +47,11 @@ - (void)performUpdate
 
 - (CGFloat)inputNodeValue
 {
+  if (self.parentNodes == nil) {
+    RCTLogWarn(@"Animated.DiffClamp node has not been fully initialised.");
+    return 0;
+  }
+
   RCTValueAnimatedNode *inputNode = (RCTValueAnimatedNode *)[self.parentNodes objectForKey:_inputNodeTag];
   if (![inputNode isKindOfClass:[RCTValueAnimatedNode class]]) {
     RCTLogError(@"Illegal node ID set as an input for Animated.DiffClamp node");
diff --git a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m
index 4517ea46fd4f..25e62f630809 100644
--- a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m
@@ -19,8 +19,7 @@ - (void)performUpdate
   if (inputNodes.count > 1) {
     RCTValueAnimatedNode *parent1 = (RCTValueAnimatedNode *)[self.parentNodes objectForKey:inputNodes[0]];
     RCTValueAnimatedNode *parent2 = (RCTValueAnimatedNode *)[self.parentNodes objectForKey:inputNodes[1]];
-    if ([parent1 isKindOfClass:[RCTValueAnimatedNode class]] &&
-        [parent2 isKindOfClass:[RCTValueAnimatedNode class]]) {
+    if ([parent1 isKindOfClass:[RCTValueAnimatedNode class]] && [parent2 isKindOfClass:[RCTValueAnimatedNode class]]) {
       if (parent2.value == 0) {
         RCTLogError(@"Detected a division by zero in Animated.divide node");
         return;
diff --git a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
index 82b94b9ca5c4..3950d4f15657 100644
--- a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
@@ -11,8 +11,7 @@
 
 static NSRegularExpression *regex;
 
-@implementation RCTInterpolationAnimatedNode
-{
+@implementation RCTInterpolationAnimatedNode {
   __weak RCTValueAnimatedNode *_parentNode;
   NSArray<NSNumber *> *_inputRange;
   NSArray<NSNumber *> *_outputRange;
@@ -23,16 +22,17 @@ @implementation RCTInterpolationAnimatedNode
   NSUInteger _numVals;
   bool _hasStringOutput;
   bool _shouldRound;
-  NSArray<NSTextCheckingResult*> *_matches;
+  NSArray<NSTextCheckingResult *> *_matches;
 }
 
-- (instancetype)initWithTag:(NSNumber *)tag
-                     config:(NSDictionary<NSString *, id> *)config
+- (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     NSString *fpRegex = @"[+-]?(\\d+\\.?\\d*|\\.\\d+)([eE][+-]?\\d+)?";
-    regex = [NSRegularExpression regularExpressionWithPattern:fpRegex options:NSRegularExpressionCaseInsensitive error:nil];
+    regex = [NSRegularExpression regularExpressionWithPattern:fpRegex
+                                                      options:NSRegularExpressionCaseInsensitive
+                                                        error:nil];
   });
   if ((self = [super initWithTag:tag config:config])) {
     _inputRange = [config[@"inputRange"] copy];
@@ -59,7 +59,7 @@ - (instancetype)initWithTag:(NSNumber *)tag
 
         _matches = [regex matchesInString:value options:0 range:NSMakeRange(0, [value length])];
         for (NSTextCheckingResult *match in _matches) {
-          NSString* strNumber = [value substringWithRange:match.range];
+          NSString *strNumber = [value substringWithRange:match.range];
           [output addObject:[NSNumber numberWithDouble:strNumber.doubleValue]];
         }
 
@@ -124,11 +124,8 @@ - (void)performUpdate
 
   CGFloat inputValue = _parentNode.value;
 
-  CGFloat interpolated = RCTInterpolateValueInRange(inputValue,
-                                                    _inputRange,
-                                                    _outputRange,
-                                                    _extrapolateLeft,
-                                                    _extrapolateRight);
+  CGFloat interpolated =
+      RCTInterpolateValueInRange(inputValue, _inputRange, _outputRange, _extrapolateLeft, _extrapolateRight);
   self.value = interpolated;
   if (_hasStringOutput) {
     // 'rgba(0, 100, 200, 0)'
@@ -139,11 +136,8 @@ - (void)performUpdate
       NSMutableString *formattedText = [NSMutableString stringWithString:text];
       NSUInteger i = _numVals;
       for (NSTextCheckingResult *match in [_matches reverseObjectEnumerator]) {
-        CGFloat val = RCTInterpolateValueInRange(inputValue,
-                                                          _inputRange,
-                                                          _outputs[--i],
-                                                          _extrapolateLeft,
-                                                          _extrapolateRight);
+        CGFloat val =
+            RCTInterpolateValueInRange(inputValue, _inputRange, _outputs[--i], _extrapolateLeft, _extrapolateRight);
         NSString *str;
         if (_shouldRound) {
           // rgba requires that the r,g,b are integers.... so we want to round them, but we *dont* want to
@@ -161,9 +155,9 @@ - (void)performUpdate
       self.animatedObject = formattedText;
     } else {
       self.animatedObject = [regex stringByReplacingMatchesInString:_soutputRange[0]
-                                                 options:0
-                                                   range:NSMakeRange(0, _soutputRange[0].length)
-                                            withTemplate:[NSString stringWithFormat:@"%1f", interpolated]];
+                                                            options:0
+                                                              range:NSMakeRange(0, _soutputRange[0].length)
+                                                       withTemplate:[NSString stringWithFormat:@"%1f", interpolated]];
     }
   }
 }
diff --git a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m
index 4f7220ebff6b..bfbfe65fd9f0 100644
--- a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m
@@ -17,8 +17,7 @@ - (void)performUpdate
   if (inputNodes.count > 1) {
     RCTValueAnimatedNode *parent1 = (RCTValueAnimatedNode *)[self.parentNodes objectForKey:inputNodes[0]];
     RCTValueAnimatedNode *parent2 = (RCTValueAnimatedNode *)[self.parentNodes objectForKey:inputNodes[1]];
-    if ([parent1 isKindOfClass:[RCTValueAnimatedNode class]] &&
-        [parent2 isKindOfClass:[RCTValueAnimatedNode class]]) {
+    if ([parent1 isKindOfClass:[RCTValueAnimatedNode class]] && [parent2 isKindOfClass:[RCTValueAnimatedNode class]]) {
       self.value = parent1.value * parent2.value;
     }
   }
diff --git a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m
index 43e96a2eb2b6..9b732b347c2f 100644
--- a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m
@@ -8,14 +8,13 @@
 #import <React/RCTPropsAnimatedNode.h>
 
 #import <React/RCTAnimationUtils.h>
+#import <React/RCTColorAnimatedNode.h>
 #import <React/RCTLog.h>
 #import <React/RCTStyleAnimatedNode.h>
 #import <React/RCTUIManager.h>
 #import <React/RCTValueAnimatedNode.h>
-#import <React/RCTColorAnimatedNode.h>
 
-@implementation RCTPropsAnimatedNode
-{
+@implementation RCTPropsAnimatedNode {
   NSNumber *_connectedViewTag;
   NSString *_connectedViewName;
   __weak RCTBridge *_bridge;
@@ -24,8 +23,7 @@ @implementation RCTPropsAnimatedNode
   BOOL _managedByFabric;
 }
 
-- (instancetype)initWithTag:(NSNumber *)tag
-                     config:(NSDictionary<NSString *, id> *)config
+- (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
   if (self = [super initWithTag:tag config:config]) {
     _propsDictionary = [NSMutableDictionary new];
@@ -41,7 +39,7 @@ - (BOOL)isManagedByFabric
 - (void)connectToView:(NSNumber *)viewTag
              viewName:(NSString *)viewName
                bridge:(RCTBridge *)bridge
-     surfacePresenter:(id<RCTSurfacePresenterStub> )surfacePresenter
+     surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
 {
   _bridge = bridge;
   _surfacePresenter = surfacePresenter;
@@ -63,11 +61,9 @@ - (void)updateView
 {
   if (_managedByFabric) {
     if (_bridge.surfacePresenter) {
-      [_bridge.surfacePresenter synchronouslyUpdateViewOnUIThread:_connectedViewTag
-      props:_propsDictionary];
+      [_bridge.surfacePresenter synchronouslyUpdateViewOnUIThread:_connectedViewTag props:_propsDictionary];
     } else {
-      [_surfacePresenter synchronouslyUpdateViewOnUIThread:_connectedViewTag
-      props:_propsDictionary];
+      [_surfacePresenter synchronouslyUpdateViewOnUIThread:_connectedViewTag props:_propsDictionary];
     }
   } else {
     [_bridge.uiManager synchronouslyUpdateViewOnUIThread:_connectedViewTag
@@ -96,12 +92,13 @@ - (void)restoreDefaultValues
 - (NSString *)propertyNameForParentTag:(NSNumber *)parentTag
 {
   __block NSString *propertyName;
-  [self.config[@"props"] enumerateKeysAndObjectsUsingBlock:^(NSString *_Nonnull property, NSNumber *_Nonnull tag, BOOL *_Nonnull stop) {
-    if ([tag isEqualToNumber:parentTag]) {
-      propertyName = property;
-      *stop = YES;
-    }
-  }];
+  [self.config[@"props"]
+      enumerateKeysAndObjectsUsingBlock:^(NSString *_Nonnull property, NSNumber *_Nonnull tag, BOOL *_Nonnull stop) {
+        if ([tag isEqualToNumber:parentTag]) {
+          propertyName = property;
+          *stop = YES;
+        }
+      }];
   return propertyName;
 }
 
diff --git a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m
index 8dc81c9efbd3..e99992ee78dd 100644
--- a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m
@@ -5,19 +5,17 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTStyleAnimatedNode.h>
 #import <React/RCTAnimationUtils.h>
-#import <React/RCTValueAnimatedNode.h>
-#import <React/RCTTransformAnimatedNode.h>
 #import <React/RCTColorAnimatedNode.h>
+#import <React/RCTStyleAnimatedNode.h>
+#import <React/RCTTransformAnimatedNode.h>
+#import <React/RCTValueAnimatedNode.h>
 
-@implementation RCTStyleAnimatedNode
-{
+@implementation RCTStyleAnimatedNode {
   NSMutableDictionary<NSString *, NSObject *> *_propsDictionary;
 }
 
-- (instancetype)initWithTag:(NSNumber *)tag
-                     config:(NSDictionary<NSString *, id> *)config
+- (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
   if ((self = [super initWithTag:tag config:config])) {
     _propsDictionary = [NSMutableDictionary new];
diff --git a/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.h
index 043b7c8674b7..886a9b4d55d5 100644
--- a/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.h
@@ -10,4 +10,3 @@
 @interface RCTSubtractionAnimatedNode : RCTValueAnimatedNode
 
 @end
-
diff --git a/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.m
index 3ddcf34d3f99..95c2a9426e86 100644
--- a/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.m
@@ -16,12 +16,10 @@ - (void)performUpdate
   if (inputNodes.count > 1) {
     RCTValueAnimatedNode *parent1 = (RCTValueAnimatedNode *)[self.parentNodes objectForKey:inputNodes[0]];
     RCTValueAnimatedNode *parent2 = (RCTValueAnimatedNode *)[self.parentNodes objectForKey:inputNodes[1]];
-    if ([parent1 isKindOfClass:[RCTValueAnimatedNode class]] &&
-        [parent2 isKindOfClass:[RCTValueAnimatedNode class]]) {
+    if ([parent1 isKindOfClass:[RCTValueAnimatedNode class]] && [parent2 isKindOfClass:[RCTValueAnimatedNode class]]) {
       self.value = parent1.value - parent2.value;
     }
   }
 }
 
 @end
-
diff --git a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h
index 0703c450fcd6..8f73efa9e76a 100644
--- a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h
@@ -7,7 +7,6 @@
 
 #import "RCTAnimatedNode.h"
 
-
 @interface RCTTrackingAnimatedNode : RCTAnimatedNode
 
 @end
diff --git a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m
index b55f6bb38f54..85d208680f3b 100644
--- a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#import <React/RCTNativeAnimatedNodesManager.h>
 #import <React/RCTTrackingAnimatedNode.h>
 #import <React/RCTValueAnimatedNode.h>
-#import <React/RCTNativeAnimatedNodesManager.h>
 
 @implementation RCTTrackingAnimatedNode {
   NSNumber *_animationId;
@@ -16,8 +16,7 @@ @implementation RCTTrackingAnimatedNode {
   NSMutableDictionary *_animationConfig;
 }
 
-- (instancetype)initWithTag:(NSNumber *)tag
-                     config:(NSDictionary<NSString *, id> *)config
+- (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
   if ((self = [super initWithTag:tag config:config])) {
     _animationId = config[@"animationId"];
@@ -42,11 +41,7 @@ - (void)performUpdate
   RCTValueAnimatedNode *node = (RCTValueAnimatedNode *)[self.parentNodes objectForKey:_toValueNodeTag];
   _animationConfig[@"toValue"] = @(node.value);
 
-  [self.manager startAnimatingNode:_animationId
-                           nodeTag:_valueNodeTag
-                            config:_animationConfig
-                       endCallback:nil];
+  [self.manager startAnimatingNode:_animationId nodeTag:_valueNodeTag config:_animationConfig endCallback:nil];
 }
 
 @end
-
diff --git a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m
index dd2fd2cfad84..8c58d6d33cab 100644
--- a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m
@@ -8,13 +8,11 @@
 #import <React/RCTTransformAnimatedNode.h>
 #import <React/RCTValueAnimatedNode.h>
 
-@implementation RCTTransformAnimatedNode
-{
+@implementation RCTTransformAnimatedNode {
   NSMutableDictionary<NSString *, NSObject *> *_propsDictionary;
 }
 
-- (instancetype)initWithTag:(NSNumber *)tag
-                     config:(NSDictionary<NSString *, id> *)config
+- (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
   if ((self = [super initWithTag:tag config:config])) {
     _propsDictionary = [NSMutableDictionary new];
@@ -37,7 +35,7 @@ - (void)performUpdate
     NSString *type = transformConfig[@"type"];
     NSString *property = transformConfig[@"property"];
     NSNumber *value;
-    if ([type isEqualToString: @"animated"]) {
+    if ([type isEqualToString:@"animated"]) {
       NSNumber *nodeTag = transformConfig[@"nodeTag"];
       RCTAnimatedNode *node = [self.parentNodes objectForKey:nodeTag];
       if (![node isKindOfClass:[RCTValueAnimatedNode class]]) {
@@ -48,7 +46,7 @@ - (void)performUpdate
     } else {
       value = transformConfig[@"value"];
     }
-    [transform addObject:@{property: value}];
+    [transform addObject:@{property : value}];
   }
 
   _propsDictionary[@"transform"] = transform;
diff --git a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m
index df1f5866bb88..d128c9d92dd2 100644
--- a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m
@@ -17,8 +17,7 @@ @implementation RCTValueAnimatedNode
 
 @synthesize value = _value;
 
-- (instancetype)initWithTag:(NSNumber *)tag
-                     config:(NSDictionary<NSString *, id> *)config
+- (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
   if (self = [super initWithTag:tag config:config]) {
     _offset = [self.config[@"offset"] floatValue];
diff --git a/Libraries/NativeAnimation/RCTAnimationUtils.h b/Libraries/NativeAnimation/RCTAnimationUtils.h
index cc8c8faa9fe8..97594f35d87f 100644
--- a/Libraries/NativeAnimation/RCTAnimationUtils.h
+++ b/Libraries/NativeAnimation/RCTAnimationUtils.h
@@ -14,19 +14,21 @@ static NSString *const EXTRAPOLATE_TYPE_IDENTITY = @"identity";
 static NSString *const EXTRAPOLATE_TYPE_CLAMP = @"clamp";
 static NSString *const EXTRAPOLATE_TYPE_EXTEND = @"extend";
 
-RCT_EXTERN CGFloat RCTInterpolateValueInRange(CGFloat value,
-                                              NSArray<NSNumber *> *inputRange,
-                                              NSArray<NSNumber *> *outputRange,
-                                              NSString *extrapolateLeft,
-                                              NSString *extrapolateRight);
+RCT_EXTERN CGFloat RCTInterpolateValueInRange(
+    CGFloat value,
+    NSArray<NSNumber *> *inputRange,
+    NSArray<NSNumber *> *outputRange,
+    NSString *extrapolateLeft,
+    NSString *extrapolateRight);
 
-RCT_EXTERN CGFloat RCTInterpolateValue(CGFloat value,
-                                       CGFloat inputMin,
-                                       CGFloat inputMax,
-                                       CGFloat outputMin,
-                                       CGFloat outputMax,
-                                       NSString *extrapolateLeft,
-                                       NSString *extrapolateRight);
+RCT_EXTERN CGFloat RCTInterpolateValue(
+    CGFloat value,
+    CGFloat inputMin,
+    CGFloat inputMax,
+    CGFloat outputMin,
+    CGFloat outputMax,
+    NSString *extrapolateLeft,
+    NSString *extrapolateRight);
 
 RCT_EXTERN CGFloat RCTRadiansToDegrees(CGFloat radians);
 RCT_EXTERN CGFloat RCTDegreesToRadians(CGFloat degrees);
diff --git a/Libraries/NativeAnimation/RCTAnimationUtils.m b/Libraries/NativeAnimation/RCTAnimationUtils.m
index f095a520cf88..1f97b22baf08 100644
--- a/Libraries/NativeAnimation/RCTAnimationUtils.m
+++ b/Libraries/NativeAnimation/RCTAnimationUtils.m
@@ -25,13 +25,14 @@ static NSUInteger _RCTFindIndexOfNearestValue(CGFloat value, NSArray<NSNumber *>
 /**
  * Interpolates value by remapping it linearly fromMin->fromMax to toMin->toMax
  */
-CGFloat RCTInterpolateValue(CGFloat value,
-                            CGFloat inputMin,
-                            CGFloat inputMax,
-                            CGFloat outputMin,
-                            CGFloat outputMax,
-                            NSString *extrapolateLeft,
-                            NSString *extrapolateRight)
+CGFloat RCTInterpolateValue(
+    CGFloat value,
+    CGFloat inputMin,
+    CGFloat inputMax,
+    CGFloat outputMin,
+    CGFloat outputMax,
+    NSString *extrapolateLeft,
+    NSString *extrapolateRight)
 {
   if (value < inputMin) {
     if ([extrapolateLeft isEqualToString:EXTRAPOLATE_TYPE_IDENTITY]) {
@@ -63,11 +64,12 @@ CGFloat RCTInterpolateValue(CGFloat value,
 /**
  * Interpolates value by mapping it from the inputRange to the outputRange.
  */
-CGFloat RCTInterpolateValueInRange(CGFloat value,
-                                   NSArray<NSNumber *> *inputRange,
-                                   NSArray<NSNumber *> *outputRange,
-                                   NSString *extrapolateLeft,
-                                   NSString *extrapolateRight)
+CGFloat RCTInterpolateValueInRange(
+    CGFloat value,
+    NSArray<NSNumber *> *inputRange,
+    NSArray<NSNumber *> *outputRange,
+    NSString *extrapolateLeft,
+    NSString *extrapolateRight)
 {
   NSUInteger rangeIndex = _RCTFindIndexOfNearestValue(value, inputRange);
   CGFloat inputMin = inputRange[rangeIndex].doubleValue;
@@ -75,13 +77,7 @@ CGFloat RCTInterpolateValueInRange(CGFloat value,
   CGFloat outputMin = outputRange[rangeIndex].doubleValue;
   CGFloat outputMax = outputRange[rangeIndex + 1].doubleValue;
 
-  return RCTInterpolateValue(value,
-                             inputMin,
-                             inputMax,
-                             outputMin,
-                             outputMax,
-                             extrapolateLeft,
-                             extrapolateRight);
+  return RCTInterpolateValue(value, inputMin, inputMax, outputMin, outputMax, extrapolateLeft, extrapolateRight);
 }
 
 CGFloat RCTRadiansToDegrees(CGFloat radians)
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.h b/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
index f573e859586d..f316c7f6374e 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
@@ -18,6 +18,11 @@
 // TODO T69437152 @petetheheat - Delete this fork when Fabric ships to 100%.
 // NOTE: This module is temporarily forked (see RCTNativeAnimatedTurboModule).
 // When making any changes, be sure to apply them to the fork as well.
-@interface RCTNativeAnimatedModule : RCTEventEmitter <RCTBridgeModule, RCTValueAnimatedNodeObserver, RCTEventDispatcherObserver, RCTUIManagerObserver, RCTSurfacePresenterObserver>
+@interface RCTNativeAnimatedModule : RCTEventEmitter <
+                                         RCTBridgeModule,
+                                         RCTValueAnimatedNodeObserver,
+                                         RCTEventDispatcherObserver,
+                                         RCTUIManagerObserver,
+                                         RCTSurfacePresenterObserver>
 
 @end
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm b/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm
index 50e8ca1ae8cf..b444ecca8e80 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm
@@ -6,10 +6,10 @@
  */
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
+#import <React/RCTInitializing.h>
+#import <React/RCTLog.h>
 #import <React/RCTNativeAnimatedModule.h>
 #import <React/RCTNativeAnimatedNodesManager.h>
-#import <React/RCTLog.h>
-#import <React/RCTInitializing.h>
 
 #import <RCTTypeSafety/RCTConvertHelpers.h>
 
@@ -20,8 +20,7 @@
 @interface RCTNativeAnimatedModule () <RCTInitializing>
 @end
 
-@implementation RCTNativeAnimatedModule
-{
+@implementation RCTNativeAnimatedModule {
   RCTNativeAnimatedNodesManager *_nodesManager;
 
   // Operations called after views have been updated.
@@ -68,7 +67,8 @@ - (dispatch_queue_t)methodQueue
 - (void)setBridge:(RCTBridge *)bridge
 {
   [super setBridge:bridge];
-  _nodesManager = [[RCTNativeAnimatedNodesManager alloc] initWithBridge:self.bridge surfacePresenter:bridge.surfacePresenter];
+  _nodesManager = [[RCTNativeAnimatedNodesManager alloc] initWithBridge:self.bridge
+                                                       surfacePresenter:bridge.surfacePresenter];
   [bridge.uiManager.observerCoordinator addObserver:self];
   [bridge.surfacePresenter addObserver:self];
 }
@@ -86,62 +86,64 @@ - (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
   RCTLogWarn(@"setSurfacePresenter should only be invoked in RCTNativeAnimatedTurboModule");
 }
 
-#pragma mark -- API
+#pragma mark-- API
 
-RCT_EXPORT_METHOD(createAnimatedNode:(double)tag
-                  config:(NSDictionary<NSString *, id> *)config)
+RCT_EXPORT_METHOD(createAnimatedNode : (double)tag config : (NSDictionary<NSString *, id> *)config)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager createAnimatedNode:[NSNumber numberWithDouble:tag] config:config];
   }];
 }
 
-RCT_EXPORT_METHOD(updateAnimatedNodeConfig:(double)tag
-                  config:(NSDictionary<NSString *, id> *)config)
+RCT_EXPORT_METHOD(updateAnimatedNodeConfig : (double)tag config : (NSDictionary<NSString *, id> *)config)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager updateAnimatedNodeConfig:[NSNumber numberWithDouble:tag] config:config];
   }];
 }
 
-RCT_EXPORT_METHOD(connectAnimatedNodes:(double)parentTag
-                  childTag:(double)childTag)
+RCT_EXPORT_METHOD(connectAnimatedNodes : (double)parentTag childTag : (double)childTag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager connectAnimatedNodes:[NSNumber numberWithDouble:parentTag] childTag:[NSNumber numberWithDouble:childTag]];
+    [nodesManager connectAnimatedNodes:[NSNumber numberWithDouble:parentTag]
+                              childTag:[NSNumber numberWithDouble:childTag]];
   }];
 }
 
-RCT_EXPORT_METHOD(disconnectAnimatedNodes:(double)parentTag
-                  childTag:(double)childTag)
+RCT_EXPORT_METHOD(disconnectAnimatedNodes : (double)parentTag childTag : (double)childTag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager disconnectAnimatedNodes:[NSNumber numberWithDouble:parentTag] childTag:[NSNumber numberWithDouble:childTag]];
+    [nodesManager disconnectAnimatedNodes:[NSNumber numberWithDouble:parentTag]
+                                 childTag:[NSNumber numberWithDouble:childTag]];
   }];
 }
 
-RCT_EXPORT_METHOD(startAnimatingNode:(double)animationId
-                  nodeTag:(double)nodeTag
-                  config:(NSDictionary<NSString *, id> *)config
-                  endCallback:(RCTResponseSenderBlock)callBack)
+RCT_EXPORT_METHOD(startAnimatingNode
+                  : (double)animationId nodeTag
+                  : (double)nodeTag config
+                  : (NSDictionary<NSString *, id> *)config endCallback
+                  : (RCTResponseSenderBlock)callBack)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager startAnimatingNode:[NSNumber numberWithDouble:animationId] nodeTag:[NSNumber numberWithDouble:nodeTag] config:config endCallback:callBack];
+    [nodesManager startAnimatingNode:[NSNumber numberWithDouble:animationId]
+                             nodeTag:[NSNumber numberWithDouble:nodeTag]
+                              config:config
+                         endCallback:callBack];
   }];
 
- RCTExecuteOnMainQueue(^{
-   if (![self->_nodesManager isNodeManagedByFabric:[NSNumber numberWithDouble:nodeTag]]) {
-     return;
-   }
+  RCTExecuteOnMainQueue(^{
+    if (![self->_nodesManager isNodeManagedByFabric:[NSNumber numberWithDouble:nodeTag]]) {
+      return;
+    }
 
-   RCTExecuteOnUIManagerQueue(^{
-     self->_animIdIsManagedByFabric[[NSNumber numberWithDouble:animationId]] = @YES;
-     [self flushOperationQueues];
-   });
- });
+    RCTExecuteOnUIManagerQueue(^{
+      self->_animIdIsManagedByFabric[[NSNumber numberWithDouble:animationId]] = @YES;
+      [self flushOperationQueues];
+    });
+  });
 }
 
-RCT_EXPORT_METHOD(stopAnimation:(double)animationId)
+RCT_EXPORT_METHOD(stopAnimation : (double)animationId)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager stopAnimation:[NSNumber numberWithDouble:animationId]];
@@ -151,68 +153,67 @@ - (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
   }
 }
 
-RCT_EXPORT_METHOD(setAnimatedNodeValue:(double)nodeTag
-                  value:(double)value)
+RCT_EXPORT_METHOD(setAnimatedNodeValue : (double)nodeTag value : (double)value)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager setAnimatedNodeValue:[NSNumber numberWithDouble:nodeTag] value:[NSNumber numberWithDouble:value]];
   }];
 }
 
-RCT_EXPORT_METHOD(setAnimatedNodeOffset:(double)nodeTag
-                  offset:(double)offset)
+RCT_EXPORT_METHOD(setAnimatedNodeOffset : (double)nodeTag offset : (double)offset)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager setAnimatedNodeOffset:[NSNumber numberWithDouble:nodeTag] offset:[NSNumber numberWithDouble:offset]];
   }];
 }
 
-RCT_EXPORT_METHOD(flattenAnimatedNodeOffset:(double)nodeTag)
+RCT_EXPORT_METHOD(flattenAnimatedNodeOffset : (double)nodeTag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager flattenAnimatedNodeOffset:[NSNumber numberWithDouble:nodeTag]];
   }];
 }
 
-RCT_EXPORT_METHOD(extractAnimatedNodeOffset:(double)nodeTag)
+RCT_EXPORT_METHOD(extractAnimatedNodeOffset : (double)nodeTag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager extractAnimatedNodeOffset:[NSNumber numberWithDouble:nodeTag]];
   }];
 }
 
-RCT_EXPORT_METHOD(connectAnimatedNodeToView:(double)nodeTag
-                  viewTag:(double)viewTag)
+RCT_EXPORT_METHOD(connectAnimatedNodeToView : (double)nodeTag viewTag : (double)viewTag)
 {
   NSString *viewName = [self.bridge.uiManager viewNameForReactTag:[NSNumber numberWithDouble:viewTag]];
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager connectAnimatedNodeToView:[NSNumber numberWithDouble:nodeTag] viewTag:[NSNumber numberWithDouble:viewTag] viewName:viewName];
+    [nodesManager connectAnimatedNodeToView:[NSNumber numberWithDouble:nodeTag]
+                                    viewTag:[NSNumber numberWithDouble:viewTag]
+                                   viewName:viewName];
   }];
 }
 
-RCT_EXPORT_METHOD(disconnectAnimatedNodeFromView:(double)nodeTag
-                  viewTag:(double)viewTag)
+RCT_EXPORT_METHOD(disconnectAnimatedNodeFromView : (double)nodeTag viewTag : (double)viewTag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager disconnectAnimatedNodeFromView:[NSNumber numberWithDouble:nodeTag] viewTag:[NSNumber numberWithDouble:viewTag]];
+    [nodesManager disconnectAnimatedNodeFromView:[NSNumber numberWithDouble:nodeTag]
+                                         viewTag:[NSNumber numberWithDouble:viewTag]];
   }];
 }
 
-RCT_EXPORT_METHOD(restoreDefaultValues:(double)nodeTag)
+RCT_EXPORT_METHOD(restoreDefaultValues : (double)nodeTag)
 {
   [self addPreOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager restoreDefaultValues:[NSNumber numberWithDouble:nodeTag]];
   }];
 }
 
-RCT_EXPORT_METHOD(dropAnimatedNode:(double)tag)
+RCT_EXPORT_METHOD(dropAnimatedNode : (double)tag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager dropAnimatedNode:[NSNumber numberWithDouble:tag]];
   }];
 }
 
-RCT_EXPORT_METHOD(startListeningToAnimatedNodeValue:(double)tag)
+RCT_EXPORT_METHOD(startListeningToAnimatedNodeValue : (double)tag)
 {
   __weak id<RCTValueAnimatedNodeObserver> valueObserver = self;
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
@@ -220,16 +221,17 @@ - (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
   }];
 }
 
-RCT_EXPORT_METHOD(stopListeningToAnimatedNodeValue:(double)tag)
+RCT_EXPORT_METHOD(stopListeningToAnimatedNodeValue : (double)tag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager stopListeningToAnimatedNodeValue:[NSNumber numberWithDouble:tag]];
   }];
 }
 
-RCT_EXPORT_METHOD(addAnimatedEventToView:(double)viewTag
-                  eventName:(nonnull NSString *)eventName
-                  eventMapping:(JS::NativeAnimatedModule::EventMapping &)eventMapping)
+RCT_EXPORT_METHOD(addAnimatedEventToView
+                  : (double)viewTag eventName
+                  : (nonnull NSString *)eventName eventMapping
+                  : (JS::NativeAnimatedModule::EventMapping &)eventMapping)
 {
   NSMutableDictionary *eventMappingDict = [NSMutableDictionary new];
   eventMappingDict[@"nativeEventPath"] = RCTConvertVecToArray(eventMapping.nativeEventPath());
@@ -239,31 +241,37 @@ - (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
   }
 
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager addAnimatedEventToView:[NSNumber numberWithDouble:viewTag] eventName:eventName eventMapping:eventMappingDict];
+    [nodesManager addAnimatedEventToView:[NSNumber numberWithDouble:viewTag]
+                               eventName:eventName
+                            eventMapping:eventMappingDict];
   }];
 }
 
-RCT_EXPORT_METHOD(removeAnimatedEventFromView:(double)viewTag
-                  eventName:(nonnull NSString *)eventName
-            animatedNodeTag:(double)animatedNodeTag)
+RCT_EXPORT_METHOD(removeAnimatedEventFromView
+                  : (double)viewTag eventName
+                  : (nonnull NSString *)eventName animatedNodeTag
+                  : (double)animatedNodeTag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager removeAnimatedEventFromView:[NSNumber numberWithDouble:viewTag] eventName:eventName animatedNodeTag:[NSNumber numberWithDouble:animatedNodeTag]];
+    [nodesManager removeAnimatedEventFromView:[NSNumber numberWithDouble:viewTag]
+                                    eventName:eventName
+                              animatedNodeTag:[NSNumber numberWithDouble:animatedNodeTag]];
   }];
 }
 
-RCT_EXPORT_METHOD(getValue:(double)nodeTag saveValueCallback:(RCTResponseSenderBlock)saveValueCallback) {
+RCT_EXPORT_METHOD(getValue : (double)nodeTag saveValueCallback : (RCTResponseSenderBlock)saveValueCallback)
+{
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-      [nodesManager getValue:[NSNumber numberWithDouble:nodeTag] saveCallback:saveValueCallback];
+    [nodesManager getValue:[NSNumber numberWithDouble:nodeTag] saveCallback:saveValueCallback];
   }];
 }
 
-RCT_EXPORT_METHOD(queueAndExecuteBatchedOperations:(NSArray *)operationsAndArgs) {
-    // TODO: implement in the future if we want the same optimization here as on Android
+RCT_EXPORT_METHOD(queueAndExecuteBatchedOperations : (NSArray *)operationsAndArgs)
+{
+  // TODO: implement in the future if we want the same optimization here as on Android
 }
 
-
-#pragma mark -- Batch handling
+#pragma mark-- Batch handling
 
 - (void)addOperationBlock:(AnimatedOperation)operation
 {
@@ -285,7 +293,6 @@ - (void)flushOperationQueues
   _preOperations = [NSMutableArray new];
   _operations = [NSMutableArray new];
 
-
   RCTExecuteOnMainQueue(^{
     for (AnimatedOperation operation in preOperations) {
       operation(self->_nodesManager);
@@ -342,11 +349,12 @@ - (void)uiManagerWillPerformMounting:(RCTUIManager *)uiManager
   _preOperations = [NSMutableArray new];
   _operations = [NSMutableArray new];
 
-  [uiManager prependUIBlock:^(__unused RCTUIManager *manager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    for (AnimatedOperation operation in preOperations) {
-      operation(self->_nodesManager);
-    }
-  }];
+  [uiManager
+      prependUIBlock:^(__unused RCTUIManager *manager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        for (AnimatedOperation operation in preOperations) {
+          operation(self->_nodesManager);
+        }
+      }];
   [uiManager addUIBlock:^(__unused RCTUIManager *manager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
     for (AnimatedOperation operation in operations) {
       operation(self->_nodesManager);
@@ -356,17 +364,16 @@ - (void)uiManagerWillPerformMounting:(RCTUIManager *)uiManager
   }];
 }
 
-#pragma mark -- Events
+#pragma mark-- Events
 
 - (NSArray<NSString *> *)supportedEvents
 {
-  return @[@"onAnimatedValueUpdate"];
+  return @[ @"onAnimatedValueUpdate" ];
 }
 
 - (void)animatedNode:(RCTValueAnimatedNode *)node didUpdateValue:(CGFloat)value
 {
-  [self sendEventWithName:@"onAnimatedValueUpdate"
-                     body:@{@"tag": node.nodeTag, @"value": @(value)}];
+  [self sendEventWithName:@"onAnimatedValueUpdate" body:@{@"tag" : node.nodeTag, @"value" : @(value)}];
 }
 
 - (void)eventDispatcherWillDispatchEvent:(id<RCTEvent>)event
@@ -380,6 +387,7 @@ - (void)eventDispatcherWillDispatchEvent:(id<RCTEvent>)event
 
 @end
 
-Class RCTNativeAnimatedModuleCls(void) {
+Class RCTNativeAnimatedModuleCls(void)
+{
   return RCTNativeAnimatedModule.class;
 }
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
index 3dd32b8828e2..932c873eb6cf 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
@@ -7,9 +7,9 @@
 
 #import <Foundation/Foundation.h>
 #import <React/RCTBridgeModule.h>
-#import <React/RCTUIManager.h>
-#import <React/RCTSurfacePresenterStub.h>
 #import <React/RCTEventDispatcherProtocol.h>
+#import <React/RCTSurfacePresenterStub.h>
+#import <React/RCTUIManager.h>
 
 @protocol RCTValueAnimatedNodeObserver;
 
@@ -26,19 +26,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (BOOL)isNodeManagedByFabric:(NSNumber *)tag;
 
-- (void)getValue:(NSNumber *)nodeTag
-        saveCallback:(RCTResponseSenderBlock)saveCallback;
+- (void)getValue:(NSNumber *)nodeTag saveCallback:(RCTResponseSenderBlock)saveCallback;
 
 // graph
 
-- (void)createAnimatedNode:(NSNumber *)tag
-                    config:(NSDictionary<NSString *, id> *)config;
+- (void)createAnimatedNode:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config;
 
-- (void)connectAnimatedNodes:(NSNumber *)parentTag
-                    childTag:(NSNumber *)childTag;
+- (void)connectAnimatedNodes:(NSNumber *)parentTag childTag:(NSNumber *)childTag;
 
-- (void)disconnectAnimatedNodes:(NSNumber *)parentTag
-                       childTag:(NSNumber *)childTag;
+- (void)disconnectAnimatedNodes:(NSNumber *)parentTag childTag:(NSNumber *)childTag;
 
 - (void)connectAnimatedNodeToView:(NSNumber *)nodeTag
                           viewTag:(NSNumber *)viewTag
@@ -46,25 +42,21 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)restoreDefaultValues:(NSNumber *)nodeTag;
 
-- (void)disconnectAnimatedNodeFromView:(NSNumber *)nodeTag
-                               viewTag:(NSNumber *)viewTag;
+- (void)disconnectAnimatedNodeFromView:(NSNumber *)nodeTag viewTag:(NSNumber *)viewTag;
 
 - (void)dropAnimatedNode:(NSNumber *)tag;
 
 // mutations
 
-- (void)setAnimatedNodeValue:(NSNumber *)nodeTag
-                       value:(NSNumber *)value;
+- (void)setAnimatedNodeValue:(NSNumber *)nodeTag value:(NSNumber *)value;
 
-- (void)setAnimatedNodeOffset:(NSNumber *)nodeTag
-                       offset:(NSNumber *)offset;
+- (void)setAnimatedNodeOffset:(NSNumber *)nodeTag offset:(NSNumber *)offset;
 
 - (void)flattenAnimatedNodeOffset:(NSNumber *)nodeTag;
 
 - (void)extractAnimatedNodeOffset:(NSNumber *)nodeTag;
 
-- (void)updateAnimatedNodeConfig:(NSNumber *)tag
-                    config:(NSDictionary<NSString *, id> *)config;
+- (void)updateAnimatedNodeConfig:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config;
 
 // drivers
 
@@ -91,8 +83,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 // listeners
 
-- (void)startListeningToAnimatedNodeValue:(NSNumber *)tag
-                            valueObserver:(id<RCTValueAnimatedNodeObserver>)valueObserver;
+- (void)startListeningToAnimatedNodeValue:(NSNumber *)tag valueObserver:(id<RCTValueAnimatedNodeObserver>)valueObserver;
 
 - (void)stopListeningToAnimatedNodeValue:(NSNumber *)tag;
 
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
index a07d19ba6307..e5007d2e8c1c 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
@@ -13,11 +13,11 @@
 #import <React/RCTAnimatedNode.h>
 #import <React/RCTAnimationDriver.h>
 #import <React/RCTColorAnimatedNode.h>
+#import <React/RCTDecayAnimation.h>
 #import <React/RCTDiffClampAnimatedNode.h>
 #import <React/RCTDivisionAnimatedNode.h>
 #import <React/RCTEventAnimation.h>
 #import <React/RCTFrameAnimation.h>
-#import <React/RCTDecayAnimation.h>
 #import <React/RCTInterpolationAnimatedNode.h>
 #import <React/RCTModuloAnimatedNode.h>
 #import <React/RCTMultiplicationAnimatedNode.h>
@@ -25,9 +25,9 @@
 #import <React/RCTSpringAnimation.h>
 #import <React/RCTStyleAnimatedNode.h>
 #import <React/RCTSubtractionAnimatedNode.h>
+#import <React/RCTTrackingAnimatedNode.h>
 #import <React/RCTTransformAnimatedNode.h>
 #import <React/RCTValueAnimatedNode.h>
-#import <React/RCTTrackingAnimatedNode.h>
 
 // We do some normalizing of the event names in RCTEventDispatcher#RCTNormalizeInputEventName.
 // To make things simpler just get rid of the parts we change in the event names we use here.
@@ -44,8 +44,7 @@
   return eventName;
 }
 
-@implementation RCTNativeAnimatedNodesManager
-{
+@implementation RCTNativeAnimatedNodesManager {
   __weak RCTBridge *_bridge;
   __weak id<RCTSurfacePresenterStub> _surfacePresenter;
   NSMutableDictionary<NSNumber *, RCTAnimatedNode *> *_animationNodes;
@@ -56,7 +55,8 @@ @implementation RCTNativeAnimatedNodesManager
   CADisplayLink *_displayLink;
 }
 
-- (instancetype)initWithBridge:(nullable RCTBridge *)bridge surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter;
+- (instancetype)initWithBridge:(nullable RCTBridge *)bridge
+              surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter;
 {
   if ((self = [super init])) {
     _bridge = bridge;
@@ -77,27 +77,28 @@ - (BOOL)isNodeManagedByFabric:(NSNumber *)tag
   return false;
 }
 
-#pragma mark -- Graph
+#pragma mark-- Graph
 
-- (void)createAnimatedNode:(NSNumber *)tag
-                    config:(NSDictionary<NSString *, id> *)config
+- (void)createAnimatedNode:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
   static NSDictionary *map;
   static dispatch_once_t mapToken;
   dispatch_once(&mapToken, ^{
-    map = @{@"style" : [RCTStyleAnimatedNode class],
-            @"value" : [RCTValueAnimatedNode class],
-            @"color" : [RCTColorAnimatedNode class],
-            @"props" : [RCTPropsAnimatedNode class],
-            @"interpolation" : [RCTInterpolationAnimatedNode class],
-            @"addition" : [RCTAdditionAnimatedNode class],
-            @"diffclamp": [RCTDiffClampAnimatedNode class],
-            @"division" : [RCTDivisionAnimatedNode class],
-            @"multiplication" : [RCTMultiplicationAnimatedNode class],
-            @"modulus" : [RCTModuloAnimatedNode class],
-            @"subtraction" : [RCTSubtractionAnimatedNode class],
-            @"transform" : [RCTTransformAnimatedNode class],
-            @"tracking" : [RCTTrackingAnimatedNode class]};
+    map = @{
+      @"style" : [RCTStyleAnimatedNode class],
+      @"value" : [RCTValueAnimatedNode class],
+      @"color" : [RCTColorAnimatedNode class],
+      @"props" : [RCTPropsAnimatedNode class],
+      @"interpolation" : [RCTInterpolationAnimatedNode class],
+      @"addition" : [RCTAdditionAnimatedNode class],
+      @"diffclamp" : [RCTDiffClampAnimatedNode class],
+      @"division" : [RCTDivisionAnimatedNode class],
+      @"multiplication" : [RCTMultiplicationAnimatedNode class],
+      @"modulus" : [RCTModuloAnimatedNode class],
+      @"subtraction" : [RCTSubtractionAnimatedNode class],
+      @"transform" : [RCTTransformAnimatedNode class],
+      @"tracking" : [RCTTrackingAnimatedNode class]
+    };
   });
 
   NSString *nodeType = [RCTConvert NSString:config[@"type"]];
@@ -114,8 +115,7 @@ - (void)createAnimatedNode:(NSNumber *)tag
   [node setNeedsUpdate];
 }
 
-- (void)connectAnimatedNodes:(NSNumber *)parentTag
-                    childTag:(NSNumber *)childTag
+- (void)connectAnimatedNodes:(NSNumber *)parentTag childTag:(NSNumber *)childTag
 {
   RCTAssertParam(parentTag);
   RCTAssertParam(childTag);
@@ -130,8 +130,7 @@ - (void)connectAnimatedNodes:(NSNumber *)parentTag
   [childNode setNeedsUpdate];
 }
 
-- (void)disconnectAnimatedNodes:(NSNumber *)parentTag
-                       childTag:(NSNumber *)childTag
+- (void)disconnectAnimatedNodes:(NSNumber *)parentTag childTag:(NSNumber *)childTag
 {
   RCTAssertParam(parentTag);
   RCTAssertParam(childTag);
@@ -146,9 +145,7 @@ - (void)disconnectAnimatedNodes:(NSNumber *)parentTag
   [childNode setNeedsUpdate];
 }
 
-- (void)connectAnimatedNodeToView:(NSNumber *)nodeTag
-                          viewTag:(NSNumber *)viewTag
-                         viewName:(nullable NSString *)viewName
+- (void)connectAnimatedNodeToView:(NSNumber *)nodeTag viewTag:(NSNumber *)viewTag viewName:(nullable NSString *)viewName
 {
   RCTAnimatedNode *node = _animationNodes[nodeTag];
   if ([node isKindOfClass:[RCTPropsAnimatedNode class]]) {
@@ -161,8 +158,7 @@ - (void)connectAnimatedNodeToView:(NSNumber *)nodeTag
   [node setNeedsUpdate];
 }
 
-- (void)disconnectAnimatedNodeFromView:(NSNumber *)nodeTag
-                               viewTag:(NSNumber *)viewTag
+- (void)disconnectAnimatedNodeFromView:(NSNumber *)nodeTag viewTag:(NSNumber *)viewTag
 {
   RCTAnimatedNode *node = _animationNodes[nodeTag];
   if ([node isKindOfClass:[RCTPropsAnimatedNode class]]) {
@@ -195,10 +191,9 @@ - (void)dropAnimatedNode:(NSNumber *)tag
   }
 }
 
-#pragma mark -- Mutations
+#pragma mark-- Mutations
 
-- (void)setAnimatedNodeValue:(NSNumber *)nodeTag
-                       value:(NSNumber *)value
+- (void)setAnimatedNodeValue:(NSNumber *)nodeTag value:(NSNumber *)value
 {
   RCTAnimatedNode *node = _animationNodes[nodeTag];
   if (![node isKindOfClass:[RCTValueAnimatedNode class]]) {
@@ -212,8 +207,7 @@ - (void)setAnimatedNodeValue:(NSNumber *)nodeTag
   [valueNode setNeedsUpdate];
 }
 
-- (void)setAnimatedNodeOffset:(NSNumber *)nodeTag
-                       offset:(NSNumber *)offset
+- (void)setAnimatedNodeOffset:(NSNumber *)nodeTag offset:(NSNumber *)offset
 {
   RCTAnimatedNode *node = _animationNodes[nodeTag];
   if (![node isKindOfClass:[RCTValueAnimatedNode class]]) {
@@ -252,22 +246,22 @@ - (void)extractAnimatedNodeOffset:(NSNumber *)nodeTag
 
 - (void)getValue:(NSNumber *)nodeTag saveCallback:(RCTResponseSenderBlock)saveCallback
 {
-     RCTAnimatedNode *node = _animationNodes[nodeTag];
-     if (![node isKindOfClass:[RCTValueAnimatedNode class]]) {
-       RCTLogError(@"Not a value node.");
-       return;
-     }
-    RCTValueAnimatedNode *valueNode = (RCTValueAnimatedNode *)node;;
-    saveCallback(@[@(valueNode.value)]);
+  RCTAnimatedNode *node = _animationNodes[nodeTag];
+  if (![node isKindOfClass:[RCTValueAnimatedNode class]]) {
+    RCTLogError(@"Not a value node.");
+    return;
+  }
+  RCTValueAnimatedNode *valueNode = (RCTValueAnimatedNode *)node;
+  ;
+  saveCallback(@[ @(valueNode.value) ]);
 }
 
-- (void)updateAnimatedNodeConfig:(NSNumber *)tag
-                    config:(NSDictionary<NSString *, id> *)config
+- (void)updateAnimatedNodeConfig:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
   // TODO (T111179606): Support platform colors for color animations
 }
 
-#pragma mark -- Drivers
+#pragma mark-- Drivers
 
 - (void)startAnimatingNode:(NSNumber *)animationId
                    nodeTag:(NSNumber *)nodeTag
@@ -328,19 +322,19 @@ - (void)stopAnimation:(NSNumber *)animationId
 
 - (void)stopAnimationsForNode:(RCTAnimatedNode *)node
 {
-    NSMutableArray<id<RCTAnimationDriver>> *discarded = [NSMutableArray new];
-    for (id<RCTAnimationDriver> driver in _activeAnimations) {
-        if ([driver.valueNode isEqual:node]) {
-            [discarded addObject:driver];
-        }
-    }
-    for (id<RCTAnimationDriver> driver in discarded) {
-        [driver stopAnimation];
-        [_activeAnimations removeObject:driver];
+  NSMutableArray<id<RCTAnimationDriver>> *discarded = [NSMutableArray new];
+  for (id<RCTAnimationDriver> driver in _activeAnimations) {
+    if ([driver.valueNode isEqual:node]) {
+      [discarded addObject:driver];
     }
+  }
+  for (id<RCTAnimationDriver> driver in discarded) {
+    [driver stopAnimation];
+    [_activeAnimations removeObject:driver];
+  }
 }
 
-#pragma mark -- Events
+#pragma mark-- Events
 
 - (void)addAnimatedEventToView:(NSNumber *)viewTag
                      eventName:(NSString *)eventName
@@ -361,8 +355,8 @@ - (void)addAnimatedEventToView:(NSNumber *)viewTag
 
   NSArray<NSString *> *eventPath = [RCTConvert NSStringArray:eventMapping[@"nativeEventPath"]];
 
-  RCTEventAnimation *driver =
-    [[RCTEventAnimation alloc] initWithEventPath:eventPath valueNode:(RCTValueAnimatedNode *)node];
+  RCTEventAnimation *driver = [[RCTEventAnimation alloc] initWithEventPath:eventPath
+                                                                 valueNode:(RCTValueAnimatedNode *)node];
 
   NSString *key = [NSString stringWithFormat:@"%@%@", viewTag, RCTNormalizeAnimatedEventName(eventName)];
   if (_eventDrivers[key] != nil) {
@@ -412,10 +406,9 @@ - (void)handleAnimatedEvent:(id<RCTEvent>)event
   }
 }
 
-#pragma mark -- Listeners
+#pragma mark-- Listeners
 
-- (void)startListeningToAnimatedNodeValue:(NSNumber *)tag
-                            valueObserver:(id<RCTValueAnimatedNodeObserver>)valueObserver
+- (void)startListeningToAnimatedNodeValue:(NSNumber *)tag valueObserver:(id<RCTValueAnimatedNodeObserver>)valueObserver
 {
   RCTAnimatedNode *node = _animationNodes[tag];
   if ([node isKindOfClass:[RCTValueAnimatedNode class]]) {
@@ -431,8 +424,7 @@ - (void)stopListeningToAnimatedNodeValue:(NSNumber *)tag
   }
 }
 
-
-#pragma mark -- Animation Loop
+#pragma mark-- Animation Loop
 
 - (void)startAnimationLoopIfNeeded
 {
@@ -476,8 +468,7 @@ - (void)stepAnimations:(CADisplayLink *)displaylink
   [self stopAnimationLoopIfNeeded];
 }
 
-
-#pragma mark -- Updates
+#pragma mark-- Updates
 
 - (void)updateAnimations
 {
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.h b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.h
index 7c4dc64a19e9..ca09f5b466cf 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.h
@@ -16,6 +16,10 @@
 // TODO T69437152 @petetheheat - Delete this fork when Fabric ships to 100%.
 // NOTE: This module is temporarily forked (see RCTNativeAnimatedModule).
 // When making any changes, be sure to apply them to the fork as well.
-@interface RCTNativeAnimatedTurboModule: RCTEventEmitter <RCTBridgeModule, RCTValueAnimatedNodeObserver, RCTEventDispatcherObserver, RCTSurfacePresenterObserver>
+@interface RCTNativeAnimatedTurboModule : RCTEventEmitter <
+                                              RCTBridgeModule,
+                                              RCTValueAnimatedNodeObserver,
+                                              RCTEventDispatcherObserver,
+                                              RCTSurfacePresenterObserver>
 
 @end
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm
index 9643b9f7d4e6..b1b884a097fa 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm
@@ -7,28 +7,24 @@
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <RCTTypeSafety/RCTConvertHelpers.h>
-#import <React/RCTNativeAnimatedTurboModule.h>
-#import <React/RCTNativeAnimatedNodesManager.h>
 #import <React/RCTInitializing.h>
+#import <React/RCTNativeAnimatedNodesManager.h>
+#import <React/RCTNativeAnimatedTurboModule.h>
 
 #import "RCTAnimationPlugins.h"
 
 typedef void (^AnimatedOperation)(RCTNativeAnimatedNodesManager *nodesManager);
 
-@interface RCTNativeAnimatedTurboModule() <NativeAnimatedModuleSpec, RCTInitializing>
+@interface RCTNativeAnimatedTurboModule () <NativeAnimatedModuleSpec, RCTInitializing>
 @end
 
-@implementation RCTNativeAnimatedTurboModule
-{
+@implementation RCTNativeAnimatedTurboModule {
   RCTNativeAnimatedNodesManager *_nodesManager;
   __weak id<RCTSurfacePresenterStub> _surfacePresenter;
   // Operations called after views have been updated.
   NSMutableArray<AnimatedOperation> *_operations;
   // Operations called before views have been updated.
   NSMutableArray<AnimatedOperation> *_preOperations;
-  NSMutableDictionary<NSNumber *, NSNumber *> *_animIdIsManagedByFabric;
-  // A set of nodeIDs managed by Fabric.
-  NSMutableSet<NSNumber *> *_nodeIDsManagedByFabric;
 }
 
 RCT_EXPORT_MODULE();
@@ -43,8 +39,6 @@ - (instancetype)init
   if (self = [super init]) {
     _operations = [NSMutableArray new];
     _preOperations = [NSMutableArray new];
-    _animIdIsManagedByFabric = [NSMutableDictionary new];
-    _nodeIDsManagedByFabric = [NSMutableSet new];
   }
   return self;
 }
@@ -82,7 +76,7 @@ - (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
   _surfacePresenter = surfacePresenter;
 }
 
-#pragma mark -- API
+#pragma mark-- API
 
 RCT_EXPORT_METHOD(startOperationBatch)
 {
@@ -94,69 +88,61 @@ - (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
   // TODO T71377585
 }
 
-RCT_EXPORT_METHOD(createAnimatedNode:(double)tag
-                  config:(NSDictionary<NSString *, id> *)config)
+RCT_EXPORT_METHOD(createAnimatedNode : (double)tag config : (NSDictionary<NSString *, id> *)config)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager createAnimatedNode:[NSNumber numberWithDouble:tag] config:config];
   }];
 }
 
-RCT_EXPORT_METHOD(updateAnimatedNodeConfig:(double)tag
-                  config:(NSDictionary<NSString *, id> *)config)
+RCT_EXPORT_METHOD(updateAnimatedNodeConfig : (double)tag config : (NSDictionary<NSString *, id> *)config)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager updateAnimatedNodeConfig:[NSNumber numberWithDouble:tag] config:config];
   }];
 }
 
-RCT_EXPORT_METHOD(connectAnimatedNodes:(double)parentTag
-                  childTag:(double)childTag)
+RCT_EXPORT_METHOD(connectAnimatedNodes : (double)parentTag childTag : (double)childTag)
 {
-  if ([_nodeIDsManagedByFabric containsObject:@(childTag)]) {
-    [_nodeIDsManagedByFabric addObject:@(parentTag)];
-  }
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager connectAnimatedNodes:[NSNumber numberWithDouble:parentTag] childTag:[NSNumber numberWithDouble:childTag]];
+    [nodesManager connectAnimatedNodes:[NSNumber numberWithDouble:parentTag]
+                              childTag:[NSNumber numberWithDouble:childTag]];
   }];
 }
 
-RCT_EXPORT_METHOD(disconnectAnimatedNodes:(double)parentTag
-                  childTag:(double)childTag)
+RCT_EXPORT_METHOD(disconnectAnimatedNodes : (double)parentTag childTag : (double)childTag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager disconnectAnimatedNodes:[NSNumber numberWithDouble:parentTag] childTag:[NSNumber numberWithDouble:childTag]];
+    [nodesManager disconnectAnimatedNodes:[NSNumber numberWithDouble:parentTag]
+                                 childTag:[NSNumber numberWithDouble:childTag]];
   }];
 }
 
-RCT_EXPORT_METHOD(startAnimatingNode:(double)animationId
-                  nodeTag:(double)nodeTag
-                  config:(NSDictionary<NSString *, id> *)config
-                  endCallback:(RCTResponseSenderBlock)callBack)
+RCT_EXPORT_METHOD(startAnimatingNode
+                  : (double)animationId nodeTag
+                  : (double)nodeTag config
+                  : (NSDictionary<NSString *, id> *)config endCallback
+                  : (RCTResponseSenderBlock)callBack)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager startAnimatingNode:[NSNumber numberWithDouble:animationId] nodeTag:[NSNumber numberWithDouble:nodeTag] config:config endCallback:callBack];
+    [nodesManager startAnimatingNode:[NSNumber numberWithDouble:animationId]
+                             nodeTag:[NSNumber numberWithDouble:nodeTag]
+                              config:config
+                         endCallback:callBack];
   }];
 
-  BOOL isNodeManagedByFabric = [_nodeIDsManagedByFabric containsObject:@(nodeTag)];
-  if (isNodeManagedByFabric) {
-    self->_animIdIsManagedByFabric[[NSNumber numberWithDouble:animationId]] = @YES;
-    [self flushOperationQueues];
-  }
+  [self flushOperationQueues];
 }
 
-RCT_EXPORT_METHOD(stopAnimation:(double)animationId)
+RCT_EXPORT_METHOD(stopAnimation : (double)animationId)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager stopAnimation:[NSNumber numberWithDouble:animationId]];
   }];
-  if ([_animIdIsManagedByFabric[[NSNumber numberWithDouble:animationId]] boolValue]) {
-    [self flushOperationQueues];
-  }
+  [self flushOperationQueues];
 }
 
-RCT_EXPORT_METHOD(setAnimatedNodeValue:(double)nodeTag
-                  value:(double)value)
+RCT_EXPORT_METHOD(setAnimatedNodeValue : (double)nodeTag value : (double)value)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager setAnimatedNodeValue:[NSNumber numberWithDouble:nodeTag] value:[NSNumber numberWithDouble:value]];
@@ -167,63 +153,60 @@ - (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
   [self flushOperationQueues];
 }
 
-RCT_EXPORT_METHOD(setAnimatedNodeOffset:(double)nodeTag
-                  offset:(double)offset)
+RCT_EXPORT_METHOD(setAnimatedNodeOffset : (double)nodeTag offset : (double)offset)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager setAnimatedNodeOffset:[NSNumber numberWithDouble:nodeTag] offset:[NSNumber numberWithDouble:offset]];
   }];
 }
 
-RCT_EXPORT_METHOD(flattenAnimatedNodeOffset:(double)nodeTag)
+RCT_EXPORT_METHOD(flattenAnimatedNodeOffset : (double)nodeTag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager flattenAnimatedNodeOffset:[NSNumber numberWithDouble:nodeTag]];
   }];
 }
 
-RCT_EXPORT_METHOD(extractAnimatedNodeOffset:(double)nodeTag)
+RCT_EXPORT_METHOD(extractAnimatedNodeOffset : (double)nodeTag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager extractAnimatedNodeOffset:[NSNumber numberWithDouble:nodeTag]];
   }];
 }
 
-RCT_EXPORT_METHOD(connectAnimatedNodeToView:(double)nodeTag
-                  viewTag:(double)viewTag)
+RCT_EXPORT_METHOD(connectAnimatedNodeToView : (double)nodeTag viewTag : (double)viewTag)
 {
-  if (RCTUIManagerTypeForTagIsFabric(@(viewTag))) {
-    [_nodeIDsManagedByFabric addObject:@(nodeTag)];
-  }
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     // viewName is not used when node is managed by Fabric, and nodes are always managed by Fabric in Bridgeless.
-    [nodesManager connectAnimatedNodeToView:[NSNumber numberWithDouble:nodeTag] viewTag:[NSNumber numberWithDouble:viewTag] viewName:nil];
+    [nodesManager connectAnimatedNodeToView:[NSNumber numberWithDouble:nodeTag]
+                                    viewTag:[NSNumber numberWithDouble:viewTag]
+                                   viewName:nil];
   }];
 }
 
-RCT_EXPORT_METHOD(disconnectAnimatedNodeFromView:(double)nodeTag
-                  viewTag:(double)viewTag)
+RCT_EXPORT_METHOD(disconnectAnimatedNodeFromView : (double)nodeTag viewTag : (double)viewTag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager disconnectAnimatedNodeFromView:[NSNumber numberWithDouble:nodeTag] viewTag:[NSNumber numberWithDouble:viewTag]];
+    [nodesManager disconnectAnimatedNodeFromView:[NSNumber numberWithDouble:nodeTag]
+                                         viewTag:[NSNumber numberWithDouble:viewTag]];
   }];
 }
 
-RCT_EXPORT_METHOD(restoreDefaultValues:(double)nodeTag)
+RCT_EXPORT_METHOD(restoreDefaultValues : (double)nodeTag)
 {
   [self addPreOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager restoreDefaultValues:[NSNumber numberWithDouble:nodeTag]];
   }];
 }
 
-RCT_EXPORT_METHOD(dropAnimatedNode:(double)tag)
+RCT_EXPORT_METHOD(dropAnimatedNode : (double)tag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager dropAnimatedNode:[NSNumber numberWithDouble:tag]];
   }];
 }
 
-RCT_EXPORT_METHOD(startListeningToAnimatedNodeValue:(double)tag)
+RCT_EXPORT_METHOD(startListeningToAnimatedNodeValue : (double)tag)
 {
   __weak id<RCTValueAnimatedNodeObserver> valueObserver = self;
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
@@ -231,16 +214,17 @@ - (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
   }];
 }
 
-RCT_EXPORT_METHOD(stopListeningToAnimatedNodeValue:(double)tag)
+RCT_EXPORT_METHOD(stopListeningToAnimatedNodeValue : (double)tag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager stopListeningToAnimatedNodeValue:[NSNumber numberWithDouble:tag]];
   }];
 }
 
-RCT_EXPORT_METHOD(addAnimatedEventToView:(double)viewTag
-                  eventName:(nonnull NSString *)eventName
-                  eventMapping:(JS::NativeAnimatedModule::EventMapping &)eventMapping)
+RCT_EXPORT_METHOD(addAnimatedEventToView
+                  : (double)viewTag eventName
+                  : (nonnull NSString *)eventName eventMapping
+                  : (JS::NativeAnimatedModule::EventMapping &)eventMapping)
 {
   NSMutableDictionary *eventMappingDict = [NSMutableDictionary new];
   eventMappingDict[@"nativeEventPath"] = RCTConvertVecToArray(eventMapping.nativeEventPath());
@@ -250,31 +234,37 @@ - (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
   }
 
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager addAnimatedEventToView:[NSNumber numberWithDouble:viewTag] eventName:eventName eventMapping:eventMappingDict];
+    [nodesManager addAnimatedEventToView:[NSNumber numberWithDouble:viewTag]
+                               eventName:eventName
+                            eventMapping:eventMappingDict];
   }];
 }
 
-RCT_EXPORT_METHOD(removeAnimatedEventFromView:(double)viewTag
-                  eventName:(nonnull NSString *)eventName
-            animatedNodeTag:(double)animatedNodeTag)
+RCT_EXPORT_METHOD(removeAnimatedEventFromView
+                  : (double)viewTag eventName
+                  : (nonnull NSString *)eventName animatedNodeTag
+                  : (double)animatedNodeTag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager removeAnimatedEventFromView:[NSNumber numberWithDouble:viewTag] eventName:eventName animatedNodeTag:[NSNumber numberWithDouble:animatedNodeTag]];
+    [nodesManager removeAnimatedEventFromView:[NSNumber numberWithDouble:viewTag]
+                                    eventName:eventName
+                              animatedNodeTag:[NSNumber numberWithDouble:animatedNodeTag]];
   }];
 }
 
-RCT_EXPORT_METHOD(getValue:(double)nodeTag saveValueCallback:(RCTResponseSenderBlock)saveValueCallback) {
+RCT_EXPORT_METHOD(getValue : (double)nodeTag saveValueCallback : (RCTResponseSenderBlock)saveValueCallback)
+{
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-      [nodesManager getValue:[NSNumber numberWithDouble:nodeTag] saveCallback:saveValueCallback];
+    [nodesManager getValue:[NSNumber numberWithDouble:nodeTag] saveCallback:saveValueCallback];
   }];
 }
 
-RCT_EXPORT_METHOD(queueAndExecuteBatchedOperations:(NSArray *)operationsAndArgs) {
-    // TODO: implement in the future if we want the same optimization here as on Android
+RCT_EXPORT_METHOD(queueAndExecuteBatchedOperations : (NSArray *)operationsAndArgs)
+{
+  // TODO: implement in the future if we want the same optimization here as on Android
 }
 
-
-#pragma mark -- Batch handling
+#pragma mark-- Batch handling
 
 - (void)addOperationBlock:(AnimatedOperation)operation
 {
@@ -296,7 +286,6 @@ - (void)flushOperationQueues
   _preOperations = [NSMutableArray new];
   _operations = [NSMutableArray new];
 
-
   RCTExecuteOnMainQueue(^{
     for (AnimatedOperation operation in preOperations) {
       operation(self->_nodesManager);
@@ -340,17 +329,16 @@ - (void)didMountComponentsWithRootTag:(NSInteger)rootTag
   });
 }
 
-#pragma mark -- Events
+#pragma mark-- Events
 
 - (NSArray<NSString *> *)supportedEvents
 {
-  return @[@"onAnimatedValueUpdate"];
+  return @[ @"onAnimatedValueUpdate" ];
 }
 
 - (void)animatedNode:(RCTValueAnimatedNode *)node didUpdateValue:(CGFloat)value
 {
-  [self sendEventWithName:@"onAnimatedValueUpdate"
-                     body:@{@"tag": node.nodeTag, @"value": @(value)}];
+  [self sendEventWithName:@"onAnimatedValueUpdate" body:@{@"tag" : node.nodeTag, @"value" : @(value)}];
 }
 
 - (void)eventDispatcherWillDispatchEvent:(id<RCTEvent>)event
@@ -362,13 +350,15 @@ - (void)eventDispatcherWillDispatchEvent:(id<RCTEvent>)event
   });
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   return std::make_shared<facebook::react::NativeAnimatedModuleSpecJSI>(params);
 }
 
 @end
 
-Class RCTNativeAnimatedTurboModuleCls(void) {
+Class RCTNativeAnimatedTurboModuleCls(void)
+{
   return RCTNativeAnimatedTurboModule.class;
 }
diff --git a/Libraries/NativeComponent/BaseViewConfig.android.js b/Libraries/NativeComponent/BaseViewConfig.android.js
index 41e9b3928cb9..6d2a0480c109 100644
--- a/Libraries/NativeComponent/BaseViewConfig.android.js
+++ b/Libraries/NativeComponent/BaseViewConfig.android.js
@@ -8,10 +8,11 @@
  * @flow strict-local
  */
 
-import {DynamicallyInjectedByGestureHandler} from './ViewConfigIgnore';
-import ReactNativeStyleAttributes from '../Components/View/ReactNativeStyleAttributes';
 import type {PartialViewConfigWithoutName} from './PlatformBaseViewConfig';
 
+import ReactNativeStyleAttributes from '../Components/View/ReactNativeStyleAttributes';
+import {DynamicallyInjectedByGestureHandler} from './ViewConfigIgnore';
+
 const bubblingEventTypes = {
   // Bubbling events from UIManagerModuleConstants.java
   topChange: {
@@ -90,6 +91,18 @@ const bubblingEventTypes = {
       bubbled: 'onPointerUp',
     },
   },
+  topPointerOut: {
+    phasedRegistrationNames: {
+      captured: 'onPointerOutCapture',
+      bubbled: 'onPointerOut',
+    },
+  },
+  topPointerOver: {
+    phasedRegistrationNames: {
+      captured: 'onPointerOverCapture',
+      bubbled: 'onPointerOver',
+    },
+  },
 };
 
 const directEventTypes = {
@@ -160,6 +173,8 @@ const validAttributesForNonEventProps = {
   accessibilityLabel: true,
   accessibilityHint: true,
   accessibilityRole: true,
+  accessibilityCollection: true,
+  accessibilityCollectionItem: true,
   accessibilityState: true,
   accessibilityActions: true,
   accessibilityValue: true,
@@ -181,6 +196,9 @@ const validAttributesForNonEventProps = {
   maxHeight: true,
   flex: true,
   flexGrow: true,
+  rowGap: true,
+  columnGap: true,
+  gap: true,
   flexShrink: true,
   flexBasis: true,
   aspectRatio: true,
@@ -260,8 +278,15 @@ const validAttributesForEventProps = {
 
   // Pointer events
   onPointerEnter: true,
+  onPointerEnterCapture: true,
   onPointerLeave: true,
+  onPointerLeaveCapture: true,
   onPointerMove: true,
+  onPointerMoveCapture: true,
+  onPointerOut: true,
+  onPointerOutCapture: true,
+  onPointerOver: true,
+  onPointerOverCapture: true,
 };
 
 /**
diff --git a/Libraries/NativeComponent/BaseViewConfig.ios.js b/Libraries/NativeComponent/BaseViewConfig.ios.js
index d19693deb929..093588c9c7b2 100644
--- a/Libraries/NativeComponent/BaseViewConfig.ios.js
+++ b/Libraries/NativeComponent/BaseViewConfig.ios.js
@@ -8,12 +8,13 @@
  * @flow strict-local
  */
 
+import type {PartialViewConfigWithoutName} from './PlatformBaseViewConfig';
+
+import ReactNativeStyleAttributes from '../Components/View/ReactNativeStyleAttributes';
 import {
-  DynamicallyInjectedByGestureHandler,
   ConditionallyIgnoredEventHandlers,
+  DynamicallyInjectedByGestureHandler,
 } from './ViewConfigIgnore';
-import ReactNativeStyleAttributes from '../Components/View/ReactNativeStyleAttributes';
-import type {PartialViewConfigWithoutName} from './PlatformBaseViewConfig';
 
 const bubblingEventTypes = {
   // Generic Events
@@ -193,6 +194,7 @@ const validAttributesForNonEventProps = {
   removeClippedSubviews: true,
   borderRadius: true,
   borderColor: {process: require('../StyleSheet/processColor')},
+  borderCurve: true,
   borderWidth: true,
   borderStyle: true,
   hitSlop: {diff: require('../Utilities/differ/insetsDiffer')},
@@ -269,6 +271,9 @@ const validAttributesForNonEventProps = {
 
   flex: true,
   flexGrow: true,
+  rowGap: true,
+  columnGap: true,
+  gap: true,
   flexShrink: true,
   flexBasis: true,
   flexDirection: true,
diff --git a/Libraries/NativeComponent/NativeComponentRegistry.js b/Libraries/NativeComponent/NativeComponentRegistry.js
index bcddcdaf6c86..4ab3acd54ef4 100644
--- a/Libraries/NativeComponent/NativeComponentRegistry.js
+++ b/Libraries/NativeComponent/NativeComponentRegistry.js
@@ -8,16 +8,17 @@
  * @format
  */
 
-import * as StaticViewConfigValidator from './StaticViewConfigValidator';
-import {createViewConfig} from './ViewConfig';
-import UIManager from '../ReactNative/UIManager';
 import type {
   HostComponent,
   PartialViewConfig,
 } from '../Renderer/shims/ReactNativeTypes';
-import ReactNativeViewConfigRegistry from '../Renderer/shims/ReactNativeViewConfigRegistry';
+
 import getNativeComponentAttributes from '../ReactNative/getNativeComponentAttributes';
+import UIManager from '../ReactNative/UIManager';
+import ReactNativeViewConfigRegistry from '../Renderer/shims/ReactNativeViewConfigRegistry';
 import verifyComponentAttributeEquivalence from '../Utilities/verifyComponentAttributeEquivalence';
+import * as StaticViewConfigValidator from './StaticViewConfigValidator';
+import {createViewConfig} from './ViewConfig';
 import invariant from 'invariant';
 import * as React from 'react';
 
diff --git a/Libraries/NativeComponent/PlatformBaseViewConfig.js b/Libraries/NativeComponent/PlatformBaseViewConfig.js
index cc69148a7c12..bdc40c3c33f1 100644
--- a/Libraries/NativeComponent/PlatformBaseViewConfig.js
+++ b/Libraries/NativeComponent/PlatformBaseViewConfig.js
@@ -9,6 +9,7 @@
  */
 
 import type {PartialViewConfig} from '../Renderer/shims/ReactNativeTypes';
+
 import BaseViewConfig from './BaseViewConfig';
 
 export type PartialViewConfigWithoutName = $Rest<
diff --git a/Libraries/NativeComponent/StaticViewConfigValidator.js b/Libraries/NativeComponent/StaticViewConfigValidator.js
index f1217d849e3b..47ddb60c9cbc 100644
--- a/Libraries/NativeComponent/StaticViewConfigValidator.js
+++ b/Libraries/NativeComponent/StaticViewConfigValidator.js
@@ -47,7 +47,7 @@ export function validate(
   nativeViewConfig: ViewConfig,
   staticViewConfig: ViewConfig,
 ): ValidationResult {
-  const differences = [];
+  const differences: Array<Difference> = [];
   accumulateDifferences(
     differences,
     [],
diff --git a/Libraries/NativeComponent/ViewConfig.js b/Libraries/NativeComponent/ViewConfig.js
index 53a003e60bce..a15e602b5e22 100644
--- a/Libraries/NativeComponent/ViewConfig.js
+++ b/Libraries/NativeComponent/ViewConfig.js
@@ -12,6 +12,7 @@ import type {
   PartialViewConfig,
   ViewConfig,
 } from '../Renderer/shims/ReactNativeTypes';
+
 import PlatformBaseViewConfig from './PlatformBaseViewConfig';
 
 /**
diff --git a/Libraries/NativeComponent/__tests__/StaticViewConfigValidator-test.js b/Libraries/NativeComponent/__tests__/StaticViewConfigValidator-test.js
index f7d1a4b9cee0..aa5c59a0fb68 100644
--- a/Libraries/NativeComponent/__tests__/StaticViewConfigValidator-test.js
+++ b/Libraries/NativeComponent/__tests__/StaticViewConfigValidator-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict
  * @format
+ * @oncall react_native
  */
 
 import * as StaticViewConfigValidator from '../StaticViewConfigValidator';
diff --git a/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js b/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js
index b1a0d7cc3b16..31869c35abb4 100644
--- a/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js
+++ b/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/NativeModules/specs/NativeDevMenu.js b/Libraries/NativeModules/specs/NativeDevMenu.js
index 86337f80a04c..3819002afbe8 100644
--- a/Libraries/NativeModules/specs/NativeDevMenu.js
+++ b/Libraries/NativeModules/specs/NativeDevMenu.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/NativeModules/specs/NativeDevSettings.js b/Libraries/NativeModules/specs/NativeDevSettings.js
index 89143ebc61c1..142836e57c20 100644
--- a/Libraries/NativeModules/specs/NativeDevSettings.js
+++ b/Libraries/NativeModules/specs/NativeDevSettings.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/NativeModules/specs/NativeDeviceEventManager.js b/Libraries/NativeModules/specs/NativeDeviceEventManager.js
index f3afae93fee4..464d154d2d80 100644
--- a/Libraries/NativeModules/specs/NativeDeviceEventManager.js
+++ b/Libraries/NativeModules/specs/NativeDeviceEventManager.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js b/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js
index 2bf53deb4615..beccaf953356 100644
--- a/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js
+++ b/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 /* 'buttonClicked' | 'dismissed' */
diff --git a/Libraries/NativeModules/specs/NativeLogBox.js b/Libraries/NativeModules/specs/NativeLogBox.js
index 65a9f5242ef5..35a8d460b966 100644
--- a/Libraries/NativeModules/specs/NativeLogBox.js
+++ b/Libraries/NativeModules/specs/NativeLogBox.js
@@ -8,8 +8,9 @@
  * @format
  */
 
-import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
-import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
+import type {TurboModule} from '../../TurboModule/RCTExport';
+
+import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
   +show: () => void;
diff --git a/Libraries/NativeModules/specs/NativeRedBox.js b/Libraries/NativeModules/specs/NativeRedBox.js
index a892cdd76ecf..689f09aa1f54 100644
--- a/Libraries/NativeModules/specs/NativeRedBox.js
+++ b/Libraries/NativeModules/specs/NativeRedBox.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/NativeModules/specs/NativeSourceCode.js b/Libraries/NativeModules/specs/NativeSourceCode.js
index e2eb48fcec1d..91778c42636b 100644
--- a/Libraries/NativeModules/specs/NativeSourceCode.js
+++ b/Libraries/NativeModules/specs/NativeSourceCode.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Network/NativeNetworkingAndroid.js b/Libraries/Network/NativeNetworkingAndroid.js
index dd05e3306215..f15a19f9b24f 100644
--- a/Libraries/Network/NativeNetworkingAndroid.js
+++ b/Libraries/Network/NativeNetworkingAndroid.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 type Header = [string, string];
diff --git a/Libraries/Network/NativeNetworkingIOS.js b/Libraries/Network/NativeNetworkingIOS.js
index 574eda7d9c09..28ec9d7bcbac 100644
--- a/Libraries/Network/NativeNetworkingIOS.js
+++ b/Libraries/Network/NativeNetworkingIOS.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Network/RCTDataRequestHandler.mm b/Libraries/Network/RCTDataRequestHandler.mm
index de308c77f6c2..f95d0c078e0d 100644
--- a/Libraries/Network/RCTDataRequestHandler.mm
+++ b/Libraries/Network/RCTDataRequestHandler.mm
@@ -10,11 +10,10 @@
 
 #import "RCTNetworkPlugins.h"
 
-@interface RCTDataRequestHandler() <RCTTurboModule>
+@interface RCTDataRequestHandler () <RCTTurboModule>
 @end
 
-@implementation RCTDataRequestHandler
-{
+@implementation RCTDataRequestHandler {
   NSOperationQueue *_queue;
 }
 
@@ -31,8 +30,7 @@ - (BOOL)canHandleRequest:(NSURLRequest *)request
   return [request.URL.scheme caseInsensitiveCompare:@"data"] == NSOrderedSame;
 }
 
-- (NSOperation *)sendRequest:(NSURLRequest *)request
-                withDelegate:(id<RCTURLRequestDelegate>)delegate
+- (NSOperation *)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequestDelegate>)delegate
 {
   // Lazy setup
   if (!_queue) {
@@ -42,10 +40,10 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request
 
   __weak __block NSBlockOperation *weakOp;
   __block NSBlockOperation *op = [NSBlockOperation blockOperationWithBlock:^{
-
     // Get mime type
     NSRange firstSemicolon = [request.URL.resourceSpecifier rangeOfString:@";"];
-    NSString *mimeType = firstSemicolon.length ? [request.URL.resourceSpecifier substringToIndex:firstSemicolon.location] : nil;
+    NSString *mimeType =
+        firstSemicolon.length ? [request.URL.resourceSpecifier substringToIndex:firstSemicolon.location] : nil;
 
     // Send response
     NSURLResponse *response = [[NSURLResponse alloc] initWithURL:request.URL
@@ -57,9 +55,7 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request
 
     // Load data
     NSError *error;
-    NSData *data = [NSData dataWithContentsOfURL:request.URL
-                                         options:NSDataReadingMappedIfSafe
-                                           error:&error];
+    NSData *data = [NSData dataWithContentsOfURL:request.URL options:NSDataReadingMappedIfSafe error:&error];
     if (data) {
       [delegate URLRequest:weakOp didReceiveData:data];
     }
@@ -84,6 +80,7 @@ - (void)cancelRequest:(NSOperation *)op
 
 @end
 
-Class RCTDataRequestHandlerCls(void) {
+Class RCTDataRequestHandlerCls(void)
+{
   return RCTDataRequestHandler.class;
 }
diff --git a/Libraries/Network/RCTFileRequestHandler.mm b/Libraries/Network/RCTFileRequestHandler.mm
index 634bbe0fd047..19d025c51e19 100644
--- a/Libraries/Network/RCTFileRequestHandler.mm
+++ b/Libraries/Network/RCTFileRequestHandler.mm
@@ -14,11 +14,10 @@
 
 #import "RCTNetworkPlugins.h"
 
-@interface RCTFileRequestHandler() <RCTTurboModule>
+@interface RCTFileRequestHandler () <RCTTurboModule>
 @end
 
-@implementation RCTFileRequestHandler
-{
+@implementation RCTFileRequestHandler {
   NSOperationQueue *_fileQueue;
 }
 
@@ -32,13 +31,10 @@ - (void)invalidate
 
 - (BOOL)canHandleRequest:(NSURLRequest *)request
 {
-  return
-  [request.URL.scheme caseInsensitiveCompare:@"file"] == NSOrderedSame
-  && !RCTIsBundleAssetURL(request.URL);
+  return [request.URL.scheme caseInsensitiveCompare:@"file"] == NSOrderedSame && !RCTIsBundleAssetURL(request.URL);
 }
 
-- (NSOperation *)sendRequest:(NSURLRequest *)request
-                withDelegate:(id<RCTURLRequestDelegate>)delegate
+- (NSOperation *)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequestDelegate>)delegate
 {
   // Lazy setup
   if (!_fileQueue) {
@@ -48,7 +44,6 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request
 
   __weak __block NSBlockOperation *weakOp;
   __block NSBlockOperation *op = [NSBlockOperation blockOperationWithBlock:^{
-
     // Get content length
     NSError *error = nil;
     NSFileManager *fileManager = [NSFileManager new];
@@ -61,9 +56,9 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request
     // Get mime type
     NSString *fileExtension = [request.URL pathExtension];
     NSString *UTI = (__bridge_transfer NSString *)UTTypeCreatePreferredIdentifierForTag(
-      kUTTagClassFilenameExtension, (__bridge CFStringRef)fileExtension, NULL);
-    NSString *contentType = (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass(
-      (__bridge CFStringRef)UTI, kUTTagClassMIMEType);
+        kUTTagClassFilenameExtension, (__bridge CFStringRef)fileExtension, NULL);
+    NSString *contentType =
+        (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)UTI, kUTTagClassMIMEType);
 
     // Send response
     NSURLResponse *response = [[NSURLResponse alloc] initWithURL:request.URL
@@ -74,9 +69,7 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request
     [delegate URLRequest:weakOp didReceiveResponse:response];
 
     // Load data
-    NSData *data = [NSData dataWithContentsOfURL:request.URL
-                                         options:NSDataReadingMappedIfSafe
-                                           error:&error];
+    NSData *data = [NSData dataWithContentsOfURL:request.URL options:NSDataReadingMappedIfSafe error:&error];
     if (data) {
       [delegate URLRequest:weakOp didReceiveData:data];
     }
@@ -101,6 +94,7 @@ - (void)cancelRequest:(NSOperation *)op
 
 @end
 
-Class RCTFileRequestHandlerCls(void) {
+Class RCTFileRequestHandlerCls(void)
+{
   return RCTFileRequestHandler.class;
 }
diff --git a/Libraries/Network/RCTHTTPRequestHandler.h b/Libraries/Network/RCTHTTPRequestHandler.h
index 3f96a8b4f6be..768982a9de59 100644
--- a/Libraries/Network/RCTHTTPRequestHandler.h
+++ b/Libraries/Network/RCTHTTPRequestHandler.h
@@ -8,10 +8,11 @@
 #import <React/RCTInvalidating.h>
 #import <React/RCTURLRequestHandler.h>
 
-typedef NSURLSessionConfiguration* (^NSURLSessionConfigurationProvider)(void);
+typedef NSURLSessionConfiguration * (^NSURLSessionConfigurationProvider)(void);
 /**
- *  The block provided via this function will provide the NSURLSessionConfiguration for all HTTP requests made by the app.
-*/
+ *  The block provided via this function will provide the NSURLSessionConfiguration for all HTTP requests made by the
+ * app.
+ */
 RCT_EXTERN void RCTSetCustomNSURLSessionConfigurationProvider(NSURLSessionConfigurationProvider);
 /**
  * This is the default RCTURLRequestHandler implementation for HTTP requests.
diff --git a/Libraries/Network/RCTHTTPRequestHandler.mm b/Libraries/Network/RCTHTTPRequestHandler.mm
index 7b545928516b..b7b2db1e57e3 100644
--- a/Libraries/Network/RCTHTTPRequestHandler.mm
+++ b/Libraries/Network/RCTHTTPRequestHandler.mm
@@ -20,12 +20,12 @@ @interface RCTHTTPRequestHandler () <NSURLSessionDataDelegate, RCTTurboModule>
 
 static NSURLSessionConfigurationProvider urlSessionConfigurationProvider;
 
-void RCTSetCustomNSURLSessionConfigurationProvider(NSURLSessionConfigurationProvider provider) {
+void RCTSetCustomNSURLSessionConfigurationProvider(NSURLSessionConfigurationProvider provider)
+{
   urlSessionConfigurationProvider = provider;
 }
 
-@implementation RCTHTTPRequestHandler
-{
+@implementation RCTHTTPRequestHandler {
   NSMapTable *_delegates;
   NSURLSession *_session;
   std::mutex _mutex;
@@ -64,8 +64,7 @@ - (BOOL)canHandleRequest:(NSURLRequest *)request
   return [schemes containsObject:request.URL.scheme.lowercaseString];
 }
 
-- (NSURLSessionDataTask *)sendRequest:(NSURLRequest *)request
-                         withDelegate:(id<RCTURLRequestDelegate>)delegate
+- (NSURLSessionDataTask *)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequestDelegate>)delegate
 {
   std::lock_guard<std::mutex> lock(_mutex);
   // Lazy setup
@@ -95,9 +94,7 @@ - (NSURLSessionDataTask *)sendRequest:(NSURLRequest *)request
       [configuration setHTTPCookieStorage:[NSHTTPCookieStorage sharedHTTPCookieStorage]];
     }
     assert(configuration != nil);
-    _session = [NSURLSession sessionWithConfiguration:configuration
-                                             delegate:self
-                                        delegateQueue:callbackQueue];
+    _session = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:callbackQueue];
 
     _delegates = [[NSMapTable alloc] initWithKeyOptions:NSPointerFunctionsStrongMemory
                                            valueOptions:NSPointerFunctionsStrongMemory
@@ -121,10 +118,10 @@ - (void)cancelRequest:(NSURLSessionDataTask *)task
 #pragma mark - NSURLSession delegate
 
 - (void)URLSession:(NSURLSession *)session
-              task:(NSURLSessionTask *)task
-   didSendBodyData:(int64_t)bytesSent
-    totalBytesSent:(int64_t)totalBytesSent
-totalBytesExpectedToSend:(int64_t)totalBytesExpectedToSend
+                        task:(NSURLSessionTask *)task
+             didSendBodyData:(int64_t)bytesSent
+              totalBytesSent:(int64_t)totalBytesSent
+    totalBytesExpectedToSend:(int64_t)totalBytesExpectedToSend
 {
   id<RCTURLRequestDelegate> delegate;
   {
@@ -135,10 +132,10 @@ - (void)URLSession:(NSURLSession *)session
 }
 
 - (void)URLSession:(NSURLSession *)session
-              task:(NSURLSessionTask *)task
-willPerformHTTPRedirection:(NSHTTPURLResponse *)response
-        newRequest:(NSURLRequest *)request
- completionHandler:(void (^)(NSURLRequest *))completionHandler
+                          task:(NSURLSessionTask *)task
+    willPerformHTTPRedirection:(NSHTTPURLResponse *)response
+                    newRequest:(NSURLRequest *)request
+             completionHandler:(void (^)(NSURLRequest *))completionHandler
 {
   // Reset the cookies on redirect.
   // This is necessary because we're not letting iOS handle cookies by itself
@@ -150,9 +147,9 @@ - (void)URLSession:(NSURLSession *)session
 }
 
 - (void)URLSession:(NSURLSession *)session
-          dataTask:(NSURLSessionDataTask *)task
-didReceiveResponse:(NSURLResponse *)response
- completionHandler:(void (^)(NSURLSessionResponseDisposition))completionHandler
+              dataTask:(NSURLSessionDataTask *)task
+    didReceiveResponse:(NSURLResponse *)response
+     completionHandler:(void (^)(NSURLSessionResponseDisposition))completionHandler
 {
   id<RCTURLRequestDelegate> delegate;
   {
@@ -163,9 +160,7 @@ - (void)URLSession:(NSURLSession *)session
   completionHandler(NSURLSessionResponseAllow);
 }
 
-- (void)URLSession:(NSURLSession *)session
-          dataTask:(NSURLSessionDataTask *)task
-    didReceiveData:(NSData *)data
+- (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)task didReceiveData:(NSData *)data
 {
   id<RCTURLRequestDelegate> delegate;
   {
@@ -194,6 +189,7 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didComp
 
 @end
 
-Class RCTHTTPRequestHandlerCls(void) {
+Class RCTHTTPRequestHandlerCls(void)
+{
   return RCTHTTPRequestHandler.class;
 }
diff --git a/Libraries/Network/RCTNetworkTask.mm b/Libraries/Network/RCTNetworkTask.mm
index a14748039c05..fc2c6dcad9f5 100644
--- a/Libraries/Network/RCTNetworkTask.mm
+++ b/Libraries/Network/RCTNetworkTask.mm
@@ -11,8 +11,7 @@
 #import <React/RCTNetworkTask.h>
 #import <React/RCTUtils.h>
 
-@implementation RCTNetworkTask
-{
+@implementation RCTNetworkTask {
   NSMutableData *_data;
   id<RCTURLRequestHandler> _handler;
   dispatch_queue_t _callbackQueue;
@@ -43,7 +42,7 @@ - (instancetype)initWithRequest:(NSURLRequest *)request
   return self;
 }
 
-RCT_NOT_IMPLEMENTED(- (instancetype)init)
+RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (void)invalidate
 {
diff --git a/Libraries/Network/RCTNetworking.android.js b/Libraries/Network/RCTNetworking.android.js
index 94c5d9b37757..4a46103bed83 100644
--- a/Libraries/Network/RCTNetworking.android.js
+++ b/Libraries/Network/RCTNetworking.android.js
@@ -8,13 +8,14 @@
  * @flow
  */
 
+import type {RequestBody} from './convertRequestBody';
+
 // Do not require the native RCTNetworking module directly! Use this wrapper module instead.
 // It will add the necessary requestId, so that you don't have to generate it yourself.
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
-import NativeNetworkingAndroid from './NativeNetworkingAndroid';
-import convertRequestBody from './convertRequestBody';
-import type {RequestBody} from './convertRequestBody';
 import Platform from '../Utilities/Platform';
+import convertRequestBody from './convertRequestBody';
+import NativeNetworkingAndroid from './NativeNetworkingAndroid';
 
 type Header = [string, string];
 
diff --git a/Libraries/Network/RCTNetworking.ios.js b/Libraries/Network/RCTNetworking.ios.js
index e0a6e6e0002d..08e6208d1cc8 100644
--- a/Libraries/Network/RCTNetworking.ios.js
+++ b/Libraries/Network/RCTNetworking.ios.js
@@ -11,10 +11,10 @@
 'use strict';
 
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
+import {type EventSubscription} from '../vendor/emitter/EventEmitter';
+import convertRequestBody, {type RequestBody} from './convertRequestBody';
 import NativeNetworkingIOS from './NativeNetworkingIOS';
 import {type NativeResponseType} from './XMLHttpRequest';
-import convertRequestBody, {type RequestBody} from './convertRequestBody';
-import {type EventSubscription} from '../vendor/emitter/EventEmitter';
 
 type RCTNetworkingEventDefinitions = $ReadOnly<{
   didSendNetworkData: [
@@ -68,6 +68,7 @@ const RCTNetworking = {
     listener: (...$ElementType<RCTNetworkingEventDefinitions, K>) => mixed,
     context?: mixed,
   ): EventSubscription {
+    // $FlowFixMe[incompatible-call]
     return RCTDeviceEventEmitter.addListener(eventType, listener, context);
   },
 
diff --git a/Libraries/Network/RCTNetworking.mm b/Libraries/Network/RCTNetworking.mm
index a0dcbed2b43a..24c175294aed 100644
--- a/Libraries/Network/RCTNetworking.mm
+++ b/Libraries/Network/RCTNetworking.mm
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-
 #import <mutex>
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
@@ -39,8 +38,7 @@ @interface RCTHTTPFormDataHelper : NSObject
 
 @end
 
-@implementation RCTHTTPFormDataHelper
-{
+@implementation RCTHTTPFormDataHelper {
   NSMutableArray<NSDictionary<NSString *, id> *> *_parts;
   NSMutableData *_multipartBody;
   RCTHTTPQueryResult _callback;
@@ -52,7 +50,7 @@ @implementation RCTHTTPFormDataHelper
   const size_t boundaryLength = 70;
   const char *boundaryChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.";
 
-  char *bytes = (char*)malloc(boundaryLength);
+  char *bytes = (char *)malloc(boundaryLength);
   if (!bytes) {
     // CWE - 391 : Unchecked error condition
     // https://www.cvedetails.com/cwe-details/391/Unchecked-Error-Condition.html
@@ -63,11 +61,13 @@ @implementation RCTHTTPFormDataHelper
   for (int i = 0; i < boundaryLength; i++) {
     bytes[i] = boundaryChars[arc4random_uniform((u_int32_t)charCount)];
   }
-  return [[NSString alloc] initWithBytesNoCopy:bytes length:boundaryLength encoding:NSUTF8StringEncoding freeWhenDone:YES];
+  return [[NSString alloc] initWithBytesNoCopy:bytes
+                                        length:boundaryLength
+                                      encoding:NSUTF8StringEncoding
+                                  freeWhenDone:YES];
 }
 
-- (RCTURLRequestCancellationBlock)process:(NSArray<NSDictionary *> *)formData
-                                 callback:(RCTHTTPQueryResult)callback
+- (RCTURLRequestCancellationBlock)process:(NSArray<NSDictionary *> *)formData callback:(RCTHTTPQueryResult)callback
 {
   RCTAssertThread(_networker.methodQueue, @"process: must be called on method queue");
 
@@ -90,13 +90,13 @@ - (RCTURLRequestCancellationBlock)process:(NSArray<NSDictionary *> *)formData
     }
   }
 
-  return [_networker processDataForHTTPQuery:_parts[0] callback:^(NSError *error, NSDictionary<NSString *, id> *result) {
-    return [self handleResult:result error:error];
-  }];
+  return [_networker processDataForHTTPQuery:_parts[0]
+                                    callback:^(NSError *error, NSDictionary<NSString *, id> *result) {
+                                      return [self handleResult:result error:error];
+                                    }];
 }
 
-- (RCTURLRequestCancellationBlock)handleResult:(NSDictionary<NSString *, id> *)result
-                                         error:(NSError *)error
+- (RCTURLRequestCancellationBlock)handleResult:(NSDictionary<NSString *, id> *)result error:(NSError *)error
 {
   RCTAssertThread(_networker.methodQueue, @"handleResult: must be called on method queue");
 
@@ -105,8 +105,8 @@ - (RCTURLRequestCancellationBlock)handleResult:(NSDictionary<NSString *, id> *)r
   }
 
   // Start with boundary.
-  [_multipartBody appendData:[[NSString stringWithFormat:@"--%@\r\n", _boundary]
-                              dataUsingEncoding:NSUTF8StringEncoding]];
+  [_multipartBody
+      appendData:[[NSString stringWithFormat:@"--%@\r\n", _boundary] dataUsingEncoding:NSUTF8StringEncoding]];
 
   // Print headers.
   NSMutableDictionary<NSString *, NSString *> *headers = [_parts[0][@"headers"] mutableCopy];
@@ -116,7 +116,7 @@ - (RCTURLRequestCancellationBlock)handleResult:(NSDictionary<NSString *, id> *)r
   }
   [headers enumerateKeysAndObjectsUsingBlock:^(NSString *parameterKey, NSString *parameterValue, BOOL *stop) {
     [self->_multipartBody appendData:[[NSString stringWithFormat:@"%@: %@\r\n", parameterKey, parameterValue]
-                                dataUsingEncoding:NSUTF8StringEncoding]];
+                                         dataUsingEncoding:NSUTF8StringEncoding]];
   }];
 
   // Add the body.
@@ -126,16 +126,17 @@ - (RCTURLRequestCancellationBlock)handleResult:(NSDictionary<NSString *, id> *)r
 
   [_parts removeObjectAtIndex:0];
   if (_parts.count) {
-    return [_networker processDataForHTTPQuery:_parts[0] callback:^(NSError *err, NSDictionary<NSString *, id> *res) {
-      return [self handleResult:res error:err];
-    }];
+    return [_networker processDataForHTTPQuery:_parts[0]
+                                      callback:^(NSError *err, NSDictionary<NSString *, id> *res) {
+                                        return [self handleResult:res error:err];
+                                      }];
   }
 
   // We've processed the last item. Finish and return.
-  [_multipartBody appendData:[[NSString stringWithFormat:@"--%@--\r\n", _boundary]
-                              dataUsingEncoding:NSUTF8StringEncoding]];
+  [_multipartBody
+      appendData:[[NSString stringWithFormat:@"--%@--\r\n", _boundary] dataUsingEncoding:NSUTF8StringEncoding]];
   NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@", _boundary];
-  return _callback(nil, @{@"body": _multipartBody, @"contentType": contentType});
+  return _callback(nil, @{@"body" : _multipartBody, @"contentType" : contentType});
 }
 
 @end
@@ -143,8 +144,7 @@ - (RCTURLRequestCancellationBlock)handleResult:(NSDictionary<NSString *, id> *)r
 /**
  * Bridge module that provides the JS interface to the network stack.
  */
-@implementation RCTNetworking
-{
+@implementation RCTNetworking {
   NSMutableDictionary<NSNumber *, RCTNetworkTask *> *_tasksByRequestID;
   std::mutex _handlersLock;
   NSArray<id<RCTURLRequestHandler>> *_handlers;
@@ -167,7 +167,8 @@ - (instancetype)init
   return [super initWithDisabledObservation];
 }
 
-- (instancetype)initWithHandlersProvider:(NSArray<id<RCTURLRequestHandler>> * (^)(RCTModuleRegistry *moduleRegistry))getHandlers
+- (instancetype)initWithHandlersProvider:
+    (NSArray<id<RCTURLRequestHandler>> * (^)(RCTModuleRegistry *moduleRegistry))getHandlers
 {
   if (self = [super initWithDisabledObservation]) {
     _handlersProvider = getHandlers;
@@ -192,12 +193,14 @@ - (void)invalidate
 
 - (NSArray<NSString *> *)supportedEvents
 {
-  return @[@"didCompleteNetworkResponse",
-           @"didReceiveNetworkResponse",
-           @"didSendNetworkData",
-           @"didReceiveNetworkIncrementalData",
-           @"didReceiveNetworkDataProgress",
-           @"didReceiveNetworkData"];
+  return @[
+    @"didCompleteNetworkResponse",
+    @"didReceiveNetworkResponse",
+    @"didSendNetworkData",
+    @"didReceiveNetworkIncrementalData",
+    @"didReceiveNetworkDataProgress",
+    @"didReceiveNetworkData"
+  ];
 }
 
 - (id<RCTURLRequestHandler>)handlerForRequest:(NSURLRequest *)request
@@ -206,7 +209,7 @@ - (void)invalidate
     return nil;
   }
   NSArray<id<RCTURLRequestHandler>> *handlers = [self prioritizedHandlers];
-  
+
   if (RCT_DEBUG) {
     // Check for handler conflicts
     float previousPriority = 0;
@@ -219,10 +222,14 @@ - (void)invalidate
       if ([handler canHandleRequest:request]) {
         if (previousHandler) {
           if (priority == previousPriority) {
-            RCTLogError(@"The RCTURLRequestHandlers %@ and %@ both reported that"
-                        " they can handle the request %@, and have equal priority"
-                        " (%g). This could result in non-deterministic behavior.",
-                        handler, previousHandler, request, priority);
+            RCTLogError(
+                @"The RCTURLRequestHandlers %@ and %@ both reported that"
+                 " they can handle the request %@, and have equal priority"
+                 " (%g). This could result in non-deterministic behavior.",
+                handler,
+                previousHandler,
+                request,
+                priority);
           }
         } else {
           previousHandler = handler;
@@ -248,24 +255,25 @@ - (void)invalidate
   if (_handlers) {
     return _handlers;
   }
-  
+
   NSArray<id<RCTURLRequestHandler>> *newHandlers = _handlersProvider
-    ? _handlersProvider(self.moduleRegistry)
-    : [self.bridge modulesConformingToProtocol:@protocol(RCTURLRequestHandler)];
+      ? _handlersProvider(self.moduleRegistry)
+      : [self.bridge modulesConformingToProtocol:@protocol(RCTURLRequestHandler)];
 
   // Get handlers, sorted in reverse priority order (highest priority first)
-  newHandlers = [newHandlers sortedArrayUsingComparator:^NSComparisonResult(id<RCTURLRequestHandler> a, id<RCTURLRequestHandler> b) {
-    float priorityA = [a respondsToSelector:@selector(handlerPriority)] ? [a handlerPriority] : 0;
-    float priorityB = [b respondsToSelector:@selector(handlerPriority)] ? [b handlerPriority] : 0;
-    if (priorityA > priorityB) {
-      return NSOrderedAscending;
-    } else if (priorityA < priorityB) {
-      return NSOrderedDescending;
-    } else {
-      return NSOrderedSame;
-    }
-  }];
-  
+  newHandlers = [newHandlers
+      sortedArrayUsingComparator:^NSComparisonResult(id<RCTURLRequestHandler> a, id<RCTURLRequestHandler> b) {
+        float priorityA = [a respondsToSelector:@selector(handlerPriority)] ? [a handlerPriority] : 0;
+        float priorityB = [b respondsToSelector:@selector(handlerPriority)] ? [b handlerPriority] : 0;
+        if (priorityA > priorityB) {
+          return NSOrderedAscending;
+        } else if (priorityA < priorityB) {
+          return NSOrderedDescending;
+        } else {
+          return NSOrderedSame;
+        }
+      }];
+
   _handlers = newHandlers;
   return newHandlers;
 }
@@ -284,7 +292,7 @@ - (void)invalidate
 }
 
 - (RCTURLRequestCancellationBlock)buildRequest:(NSDictionary<NSString *, id> *)query
-                                 completionBlock:(void (^)(NSURLRequest *request))block
+                               completionBlock:(void (^)(NSURLRequest *request))block
 {
   RCTAssertThread(_methodQueue, @"buildRequest: must be called on method queue");
 
@@ -311,39 +319,39 @@ - (RCTURLRequestCancellationBlock)buildRequest:(NSDictionary<NSString *, id> *)q
   NSDictionary<NSString *, id> *data = [RCTConvert NSDictionary:RCTNilIfNull(query[@"data"])];
   NSString *trackingName = data[@"trackingName"];
   if (trackingName) {
-    [NSURLProtocol setProperty:trackingName
-                        forKey:@"trackingName"
-                     inRequest:request];
-  }
-  return [self processDataForHTTPQuery:data callback:^(NSError *error, NSDictionary<NSString *, id> *result) {
-    if (error) {
-      RCTLogError(@"Error processing request body: %@", error);
-      // Ideally we'd circle back to JS here and notify an error/abort on the request.
-      return (RCTURLRequestCancellationBlock)nil;
-    }
-    request.HTTPBody = result[@"body"];
-    NSString *dataContentType = result[@"contentType"];
-    NSString *requestContentType = [request valueForHTTPHeaderField:@"Content-Type"];
-    BOOL isMultipart = [dataContentType hasPrefix:@"multipart"];
-
-    // For multipart requests we need to override caller-specified content type with one
-    // from the data object, because it contains the boundary string
-    if (dataContentType && ([requestContentType length] == 0 || isMultipart)) {
-      [request setValue:dataContentType forHTTPHeaderField:@"Content-Type"];
-    }
-
-    // Gzip the request body
-    if ([request.allHTTPHeaderFields[@"Content-Encoding"] isEqualToString:@"gzip"]) {
-      request.HTTPBody = RCTGzipData(request.HTTPBody, -1 /* default */);
-      [request setValue:(@(request.HTTPBody.length)).description forHTTPHeaderField:@"Content-Length"];
-    }
-
-    dispatch_async(self->_methodQueue, ^{
-      block(request);
-    });
-
-    return (RCTURLRequestCancellationBlock)nil;
-  }];
+    [NSURLProtocol setProperty:trackingName forKey:@"trackingName" inRequest:request];
+  }
+  return [self processDataForHTTPQuery:data
+                              callback:^(NSError *error, NSDictionary<NSString *, id> *result) {
+                                if (error) {
+                                  RCTLogError(@"Error processing request body: %@", error);
+                                  // Ideally we'd circle back to JS here and notify an error/abort on the request.
+                                  return (RCTURLRequestCancellationBlock)nil;
+                                }
+                                request.HTTPBody = result[@"body"];
+                                NSString *dataContentType = result[@"contentType"];
+                                NSString *requestContentType = [request valueForHTTPHeaderField:@"Content-Type"];
+                                BOOL isMultipart = [dataContentType hasPrefix:@"multipart"];
+
+                                // For multipart requests we need to override caller-specified content type with one
+                                // from the data object, because it contains the boundary string
+                                if (dataContentType && ([requestContentType length] == 0 || isMultipart)) {
+                                  [request setValue:dataContentType forHTTPHeaderField:@"Content-Type"];
+                                }
+
+                                // Gzip the request body
+                                if ([request.allHTTPHeaderFields[@"Content-Encoding"] isEqualToString:@"gzip"]) {
+                                  request.HTTPBody = RCTGzipData(request.HTTPBody, -1 /* default */);
+                                  [request setValue:(@(request.HTTPBody.length)).description
+                                      forHTTPHeaderField:@"Content-Length"];
+                                }
+
+                                dispatch_async(self->_methodQueue, ^{
+                                  block(request);
+                                });
+
+                                return (RCTURLRequestCancellationBlock)nil;
+                              }];
 }
 
 - (BOOL)canHandleRequest:(NSURLRequest *)request
@@ -371,8 +379,10 @@ - (BOOL)canHandleRequest:(NSURLRequest *)request
  * - @"contentType" (NSString): the content type header of the request
  *
  */
-- (RCTURLRequestCancellationBlock)processDataForHTTPQuery:(nullable NSDictionary<NSString *, id> *)query callback:
-(RCTURLRequestCancellationBlock (^)(NSError *error, NSDictionary<NSString *, id> *result))callback
+- (RCTURLRequestCancellationBlock)
+    processDataForHTTPQuery:(nullable NSDictionary<NSString *, id> *)query
+                   callback:(RCTURLRequestCancellationBlock (^)(NSError *error, NSDictionary<NSString *, id> *result))
+                                callback
 {
   RCTAssertThread(_methodQueue, @"processDataForHTTPQuery: must be called on method queue");
 
@@ -390,22 +400,24 @@ - (RCTURLRequestCancellationBlock)processDataForHTTPQuery:(nullable NSDictionary
   }
   NSData *body = [RCTConvert NSData:query[@"string"]];
   if (body) {
-    return callback(nil, @{@"body": body});
+    return callback(nil, @{@"body" : body});
   }
   NSString *base64String = [RCTConvert NSString:query[@"base64"]];
   if (base64String) {
     NSData *data = [[NSData alloc] initWithBase64EncodedString:base64String options:0];
-    return callback(nil, @{@"body": data});
+    return callback(nil, @{@"body" : data});
   }
   NSURLRequest *request = [RCTConvert NSURLRequest:query[@"uri"]];
   if (request) {
-
     __block RCTURLRequestCancellationBlock cancellationBlock = nil;
-    RCTNetworkTask *task = [self networkTaskWithRequest:request completionBlock:^(NSURLResponse *response, NSData *data, NSError *error) {
-      dispatch_async(self->_methodQueue, ^{
-        cancellationBlock = callback(error, data ? @{@"body": data, @"contentType": RCTNullIfNil(response.MIMEType)} : nil);
-      });
-    }];
+    RCTNetworkTask *task =
+        [self networkTaskWithRequest:request
+                     completionBlock:^(NSURLResponse *response, NSData *data, NSError *error) {
+                       dispatch_async(self->_methodQueue, ^{
+                         cancellationBlock = callback(
+                             error, data ? @{@"body" : data, @"contentType" : RCTNullIfNil(response.MIMEType)} : nil);
+                       });
+                     }];
 
     [task start];
 
@@ -428,7 +440,9 @@ - (RCTURLRequestCancellationBlock)processDataForHTTPQuery:(nullable NSDictionary
   return callback(nil, nil);
 }
 
-+ (NSString *)decodeTextData:(NSData *)data fromResponse:(NSURLResponse *)response withCarryData:(NSMutableData *)inputCarryData
++ (NSString *)decodeTextData:(NSData *)data
+                fromResponse:(NSURLResponse *)response
+               withCarryData:(NSMutableData *)inputCarryData
 {
   NSStringEncoding encoding = NSUTF8StringEncoding;
   if (response.textEncodingName) {
@@ -445,21 +459,23 @@ + (NSString *)decodeTextData:(NSData *)data fromResponse:(NSURLResponse *)respon
   if (!encodedResponse && data.length > 0) {
     if (encoding == NSUTF8StringEncoding && inputCarryData) {
       // If decode failed, we attempt to trim broken character bytes from the data.
-      // At this time, only UTF-8 support is enabled. Multibyte encodings, such as UTF-16 and UTF-32, require a lot of additional work
-      // to determine wether BOM was included in the first data packet. If so, save it, and attach it to each new data packet. If not,
-      // an encoding has to be selected with a suitable byte order (for ARM iOS, it would be little endianness).
+      // At this time, only UTF-8 support is enabled. Multibyte encodings, such as UTF-16 and UTF-32, require a lot of
+      // additional work to determine wether BOM was included in the first data packet. If so, save it, and attach it to
+      // each new data packet. If not, an encoding has to be selected with a suitable byte order (for ARM iOS, it would
+      // be little endianness).
 
       CFStringEncoding cfEncoding = CFStringConvertNSStringEncodingToEncoding(encoding);
-      // Taking a single unichar is not good enough, due to Unicode combining character sequences or characters outside the BMP.
-      // See https://www.objc.io/issues/9-strings/unicode/#common-pitfalls
-      // We'll attempt with a sequence of two characters, the most common combining character sequence and characters outside the BMP (emojis).
+      // Taking a single unichar is not good enough, due to Unicode combining character sequences or characters outside
+      // the BMP. See https://www.objc.io/issues/9-strings/unicode/#common-pitfalls We'll attempt with a sequence of two
+      // characters, the most common combining character sequence and characters outside the BMP (emojis).
       CFIndex maxCharLength = CFStringGetMaximumSizeForEncoding(2, cfEncoding);
 
       NSUInteger removedBytes = 1;
 
       while (removedBytes < maxCharLength) {
-        encodedResponse = [[NSString alloc] initWithData:[currentCarryData subdataWithRange:NSMakeRange(0, currentCarryData.length - removedBytes)]
-                                                encoding:encoding];
+        encodedResponse = [[NSString alloc]
+            initWithData:[currentCarryData subdataWithRange:NSMakeRange(0, currentCarryData.length - removedBytes)]
+                encoding:encoding];
 
         if (encodedResponse != nil) {
           break;
@@ -470,7 +486,7 @@ + (NSString *)decodeTextData:(NSData *)data fromResponse:(NSURLResponse *)respon
     } else {
       // We don't have an encoding, or the encoding is incorrect, so now we try to guess
       [NSString stringEncodingForData:data
-                      encodingOptions:@{ NSStringEncodingDetectionSuggestedEncodingsKey: @[ @(encoding) ] }
+                      encodingOptions:@{NSStringEncodingDetectionSuggestedEncodingsKey : @[ @(encoding) ]}
                       convertedString:&encodedResponse
                   usedLossyConversion:NULL];
     }
@@ -481,7 +497,8 @@ + (NSString *)decodeTextData:(NSData *)data fromResponse:(NSURLResponse *)respon
 
     // Ensure a valid subrange exists within currentCarryData
     if (currentCarryData.length >= encodedResponseLength) {
-      NSData *newCarryData = [currentCarryData subdataWithRange:NSMakeRange(encodedResponseLength, currentCarryData.length - encodedResponseLength)];
+      NSData *newCarryData = [currentCarryData
+          subdataWithRange:NSMakeRange(encodedResponseLength, currentCarryData.length - encodedResponseLength)];
       [inputCarryData setData:newCarryData];
     } else {
       [inputCarryData setLength:0];
@@ -526,19 +543,19 @@ - (void)sendData:(NSData *)data
     }
   }
 
-  [self sendEventWithName:@"didReceiveNetworkData" body:@[task.requestID, responseData]];
+  [self sendEventWithName:@"didReceiveNetworkData" body:@[ task.requestID, responseData ]];
 }
 
 - (void)sendRequest:(NSURLRequest *)request
-       responseType:(NSString *)responseType
- incrementalUpdates:(BOOL)incrementalUpdates
-     responseSender:(RCTResponseSenderBlock)responseSender
+          responseType:(NSString *)responseType
+    incrementalUpdates:(BOOL)incrementalUpdates
+        responseSender:(RCTResponseSenderBlock)responseSender
 {
   RCTAssertThread(_methodQueue, @"sendRequest: must be called on method queue");
   __weak __typeof(self) weakSelf = self;
   __block RCTNetworkTask *task;
   RCTURLRequestProgressBlock uploadProgressBlock = ^(int64_t progress, int64_t total) {
-    NSArray *responseJSON = @[task.requestID, @((double)progress), @((double)total)];
+    NSArray *responseJSON = @[ task.requestID, @((double)progress), @((double)total) ];
     [weakSelf sendEventWithName:@"didSendNetworkData" body:responseJSON];
   };
 
@@ -550,11 +567,11 @@ - (void)sendRequest:(NSURLRequest *)request
       headers = httpResponse.allHeaderFields ?: @{};
       status = httpResponse.statusCode;
     } else {
-      headers = response.MIMEType ? @{@"Content-Type": response.MIMEType} : @{};
+      headers = response.MIMEType ? @{@"Content-Type" : response.MIMEType} : @{};
       status = 200;
     }
     id responseURL = response.URL ? response.URL.absoluteString : [NSNull null];
-    NSArray<id> *responseJSON = @[task.requestID, @(status), headers, responseURL];
+    NSArray<id> *responseJSON = @[ task.requestID, @(status), headers, responseURL ];
     [weakSelf sendEventWithName:@"didReceiveNetworkResponse" body:responseJSON];
   };
 
@@ -566,7 +583,6 @@ - (void)sendRequest:(NSURLRequest *)request
   RCTURLRequestProgressBlock downloadProgressBlock = nil;
   if (incrementalUpdates) {
     if ([responseType isEqualToString:@"text"]) {
-
       // We need this to carry over bytes, which could not be decoded into text (such as broken UTF-8 characters).
       // The incremental data block holds the ownership of this object, and will be released upon release of the block.
       NSMutableData *incrementalDataCarry = [NSMutableData new];
@@ -583,23 +599,24 @@ - (void)sendRequest:(NSURLRequest *)request
         }
 
         // Update progress to include the previous carry length and reduce the current carry length.
-        NSArray<id> *responseJSON = @[task.requestID,
-                                      responseString,
-                                      @(progress + initialCarryLength - incrementalDataCarry.length),
-                                      @(total)];
+        NSArray<id> *responseJSON = @[
+          task.requestID,
+          responseString,
+          @(progress + initialCarryLength - incrementalDataCarry.length),
+          @(total)
+        ];
 
         [weakSelf sendEventWithName:@"didReceiveNetworkIncrementalData" body:responseJSON];
       };
     } else {
       downloadProgressBlock = ^(int64_t progress, int64_t total) {
-        NSArray<id> *responseJSON = @[task.requestID, @(progress), @(total)];
+        NSArray<id> *responseJSON = @[ task.requestID, @(progress), @(total) ];
         [weakSelf sendEventWithName:@"didReceiveNetworkDataProgress" body:responseJSON];
       };
     }
   }
 
-  RCTURLRequestCompletionBlock completionBlock =
-  ^(NSURLResponse *response, NSData *data, NSError *error) {
+  RCTURLRequestCompletionBlock completionBlock = ^(NSURLResponse *response, NSData *data, NSError *error) {
     __typeof(self) strongSelf = weakSelf;
     if (!strongSelf) {
       return;
@@ -608,15 +625,10 @@ - (void)sendRequest:(NSURLRequest *)request
     // Unless we were sending incremental (text) chunks to JS, all along, now
     // is the time to send the request body to JS.
     if (!(incrementalUpdates && [responseType isEqualToString:@"text"])) {
-      [strongSelf sendData:data
-              responseType:responseType
-                  response:response
-                   forTask:task];
+      [strongSelf sendData:data responseType:responseType response:response forTask:task];
     }
-    NSArray *responseJSON = @[task.requestID,
-                              RCTNullIfNil(error.localizedDescription),
-                              error.code == kCFURLErrorTimedOut ? @YES : @NO
-                              ];
+    NSArray *responseJSON =
+        @[ task.requestID, RCTNullIfNil(error.localizedDescription), error.code == kCFURLErrorTimedOut ? @YES : @NO ];
 
     [strongSelf sendEventWithName:@"didCompleteNetworkResponse" body:responseJSON];
     [strongSelf->_tasksByRequestID removeObjectForKey:task.requestID];
@@ -633,7 +645,7 @@ - (void)sendRequest:(NSURLRequest *)request
       _tasksByRequestID = [NSMutableDictionary new];
     }
     _tasksByRequestID[task.requestID] = task;
-    responseSender(@[task.requestID]);
+    responseSender(@[ task.requestID ]);
   }
 
   [task start];
@@ -667,7 +679,8 @@ - (void)removeResponseHandler:(id<RCTNetworkingResponseHandler>)handler
   [_responseHandlers removeObject:handler];
 }
 
-- (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request completionBlock:(RCTURLRequestCompletionBlock)completionBlock
+- (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request
+                           completionBlock:(RCTURLRequestCompletionBlock)completionBlock
 {
   id<RCTURLRequestHandler> handler = [self handlerForRequest:request];
   if (!handler) {
@@ -675,63 +688,64 @@ - (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request completionBlo
     return nil;
   }
 
-  RCTNetworkTask *task = [[RCTNetworkTask alloc] initWithRequest:request
-                                                         handler:handler
-                                                   callbackQueue:_methodQueue];
+  RCTNetworkTask *task = [[RCTNetworkTask alloc] initWithRequest:request handler:handler callbackQueue:_methodQueue];
   task.completionBlock = completionBlock;
   return task;
 }
 
 #pragma mark - JS API
 
-RCT_EXPORT_METHOD(sendRequest:(JS::NativeNetworkingIOS::SpecSendRequestQuery &)query
-                  callback:(RCTResponseSenderBlock)responseSender)
+RCT_EXPORT_METHOD(sendRequest
+                  : (JS::NativeNetworkingIOS::SpecSendRequestQuery &)query callback
+                  : (RCTResponseSenderBlock)responseSender)
 {
   NSDictionary *queryDict = @{
-    @"method": query.method(),
-    @"url": query.url(),
-    @"data": query.data(),
-    @"headers": query.headers(),
-    @"responseType": query.responseType(),
-    @"incrementalUpdates": @(query.incrementalUpdates()),
-    @"timeout": @(query.timeout()),
-    @"withCredentials": @(query.withCredentials()),
+    @"method" : query.method(),
+    @"url" : query.url(),
+    @"data" : query.data(),
+    @"headers" : query.headers(),
+    @"responseType" : query.responseType(),
+    @"incrementalUpdates" : @(query.incrementalUpdates()),
+    @"timeout" : @(query.timeout()),
+    @"withCredentials" : @(query.withCredentials()),
   };
 
   // TODO: buildRequest returns a cancellation block, but there's currently
   // no way to invoke it, if, for example the request is cancelled while
   // loading a large file to build the request body
-  [self buildRequest:queryDict completionBlock:^(NSURLRequest *request) {
-    NSString *responseType = [RCTConvert NSString:queryDict[@"responseType"]];
-    BOOL incrementalUpdates = [RCTConvert BOOL:queryDict[@"incrementalUpdates"]];
-    [self sendRequest:request
-         responseType:responseType
-   incrementalUpdates:incrementalUpdates
-       responseSender:responseSender];
-  }];
+  [self buildRequest:queryDict
+      completionBlock:^(NSURLRequest *request) {
+        NSString *responseType = [RCTConvert NSString:queryDict[@"responseType"]];
+        BOOL incrementalUpdates = [RCTConvert BOOL:queryDict[@"incrementalUpdates"]];
+        [self sendRequest:request
+                  responseType:responseType
+            incrementalUpdates:incrementalUpdates
+                responseSender:responseSender];
+      }];
 }
 
-RCT_EXPORT_METHOD(abortRequest:(double)requestID)
+RCT_EXPORT_METHOD(abortRequest : (double)requestID)
 {
   [_tasksByRequestID[[NSNumber numberWithDouble:requestID]] cancel];
   [_tasksByRequestID removeObjectForKey:[NSNumber numberWithDouble:requestID]];
 }
 
-RCT_EXPORT_METHOD(clearCookies:(RCTResponseSenderBlock)responseSender)
+RCT_EXPORT_METHOD(clearCookies : (RCTResponseSenderBlock)responseSender)
 {
   NSHTTPCookieStorage *storage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
   if (!storage.cookies.count) {
-    responseSender(@[@NO]);
+    responseSender(@[ @NO ]);
     return;
   }
 
   for (NSHTTPCookie *cookie in storage.cookies) {
     [storage deleteCookie:cookie];
   }
-  responseSender(@[@YES]);
+  responseSender(@[ @YES ]);
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   return std::make_shared<facebook::react::NativeNetworkingIOSSpecJSI>(params);
 }
@@ -747,6 +761,7 @@ - (RCTNetworking *)networking
 
 @end
 
-Class RCTNetworkingCls(void) {
+Class RCTNetworkingCls(void)
+{
   return RCTNetworking.class;
 }
diff --git a/Libraries/Network/__tests__/FormData-test.js b/Libraries/Network/__tests__/FormData-test.js
index 329fc0d4cca9..b708a04263d0 100644
--- a/Libraries/Network/__tests__/FormData-test.js
+++ b/Libraries/Network/__tests__/FormData-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Network/__tests__/XMLHttpRequest-test.js b/Libraries/Network/__tests__/XMLHttpRequest-test.js
index d2500ae75f3f..2d229a200743 100644
--- a/Libraries/Network/__tests__/XMLHttpRequest-test.js
+++ b/Libraries/Network/__tests__/XMLHttpRequest-test.js
@@ -5,27 +5,26 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
 import createPerformanceLogger from '../../Utilities/createPerformanceLogger';
 
+const GlobalPerformanceLogger = require('../../Utilities/GlobalPerformanceLogger');
+const Platform = require('../../Utilities/Platform');
+const XMLHttpRequest = require('../XMLHttpRequest');
+
 jest.unmock('../../Utilities/Platform');
 jest.mock('../../Utilities/GlobalPerformanceLogger');
-
-const Platform = require('../../Utilities/Platform');
-const GlobalPerformanceLogger = require('../../Utilities/GlobalPerformanceLogger');
 let requestId = 1;
-
 function setRequestId(id) {
   if (Platform.OS === 'ios') {
     return;
   }
   requestId = id;
 }
-
 jest
   .dontMock('event-target-shim')
   .setMock('../../BatchedBridge/NativeModules', {
@@ -47,8 +46,6 @@ jest
     },
   });
 
-const XMLHttpRequest = require('../XMLHttpRequest');
-
 describe('XMLHttpRequest', function () {
   let xhr;
   let handleTimeout;
diff --git a/Libraries/Network/convertRequestBody.js b/Libraries/Network/convertRequestBody.js
index b65b38f3b169..b9bd96097633 100644
--- a/Libraries/Network/convertRequestBody.js
+++ b/Libraries/Network/convertRequestBody.js
@@ -10,9 +10,8 @@
 
 'use strict';
 
-const binaryToBase64 = require('../Utilities/binaryToBase64');
-
 const Blob = require('../Blob/Blob');
+const binaryToBase64 = require('../Utilities/binaryToBase64');
 const FormData = require('./FormData');
 
 export type RequestBody =
diff --git a/Libraries/NewAppScreen/components/DebugInstructions.js b/Libraries/NewAppScreen/components/DebugInstructions.js
index 35bb4a80dacf..f296af2cfd0a 100644
--- a/Libraries/NewAppScreen/components/DebugInstructions.js
+++ b/Libraries/NewAppScreen/components/DebugInstructions.js
@@ -9,7 +9,10 @@
  */
 
 import type {Node} from 'react';
-import {Platform, StyleSheet, Text} from 'react-native';
+
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import Text from '../../Text/Text';
+import Platform from '../../Utilities/Platform';
 import React from 'react';
 
 const styles = StyleSheet.create({
diff --git a/Libraries/NewAppScreen/components/Header.js b/Libraries/NewAppScreen/components/Header.js
index 490746601aa9..5e44c81a37b4 100644
--- a/Libraries/NewAppScreen/components/Header.js
+++ b/Libraries/NewAppScreen/components/Header.js
@@ -9,10 +9,14 @@
  */
 
 import type {Node} from 'react';
-import {ImageBackground, StyleSheet, Text, useColorScheme} from 'react-native';
-import React from 'react';
+
+import ImageBackground from '../../Image/ImageBackground';
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import Text from '../../Text/Text';
+import useColorScheme from '../../Utilities/useColorScheme';
 import Colors from './Colors';
 import HermesBadge from './HermesBadge';
+import React from 'react';
 
 const Header = (): Node => {
   const isDarkMode = useColorScheme() === 'dark';
diff --git a/Libraries/NewAppScreen/components/HermesBadge.js b/Libraries/NewAppScreen/components/HermesBadge.js
index 9ead0caf9107..8522aebd2c97 100644
--- a/Libraries/NewAppScreen/components/HermesBadge.js
+++ b/Libraries/NewAppScreen/components/HermesBadge.js
@@ -8,10 +8,14 @@
  * @format
  */
 
-import React from 'react';
 import type {Node} from 'react';
-import {StyleSheet, Text, useColorScheme, View} from 'react-native';
+
+import View from '../../Components/View/View';
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import Text from '../../Text/Text';
+import useColorScheme from '../../Utilities/useColorScheme';
 import Colors from './Colors';
+import React from 'react';
 
 const HermesBadge = (): Node => {
   const isDarkMode = useColorScheme() === 'dark';
diff --git a/Libraries/NewAppScreen/components/LearnMoreLinks.js b/Libraries/NewAppScreen/components/LearnMoreLinks.js
index b2d170e69f8a..d059183d74bd 100644
--- a/Libraries/NewAppScreen/components/LearnMoreLinks.js
+++ b/Libraries/NewAppScreen/components/LearnMoreLinks.js
@@ -8,16 +8,15 @@
  * @format
  */
 
-import Colors from './Colors';
 import type {Node} from 'react';
-import openURLInBrowser from 'react-native/Libraries/Core/Devtools/openURLInBrowser';
-import {
-  StyleSheet,
-  Text,
-  TouchableOpacity,
-  useColorScheme,
-  View,
-} from 'react-native';
+
+import TouchableOpacity from '../../Components/Touchable/TouchableOpacity';
+import View from '../../Components/View/View';
+import openURLInBrowser from '../../Core/Devtools/openURLInBrowser';
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import Text from '../../Text/Text';
+import useColorScheme from '../../Utilities/useColorScheme';
+import Colors from './Colors';
 import React, {Fragment} from 'react';
 
 const links = [
diff --git a/Libraries/NewAppScreen/components/ReloadInstructions.js b/Libraries/NewAppScreen/components/ReloadInstructions.js
index 0294113b3c5c..6c1eba2fdfff 100644
--- a/Libraries/NewAppScreen/components/ReloadInstructions.js
+++ b/Libraries/NewAppScreen/components/ReloadInstructions.js
@@ -9,7 +9,10 @@
  */
 
 import type {Node} from 'react';
-import {Platform, StyleSheet, Text} from 'react-native';
+
+import StyleSheet from '../../StyleSheet/StyleSheet';
+import Text from '../../Text/Text';
+import Platform from '../../Utilities/Platform';
 import React from 'react';
 
 const styles = StyleSheet.create({
diff --git a/Libraries/NewAppScreen/index.js b/Libraries/NewAppScreen/index.js
index 61f27b5c1e85..84e620f00f1f 100644
--- a/Libraries/NewAppScreen/index.js
+++ b/Libraries/NewAppScreen/index.js
@@ -9,10 +9,10 @@
  */
 
 import Colors from './components/Colors';
+import DebugInstructions from './components/DebugInstructions';
 import Header from './components/Header';
 import HermesBadge from './components/HermesBadge';
 import LearnMoreLinks from './components/LearnMoreLinks';
-import DebugInstructions from './components/DebugInstructions';
 import ReloadInstructions from './components/ReloadInstructions';
 
 export {
diff --git a/Libraries/Performance/NativeJSCSamplingProfiler.js b/Libraries/Performance/NativeJSCSamplingProfiler.js
index a8c64967ce4f..ca780e705f0e 100644
--- a/Libraries/Performance/NativeJSCSamplingProfiler.js
+++ b/Libraries/Performance/NativeJSCSamplingProfiler.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Performance/QuickPerformanceLogger.js b/Libraries/Performance/QuickPerformanceLogger.js
index 48fcc468b20e..4a0da73e4782 100644
--- a/Libraries/Performance/QuickPerformanceLogger.js
+++ b/Libraries/Performance/QuickPerformanceLogger.js
@@ -13,11 +13,18 @@
 const AUTO_SET_TIMESTAMP = -1;
 const DUMMY_INSTANCE_KEY = 0;
 
-// Defines map of annotations for markEvent
+// Defines map of annotations
 // Use as following:
 // {string: {key1: value1, key2: value2}}
 export type AnnotationsMap = $Shape<{
   string: ?{[string]: string, ...},
+  int: ?{[string]: number, ...},
+  double: ?{[string]: number, ...},
+  bool: ?{[string]: boolean, ...},
+  string_array: ?{[string]: $ReadOnlyArray<string>, ...},
+  int_array: ?{[string]: $ReadOnlyArray<number>, ...},
+  double_array: ?{[string]: $ReadOnlyArray<number>, ...},
+  bool_array: ?{[string]: $ReadOnlyArray<boolean>, ...},
 }>;
 
 const QuickPerformanceLogger = {
@@ -54,17 +61,34 @@ const QuickPerformanceLogger = {
 
   markerAnnotate(
     markerId: number,
-    annotationKey: string,
-    annotationValue: string,
+    annotations: AnnotationsMap,
     instanceKey: number = DUMMY_INSTANCE_KEY,
   ): void {
-    if (global.nativeQPLMarkerAnnotate) {
-      global.nativeQPLMarkerAnnotate(
-        markerId,
-        instanceKey,
-        annotationKey,
-        annotationValue,
-      );
+    if (global.nativeQPLMarkerAnnotateWithMap) {
+      global.nativeQPLMarkerAnnotateWithMap(markerId, annotations, instanceKey);
+    } else if (global.nativeQPLMarkerAnnotate) {
+      for (const type of [
+        'string',
+        'int',
+        'double',
+        'bool',
+        'string_array',
+        'int_array',
+        'double_array',
+        'bool_array',
+      ]) {
+        const keyValsOfType = annotations[type];
+        if (keyValsOfType != null) {
+          for (const annotationKey of Object.keys(keyValsOfType)) {
+            global.nativeQPLMarkerAnnotate(
+              markerId,
+              instanceKey,
+              annotationKey,
+              keyValsOfType[annotationKey].toString(),
+            );
+          }
+        }
+      }
     }
   },
 
diff --git a/Libraries/Performance/Systrace.d.ts b/Libraries/Performance/Systrace.d.ts
new file mode 100644
index 000000000000..6b1e73712690
--- /dev/null
+++ b/Libraries/Performance/Systrace.d.ts
@@ -0,0 +1,66 @@
+/**
+ * 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
+ */
+
+type EventName = string | (() => string);
+type EventArgs = {[key: string]: string} | void | null;
+
+/**
+ * Indicates if the application is currently being traced.
+ *
+ * Calling methods on this module when the application isn't being traced is
+ * cheap, but this method can be used to avoid computing expensive values for
+ * those functions.
+ *
+ * @example
+ * if (Systrace.isEnabled()) {
+ *   const expensiveArgs = computeExpensiveArgs();
+ *   Systrace.beginEvent('myEvent', expensiveArgs);
+ * }
+ */
+export function isEnabled(): boolean;
+
+/**
+ * @deprecated This function is now a no-op but it's left for backwards
+ * compatibility. `isEnabled` will now synchronously check if we're actively
+ * profiling or not. This is necessary because we don't have callbacks to know
+ * when profiling has started/stopped on Android APIs.
+ */
+export function setEnabled(_doEnable: boolean): void;
+
+/**
+ * Marks the start of a synchronous event that should end in the same stack
+ * frame. The end of this event should be marked using the `endEvent` function.
+ */
+export function beginEvent(eventName: EventName, args?: EventArgs): void;
+
+/**
+ * Marks the end of a synchronous event started in the same stack frame.
+ */
+export function endEvent(args?: EventArgs): void;
+
+/**
+ * Marks the start of a potentially asynchronous event. The end of this event
+ * should be marked calling the `endAsyncEvent` function with the cookie
+ * returned by this function.
+ */
+export function beginAsyncEvent(eventName: EventName, args?: EventArgs): number;
+
+/**
+ * Registers a new value for a counter event.
+ */
+export function endAsyncEvent(
+  eventName: EventName,
+  cookie: number,
+  args?: EventArgs,
+): void;
+
+/**
+ * counterEvent registers the value to the eventName on the systrace timeline
+ **/
+export function counterEvent(eventName: EventName, value: number): void;
diff --git a/Libraries/Performance/Systrace.js b/Libraries/Performance/Systrace.js
index d25b76bd3d3b..581db4b375d6 100644
--- a/Libraries/Performance/Systrace.js
+++ b/Libraries/Performance/Systrace.js
@@ -8,217 +8,132 @@
  * @format
  */
 
-'use strict';
-
-const invariant = require('invariant');
+import typeof * as SystraceModule from './Systrace';
 
 const TRACE_TAG_REACT_APPS = 1 << 17; // eslint-disable-line no-bitwise
-const TRACE_TAG_JS_VM_CALLS = 1 << 27; // eslint-disable-line no-bitwise
 
-let _enabled = false;
 let _asyncCookie = 0;
-const _markStack = [];
-let _markStackIndex = -1;
-let _canInstallReactHook = false;
-
-// Implements a subset of User Timing API necessary for React measurements.
-// https://developer.mozilla.org/en-US/docs/Web/API/User_Timing_API
-const REACT_MARKER = '\u269B';
-const userTimingPolyfill = __DEV__
-  ? {
-      mark(markName: string) {
-        if (_enabled) {
-          _markStackIndex++;
-          _markStack[_markStackIndex] = markName;
-          let systraceLabel = markName;
-          // Since perf measurements are a shared namespace in User Timing API,
-          // we prefix all React results with a React emoji.
-          if (markName[0] === REACT_MARKER) {
-            // This is coming from React.
-            // Removing component IDs keeps trace colors stable.
-            const indexOfId = markName.lastIndexOf(' (#');
-            const cutoffIndex = indexOfId !== -1 ? indexOfId : markName.length;
-            // Also cut off the emoji because it breaks Systrace
-            systraceLabel = markName.slice(2, cutoffIndex);
-          }
-          Systrace.beginEvent(systraceLabel);
-        }
-      },
-      measure(measureName: string, startMark: ?string, endMark: ?string) {
-        if (_enabled) {
-          invariant(
-            typeof measureName === 'string' &&
-              typeof startMark === 'string' &&
-              typeof endMark === 'undefined',
-            'Only performance.measure(string, string) overload is supported.',
-          );
-          const topMark = _markStack[_markStackIndex];
-          invariant(
-            startMark === topMark,
-            'There was a mismatching performance.measure() call. ' +
-              'Expected "%s" but got "%s."',
-            topMark,
-            startMark,
-          );
-          _markStackIndex--;
-          // We can't use more descriptive measureName because Systrace doesn't
-          // let us edit labels post factum.
-          Systrace.endEvent();
-        }
-      },
-      clearMarks(markName: string) {
-        if (_enabled) {
-          if (_markStackIndex === -1) {
-            return;
-          }
-          if (markName === _markStack[_markStackIndex]) {
-            // React uses this for "cancelling" started measurements.
-            // Systrace doesn't support deleting measurements, so we just stop them.
-            if (userTimingPolyfill != null) {
-              userTimingPolyfill.measure(markName, markName);
-            }
-          }
-        }
-      },
-      clearMeasures() {
-        // React calls this to avoid memory leaks in browsers, but we don't keep
-        // measurements anyway.
-      },
-    }
-  : null;
 
-function installPerformanceHooks(
-  polyfill: null | $TEMPORARY$object<{
-    clearMarks(markName: string): void,
-    clearMeasures(): void,
-    mark(markName: string): void,
-    measure(measureName: string, startMark: ?string, endMark: ?string): void,
-  }>,
-) {
-  if (polyfill) {
-    if (global.performance === undefined) {
-      global.performance = {};
-    }
+type EventName = string | (() => string);
+type EventArgs = ?{[string]: string};
 
-    Object.keys(polyfill).forEach(methodName => {
-      if (typeof global.performance[methodName] !== 'function') {
-        global.performance[methodName] = polyfill[methodName];
-      }
-    });
-  }
+/**
+ * Indicates if the application is currently being traced.
+ *
+ * Calling methods on this module when the application isn't being traced is
+ * cheap, but this method can be used to avoid computing expensive values for
+ * those functions.
+ *
+ * @example
+ * if (Systrace.isEnabled()) {
+ *   const expensiveArgs = computeExpensiveArgs();
+ *   Systrace.beginEvent('myEvent', expensiveArgs);
+ * }
+ */
+export function isEnabled(): boolean {
+  return global.nativeTraceIsTracing
+    ? global.nativeTraceIsTracing(TRACE_TAG_REACT_APPS)
+    : Boolean(global.__RCTProfileIsProfiling);
 }
 
-const Systrace = {
-  installReactHook() {
-    if (_enabled) {
-      if (__DEV__) {
-        installPerformanceHooks(userTimingPolyfill);
-      }
-    }
-    _canInstallReactHook = true;
-  },
-
-  setEnabled(enabled: boolean) {
-    if (_enabled !== enabled) {
-      if (__DEV__) {
-        if (enabled) {
-          global.nativeTraceBeginLegacy &&
-            global.nativeTraceBeginLegacy(TRACE_TAG_JS_VM_CALLS);
-        } else {
-          global.nativeTraceEndLegacy &&
-            global.nativeTraceEndLegacy(TRACE_TAG_JS_VM_CALLS);
-        }
-        if (_canInstallReactHook) {
-          if (enabled) {
-            installPerformanceHooks(userTimingPolyfill);
-          }
-        }
-      }
-      _enabled = enabled;
-    }
-  },
-
-  isEnabled(): boolean {
-    return _enabled;
-  },
+/**
+ * @deprecated This function is now a no-op but it's left for backwards
+ * compatibility. `isEnabled` will now synchronously check if we're actively
+ * profiling or not. This is necessary because we don't have callbacks to know
+ * when profiling has started/stopped on Android APIs.
+ */
+export function setEnabled(_doEnable: boolean): void {}
 
-  /**
-   * beginEvent/endEvent for starting and then ending a profile within the same call stack frame
-   **/
-  beginEvent(
-    profileName?: string | (() => string),
-    args?: {[string]: string, ...},
-  ) {
-    if (_enabled) {
-      const profileNameString =
-        typeof profileName === 'function' ? profileName() : profileName;
-      global.nativeTraceBeginSection(
-        TRACE_TAG_REACT_APPS,
-        profileNameString,
-        args,
-      );
-    }
-  },
+/**
+ * Marks the start of a synchronous event that should end in the same stack
+ * frame. The end of this event should be marked using the `endEvent` function.
+ */
+export function beginEvent(eventName: EventName, args?: EventArgs): void {
+  if (isEnabled()) {
+    const eventNameString =
+      typeof eventName === 'function' ? eventName() : eventName;
+    global.nativeTraceBeginSection(TRACE_TAG_REACT_APPS, eventNameString, args);
+  }
+}
 
-  endEvent() {
-    if (_enabled) {
-      global.nativeTraceEndSection(TRACE_TAG_REACT_APPS);
-    }
-  },
+/**
+ * Marks the end of a synchronous event started in the same stack frame.
+ */
+export function endEvent(args?: EventArgs): void {
+  if (isEnabled()) {
+    global.nativeTraceEndSection(TRACE_TAG_REACT_APPS, args);
+  }
+}
 
-  /**
-   * beginAsyncEvent/endAsyncEvent for starting and then ending a profile where the end can either
-   * occur on another thread or out of the current stack frame, eg await
-   * the returned cookie variable should be used as input into the endAsyncEvent call to end the profile
-   **/
-  beginAsyncEvent(profileName?: string | (() => string)): number {
-    const cookie = _asyncCookie;
-    if (_enabled) {
-      _asyncCookie++;
-      const profileNameString =
-        typeof profileName === 'function' ? profileName() : profileName;
-      global.nativeTraceBeginAsyncSection(
-        TRACE_TAG_REACT_APPS,
-        profileNameString,
-        cookie,
-      );
-    }
-    return cookie;
-  },
+/**
+ * Marks the start of a potentially asynchronous event. The end of this event
+ * should be marked calling the `endAsyncEvent` function with the cookie
+ * returned by this function.
+ */
+export function beginAsyncEvent(
+  eventName: EventName,
+  args?: EventArgs,
+): number {
+  const cookie = _asyncCookie;
+  if (isEnabled()) {
+    _asyncCookie++;
+    const eventNameString =
+      typeof eventName === 'function' ? eventName() : eventName;
+    global.nativeTraceBeginAsyncSection(
+      TRACE_TAG_REACT_APPS,
+      eventNameString,
+      cookie,
+      args,
+    );
+  }
+  return cookie;
+}
 
-  endAsyncEvent(profileName?: string | (() => string), cookie?: number) {
-    if (_enabled) {
-      const profileNameString =
-        typeof profileName === 'function' ? profileName() : profileName;
-      global.nativeTraceEndAsyncSection(
-        TRACE_TAG_REACT_APPS,
-        profileNameString,
-        cookie,
-      );
-    }
-  },
+/**
+ * Marks the end of a potentially asynchronous event, which was started with
+ * the given cookie.
+ */
+export function endAsyncEvent(
+  eventName: EventName,
+  cookie: number,
+  args?: EventArgs,
+): void {
+  if (isEnabled()) {
+    const eventNameString =
+      typeof eventName === 'function' ? eventName() : eventName;
+    global.nativeTraceEndAsyncSection(
+      TRACE_TAG_REACT_APPS,
+      eventNameString,
+      cookie,
+      args,
+    );
+  }
+}
 
-  /**
-   * counterEvent registers the value to the profileName on the systrace timeline
-   **/
-  counterEvent(profileName?: string | (() => string), value?: number) {
-    if (_enabled) {
-      const profileNameString =
-        typeof profileName === 'function' ? profileName() : profileName;
-      global.nativeTraceCounter &&
-        global.nativeTraceCounter(
-          TRACE_TAG_REACT_APPS,
-          profileNameString,
-          value,
-        );
-    }
-  },
-};
+/**
+ * Registers a new value for a counter event.
+ */
+export function counterEvent(eventName: EventName, value: number): void {
+  if (isEnabled()) {
+    const eventNameString =
+      typeof eventName === 'function' ? eventName() : eventName;
+    global.nativeTraceCounter &&
+      global.nativeTraceCounter(TRACE_TAG_REACT_APPS, eventNameString, value);
+  }
+}
 
 if (__DEV__) {
+  const Systrace: SystraceModule = {
+    isEnabled,
+    setEnabled,
+    beginEvent,
+    endEvent,
+    beginAsyncEvent,
+    endAsyncEvent,
+    counterEvent,
+  };
+
   // The metro require polyfill can not have dependencies (true for all polyfills).
   // Ensure that `Systrace` is available in polyfill by exposing it globally.
   global[(global.__METRO_GLOBAL_PREFIX__ || '') + '__SYSTRACE'] = Systrace;
 }
-
-module.exports = Systrace;
diff --git a/Libraries/PermissionsAndroid/NativePermissionsAndroid.js b/Libraries/PermissionsAndroid/NativePermissionsAndroid.js
index ca8e6fb7633c..27c068082ad2 100644
--- a/Libraries/PermissionsAndroid/NativePermissionsAndroid.js
+++ b/Libraries/PermissionsAndroid/NativePermissionsAndroid.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 // TODO: Use proper enum types.
diff --git a/Libraries/PermissionsAndroid/PermissionsAndroid.d.ts b/Libraries/PermissionsAndroid/PermissionsAndroid.d.ts
new file mode 100644
index 000000000000..71b41076ef94
--- /dev/null
+++ b/Libraries/PermissionsAndroid/PermissionsAndroid.d.ts
@@ -0,0 +1,115 @@
+/**
+ * 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 Rationale {
+  title: string;
+  message: string;
+  buttonPositive: string;
+  buttonNegative?: string | undefined;
+  buttonNeutral?: string | undefined;
+}
+
+export type Permission =
+  | 'android.permission.READ_CALENDAR'
+  | 'android.permission.WRITE_CALENDAR'
+  | 'android.permission.CAMERA'
+  | 'android.permission.READ_CONTACTS'
+  | 'android.permission.WRITE_CONTACTS'
+  | 'android.permission.GET_ACCOUNTS'
+  | 'android.permission.ACCESS_BACKGROUND_LOCATION'
+  | 'android.permission.ACCESS_FINE_LOCATION'
+  | 'android.permission.ACCESS_COARSE_LOCATION'
+  | 'android.permission.RECORD_AUDIO'
+  | 'android.permission.READ_PHONE_STATE'
+  | 'android.permission.CALL_PHONE'
+  | 'android.permission.READ_CALL_LOG'
+  | 'android.permission.WRITE_CALL_LOG'
+  | 'com.android.voicemail.permission.ADD_VOICEMAIL'
+  | 'com.android.voicemail.permission.READ_VOICEMAIL'
+  | 'com.android.voicemail.permission.WRITE_VOICEMAIL'
+  | 'android.permission.USE_SIP'
+  | 'android.permission.PROCESS_OUTGOING_CALLS'
+  | 'android.permission.BODY_SENSORS'
+  | 'android.permission.BODY_SENSORS_BACKGROUND'
+  | 'android.permission.SEND_SMS'
+  | 'android.permission.RECEIVE_SMS'
+  | 'android.permission.READ_SMS'
+  | 'android.permission.RECEIVE_WAP_PUSH'
+  | 'android.permission.RECEIVE_MMS'
+  | 'android.permission.READ_EXTERNAL_STORAGE'
+  | 'android.permission.READ_MEDIA_IMAGES'
+  | 'android.permission.READ_MEDIA_VIDEO'
+  | 'android.permission.READ_MEDIA_AUDIO'
+  | 'android.permission.WRITE_EXTERNAL_STORAGE'
+  | 'android.permission.BLUETOOTH_CONNECT'
+  | 'android.permission.BLUETOOTH_SCAN'
+  | 'android.permission.BLUETOOTH_ADVERTISE'
+  | 'android.permission.ACCESS_MEDIA_LOCATION'
+  | 'android.permission.ACCEPT_HANDOVER'
+  | 'android.permission.ACTIVITY_RECOGNITION'
+  | 'android.permission.ANSWER_PHONE_CALLS'
+  | 'android.permission.READ_PHONE_NUMBERS'
+  | 'android.permission.UWB_RANGING'
+  | 'android.permission.POST_NOTIFICATIONS'
+  | 'android.permission.NEARBY_WIFI_DEVICES';
+
+export type PermissionStatus = 'granted' | 'denied' | 'never_ask_again';
+
+export interface PermissionsAndroidStatic {
+  /**
+   * A list of permission results that are returned
+   */
+  RESULTS: {[key: string]: PermissionStatus};
+  /**
+   * A list of specified "dangerous" permissions that require prompting the user
+   */
+  PERMISSIONS: {[key: string]: Permission};
+  new (): PermissionsAndroidStatic;
+  /**
+   * @deprecated Use check instead
+   */
+  checkPermission(permission: Permission): Promise<boolean>;
+  /**
+   * Returns a promise resolving to a boolean value as to whether the specified
+   * permissions has been granted
+   */
+  check(permission: Permission): Promise<boolean>;
+  /**
+   * @deprecated Use request instead
+   */
+  requestPermission(
+    permission: Permission,
+    rationale?: Rationale,
+  ): Promise<boolean>;
+  /**
+   * Prompts the user to enable a permission and returns a promise resolving to a
+   * string value indicating whether the user allowed or denied the request
+   *
+   * If the optional rationale argument is included (which is an object with a
+   * title and message), this function checks with the OS whether it is necessary
+   * to show a dialog explaining why the permission is needed
+   * (https://developer.android.com/training/permissions/requesting.html#explain)
+   * and then shows the system permission dialog
+   */
+  request(
+    permission: Permission,
+    rationale?: Rationale,
+  ): Promise<PermissionStatus>;
+  /**
+   * Prompts the user to enable multiple permissions in the same dialog and
+   * returns an object with the permissions as keys and strings as values
+   * indicating whether the user allowed or denied the request
+   */
+  requestMultiple(
+    permissions: Array<Permission>,
+  ): Promise<{[key in Permission]: PermissionStatus}>;
+}
+
+export const PermissionsAndroid: PermissionsAndroidStatic;
+export type PermissionsAndroid = PermissionsAndroidStatic;
diff --git a/Libraries/PermissionsAndroid/PermissionsAndroid.js b/Libraries/PermissionsAndroid/PermissionsAndroid.js
index 389f7b70ab98..094b3ccf9016 100644
--- a/Libraries/PermissionsAndroid/PermissionsAndroid.js
+++ b/Libraries/PermissionsAndroid/PermissionsAndroid.js
@@ -8,16 +8,17 @@
  * @flow strict
  */
 
-const Platform = require('../Utilities/Platform');
-
-import NativeDialogManagerAndroid from '../NativeModules/specs/NativeDialogManagerAndroid';
-import NativePermissionsAndroid from './NativePermissionsAndroid';
 import type {
   PermissionStatus,
   PermissionType,
 } from './NativePermissionsAndroid';
+
+import NativeDialogManagerAndroid from '../NativeModules/specs/NativeDialogManagerAndroid';
+import NativePermissionsAndroid from './NativePermissionsAndroid';
 import invariant from 'invariant';
 
+const Platform = require('../Utilities/Platform');
+
 export type Rationale = {
   title: string,
   message: string,
@@ -74,7 +75,8 @@ const PERMISSIONS = Object.freeze({
   ANSWER_PHONE_CALLS: 'android.permission.ANSWER_PHONE_CALLS',
   READ_PHONE_NUMBERS: 'android.permission.READ_PHONE_NUMBERS',
   UWB_RANGING: 'android.permission.UWB_RANGING',
-  POST_NOTIFICATION: 'android.permission.POST_NOTIFICATIONS',
+  POST_NOTIFICATION: 'android.permission.POST_NOTIFICATIONS', // Remove in 0.72
+  POST_NOTIFICATIONS: 'android.permission.POST_NOTIFICATIONS',
   NEARBY_WIFI_DEVICES: 'android.permission.NEARBY_WIFI_DEVICES',
 });
 
@@ -105,7 +107,8 @@ class PermissionsAndroid {
     CAMERA: string,
     GET_ACCOUNTS: string,
     NEARBY_WIFI_DEVICES: string,
-    POST_NOTIFICATION: string,
+    POST_NOTIFICATION: string, // Remove in 0.72
+    POST_NOTIFICATIONS: string,
     PROCESS_OUTGOING_CALLS: string,
     READ_CALENDAR: string,
     READ_CALL_LOG: string,
diff --git a/Libraries/Pressability/Pressability.js b/Libraries/Pressability/Pressability.js
index 5c8f2b8af5cf..5fa9b8932eb0 100644
--- a/Libraries/Pressability/Pressability.js
+++ b/Libraries/Pressability/Pressability.js
@@ -8,24 +8,25 @@
  * @format
  */
 
-import {isHoverEnabled} from './HoverState';
-import invariant from 'invariant';
-import SoundManager from '../Components/Sound/SoundManager';
-import {normalizeRect, type RectOrSize} from '../StyleSheet/Rect';
+import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
 import type {
   BlurEvent,
   FocusEvent,
-  PressEvent,
   MouseEvent,
+  PressEvent,
 } from '../Types/CoreEventTypes';
+
+import SoundManager from '../Components/Sound/SoundManager';
+import ReactNativeFeatureFlags from '../ReactNative/ReactNativeFeatureFlags';
+import UIManager from '../ReactNative/UIManager';
+import {type RectOrSize, normalizeRect} from '../StyleSheet/Rect';
+import {type PointerEvent} from '../Types/CoreEventTypes';
+import Platform from '../Utilities/Platform';
+import {isHoverEnabled} from './HoverState';
 import PressabilityPerformanceEventEmitter from './PressabilityPerformanceEventEmitter.js';
 import {type PressabilityTouchSignal as TouchSignal} from './PressabilityTypes.js';
-import Platform from '../Utilities/Platform';
-import UIManager from '../ReactNative/UIManager';
-import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
+import invariant from 'invariant';
 import * as React from 'react';
-import ReactNativeFeatureFlags from '../ReactNative/ReactNativeFeatureFlags';
-import {type PointerEvent} from '../Types/CoreEventTypes';
 
 export type PressabilityConfig = $ReadOnly<{|
   /**
@@ -549,6 +550,7 @@ export default class Pressability {
 
     if (process.env.NODE_ENV === 'test') {
       // We are setting this in order to find this node in ReactNativeTestTools
+      // $FlowFixMe[prop-missing]
       responderEventHandlers.onStartShouldSetResponder.testOnly_pressabilityConfig =
         () => this._config;
     }
diff --git a/Libraries/Pressability/PressabilityDebug.js b/Libraries/Pressability/PressabilityDebug.js
index 9c5bb0830e29..01ec826ed7c5 100644
--- a/Libraries/Pressability/PressabilityDebug.js
+++ b/Libraries/Pressability/PressabilityDebug.js
@@ -8,11 +8,11 @@
  * @format
  */
 
-import normalizeColor from '../StyleSheet/normalizeColor';
 import type {ColorValue} from '../StyleSheet/StyleSheet';
-import {normalizeRect, type RectOrSize} from '../StyleSheet/Rect';
 
 import View from '../Components/View/View';
+import normalizeColor from '../StyleSheet/normalizeColor';
+import {type RectOrSize, normalizeRect} from '../StyleSheet/Rect';
 import * as React from 'react';
 
 type Props = $ReadOnly<{|
diff --git a/Libraries/Pressability/__tests__/Pressability-test.js b/Libraries/Pressability/__tests__/Pressability-test.js
index f73c5b129ac0..5f5fa3e85145 100644
--- a/Libraries/Pressability/__tests__/Pressability-test.js
+++ b/Libraries/Pressability/__tests__/Pressability-test.js
@@ -4,19 +4,19 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
- * @format
  * @flow strict-local
+ * @format
+ * @oncall react_native
  */
 
 import type {PressEvent} from '../../Types/CoreEventTypes';
 
+const UIManager = require('../../ReactNative/UIManager');
+const Platform = require('../../Utilities/Platform');
 const HoverState = require('../HoverState');
 const Pressability = require('../Pressability').default;
 const invariant = require('invariant');
 const nullthrows = require('nullthrows');
-const Platform = require('../../Utilities/Platform');
-const UIManager = require('../../ReactNative/UIManager');
 
 // TODO: Move this util to a shared location.
 function getMock<TArguments: $ReadOnlyArray<mixed>, TReturn>(
@@ -233,6 +233,7 @@ const createMockPressEvent = (
 describe('Pressability', () => {
   beforeEach(() => {
     jest.resetModules();
+    jest.restoreAllMocks();
     jest.spyOn(Date, 'now');
     jest.spyOn(HoverState, 'isHoverEnabled');
   });
@@ -667,15 +668,20 @@ describe('Pressability', () => {
       handlers.onResponderMove(createMockPressEvent('onResponderMove'));
       jest.runOnlyPendingTimers();
       expect(config.onPressIn).toBeCalled();
+
       // WORKAROUND: Jest does not advance `Date.now()`.
-      const touchActivateTime = Date.now();
+      expect(Date.now).toHaveBeenCalledTimes(1);
+      const touchActivateTime = Date.now.mock.results[0].value;
       jest.advanceTimersByTime(120);
       Date.now.mockReturnValue(touchActivateTime + 120);
       handlers.onResponderRelease(createMockPressEvent('onResponderRelease'));
 
       expect(config.onPressOut).not.toBeCalled();
       jest.advanceTimersByTime(10);
+      Date.now.mockReturnValue(touchActivateTime + 130);
       expect(config.onPressOut).toBeCalled();
+
+      Date.now.mockRestore();
     });
 
     it('is called synchronously if minimum press duration is 0ms', () => {
diff --git a/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js b/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js
index 93f79effa9ad..102ce795e77a 100644
--- a/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js
+++ b/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 type Permissions = {|
diff --git a/Libraries/PushNotificationIOS/PushNotificationIOS.d.ts b/Libraries/PushNotificationIOS/PushNotificationIOS.d.ts
new file mode 100644
index 000000000000..364bd8aa01ed
--- /dev/null
+++ b/Libraries/PushNotificationIOS/PushNotificationIOS.d.ts
@@ -0,0 +1,295 @@
+/**
+ * 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 PushNotificationPermissions {
+  alert?: boolean | undefined;
+  badge?: boolean | undefined;
+  sound?: boolean | undefined;
+}
+
+export interface PushNotification {
+  /**
+   * An alias for `getAlert` to get the notification's main message string
+   */
+  getMessage(): string | Object;
+
+  /**
+   * Gets the sound string from the `aps` object
+   */
+  getSound(): string;
+
+  /**
+   * Gets the category string from the `aps` object
+   */
+  getCategory(): string;
+
+  /**
+   * Gets the notification's main message from the `aps` object
+   */
+  getAlert(): string | Object;
+
+  /**
+   * Gets the content-available number from the `aps` object
+   */
+  getContentAvailable(): number;
+
+  /**
+   * Gets the badge count number from the `aps` object
+   */
+  getBadgeCount(): number;
+
+  /**
+   * Gets the data object on the notif
+   */
+  getData(): Object;
+
+  /**
+   * Gets the thread ID on the notif
+   */
+  getThreadId(): string;
+
+  /**
+   * iOS Only
+   * Signifies remote notification handling is complete
+   */
+  finish(result: string): void;
+}
+
+type PresentLocalNotificationDetails = {
+  alertBody: string;
+  alertAction: string;
+  alertTitle?: string | undefined;
+  soundName?: string | undefined;
+  category?: string | undefined;
+  userInfo?: Object | undefined;
+  applicationIconBadgeNumber?: number | undefined;
+};
+
+type ScheduleLocalNotificationDetails = {
+  alertAction?: string | undefined;
+  alertBody?: string | undefined;
+  alertTitle?: string | undefined;
+  applicationIconBadgeNumber?: number | undefined;
+  category?: string | undefined;
+  fireDate?: number | string | undefined;
+  isSilent?: boolean | undefined;
+  repeatInterval?:
+    | 'year'
+    | 'month'
+    | 'week'
+    | 'day'
+    | 'hour'
+    | 'minute'
+    | undefined;
+  soundName?: string | undefined;
+  userInfo?: Object | undefined;
+};
+
+export type PushNotificationEventName =
+  | 'notification'
+  | 'localNotification'
+  | 'register'
+  | 'registrationError';
+
+type FetchResult = {
+  NewData: 'UIBackgroundFetchResultNewData';
+  NoData: 'UIBackgroundFetchResultNoData';
+  ResultFailed: 'UIBackgroundFetchResultFailed';
+};
+
+/**
+ * Handle push notifications for your app, including permission handling and icon badge number.
+ * @see https://reactnative.dev/docs/pushnotificationios#content
+ *
+ * //FIXME: BGR: The documentation seems completely off compared to the actual js implementation. I could never get the example to run
+ */
+export interface PushNotificationIOSStatic {
+  /**
+   * Schedules the localNotification for immediate presentation.
+   * details is an object containing:
+   * alertBody : The message displayed in the notification alert.
+   * alertAction : The "action" displayed beneath an actionable notification. Defaults to "view";
+   * soundName : The sound played when the notification is fired (optional).
+   * category : The category of this notification, required for actionable notifications (optional).
+   * userInfo : An optional object containing additional notification data.
+   * applicationIconBadgeNumber (optional) : The number to display as the app's icon badge. The default value of this property is 0, which means that no badge is displayed.
+   */
+  presentLocalNotification(details: PresentLocalNotificationDetails): void;
+
+  /**
+   * Schedules the localNotification for future presentation.
+   * details is an object containing:
+   * fireDate : The date and time when the system should deliver the notification.
+   * alertBody : The message displayed in the notification alert.
+   * alertAction : The "action" displayed beneath an actionable notification. Defaults to "view";
+   * soundName : The sound played when the notification is fired (optional).
+   * category : The category of this notification, required for actionable notifications (optional).
+   * userInfo : An optional object containing additional notification data.
+   * applicationIconBadgeNumber (optional) : The number to display as the app's icon badge. Setting the number to 0 removes the icon badge.
+   */
+  scheduleLocalNotification(details: ScheduleLocalNotificationDetails): void;
+
+  /**
+   * Cancels all scheduled localNotifications
+   */
+  cancelAllLocalNotifications(): void;
+
+  /**
+   * Remove all delivered notifications from Notification Center.
+   */
+  removeAllDeliveredNotifications(): void;
+
+  /**
+   * Provides you with a list of the app’s notifications that are still displayed in Notification Center.
+   */
+  getDeliveredNotifications(callback: (notifications: Object[]) => void): void;
+
+  /**
+   * Removes the specified notifications from Notification Center
+   */
+  removeDeliveredNotifications(identifiers: string[]): void;
+
+  /**
+   * Cancel local notifications.
+   * Optionally restricts the set of canceled notifications to those notifications whose userInfo fields match the corresponding fields in the userInfo argument.
+   */
+  cancelLocalNotifications(userInfo: Object): void;
+
+  /**
+   * Sets the badge number for the app icon on the home screen
+   */
+  setApplicationIconBadgeNumber(number: number): void;
+
+  /**
+   * Gets the current badge number for the app icon on the home screen
+   */
+  getApplicationIconBadgeNumber(callback: (badge: number) => void): void;
+
+  /**
+   * Gets the local notifications that are currently scheduled.
+   */
+  getScheduledLocalNotifications(
+    callback: (notifications: ScheduleLocalNotificationDetails[]) => void,
+  ): void;
+
+  /**
+   * Attaches a listener to remote notifications while the app is running in the
+   * foreground or the background.
+   *
+   * The handler will get be invoked with an instance of `PushNotificationIOS`
+   *
+   * The type MUST be 'notification'
+   */
+  addEventListener(
+    type: 'notification' | 'localNotification',
+    handler: (notification: PushNotification) => void,
+  ): void;
+
+  /**
+   * Fired when the user registers for remote notifications.
+   *
+   * The handler will be invoked with a hex string representing the deviceToken.
+   *
+   * The type MUST be 'register'
+   */
+  addEventListener(
+    type: 'register',
+    handler: (deviceToken: string) => void,
+  ): void;
+
+  /**
+   * Fired when the user fails to register for remote notifications.
+   * Typically occurs when APNS is having issues, or the device is a simulator.
+   *
+   * The handler will be invoked with {message: string, code: number, details: any}.
+   *
+   * The type MUST be 'registrationError'
+   */
+  addEventListener(
+    type: 'registrationError',
+    handler: (error: {message: string; code: number; details: any}) => void,
+  ): void;
+
+  /**
+   * Removes the event listener. Do this in `componentWillUnmount` to prevent
+   * memory leaks
+   */
+  removeEventListener(
+    type: PushNotificationEventName,
+    handler:
+      | ((notification: PushNotification) => void)
+      | ((deviceToken: string) => void)
+      | ((error: {message: string; code: number; details: any}) => void),
+  ): void;
+
+  /**
+   * Requests all notification permissions from iOS, prompting the user's
+   * dialog box.
+   */
+  requestPermissions(permissions?: PushNotificationPermissions[]): void;
+
+  /**
+   * Requests all notification permissions from iOS, prompting the user's
+   * dialog box.
+   */
+  requestPermissions(
+    permissions?: PushNotificationPermissions,
+  ): Promise<PushNotificationPermissions>;
+
+  /**
+   * Unregister for all remote notifications received via Apple Push
+   * Notification service.
+   * You should call this method in rare circumstances only, such as when
+   * a new version of the app removes support for all types of remote
+   * notifications. Users can temporarily prevent apps from receiving
+   * remote notifications through the Notifications section of the
+   * Settings app. Apps unregistered through this method can always
+   * re-register.
+   */
+  abandonPermissions(): void;
+
+  /**
+   * See what push permissions are currently enabled. `callback` will be
+   * invoked with a `permissions` object:
+   *
+   *  - `alert` :boolean
+   *  - `badge` :boolean
+   *  - `sound` :boolean
+   */
+  checkPermissions(
+    callback: (permissions: PushNotificationPermissions) => void,
+  ): void;
+
+  /**
+   * This method returns a promise that resolves to either the notification
+   * object if the app was launched by a push notification, or `null` otherwise.
+   */
+  getInitialNotification(): Promise<PushNotification | null>;
+
+  /**
+   * iOS fetch results that best describe the result of a finished remote notification handler.
+   * For a list of possible values, see `PushNotificationIOS.FetchResult`.
+   */
+  FetchResult: FetchResult;
+}
+
+/**
+ * PushNotificationIOS has been extracted from react-native core and will be removed in a future release.
+ * It can now be installed and imported from `@react-native-community/push-notification-ios` instead of 'react-native'.
+ * @see https://github.com/react-native-community/react-native-push-notification-ios
+ * @deprecated
+ */
+export const PushNotificationIOS: PushNotificationIOSStatic;
+/**
+ * PushNotificationIOS has been extracted from react-native core and will be removed in a future release.
+ * It can now be installed and imported from `@react-native-community/push-notification-ios` instead of 'react-native'.
+ * @see https://github.com/react-native-community/react-native-push-notification-ios
+ * @deprecated
+ */
+export type PushNotificationIOS = PushNotificationIOSStatic;
diff --git a/Libraries/PushNotificationIOS/PushNotificationIOS.js b/Libraries/PushNotificationIOS/PushNotificationIOS.js
index 268f7e9c15b4..5422d02e32e2 100644
--- a/Libraries/PushNotificationIOS/PushNotificationIOS.js
+++ b/Libraries/PushNotificationIOS/PushNotificationIOS.js
@@ -8,10 +8,12 @@
  * @flow
  */
 
+import type {EventSubscription} from '../vendor/emitter/EventEmitter';
+
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
+import Platform from '../Utilities/Platform';
 import NativePushNotificationManagerIOS from './NativePushNotificationManagerIOS';
 import invariant from 'invariant';
-import Platform from '../Utilities/Platform';
 
 type NativePushNotificationIOSEventDefinitions = {
   remoteNotificationReceived: [
@@ -44,7 +46,7 @@ const PushNotificationEmitter =
     Platform.OS !== 'ios' ? null : NativePushNotificationManagerIOS,
   );
 
-const _notifHandlers = new Map();
+const _notifHandlers = new Map<string, void | EventSubscription>();
 
 const DEVICE_NOTIF_EVENT = 'remoteNotificationReceived';
 const NOTIF_REGISTER_EVENT = 'remoteNotificationsRegistered';
@@ -118,7 +120,7 @@ class PushNotificationIOS {
    *
    * See https://reactnative.dev/docs/pushnotificationios#presentlocalnotification
    */
-  static presentLocalNotification(details: Object) {
+  static presentLocalNotification(details: Object): void {
     invariant(
       NativePushNotificationManagerIOS,
       'PushNotificationManager is not available.',
@@ -131,7 +133,7 @@ class PushNotificationIOS {
    *
    * See https://reactnative.dev/docs/pushnotificationios#schedulelocalnotification
    */
-  static scheduleLocalNotification(details: Object) {
+  static scheduleLocalNotification(details: Object): void {
     invariant(
       NativePushNotificationManagerIOS,
       'PushNotificationManager is not available.',
@@ -144,7 +146,7 @@ class PushNotificationIOS {
    *
    * See https://reactnative.dev/docs/pushnotificationios#cancelalllocalnotifications
    */
-  static cancelAllLocalNotifications() {
+  static cancelAllLocalNotifications(): void {
     invariant(
       NativePushNotificationManagerIOS,
       'PushNotificationManager is not available.',
@@ -198,7 +200,7 @@ class PushNotificationIOS {
    *
    * See https://reactnative.dev/docs/pushnotificationios#setapplicationiconbadgenumber
    */
-  static setApplicationIconBadgeNumber(number: number) {
+  static setApplicationIconBadgeNumber(number: number): void {
     invariant(
       NativePushNotificationManagerIOS,
       'PushNotificationManager is not available.',
@@ -211,7 +213,7 @@ class PushNotificationIOS {
    *
    * See https://reactnative.dev/docs/pushnotificationios#getapplicationiconbadgenumber
    */
-  static getApplicationIconBadgeNumber(callback: Function) {
+  static getApplicationIconBadgeNumber(callback: Function): void {
     invariant(
       NativePushNotificationManagerIOS,
       'PushNotificationManager is not available.',
@@ -224,7 +226,7 @@ class PushNotificationIOS {
    *
    * See https://reactnative.dev/docs/pushnotificationios#cancellocalnotification
    */
-  static cancelLocalNotifications(userInfo: Object) {
+  static cancelLocalNotifications(userInfo: Object): void {
     invariant(
       NativePushNotificationManagerIOS,
       'PushNotificationManager is not available.',
@@ -237,7 +239,7 @@ class PushNotificationIOS {
    *
    * See https://reactnative.dev/docs/pushnotificationios#getscheduledlocalnotifications
    */
-  static getScheduledLocalNotifications(callback: Function) {
+  static getScheduledLocalNotifications(callback: Function): void {
     invariant(
       NativePushNotificationManagerIOS,
       'PushNotificationManager is not available.',
@@ -251,7 +253,10 @@ class PushNotificationIOS {
    *
    * See https://reactnative.dev/docs/pushnotificationios#addeventlistener
    */
-  static addEventListener(type: PushNotificationEventName, handler: Function) {
+  static addEventListener(
+    type: PushNotificationEventName,
+    handler: Function,
+  ): void {
     invariant(
       type === 'notification' ||
         type === 'register' ||
@@ -301,7 +306,7 @@ class PushNotificationIOS {
   static removeEventListener(
     type: PushNotificationEventName,
     handler: Function,
-  ) {
+  ): void {
     invariant(
       type === 'notification' ||
         type === 'register' ||
@@ -362,7 +367,7 @@ class PushNotificationIOS {
    *
    * See https://reactnative.dev/docs/pushnotificationios#abandonpermissions
    */
-  static abandonPermissions() {
+  static abandonPermissions(): void {
     invariant(
       NativePushNotificationManagerIOS,
       'PushNotificationManager is not available.',
@@ -376,7 +381,7 @@ class PushNotificationIOS {
    *
    * See https://reactnative.dev/docs/pushnotificationios#checkpermissions
    */
-  static checkPermissions(callback: Function) {
+  static checkPermissions(callback: Function): void {
     invariant(typeof callback === 'function', 'Must provide a valid callback');
     invariant(
       NativePushNotificationManagerIOS,
@@ -463,7 +468,7 @@ class PushNotificationIOS {
    *
    * See https://reactnative.dev/docs/pushnotificationios#finish
    */
-  finish(fetchResult: string) {
+  finish(fetchResult: string): void {
     if (
       !this._isRemote ||
       !this._notificationId ||
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.h b/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
index cbd581536e3b..778db415b587 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
@@ -17,7 +17,8 @@ typedef void (^RCTRemoteNotificationCallback)(UIBackgroundFetchResult result);
 + (void)didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings;
 + (void)didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken;
 + (void)didReceiveRemoteNotification:(NSDictionary *)notification;
-+ (void)didReceiveRemoteNotification:(NSDictionary *)notification fetchCompletionHandler:(RCTRemoteNotificationCallback)completionHandler;
++ (void)didReceiveRemoteNotification:(NSDictionary *)notification
+              fetchCompletionHandler:(RCTRemoteNotificationCallback)completionHandler;
 + (void)didReceiveLocalNotification:(UILocalNotification *)notification;
 + (void)didFailToRegisterForRemoteNotificationsWithError:(NSError *)error;
 #endif
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm b/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm
index 8dec975d054e..0d586d8e65dd 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm
@@ -27,17 +27,18 @@
 #if !TARGET_OS_UIKITFORMAC
 @implementation RCTConvert (NSCalendarUnit)
 
-RCT_ENUM_CONVERTER(NSCalendarUnit,
-                   (@{
-                      @"year": @(NSCalendarUnitYear),
-                      @"month": @(NSCalendarUnitMonth),
-                      @"week": @(NSCalendarUnitWeekOfYear),
-                      @"day": @(NSCalendarUnitDay),
-                      @"hour": @(NSCalendarUnitHour),
-                      @"minute": @(NSCalendarUnitMinute)
-                      }),
-                   0,
-                   integerValue)
+RCT_ENUM_CONVERTER(
+    NSCalendarUnit,
+    (@{
+      @"year" : @(NSCalendarUnitYear),
+      @"month" : @(NSCalendarUnitMonth),
+      @"week" : @(NSCalendarUnitWeekOfYear),
+      @"day" : @(NSCalendarUnitDay),
+      @"hour" : @(NSCalendarUnitHour),
+      @"minute" : @(NSCalendarUnitMinute)
+    }),
+    0,
+    integerValue)
 
 @end
 
@@ -68,11 +69,15 @@ + (UILocalNotification *)UILocalNotification:(id)json
   return notification;
 }
 
-RCT_ENUM_CONVERTER(UIBackgroundFetchResult, (@{
-  @"UIBackgroundFetchResultNewData": @(UIBackgroundFetchResultNewData),
-  @"UIBackgroundFetchResultNoData": @(UIBackgroundFetchResultNoData),
-  @"UIBackgroundFetchResultFailed": @(UIBackgroundFetchResultFailed),
-}), UIBackgroundFetchResultNoData, integerValue)
+RCT_ENUM_CONVERTER(
+    UIBackgroundFetchResult,
+    (@{
+      @"UIBackgroundFetchResultNewData" : @(UIBackgroundFetchResultNewData),
+      @"UIBackgroundFetchResultNoData" : @(UIBackgroundFetchResultNoData),
+      @"UIBackgroundFetchResultFailed" : @(UIBackgroundFetchResultFailed),
+    }),
+    UIBackgroundFetchResultNoData,
+    integerValue)
 
 @end
 #else
@@ -163,10 +168,12 @@ - (void)stopObserving
 
 - (NSArray<NSString *> *)supportedEvents
 {
-  return @[@"localNotificationReceived",
-           @"remoteNotificationReceived",
-           @"remoteNotificationsRegistered",
-           @"remoteNotificationRegistrationError"];
+  return @[
+    @"localNotificationReceived",
+    @"remoteNotificationReceived",
+    @"remoteNotificationsRegistered",
+    @"remoteNotificationRegistrationError"
+  ];
 }
 
 + (void)didRegisterUserNotificationSettings:(__unused UIUserNotificationSettings *)notificationSettings
@@ -190,12 +197,12 @@ + (void)didFailToRegisterForRemoteNotificationsWithError:(NSError *)error
 {
   [[NSNotificationCenter defaultCenter] postNotificationName:kRemoteNotificationRegistrationFailed
                                                       object:self
-                                                    userInfo:@{@"error": error}];
+                                                    userInfo:@{@"error" : error}];
 }
 
 + (void)didReceiveRemoteNotification:(NSDictionary *)notification
 {
-  NSDictionary *userInfo = @{@"notification": notification};
+  NSDictionary *userInfo = @{@"notification" : notification};
   [[NSNotificationCenter defaultCenter] postNotificationName:RCTRemoteNotificationReceived
                                                       object:self
                                                     userInfo:userInfo];
@@ -204,7 +211,7 @@ + (void)didReceiveRemoteNotification:(NSDictionary *)notification
 + (void)didReceiveRemoteNotification:(NSDictionary *)notification
               fetchCompletionHandler:(RCTRemoteNotificationCallback)completionHandler
 {
-  NSDictionary *userInfo = @{@"notification": notification, @"completionHandler": completionHandler};
+  NSDictionary *userInfo = @{@"notification" : notification, @"completionHandler" : completionHandler};
   [[NSNotificationCenter defaultCenter] postNotificationName:RCTRemoteNotificationReceived
                                                       object:self
                                                     userInfo:userInfo];
@@ -224,7 +231,8 @@ - (void)handleLocalNotificationReceived:(NSNotification *)notification
 
 - (void)handleRemoteNotificationReceived:(NSNotification *)notification
 {
-  NSMutableDictionary *remoteNotification = [NSMutableDictionary dictionaryWithDictionary:notification.userInfo[@"notification"]];
+  NSMutableDictionary *remoteNotification =
+      [NSMutableDictionary dictionaryWithDictionary:notification.userInfo[@"notification"]];
   RCTRemoteNotificationCallback completionHandler = notification.userInfo[@"completionHandler"];
   NSString *notificationId = [[NSUUID UUID] UUIDString];
   remoteNotification[@"notificationId"] = notificationId;
@@ -249,14 +257,15 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
 {
   NSError *error = notification.userInfo[@"error"];
   NSDictionary *errorDetails = @{
-    @"message": error.localizedDescription,
-    @"code": @(error.code),
-    @"details": error.userInfo,
+    @"message" : error.localizedDescription,
+    @"code" : @(error.code),
+    @"details" : error.userInfo,
   };
   [self sendEventWithName:@"remoteNotificationRegistrationError" body:errorDetails];
 }
 
-RCT_EXPORT_METHOD(onFinishRemoteNotification:(NSString *)notificationId fetchResult:(NSString *)fetchResult) {
+RCT_EXPORT_METHOD(onFinishRemoteNotification : (NSString *)notificationId fetchResult : (NSString *)fetchResult)
+{
   UIBackgroundFetchResult result = [RCTConvert UIBackgroundFetchResult:fetchResult];
   RCTRemoteNotificationCallback completionHandler = self.remoteNotificationCallbacks[notificationId];
   if (!completionHandler) {
@@ -270,7 +279,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
 /**
  * Update the application icon badge number on the home screen
  */
-RCT_EXPORT_METHOD(setApplicationIconBadgeNumber:(double)number)
+RCT_EXPORT_METHOD(setApplicationIconBadgeNumber : (double)number)
 {
   RCTSharedApplication().applicationIconBadgeNumber = number;
 }
@@ -278,19 +287,23 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
 /**
  * Get the current application icon badge number on the home screen
  */
-RCT_EXPORT_METHOD(getApplicationIconBadgeNumber:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getApplicationIconBadgeNumber : (RCTResponseSenderBlock)callback)
 {
-  callback(@[@(RCTSharedApplication().applicationIconBadgeNumber)]);
+  callback(@[ @(RCTSharedApplication().applicationIconBadgeNumber) ]);
 }
 
-RCT_EXPORT_METHOD(requestPermissions:(JS::NativePushNotificationManagerIOS::SpecRequestPermissionsPermission &)permissions
-                 resolve:(RCTPromiseResolveBlock)resolve
-                 reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(requestPermissions
+                  : (JS::NativePushNotificationManagerIOS::SpecRequestPermissionsPermission &)permissions resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
-   if (RCTRunningInAppExtension()) {
-     reject(kErrorUnableToRequestPermissions, nil, RCTErrorWithMessage(@"Requesting push notifications is currently unavailable in an app extension"));
-     return;
-   }
+  if (RCTRunningInAppExtension()) {
+    reject(
+        kErrorUnableToRequestPermissions,
+        nil,
+        RCTErrorWithMessage(@"Requesting push notifications is currently unavailable in an app extension"));
+    return;
+  }
 
   // Add a listener to make sure that startObserving has been called
   [self addListener:@"remoteNotificationsRegistered"];
@@ -308,19 +321,21 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   }
 
   [UNUserNotificationCenter.currentNotificationCenter
-   requestAuthorizationWithOptions:types
-   completionHandler:^(BOOL granted, NSError *_Nullable error) {
-    if (error != NULL) {
-      reject(@"-1", @"Error - Push authorization request failed.", error);
-    } else {
-      dispatch_async(dispatch_get_main_queue(), ^{
-        [RCTSharedApplication() registerForRemoteNotifications];
-        [UNUserNotificationCenter.currentNotificationCenter getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
-           resolve(RCTPromiseResolveValueForUNNotificationSettings(settings));
-        }];
-      });
-    }
-  }];
+      requestAuthorizationWithOptions:types
+                    completionHandler:^(BOOL granted, NSError *_Nullable error) {
+                      if (error != NULL) {
+                        reject(@"-1", @"Error - Push authorization request failed.", error);
+                      } else {
+                        dispatch_async(dispatch_get_main_queue(), ^{
+                          [RCTSharedApplication() registerForRemoteNotifications];
+                          [UNUserNotificationCenter.currentNotificationCenter
+                              getNotificationSettingsWithCompletionHandler:^(
+                                  UNNotificationSettings *_Nonnull settings) {
+                                resolve(RCTPromiseResolveValueForUNNotificationSettings(settings));
+                              }];
+                        });
+                      }
+                    }];
 }
 
 RCT_EXPORT_METHOD(abandonPermissions)
@@ -328,33 +343,52 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   [RCTSharedApplication() unregisterForRemoteNotifications];
 }
 
-RCT_EXPORT_METHOD(checkPermissions:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(checkPermissions : (RCTResponseSenderBlock)callback)
 {
   if (RCTRunningInAppExtension()) {
-    callback(@[RCTSettingsDictForUNNotificationSettings(NO, NO, NO, NO, NO, NO, UNAuthorizationStatusNotDetermined)]);
+    callback(@[ RCTSettingsDictForUNNotificationSettings(NO, NO, NO, NO, NO, NO, UNAuthorizationStatusNotDetermined) ]);
     return;
   }
 
-  [UNUserNotificationCenter.currentNotificationCenter getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
-    callback(@[RCTPromiseResolveValueForUNNotificationSettings(settings)]);
-  }];
-}
-
-static inline NSDictionary *RCTPromiseResolveValueForUNNotificationSettings(UNNotificationSettings* _Nonnull settings) {
-  return RCTSettingsDictForUNNotificationSettings(settings.alertSetting == UNNotificationSettingEnabled,
-                                                  settings.badgeSetting == UNNotificationSettingEnabled,
-                                                  settings.soundSetting == UNNotificationSettingEnabled,
-                                                  settings.criticalAlertSetting == UNNotificationSettingEnabled,
-                                                  settings.lockScreenSetting == UNNotificationSettingEnabled,
-                                                  settings.notificationCenterSetting == UNNotificationSettingEnabled,
-                                                  settings.authorizationStatus);
-}
-
-static inline NSDictionary *RCTSettingsDictForUNNotificationSettings(BOOL alert, BOOL badge, BOOL sound, BOOL critical, BOOL lockScreen, BOOL notificationCenter, UNAuthorizationStatus authorizationStatus) {
-  return @{@"alert": @(alert), @"badge": @(badge), @"sound": @(sound), @"critical": @(critical), @"lockScreen": @(lockScreen), @"notificationCenter": @(notificationCenter), @"authorizationStatus": @(authorizationStatus)};
+  [UNUserNotificationCenter.currentNotificationCenter
+      getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings *_Nonnull settings) {
+        callback(@[ RCTPromiseResolveValueForUNNotificationSettings(settings) ]);
+      }];
+}
+
+static inline NSDictionary *RCTPromiseResolveValueForUNNotificationSettings(UNNotificationSettings *_Nonnull settings)
+{
+  return RCTSettingsDictForUNNotificationSettings(
+      settings.alertSetting == UNNotificationSettingEnabled,
+      settings.badgeSetting == UNNotificationSettingEnabled,
+      settings.soundSetting == UNNotificationSettingEnabled,
+      settings.criticalAlertSetting == UNNotificationSettingEnabled,
+      settings.lockScreenSetting == UNNotificationSettingEnabled,
+      settings.notificationCenterSetting == UNNotificationSettingEnabled,
+      settings.authorizationStatus);
+}
+
+static inline NSDictionary *RCTSettingsDictForUNNotificationSettings(
+    BOOL alert,
+    BOOL badge,
+    BOOL sound,
+    BOOL critical,
+    BOOL lockScreen,
+    BOOL notificationCenter,
+    UNAuthorizationStatus authorizationStatus)
+{
+  return @{
+    @"alert" : @(alert),
+    @"badge" : @(badge),
+    @"sound" : @(sound),
+    @"critical" : @(critical),
+    @"lockScreen" : @(lockScreen),
+    @"notificationCenter" : @(notificationCenter),
+    @"authorizationStatus" : @(authorizationStatus)
+  };
 }
 
-RCT_EXPORT_METHOD(presentLocalNotification:(JS::NativePushNotificationManagerIOS::Notification &)notification)
+RCT_EXPORT_METHOD(presentLocalNotification : (JS::NativePushNotificationManagerIOS::Notification &)notification)
 {
   NSMutableDictionary *notificationDict = [NSMutableDictionary new];
   notificationDict[@"alertTitle"] = notification.alertTitle();
@@ -378,7 +412,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   [RCTSharedApplication() presentLocalNotificationNow:[RCTConvert UILocalNotification:notificationDict]];
 }
 
-RCT_EXPORT_METHOD(scheduleLocalNotification:(JS::NativePushNotificationManagerIOS::Notification &)notification)
+RCT_EXPORT_METHOD(scheduleLocalNotification : (JS::NativePushNotificationManagerIOS::Notification &)notification)
 {
   NSMutableDictionary *notificationDict = [NSMutableDictionary new];
   notificationDict[@"alertTitle"] = notification.alertTitle();
@@ -407,7 +441,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   [RCTSharedApplication() cancelAllLocalNotifications];
 }
 
-RCT_EXPORT_METHOD(cancelLocalNotifications:(NSDictionary<NSString *, id> *)userInfo)
+RCT_EXPORT_METHOD(cancelLocalNotifications : (NSDictionary<NSString *, id> *)userInfo)
 {
   for (UILocalNotification *notification in RCTSharedApplication().scheduledLocalNotifications) {
     __block BOOL matchesAll = YES;
@@ -428,14 +462,15 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   }
 }
 
-RCT_EXPORT_METHOD(getInitialNotification:(RCTPromiseResolveBlock)resolve
-                  reject:(__unused RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getInitialNotification
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (__unused RCTPromiseRejectBlock)reject)
 {
   NSMutableDictionary<NSString *, id> *initialNotification =
-    [self.bridge.launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey] mutableCopy];
+      [self.bridge.launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey] mutableCopy];
 
   UILocalNotification *initialLocalNotification =
-    self.bridge.launchOptions[UIApplicationLaunchOptionsLocalNotificationKey];
+      self.bridge.launchOptions[UIApplicationLaunchOptionsLocalNotificationKey];
 
   if (initialNotification) {
     initialNotification[@"remote"] = @YES;
@@ -447,14 +482,14 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   }
 }
 
-RCT_EXPORT_METHOD(getScheduledLocalNotifications:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getScheduledLocalNotifications : (RCTResponseSenderBlock)callback)
 {
   NSArray<UILocalNotification *> *scheduledLocalNotifications = RCTSharedApplication().scheduledLocalNotifications;
   NSMutableArray<NSDictionary *> *formattedScheduledLocalNotifications = [NSMutableArray new];
   for (UILocalNotification *notification in scheduledLocalNotifications) {
     [formattedScheduledLocalNotifications addObject:RCTFormatLocalNotification(notification)];
   }
-  callback(@[formattedScheduledLocalNotifications]);
+  callback(@[ formattedScheduledLocalNotifications ]);
 }
 
 RCT_EXPORT_METHOD(removeAllDeliveredNotifications)
@@ -463,13 +498,13 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   [center removeAllDeliveredNotifications];
 }
 
-RCT_EXPORT_METHOD(removeDeliveredNotifications:(NSArray<NSString *> *)identifiers)
+RCT_EXPORT_METHOD(removeDeliveredNotifications : (NSArray<NSString *> *)identifiers)
 {
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
   [center removeDeliveredNotificationsWithIdentifiers:identifiers];
 }
 
-RCT_EXPORT_METHOD(getDeliveredNotifications:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getDeliveredNotifications : (RCTResponseSenderBlock)callback)
 {
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
   [center getDeliveredNotificationsWithCompletionHandler:^(NSArray<UNNotification *> *_Nonnull notifications) {
@@ -478,38 +513,39 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
     for (UNNotification *notification in notifications) {
       [formattedNotifications addObject:RCTFormatUNNotification(notification)];
     }
-    callback(@[formattedNotifications]);
+    callback(@[ formattedNotifications ]);
   }];
 }
 
-RCT_EXPORT_METHOD(getAuthorizationStatus:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getAuthorizationStatus : (RCTResponseSenderBlock)callback)
 {
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
-  [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings *_Nonnull settings)  {
-    callback(@[@(settings.authorizationStatus)]);
+  [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings *_Nonnull settings) {
+    callback(@[ @(settings.authorizationStatus) ]);
   }];
 }
 
 #else // TARGET_OS_UIKITFORMAC
 
-RCT_EXPORT_METHOD(onFinishRemoteNotification:(NSString *)notificationId fetchResult:(NSString *)fetchResult)
+RCT_EXPORT_METHOD(onFinishRemoteNotification : (NSString *)notificationId fetchResult : (NSString *)fetchResult)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(setApplicationIconBadgeNumber:(double)number)
+RCT_EXPORT_METHOD(setApplicationIconBadgeNumber : (double)number)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(getApplicationIconBadgeNumber:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getApplicationIconBadgeNumber : (RCTResponseSenderBlock)callback)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(requestPermissions:(JS::NativePushNotificationManagerIOS::SpecRequestPermissionsPermission &)permissions
-                 resolve:(RCTPromiseResolveBlock)resolve
-                 reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(requestPermissions
+                  : (JS::NativePushNotificationManagerIOS::SpecRequestPermissionsPermission &)permissions resolve
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (RCTPromiseRejectBlock)reject)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
@@ -519,17 +555,17 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(checkPermissions:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(checkPermissions : (RCTResponseSenderBlock)callback)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(presentLocalNotification:(JS::NativePushNotificationManagerIOS::Notification &)notification)
+RCT_EXPORT_METHOD(presentLocalNotification : (JS::NativePushNotificationManagerIOS::Notification &)notification)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(scheduleLocalNotification:(JS::NativePushNotificationManagerIOS::Notification &)notification)
+RCT_EXPORT_METHOD(scheduleLocalNotification : (JS::NativePushNotificationManagerIOS::Notification &)notification)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
@@ -539,18 +575,19 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(cancelLocalNotifications:(NSDictionary<NSString *, id> *)userInfo)
+RCT_EXPORT_METHOD(cancelLocalNotifications : (NSDictionary<NSString *, id> *)userInfo)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(getInitialNotification:(RCTPromiseResolveBlock)resolve
-                  reject:(__unused RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getInitialNotification
+                  : (RCTPromiseResolveBlock)resolve reject
+                  : (__unused RCTPromiseRejectBlock)reject)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(getScheduledLocalNotifications:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getScheduledLocalNotifications : (RCTResponseSenderBlock)callback)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
@@ -560,17 +597,17 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(removeDeliveredNotifications:(NSArray<NSString *> *)identifiers)
+RCT_EXPORT_METHOD(removeDeliveredNotifications : (NSArray<NSString *> *)identifiers)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(getDeliveredNotifications:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getDeliveredNotifications : (RCTResponseSenderBlock)callback)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
 
-RCT_EXPORT_METHOD(getAuthorizationStatus:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getAuthorizationStatus : (RCTResponseSenderBlock)callback)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }
@@ -582,13 +619,15 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
 
 #endif // TARGET_OS_UIKITFORMAC
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   return std::make_shared<facebook::react::NativePushNotificationManagerIOSSpecJSI>(params);
 }
 
 @end
 
-Class RCTPushNotificationManagerCls(void) {
+Class RCTPushNotificationManagerCls(void)
+{
   return RCTPushNotificationManager.class;
 }
diff --git a/Libraries/RCTRequired/BUCK b/Libraries/RCTRequired/BUCK
index 34b493a0e372..579d95beecdf 100644
--- a/Libraries/RCTRequired/BUCK
+++ b/Libraries/RCTRequired/BUCK
@@ -11,7 +11,8 @@ fb_apple_library(
     extension_api_only = True,
     frameworks = ["Foundation"],
     labels = [
+        "fbios_link_group:xplat/default/public.react_native.infra",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
+        "talkios_link_group:xplat/default/public.react_native.infra",
     ],
 )
diff --git a/Libraries/RCTRequired/RCTRequired/RCTRequired.h b/Libraries/RCTRequired/RCTRequired/RCTRequired.h
index d0c9d3e3994b..1da5375d66a8 100644
--- a/Libraries/RCTRequired/RCTRequired/RCTRequired.h
+++ b/Libraries/RCTRequired/RCTRequired/RCTRequired.h
@@ -19,9 +19,11 @@
 #endif
 
 /**
- RCTRequired<T> uses the compiler to enforce definition of a struct member (primitives, pointers, or objects).
+ RCTRequired<T> uses the compiler to enforce definition of a struct member
+ (primitives, pointers, or objects).
 
- Internally, we use an implicit constructor without a default, so there has to be an initial value.
+ Internally, we use an implicit constructor without a default, so there has to
+ be an initial value.
 
  Usage:
  @code
@@ -39,39 +41,50 @@
  */
 template <typename T>
 struct RCTRequired {
-  /// Pass-through constructor (allows for implicit conversion) for wrapped type T
-  template<typename... Args>
-  RCTREQUIRED_INLINE
-  RCTRequired(Args&&... args): _t(std::forward<Args>(args)...) {
-    static_assert(sizeof...(Args) > 0, "Required struct member not initialized. Expand assert trace to see where this was triggered.");
+  /// Pass-through constructor (allows for implicit conversion) for wrapped type
+  /// T
+  template <typename... Args>
+  RCTREQUIRED_INLINE RCTRequired(Args &&...args)
+      : _t(std::forward<Args>(args)...) {
+    static_assert(
+        sizeof...(Args) > 0,
+        "Required struct member not initialized. Expand assert trace to see where this was triggered.");
   }
 
   RCTREQUIRED_INLINE
-  RCTRequired(const RCTRequired&) = default;
+  RCTRequired(const RCTRequired &) = default;
   RCTREQUIRED_INLINE
-  RCTRequired(RCTRequired&&) = default;
+  RCTRequired(RCTRequired &&) = default;
 
   RCTREQUIRED_INLINE
-  RCTRequired& operator=(const RCTRequired&) = default;
+  RCTRequired &operator=(const RCTRequired &) = default;
   RCTREQUIRED_INLINE
-  RCTRequired& operator=(RCTRequired&&) = default;
+  RCTRequired &operator=(RCTRequired &&) = default;
 
   RCTREQUIRED_INLINE
   ~RCTRequired() = default;
 
-  /// Public accessor for private storage (Use when implicit conversion is impracticable)
+  /// Public accessor for private storage (Use when implicit conversion is
+  /// impracticable)
   RCTREQUIRED_INLINE
-  const T &get() const { return _t; }
+  const T &get() const {
+    return _t;
+  }
   RCTREQUIRED_INLINE
-  T &get() { return _t; }
-
+  T &get() {
+    return _t;
+  }
 
   // Implicit conversion
   RCTREQUIRED_INLINE
-  operator T() const { return _t; }
+  operator T() const {
+    return _t;
+  }
   RCTREQUIRED_INLINE
-  operator T&() { return _t; }
+  operator T &() {
+    return _t;
+  }
 
-private:
+ private:
   T _t;
 };
diff --git a/Libraries/ReactNative/AppContainer.js b/Libraries/ReactNative/AppContainer.js
index 8495893f8e31..cf3f1d0274e8 100644
--- a/Libraries/ReactNative/AppContainer.js
+++ b/Libraries/ReactNative/AppContainer.js
@@ -8,12 +8,13 @@
  * @flow
  */
 
+import type {RootTag} from './RootTag';
+
 import View from '../Components/View/View';
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
 import StyleSheet from '../StyleSheet/StyleSheet';
 import {type EventSubscription} from '../vendor/emitter/EventEmitter';
 import {RootTagContext, createRootTag} from './RootTag';
-import type {RootTag} from './RootTag';
 import * as React from 'react';
 
 type Props = $ReadOnly<{|
@@ -25,10 +26,12 @@ type Props = $ReadOnly<{|
   showArchitectureIndicator?: boolean,
   WrapperComponent?: ?React.ComponentType<any>,
   internal_excludeLogBox?: ?boolean,
+  internal_excludeInspector?: ?boolean,
 |}>;
 
 type State = {|
   inspector: ?React.Node,
+  devtoolsOverlay: ?React.Node,
   mainKey: number,
   hasError: boolean,
 |};
@@ -36,6 +39,7 @@ type State = {|
 class AppContainer extends React.Component<Props, State> {
   state: State = {
     inspector: null,
+    devtoolsOverlay: null,
     mainKey: 1,
     hasError: false,
   };
@@ -46,7 +50,7 @@ class AppContainer extends React.Component<Props, State> {
 
   componentDidMount(): void {
     if (__DEV__) {
-      if (!global.__RCTProfileIsProfiling) {
+      if (!this.props.internal_excludeInspector) {
         this._subscription = RCTDeviceEventEmitter.addListener(
           'toggleElementInspector',
           () => {
@@ -65,6 +69,14 @@ class AppContainer extends React.Component<Props, State> {
             this.setState({inspector});
           },
         );
+        if (window.__REACT_DEVTOOLS_GLOBAL_HOOK__ != null) {
+          const DevtoolsOverlay =
+            require('../Inspector/DevtoolsOverlay').default;
+          const devtoolsOverlay = (
+            <DevtoolsOverlay inspectedView={this._mainRef} />
+          );
+          this.setState({devtoolsOverlay});
+        }
       }
     }
   }
@@ -78,10 +90,7 @@ class AppContainer extends React.Component<Props, State> {
   render(): React.Node {
     let logBox = null;
     if (__DEV__) {
-      if (
-        !global.__RCTProfileIsProfiling &&
-        !this.props.internal_excludeLogBox
-      ) {
+      if (!this.props.internal_excludeLogBox) {
         const LogBoxNotificationContainer =
           require('../LogBox/LogBoxNotificationContainer').default;
         logBox = <LogBoxNotificationContainer />;
@@ -90,7 +99,7 @@ class AppContainer extends React.Component<Props, State> {
 
     let innerView: React.Node = (
       <View
-        collapsable={!this.state.inspector}
+        collapsable={!this.state.inspector && !this.state.devtoolsOverlay}
         key={this.state.mainKey}
         pointerEvents="box-none"
         style={styles.appContainer}
@@ -118,6 +127,7 @@ class AppContainer extends React.Component<Props, State> {
       <RootTagContext.Provider value={createRootTag(this.props.rootTag)}>
         <View style={styles.appContainer} pointerEvents="box-none">
           {!this.state.hasError && innerView}
+          {this.state.devtoolsOverlay}
           {this.state.inspector}
           {logBox}
         </View>
diff --git a/Libraries/ReactNative/AppRegistry.d.ts b/Libraries/ReactNative/AppRegistry.d.ts
new file mode 100644
index 000000000000..2e792e79b240
--- /dev/null
+++ b/Libraries/ReactNative/AppRegistry.d.ts
@@ -0,0 +1,119 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger';
+
+type Task = (taskData: any) => Promise<void>;
+type TaskProvider = () => Task;
+type TaskCanceller = () => void;
+type TaskCancelProvider = () => TaskCanceller;
+
+export type ComponentProvider = () => React.ComponentType<any>;
+
+export type Runnable = (appParameters: any) => void;
+
+export type AppConfig = {
+  appKey: string;
+  component?: ComponentProvider | undefined;
+  run?: Runnable | undefined;
+};
+
+export type ComponentProviderInstrumentationHook = (
+  component: ComponentProvider,
+  scopedPerformanceLogger: IPerformanceLogger,
+) => React.ComponentType<any>;
+
+export type WrapperComponentProvider = (
+  appParameters: any,
+) => React.ComponentType<any>;
+
+/**
+ * `AppRegistry` is the JS entry point to running all React Native apps.  App
+ * root components should register themselves with
+ * `AppRegistry.registerComponent`, then the native system can load the bundle
+ * for the app and then actually run the app when it's ready by invoking
+ * `AppRegistry.runApplication`.
+ *
+ * To "stop" an application when a view should be destroyed, call
+ * `AppRegistry.unmountApplicationComponentAtRootTag` with the tag that was
+ * pass into `runApplication`. These should always be used as a pair.
+ *
+ * `AppRegistry` should be `require`d early in the `require` sequence to make
+ * sure the JS execution environment is setup before other modules are
+ * `require`d.
+ */
+export namespace AppRegistry {
+  export function setWrapperComponentProvider(
+    provider: WrapperComponentProvider,
+  ): void;
+
+  export function registerConfig(config: AppConfig[]): void;
+
+  export function registerComponent(
+    appKey: string,
+    getComponentFunc: ComponentProvider,
+    section?: boolean,
+  ): string;
+
+  export function registerRunnable(appKey: string, func: Runnable): string;
+
+  export function registerSection(
+    appKey: string,
+    component: ComponentProvider,
+  ): void;
+
+  export function getAppKeys(): string[];
+
+  export function getSectionKeys(): string[];
+
+  export function getSections(): Record<string, Runnable>;
+
+  export function unmountApplicationComponentAtRootTag(rootTag: number): void;
+
+  export function runApplication(appKey: string, appParameters: any): void;
+
+  export function setSurfaceProps(
+    appKey: string,
+    appParameters: any,
+    displayMode?: number,
+  ): void;
+
+  export function registerHeadlessTask(
+    appKey: string,
+    task: TaskProvider,
+  ): void;
+
+  export function getRunnable(appKey: string): Runnable | undefined;
+
+  export function getRegistry(): {sections: string[]; runnables: Runnable[]};
+
+  export function setComponentProviderInstrumentationHook(
+    hook: ComponentProviderInstrumentationHook,
+  ): void;
+
+  export function registerHeadlessTask(
+    taskKey: string,
+    taskProvider: TaskProvider,
+  ): void;
+
+  export function registerCancellableHeadlessTask(
+    taskKey: string,
+    taskProvider: TaskProvider,
+    taskCancelProvider: TaskCancelProvider,
+  ): void;
+
+  export function startHeadlessTask(
+    taskId: number,
+    taskKey: string,
+    data: any,
+  ): void;
+
+  export function cancelHeadlessTask(taskId: number, taskKey: string): void;
+}
diff --git a/Libraries/ReactNative/AppRegistry.js b/Libraries/ReactNative/AppRegistry.js
index 6607db3954a7..45c08d49f997 100644
--- a/Libraries/ReactNative/AppRegistry.js
+++ b/Libraries/ReactNative/AppRegistry.js
@@ -8,21 +8,20 @@
  * @format
  */
 
-const BatchedBridge = require('../BatchedBridge/BatchedBridge');
-const BugReporting = require('../BugReporting/BugReporting');
-const ReactNative = require('../Renderer/shims/ReactNative');
-const SceneTracker = require('../Utilities/SceneTracker');
-
-const infoLog = require('../Utilities/infoLog');
-const invariant = require('invariant');
-const renderApplication = require('./renderApplication');
+import type {RootTag} from '../Types/RootTagTypes';
 import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger';
 
-import {coerceDisplayMode} from './DisplayMode';
+import BatchedBridge from '../BatchedBridge/BatchedBridge';
+import BugReporting from '../BugReporting/BugReporting';
 import createPerformanceLogger from '../Utilities/createPerformanceLogger';
-import NativeHeadlessJsTaskSupport from './NativeHeadlessJsTaskSupport';
+import infoLog from '../Utilities/infoLog';
+import SceneTracker from '../Utilities/SceneTracker';
+import {coerceDisplayMode} from './DisplayMode';
 import HeadlessJsTaskError from './HeadlessJsTaskError';
-import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';
+import NativeHeadlessJsTaskSupport from './NativeHeadlessJsTaskSupport';
+import renderApplication from './renderApplication';
+import {unmountComponentAtNodeAndRemoveContainer} from './RendererProxy';
+import invariant from 'invariant';
 
 type Task = (taskData: any) => Promise<void>;
 export type TaskProvider = () => Task;
@@ -52,7 +51,9 @@ export type Registry = {
   runnables: Runnables,
   ...
 };
-export type WrapperComponentProvider = any => React$ComponentType<any>;
+export type WrapperComponentProvider = (
+  appParameters: any,
+) => React$ComponentType<any>;
 
 const runnables: Runnables = {};
 let runCount = 1;
@@ -250,9 +251,7 @@ const AppRegistry = {
    * See https://reactnative.dev/docs/appregistry#unmountapplicationcomponentatroottag
    */
   unmountApplicationComponentAtRootTag(rootTag: RootTag): void {
-    // NOTE: RootTag type
-    // $FlowFixMe[incompatible-call] RootTag: RootTag is incompatible with number, needs an updated synced version of the ReactNativeTypes.js file
-    ReactNative.unmountComponentAtNodeAndRemoveContainer(rootTag);
+    unmountComponentAtNodeAndRemoveContainer(rootTag);
   },
 
   /**
diff --git a/Libraries/ReactNative/BridgelessUIManager.js b/Libraries/ReactNative/BridgelessUIManager.js
index 0b959568a372..bcd7f2597541 100644
--- a/Libraries/ReactNative/BridgelessUIManager.js
+++ b/Libraries/ReactNative/BridgelessUIManager.js
@@ -10,8 +10,9 @@
 
 'use strict';
 
-import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';
-import {unstable_hasComponent} from 'react-native/Libraries/NativeComponent/NativeComponentRegistryUnstable';
+import type {RootTag} from '../Types/RootTagTypes';
+
+import {unstable_hasComponent} from '../NativeComponent/NativeComponentRegistryUnstable';
 
 const errorMessageForMethod = (methodName: string): string =>
   "[ReactNative Architecture][JS] '" +
@@ -146,7 +147,7 @@ module.exports = {
       errorMessageForMethod('setLayoutAnimationEnabledExperimental'),
     );
   },
-  // Please use AccessibilityInfo.sendAccessibilityEvent_unstable instead.
+  // Please use AccessibilityInfo.sendAccessibilityEvent instead.
   // See SetAccessibilityFocusExample in AccessibilityExample.js for a migration example.
   sendAccessibilityEvent: (reactTag: ?number, eventType: number): void =>
     console.error(errorMessageForMethod('sendAccessibilityEvent')),
diff --git a/Libraries/ReactNative/FabricUIManager.js b/Libraries/ReactNative/FabricUIManager.js
index 9e5b625a778b..b73fc1eae061 100644
--- a/Libraries/ReactNative/FabricUIManager.js
+++ b/Libraries/ReactNative/FabricUIManager.js
@@ -11,12 +11,12 @@
 'use strict';
 
 import type {
-  MeasureOnSuccessCallback,
+  LayoutAnimationConfig,
   MeasureInWindowOnSuccessCallback,
   MeasureLayoutOnSuccessCallback,
-  LayoutAnimationConfig,
+  MeasureOnSuccessCallback,
 } from '../Renderer/shims/ReactNativeTypes';
-import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';
+import type {RootTag} from '../Types/RootTagTypes';
 
 // TODO: type these properly.
 type Node = {...};
diff --git a/Libraries/ReactNative/I18nManager.d.ts b/Libraries/ReactNative/I18nManager.d.ts
new file mode 100644
index 000000000000..39679aa6cdd7
--- /dev/null
+++ b/Libraries/ReactNative/I18nManager.d.ts
@@ -0,0 +1,25 @@
+/**
+ * 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 I18nManagerStatic {
+  getConstants: () => {
+    isRTL: boolean;
+    doLeftAndRightSwapInRTL: boolean;
+    localeIdentifier?: string | null | undefined;
+  };
+  allowRTL: (allowRTL: boolean) => void;
+  forceRTL: (forceRTL: boolean) => void;
+  swapLeftAndRightInRTL: (swapLeftAndRight: boolean) => void;
+  isRTL: boolean;
+  doLeftAndRightSwapInRTL: boolean;
+}
+
+/** https://reactnative.dev/blog/2016/08/19/right-to-left-support-for-react-native-apps */
+export const I18nManager: I18nManagerStatic;
+export type I18nManager = I18nManagerStatic;
diff --git a/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js b/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js
index 3fe8cf032777..48940a9b0216 100644
--- a/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js
+++ b/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/ReactNative/NativeI18nManager.js b/Libraries/ReactNative/NativeI18nManager.js
index 1c605de0f149..7161aec921d1 100644
--- a/Libraries/ReactNative/NativeI18nManager.js
+++ b/Libraries/ReactNative/NativeI18nManager.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/ReactNative/NativeUIManager.js b/Libraries/ReactNative/NativeUIManager.js
index a198dcb12926..df161a1e2078 100644
--- a/Libraries/ReactNative/NativeUIManager.js
+++ b/Libraries/ReactNative/NativeUIManager.js
@@ -10,6 +10,7 @@
 
 import type {RootTag} from '../TurboModule/RCTExport';
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/ReactNative/PaperUIManager.js b/Libraries/ReactNative/PaperUIManager.js
index b331ca2e9521..2b1efffb456f 100644
--- a/Libraries/ReactNative/PaperUIManager.js
+++ b/Libraries/ReactNative/PaperUIManager.js
@@ -8,7 +8,7 @@
  * @format
  */
 
-import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';
+import type {RootTag} from '../Types/RootTagTypes';
 
 import NativeUIManager from './NativeUIManager';
 
@@ -19,7 +19,7 @@ const UIManagerProperties = require('./UIManagerProperties');
 
 const viewManagerConfigs: {[string]: any | null} = {};
 
-const triedLoadingConfig = new Set();
+const triedLoadingConfig = new Set<string>();
 
 let NativeUIManagerConstants = {};
 let isNativeUIManagerConstantsSet = false;
diff --git a/Libraries/ReactNative/ReactNativeFeatureFlags.js b/Libraries/ReactNative/ReactNativeFeatureFlags.js
index 7ad91c1fe1b0..1e5845c77dcd 100644
--- a/Libraries/ReactNative/ReactNativeFeatureFlags.js
+++ b/Libraries/ReactNative/ReactNativeFeatureFlags.js
@@ -38,6 +38,13 @@ export type FeatureFlags = {|
    * traffic.
    */
   animatedShouldUseSingleOp: () => boolean,
+  /**
+   * This feature flag enables an experimental render system that allows
+   * to render react components driven by classes written in C++.
+   */
+  enableCppRenderSystem: () => boolean,
+
+  removeListenersOnDetach: () => boolean,
 |};
 
 const ReactNativeFeatureFlags: FeatureFlags = {
@@ -46,6 +53,8 @@ const ReactNativeFeatureFlags: FeatureFlags = {
   shouldPressibilityUseW3CPointerEventsForHover: () => false,
   animatedShouldDebounceQueueFlush: () => false,
   animatedShouldUseSingleOp: () => false,
+  enableCppRenderSystem: () => false,
+  removeListenersOnDetach: () => false,
 };
 
 module.exports = ReactNativeFeatureFlags;
diff --git a/Libraries/ReactNative/RendererImplementation.js b/Libraries/ReactNative/RendererImplementation.js
new file mode 100644
index 000000000000..8bc7500a1c4f
--- /dev/null
+++ b/Libraries/ReactNative/RendererImplementation.js
@@ -0,0 +1,112 @@
+/**
+ * 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 type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
+import type {Element, ElementRef, ElementType} from 'react';
+
+import {type RootTag} from './RootTag';
+
+export function renderElement({
+  element,
+  rootTag,
+  useFabric,
+  useConcurrentRoot,
+}: {
+  element: Element<ElementType>,
+  rootTag: number,
+  useFabric: boolean,
+  useConcurrentRoot: boolean,
+}): void {
+  if (useFabric) {
+    require('../Renderer/shims/ReactFabric').render(
+      element,
+      rootTag,
+      null,
+      useConcurrentRoot,
+    );
+  } else {
+    require('../Renderer/shims/ReactNative').render(element, rootTag);
+  }
+}
+
+export function findHostInstance_DEPRECATED<TElementType: ElementType>(
+  componentOrHandle: ?(ElementRef<TElementType> | number),
+): ?ElementRef<HostComponent<mixed>> {
+  return require('../Renderer/shims/ReactNative').findHostInstance_DEPRECATED(
+    componentOrHandle,
+  );
+}
+
+export function findNodeHandle<TElementType: ElementType>(
+  componentOrHandle: ?(ElementRef<TElementType> | number),
+): ?number {
+  return require('../Renderer/shims/ReactNative').findNodeHandle(
+    componentOrHandle,
+  );
+}
+
+export function dispatchCommand(
+  handle: ElementRef<HostComponent<mixed>>,
+  command: string,
+  args: Array<mixed>,
+): void {
+  if (global.RN$Bridgeless === true) {
+    // Note: this function has the same implementation in the legacy and new renderer.
+    // However, evaluating the old renderer comes with some side effects.
+    return require('../Renderer/shims/ReactFabric').dispatchCommand(
+      handle,
+      command,
+      args,
+    );
+  } else {
+    return require('../Renderer/shims/ReactNative').dispatchCommand(
+      handle,
+      command,
+      args,
+    );
+  }
+}
+
+export function sendAccessibilityEvent(
+  handle: ElementRef<HostComponent<mixed>>,
+  eventType: string,
+): void {
+  return require('../Renderer/shims/ReactNative').sendAccessibilityEvent(
+    handle,
+    eventType,
+  );
+}
+
+/**
+ * This method is used by AppRegistry to unmount a root when using the old
+ * React Native renderer (Paper).
+ */
+export function unmountComponentAtNodeAndRemoveContainer(rootTag: RootTag) {
+  // $FlowExpectedError[incompatible-type] rootTag is an opaque type so we can't really cast it as is.
+  const rootTagAsNumber: number = rootTag;
+  require('../Renderer/shims/ReactNative').unmountComponentAtNodeAndRemoveContainer(
+    rootTagAsNumber,
+  );
+}
+
+export function unstable_batchedUpdates<T>(
+  fn: T => void,
+  bookkeeping: T,
+): void {
+  // This doesn't actually do anything when batching updates for a Fabric root.
+  return require('../Renderer/shims/ReactNative').unstable_batchedUpdates(
+    fn,
+    bookkeeping,
+  );
+}
+
+export function isProfilingRenderer(): boolean {
+  return Boolean(__DEV__);
+}
diff --git a/Libraries/ReactNative/RendererProxy.d.ts b/Libraries/ReactNative/RendererProxy.d.ts
new file mode 100644
index 000000000000..f7f451c09934
--- /dev/null
+++ b/Libraries/ReactNative/RendererProxy.d.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+import type * as React from 'react';
+
+export type NodeHandle = number;
+
+export function findNodeHandle(
+  componentOrHandle:
+    | null
+    | number
+    | React.Component<any, any>
+    | React.ComponentClass<any>,
+): null | NodeHandle;
diff --git a/Libraries/ReactNative/RendererProxy.js b/Libraries/ReactNative/RendererProxy.js
new file mode 100644
index 000000000000..6698e0f68c37
--- /dev/null
+++ b/Libraries/ReactNative/RendererProxy.js
@@ -0,0 +1,26 @@
+/**
+ * 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
+ */
+
+/**
+ * This module exists to allow apps to select their renderer implementation
+ * (e.g.: Fabric-only, Paper-only) without having to pull all the renderer
+ * implementations into their app bundle, which affects app size.
+ *
+ * By default, the setup will be:
+ *   -> RendererProxy
+ *     -> RendererImplementation (which uses Fabric or Paper depending on a flag at runtime)
+ *
+ * But this will allow a setup like this without duplicating logic:
+ *   -> RendererProxy (fork)
+ *     -> RendererImplementation (which uses Fabric or Paper depending on a flag at runtime)
+ *     or -> OtherImplementation (which uses Fabric only)
+ */
+
+export * from './RendererImplementation';
diff --git a/Libraries/ReactNative/RootTag.d.ts b/Libraries/ReactNative/RootTag.d.ts
new file mode 100644
index 000000000000..2522b8937a9e
--- /dev/null
+++ b/Libraries/ReactNative/RootTag.d.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+import type * as React from 'react';
+
+export type RootTag = number;
+export const RootTagContext: React.Context<RootTag>;
diff --git a/Libraries/ReactNative/RootTag.js b/Libraries/ReactNative/RootTag.js
index e2cb96cfa580..693fa31cbb79 100644
--- a/Libraries/ReactNative/RootTag.js
+++ b/Libraries/ReactNative/RootTag.js
@@ -10,7 +10,6 @@
 
 import * as React from 'react';
 
-// TODO: Make this into an opaque type.
 export opaque type RootTag = number;
 
 export const RootTagContext: React$Context<RootTag> =
diff --git a/Libraries/ReactNative/UIManager.d.ts b/Libraries/ReactNative/UIManager.d.ts
new file mode 100644
index 000000000000..1f0b346802d7
--- /dev/null
+++ b/Libraries/ReactNative/UIManager.d.ts
@@ -0,0 +1,157 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {
+  MeasureInWindowOnSuccessCallback,
+  MeasureLayoutOnSuccessCallback,
+  MeasureOnSuccessCallback,
+} from '../../types/public/ReactNativeTypes';
+
+export interface UIManagerStatic {
+  /**
+   * Capture an image of the screen, window or an individual view. The image
+   * will be stored in a temporary file that will only exist for as long as the
+   * app is running.
+   *
+   * The `view` argument can be the literal string `window` if you want to
+   * capture the entire window, or it can be a reference to a specific
+   * React Native component.
+   *
+   * The `options` argument may include:
+   * - width/height (number) - the width and height of the image to capture.
+   * - format (string) - either 'png' or 'jpeg'. Defaults to 'png'.
+   * - quality (number) - the quality when using jpeg. 0.0 - 1.0 (default).
+   *
+   * Returns a Promise<string> (tempFilePath)
+   * @platform ios
+   */
+  takeSnapshot: (
+    view?: 'window' | React.ReactElement | number,
+    options?: {
+      width?: number | undefined;
+      height?: number | undefined;
+      format?: 'png' | 'jpeg' | undefined;
+      quality?: number | undefined;
+    },
+  ) => Promise<string>;
+
+  /**
+   * Determines the location on screen, width, and height of the given view and
+   * returns the values via an async callback. If successful, the callback will
+   * be called with the following arguments:
+   *
+   *  - x
+   *  - y
+   *  - width
+   *  - height
+   *  - pageX
+   *  - pageY
+   *
+   * Note that these measurements are not available until after the rendering
+   * has been completed in native. If you need the measurements as soon as
+   * possible, consider using the [`onLayout`
+   * prop](docs/view.html#onlayout) instead.
+   *
+   * @deprecated Use `ref.measure` instead.
+   */
+  measure(node: number, callback: MeasureOnSuccessCallback): void;
+
+  /**
+   * Determines the location of the given view in the window and returns the
+   * values via an async callback. If the React root view is embedded in
+   * another native view, this will give you the absolute coordinates. If
+   * successful, the callback will be called with the following
+   * arguments:
+   *
+   *  - x
+   *  - y
+   *  - width
+   *  - height
+   *
+   * Note that these measurements are not available until after the rendering
+   * has been completed in native.
+   *
+   * @deprecated Use `ref.measureInWindow` instead.
+   */
+  measureInWindow(
+    node: number,
+    callback: MeasureInWindowOnSuccessCallback,
+  ): void;
+
+  /**
+   * Like [`measure()`](#measure), but measures the view relative an ancestor,
+   * specified as `relativeToNativeNode`. This means that the returned x, y
+   * are relative to the origin x, y of the ancestor view.
+   *
+   * As always, to obtain a native node handle for a component, you can use
+   * `React.findNodeHandle(component)`.
+   *
+   * @deprecated Use `ref.measureLayout` instead.
+   */
+  measureLayout(
+    node: number,
+    relativeToNativeNode: number,
+    onFail: () => void /* currently unused */,
+    onSuccess: MeasureLayoutOnSuccessCallback,
+  ): void;
+
+  /**
+   * Automatically animates views to their new positions when the
+   * next layout happens.
+   *
+   * A common way to use this API is to call it before calling `setState`.
+   *
+   * Note that in order to get this to work on **Android** you need to set the following flags via `UIManager`:
+   *
+   *     UIManager.setLayoutAnimationEnabledExperimental && UIManager.setLayoutAnimationEnabledExperimental(true);
+   */
+  setLayoutAnimationEnabledExperimental(value: boolean): void;
+
+  /**
+   * Used to display an Android PopupMenu. If a menu item is pressed, the success callback will
+   * be called with the following arguments:
+   *
+   *  - item - the menu item.
+   *  - index - index of the pressed item in array. Returns `undefined` if cancelled.
+   *
+   * To obtain a native node handle for a component, you can use
+   * `React.findNodeHandle(component)`.
+   *
+   * Note that this works only on Android
+   */
+  showPopupMenu(
+    node: number,
+    items: string[],
+    error: () => void /* currently unused */,
+    success: (item: string, index: number | undefined) => void,
+  ): void;
+
+  getViewManagerConfig: (name: string) => {
+    Commands: {[key: string]: number};
+  };
+
+  hasViewManagerConfig: (name: string) => boolean;
+
+  /**
+   * Used to call a native view method from JavaScript
+   *
+   * reactTag - Id of react view.
+   * commandID - Id of the native method that should be called.
+   * commandArgs - Args of the native method that we can pass from JS to native.
+   */
+  dispatchViewManagerCommand: (
+    reactTag: number | null,
+    commandID: number | string,
+    commandArgs?: Array<any>,
+  ) => void;
+}
+
+export const UIManager: UIManagerStatic;
+export type UIManager = UIManagerStatic;
diff --git a/Libraries/ReactNative/UIManager.js b/Libraries/ReactNative/UIManager.js
index fc9da190bef5..ffead4967c84 100644
--- a/Libraries/ReactNative/UIManager.js
+++ b/Libraries/ReactNative/UIManager.js
@@ -8,8 +8,8 @@
  * @format
  */
 
+import type {RootTag} from '../Types/RootTagTypes';
 import type {Spec} from './NativeUIManager';
-import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';
 
 export interface UIManagerJSInterface extends Spec {
   +getViewManagerConfig: (viewManagerName: string) => Object;
diff --git a/Libraries/ReactNative/getCachedComponentWithDebugName.js b/Libraries/ReactNative/getCachedComponentWithDebugName.js
index c2020c9ede24..eaa6f01def04 100644
--- a/Libraries/ReactNative/getCachedComponentWithDebugName.js
+++ b/Libraries/ReactNative/getCachedComponentWithDebugName.js
@@ -26,6 +26,7 @@ export default function getCachedComponentWithDisplayName(
     ComponentWithDisplayName = ({
       children,
     }: $TEMPORARY$object<{children: Node}>) => children;
+    // $FlowFixMe[prop-missing]
     ComponentWithDisplayName.displayName = displayName;
     cache.set(displayName, ComponentWithDisplayName);
   }
diff --git a/Libraries/ReactNative/renderApplication.js b/Libraries/ReactNative/renderApplication.js
index 2e701dcbac53..7a3aeb2e60df 100644
--- a/Libraries/ReactNative/renderApplication.js
+++ b/Libraries/ReactNative/renderApplication.js
@@ -8,20 +8,26 @@
  * @flow
  */
 
-const AppContainer = require('./AppContainer');
-import GlobalPerformanceLogger from '../Utilities/GlobalPerformanceLogger';
 import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger';
+
+import GlobalPerformanceLogger from '../Utilities/GlobalPerformanceLogger';
 import PerformanceLoggerContext from '../Utilities/PerformanceLoggerContext';
-import type {DisplayModeType} from './DisplayMode';
+import AppContainer from './AppContainer';
+import DisplayMode, {type DisplayModeType} from './DisplayMode';
 import getCachedComponentWithDebugName from './getCachedComponentWithDebugName';
-const React = require('react');
-
-const invariant = require('invariant');
+import * as Renderer from './RendererProxy';
+import invariant from 'invariant';
+import * as React from 'react';
 
 // require BackHandler so it sets the default handler that exits the app if no listeners respond
-require('../Utilities/BackHandler');
+import '../Utilities/BackHandler';
 
-function renderApplication<Props: Object>(
+type OffscreenType = React.AbstractComponent<{
+  mode: 'visible' | 'hidden',
+  children: React.Node,
+}>;
+
+export default function renderApplication<Props: Object>(
   RootComponent: React.ComponentType<Props>,
   initialProps: Props,
   rootTag: any,
@@ -33,6 +39,7 @@ function renderApplication<Props: Object>(
   debugName?: string,
   displayMode?: ?DisplayModeType,
   useConcurrentRoot?: boolean,
+  useOffscreen?: boolean,
 ) {
   invariant(rootTag, 'Expect to have a valid rootTag, instead got ', rootTag);
 
@@ -63,23 +70,34 @@ function renderApplication<Props: Object>(
     );
   }
 
+  if (useOffscreen && displayMode != null) {
+    // $FlowFixMe[incompatible-type]
+    // $FlowFixMe[prop-missing]
+    const Offscreen: OffscreenType = React.unstable_Offscreen;
+
+    renderable = (
+      <Offscreen
+        mode={displayMode === DisplayMode.VISIBLE ? 'visible' : 'hidden'}>
+        {renderable}
+      </Offscreen>
+    );
+  }
+
   performanceLogger.startTimespan('renderApplication_React_render');
   performanceLogger.setExtra(
     'usedReactConcurrentRoot',
     useConcurrentRoot ? '1' : '0',
   );
   performanceLogger.setExtra('usedReactFabric', fabric ? '1' : '0');
-  if (fabric) {
-    require('../Renderer/shims/ReactFabric').render(
-      renderable,
-      rootTag,
-      null,
-      useConcurrentRoot,
-    );
-  } else {
-    require('../Renderer/shims/ReactNative').render(renderable, rootTag);
-  }
+  performanceLogger.setExtra(
+    'usedReactProfiler',
+    Renderer.isProfilingRenderer(),
+  );
+  Renderer.renderElement({
+    element: renderable,
+    rootTag,
+    useFabric: Boolean(fabric),
+    useConcurrentRoot: Boolean(useConcurrentRoot),
+  });
   performanceLogger.stopTimespan('renderApplication_React_render');
 }
-
-module.exports = renderApplication;
diff --git a/Libraries/ReactNative/requireNativeComponent.d.ts b/Libraries/ReactNative/requireNativeComponent.d.ts
new file mode 100644
index 000000000000..935762a3e259
--- /dev/null
+++ b/Libraries/ReactNative/requireNativeComponent.d.ts
@@ -0,0 +1,23 @@
+/**
+ * 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
+ */
+
+import {HostComponent} from '../../types/public//ReactNativeTypes';
+
+/**
+ * Creates values that can be used like React components which represent native
+ * view managers. You should create JavaScript modules that wrap these values so
+ * that the results are memoized. Example:
+ *
+ *   const View = requireNativeComponent('RCTView');
+ *
+ * The concrete return type of `requireNativeComponent` is a string, but the declared type is
+ * `HostComponent` because TypeScript assumes anonymous JSX intrinsics (e.g. a `string`) not
+ * to have any props.
+ */
+export function requireNativeComponent<T>(viewName: string): HostComponent<T>;
diff --git a/Libraries/ReactNative/requireNativeComponent.js b/Libraries/ReactNative/requireNativeComponent.js
index 7402bbfb0758..c17d9895a76d 100644
--- a/Libraries/ReactNative/requireNativeComponent.js
+++ b/Libraries/ReactNative/requireNativeComponent.js
@@ -10,11 +10,11 @@
 
 'use strict';
 
+import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
+
 const createReactNativeComponentClass = require('../Renderer/shims/createReactNativeComponentClass');
 const getNativeComponentAttributes = require('./getNativeComponentAttributes');
 
-import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
-
 /**
  * Creates values that can be used like React components which represent native
  * view managers. You should create JavaScript modules that wrap these values so
diff --git a/Libraries/ReactPrivate/ReactNativePrivateInterface.js b/Libraries/ReactPrivate/ReactNativePrivateInterface.js
index 78ac5240384f..8dd647911a85 100644
--- a/Libraries/ReactPrivate/ReactNativePrivateInterface.js
+++ b/Libraries/ReactPrivate/ReactNativePrivateInterface.js
@@ -9,20 +9,21 @@
  */
 
 import typeof BatchedBridge from '../BatchedBridge/BatchedBridge';
+import typeof legacySendAccessibilityEvent from '../Components/AccessibilityInfo/legacySendAccessibilityEvent';
+import typeof TextInputState from '../Components/TextInput/TextInputState';
 import typeof ExceptionsManager from '../Core/ExceptionsManager';
-import typeof Platform from '../Utilities/Platform';
+import typeof RawEventEmitter from '../Core/RawEventEmitter';
+import typeof ReactFiberErrorDialog from '../Core/ReactFiberErrorDialog';
 import typeof RCTEventEmitter from '../EventEmitter/RCTEventEmitter';
-import typeof ReactNativeViewConfigRegistry from '../Renderer/shims/ReactNativeViewConfigRegistry';
-import typeof TextInputState from '../Components/TextInput/TextInputState';
+import typeof CustomEvent from '../Events/CustomEvent';
 import typeof UIManager from '../ReactNative/UIManager';
-import typeof deepDiffer from '../Utilities/differ/deepDiffer';
-import typeof deepFreezeAndThrowOnMutationInDev from '../Utilities/deepFreezeAndThrowOnMutationInDev';
+import typeof ReactNativeViewConfigRegistry from '../Renderer/shims/ReactNativeViewConfigRegistry';
 import typeof flattenStyle from '../StyleSheet/flattenStyle';
+import typeof deepFreezeAndThrowOnMutationInDev from '../Utilities/deepFreezeAndThrowOnMutationInDev';
+import typeof deepDiffer from '../Utilities/differ/deepDiffer';
+import typeof Platform from '../Utilities/Platform';
+
 import {type DangerouslyImpreciseStyleProp} from '../StyleSheet/StyleSheet';
-import typeof ReactFiberErrorDialog from '../Core/ReactFiberErrorDialog';
-import typeof legacySendAccessibilityEvent from '../Components/AccessibilityInfo/legacySendAccessibilityEvent';
-import typeof RawEventEmitter from '../Core/RawEventEmitter';
-import typeof CustomEvent from '../Events/CustomEvent';
 
 // flowlint unsafe-getters-setters:off
 module.exports = {
diff --git a/Libraries/Renderer/README.md b/Libraries/Renderer/README.md
index 0462f897e8d2..d7f278751a84 100644
--- a/Libraries/Renderer/README.md
+++ b/Libraries/Renderer/README.md
@@ -1,7 +1,7 @@
 # React & React Native Versions
 
 This page describes how React and React Native versions interact each other.
-The version alignment between the two frameworks relies on two syncronization points:
+The version alignment between the two frameworks relies on two synchronization points:
 
 1. The versions in the `package.json` of the new app template. For example [for React Native 0.68.1](https://github.com/facebook/react-native/blob/0.68-stable/template/package.json#L12-L15) the versions are aligned as follows:
 
diff --git a/Libraries/Renderer/REVISION b/Libraries/Renderer/REVISION
index c9a2a7c8e0a9..21e513e87f3c 100644
--- a/Libraries/Renderer/REVISION
+++ b/Libraries/Renderer/REVISION
@@ -1 +1 @@
-d300cebde2a63e742ccb8b6aa7b0f61db1ae29b4
\ No newline at end of file
+ab075a232409ea1f566526c6a5dca30f658280de
\ No newline at end of file
diff --git a/Libraries/Renderer/implementations/ReactFabric-dev.js b/Libraries/Renderer/implementations/ReactFabric-dev.js
index 89b2d1153112..beb1a29161ff 100644
--- a/Libraries/Renderer/implementations/ReactFabric-dev.js
+++ b/Libraries/Renderer/implementations/ReactFabric-dev.js
@@ -8,7 +8,7 @@
  * @nolint
  * @providesModule ReactFabric-dev
  * @preventMunge
- * @generated SignedSource<<b3705264eb7f21a670df3e269efd297e>>
+ * @generated SignedSource<<343bc15819bccf8610b6ff32fcb59b21>>
  */
 
 'use strict';
@@ -7197,30 +7197,27 @@ function readContext(context) {
   return value;
 }
 
-// An array of all update queues that received updates during the current
 // render. When this render exits, either because it finishes or because it is
 // interrupted, the interleaved updates will be transferred onto the main part
 // of the queue.
-var interleavedQueues = null;
-function pushInterleavedQueue(queue) {
-  if (interleavedQueues === null) {
-    interleavedQueues = [queue];
+
+var concurrentQueues = null;
+function pushConcurrentUpdateQueue(queue) {
+  if (concurrentQueues === null) {
+    concurrentQueues = [queue];
   } else {
-    interleavedQueues.push(queue);
+    concurrentQueues.push(queue);
   }
 }
-function hasInterleavedUpdates() {
-  return interleavedQueues !== null;
-}
-function enqueueInterleavedUpdates() {
+function finishQueueingConcurrentUpdates() {
   // Transfer the interleaved updates onto the main queue. Each queue has a
   // `pending` field and an `interleaved` field. When they are not null, they
   // point to the last node in a circular linked list. We need to append the
   // interleaved list to the end of the pending list by joining them into a
   // single, circular list.
-  if (interleavedQueues !== null) {
-    for (var i = 0; i < interleavedQueues.length; i++) {
-      var queue = interleavedQueues[i];
+  if (concurrentQueues !== null) {
+    for (var i = 0; i < concurrentQueues.length; i++) {
+      var queue = concurrentQueues[i];
       var lastInterleavedUpdate = queue.interleaved;
 
       if (lastInterleavedUpdate !== null) {
@@ -7238,7 +7235,115 @@ function enqueueInterleavedUpdates() {
       }
     }
 
-    interleavedQueues = null;
+    concurrentQueues = null;
+  }
+}
+function enqueueConcurrentHookUpdate(fiber, queue, update, lane) {
+  var interleaved = queue.interleaved;
+
+  if (interleaved === null) {
+    // This is the first update. Create a circular list.
+    update.next = update; // At the end of the current render, this queue's interleaved updates will
+    // be transferred to the pending queue.
+
+    pushConcurrentUpdateQueue(queue);
+  } else {
+    update.next = interleaved.next;
+    interleaved.next = update;
+  }
+
+  queue.interleaved = update;
+  return markUpdateLaneFromFiberToRoot(fiber, lane);
+}
+function enqueueConcurrentHookUpdateAndEagerlyBailout(
+  fiber,
+  queue,
+  update,
+  lane
+) {
+  var interleaved = queue.interleaved;
+
+  if (interleaved === null) {
+    // This is the first update. Create a circular list.
+    update.next = update; // At the end of the current render, this queue's interleaved updates will
+    // be transferred to the pending queue.
+
+    pushConcurrentUpdateQueue(queue);
+  } else {
+    update.next = interleaved.next;
+    interleaved.next = update;
+  }
+
+  queue.interleaved = update;
+}
+function enqueueConcurrentClassUpdate(fiber, queue, update, lane) {
+  var interleaved = queue.interleaved;
+
+  if (interleaved === null) {
+    // This is the first update. Create a circular list.
+    update.next = update; // At the end of the current render, this queue's interleaved updates will
+    // be transferred to the pending queue.
+
+    pushConcurrentUpdateQueue(queue);
+  } else {
+    update.next = interleaved.next;
+    interleaved.next = update;
+  }
+
+  queue.interleaved = update;
+  return markUpdateLaneFromFiberToRoot(fiber, lane);
+}
+function enqueueConcurrentRenderForLane(fiber, lane) {
+  return markUpdateLaneFromFiberToRoot(fiber, lane);
+} // Calling this function outside this module should only be done for backwards
+// compatibility and should always be accompanied by a warning.
+
+var unsafe_markUpdateLaneFromFiberToRoot = markUpdateLaneFromFiberToRoot;
+
+function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
+  // Update the source fiber's lanes
+  sourceFiber.lanes = mergeLanes(sourceFiber.lanes, lane);
+  var alternate = sourceFiber.alternate;
+
+  if (alternate !== null) {
+    alternate.lanes = mergeLanes(alternate.lanes, lane);
+  }
+
+  {
+    if (
+      alternate === null &&
+      (sourceFiber.flags & (Placement | Hydrating)) !== NoFlags
+    ) {
+      warnAboutUpdateOnNotYetMountedFiberInDEV(sourceFiber);
+    }
+  } // Walk the parent path to the root and update the child lanes.
+
+  var node = sourceFiber;
+  var parent = sourceFiber.return;
+
+  while (parent !== null) {
+    parent.childLanes = mergeLanes(parent.childLanes, lane);
+    alternate = parent.alternate;
+
+    if (alternate !== null) {
+      alternate.childLanes = mergeLanes(alternate.childLanes, lane);
+    } else {
+      {
+        if ((parent.flags & (Placement | Hydrating)) !== NoFlags) {
+          warnAboutUpdateOnNotYetMountedFiberInDEV(sourceFiber);
+        }
+      }
+    }
+
+    node = parent;
+    parent = parent.return;
+  }
+
+  if (node.tag === HostRoot) {
+    var root = node.stateNode;
+    return root;
+  } else {
+    return null;
   }
 }
 
@@ -7304,40 +7409,11 @@ function enqueueUpdate(fiber, update, lane) {
 
   if (updateQueue === null) {
     // Only occurs if the fiber has been unmounted.
-    return;
+    return null;
   }
 
   var sharedQueue = updateQueue.shared;
 
-  if (isInterleavedUpdate(fiber)) {
-    var interleaved = sharedQueue.interleaved;
-
-    if (interleaved === null) {
-      // This is the first update. Create a circular list.
-      update.next = update; // At the end of the current render, this queue's interleaved updates will
-      // be transferred to the pending queue.
-
-      pushInterleavedQueue(sharedQueue);
-    } else {
-      update.next = interleaved.next;
-      interleaved.next = update;
-    }
-
-    sharedQueue.interleaved = update;
-  } else {
-    var pending = sharedQueue.pending;
-
-    if (pending === null) {
-      // This is the first update. Create a circular list.
-      update.next = update;
-    } else {
-      update.next = pending.next;
-      pending.next = update;
-    }
-
-    sharedQueue.pending = update;
-  }
-
   {
     if (
       currentlyProcessingQueue === sharedQueue &&
@@ -7353,6 +7429,29 @@ function enqueueUpdate(fiber, update, lane) {
       didWarnUpdateInsideUpdate = true;
     }
   }
+
+  if (isUnsafeClassRenderPhaseUpdate()) {
+    // This is an unsafe render phase update. Add directly to the update
+    // queue so we can process it immediately during the current render.
+    var pending = sharedQueue.pending;
+
+    if (pending === null) {
+      // This is the first update. Create a circular list.
+      update.next = update;
+    } else {
+      update.next = pending.next;
+      pending.next = update;
+    }
+
+    sharedQueue.pending = update; // Update the childLanes even though we're most likely already rendering
+    // this fiber. This is for backwards compatibility in the case where you
+    // update a different component during render phase than the one that is
+    // currently renderings (a pattern that is accompanied by a warning).
+
+    return unsafe_markUpdateLaneFromFiberToRoot(fiber, lane);
+  } else {
+    return enqueueConcurrentClassUpdate(fiber, sharedQueue, update, lane);
+  }
 }
 function entangleTransitions(root, fiber, lane) {
   var updateQueue = fiber.updateQueue;
@@ -7889,10 +7988,10 @@ var classComponentUpdater = {
       update.callback = callback;
     }
 
-    enqueueUpdate(fiber, update);
-    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = enqueueUpdate(fiber, update, lane);
 
     if (root !== null) {
+      scheduleUpdateOnFiber(root, fiber, lane, eventTime);
       entangleTransitions(root, fiber, lane);
     }
   },
@@ -7912,10 +8011,10 @@ var classComponentUpdater = {
       update.callback = callback;
     }
 
-    enqueueUpdate(fiber, update);
-    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = enqueueUpdate(fiber, update, lane);
 
     if (root !== null) {
+      scheduleUpdateOnFiber(root, fiber, lane, eventTime);
       entangleTransitions(root, fiber, lane);
     }
   },
@@ -7934,10 +8033,10 @@ var classComponentUpdater = {
       update.callback = callback;
     }
 
-    enqueueUpdate(fiber, update);
-    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = enqueueUpdate(fiber, update, lane);
 
     if (root !== null) {
+      scheduleUpdateOnFiber(root, fiber, lane, eventTime);
       entangleTransitions(root, fiber, lane);
     }
   }
@@ -11318,7 +11417,11 @@ function checkIfSnapshotChanged(inst) {
 }
 
 function forceStoreRerender(fiber) {
-  scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+  var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+  if (root !== null) {
+    scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+  }
 }
 
 function mountState(initialState) {
@@ -11804,11 +11907,11 @@ function dispatchReducerAction(fiber, queue, action) {
   if (isRenderPhaseUpdate(fiber)) {
     enqueueRenderPhaseUpdate(queue, update);
   } else {
-    enqueueUpdate$1(fiber, queue, update);
-    var eventTime = requestEventTime();
-    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = enqueueConcurrentHookUpdate(fiber, queue, update, lane);
 
     if (root !== null) {
+      var eventTime = requestEventTime();
+      scheduleUpdateOnFiber(root, fiber, lane, eventTime);
       entangleTransitionUpdate(root, queue, lane);
     }
   }
@@ -11837,7 +11940,6 @@ function dispatchSetState(fiber, queue, action) {
   if (isRenderPhaseUpdate(fiber)) {
     enqueueRenderPhaseUpdate(queue, update);
   } else {
-    enqueueUpdate$1(fiber, queue, update);
     var alternate = fiber.alternate;
 
     if (
@@ -11872,6 +11974,13 @@ function dispatchSetState(fiber, queue, action) {
             // It's still possible that we'll need to rebase this update later,
             // if the component re-renders for a different reason and by that
             // time the reducer has changed.
+            // TODO: Do we still need to entangle transitions in this case?
+            enqueueConcurrentHookUpdateAndEagerlyBailout(
+              fiber,
+              queue,
+              update,
+              lane
+            );
             return;
           }
         } catch (error) {
@@ -11884,10 +11993,11 @@ function dispatchSetState(fiber, queue, action) {
       }
     }
 
-    var eventTime = requestEventTime();
-    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = enqueueConcurrentHookUpdate(fiber, queue, update, lane);
 
     if (root !== null) {
+      var eventTime = requestEventTime();
+      scheduleUpdateOnFiber(root, fiber, lane, eventTime);
       entangleTransitionUpdate(root, queue, lane);
     }
   }
@@ -11917,38 +12027,7 @@ function enqueueRenderPhaseUpdate(queue, update) {
   }
 
   queue.pending = update;
-}
-
-function enqueueUpdate$1(fiber, queue, update, lane) {
-  if (isInterleavedUpdate(fiber)) {
-    var interleaved = queue.interleaved;
-
-    if (interleaved === null) {
-      // This is the first update. Create a circular list.
-      update.next = update; // At the end of the current render, this queue's interleaved updates will
-      // be transferred to the pending queue.
-
-      pushInterleavedQueue(queue);
-    } else {
-      update.next = interleaved.next;
-      interleaved.next = update;
-    }
-
-    queue.interleaved = update;
-  } else {
-    var pending = queue.pending;
-
-    if (pending === null) {
-      // This is the first update. Create a circular list.
-      update.next = update;
-    } else {
-      update.next = pending.next;
-      pending.next = update;
-    }
-
-    queue.pending = update;
-  }
-}
+} // TODO: Move to ReactFiberConcurrentUpdates?
 
 function entangleTransitionUpdate(root, queue, lane) {
   if (isTransitionLane(lane)) {
@@ -12996,13 +13075,22 @@ function transferActualDuration(fiber) {
   }
 }
 
-function createCapturedValue(value, source) {
+function createCapturedValueAtFiber(value, source) {
   // If the value is an error, call this function immediately after it is thrown
   // so the stack is accurate.
   return {
     value: value,
     source: source,
-    stack: getStackByFiberInDevAndProd(source)
+    stack: getStackByFiberInDevAndProd(source),
+    digest: null
+  };
+}
+function createCapturedValue(value, digest, stack) {
+  return {
+    value: value,
+    source: null,
+    stack: stack != null ? stack : null,
+    digest: digest != null ? digest : null
   };
 }
 
@@ -13358,7 +13446,7 @@ function markSuspenseBoundaryShouldCapture(
           // prevent a bail out.
           var update = createUpdate(NoTimestamp, SyncLane);
           update.tag = ForceUpdate;
-          enqueueUpdate(sourceFiber, update);
+          enqueueUpdate(sourceFiber, update, SyncLane);
         }
       } // The source fiber did not complete. Mark it with Sync priority to
       // indicate that it still has pending work.
@@ -13488,12 +13576,13 @@ function throwException(
 
       value = uncaughtSuspenseError;
     }
-  } // We didn't find a boundary that could handle this type of exception. Start
+  }
+
+  value = createCapturedValueAtFiber(value, sourceFiber);
+  renderDidError(value); // We didn't find a boundary that could handle this type of exception. Start
   // over and traverse parent path again, this time treating the exception
   // as an error.
 
-  renderDidError(value);
-  value = createCapturedValue(value, sourceFiber);
   var workInProgress = returnFiber;
 
   do {
@@ -14131,7 +14220,7 @@ function updateClassComponent(
 
         var update = createClassErrorUpdate(
           workInProgress,
-          createCapturedValue(error$1, workInProgress),
+          createCapturedValueAtFiber(error$1, workInProgress),
           lane
         );
         enqueueCapturedUpdate(workInProgress, update);
@@ -15305,21 +15394,35 @@ function updateDehydratedSuspenseComponent(
       // This boundary is in a permanent fallback state. In this case, we'll never
       // get an update and we'll never be able to hydrate the final content. Let's just try the
       // client side render instead.
-      var _getSuspenseInstanceF = getSuspenseInstanceFallbackErrorDetails(),
-        errorMessage = _getSuspenseInstanceF.errorMessage;
-
-      var error = errorMessage // eslint-disable-next-line react-internal/prod-error-codes
-        ? new Error(errorMessage)
-        : new Error(
-            "The server could not finish this Suspense boundary, likely " +
-              "due to an error during server rendering. Switched to " +
-              "client rendering."
-          );
+      var digest, message, stack;
+
+      {
+        var _getSuspenseInstanceF = getSuspenseInstanceFallbackErrorDetails();
+
+        digest = _getSuspenseInstanceF.digest;
+        message = _getSuspenseInstanceF.message;
+        stack = _getSuspenseInstanceF.stack;
+      }
+
+      var error;
+
+      if (message) {
+        // eslint-disable-next-line react-internal/prod-error-codes
+        error = new Error(message);
+      } else {
+        error = new Error(
+          "The server could not finish this Suspense boundary, likely " +
+            "due to an error during server rendering. Switched to " +
+            "client rendering."
+        );
+      }
+
+      var capturedValue = createCapturedValue(error, digest, stack);
       return retrySuspenseComponentWithoutHydrating(
         current,
         workInProgress,
         renderLanes,
-        error
+        capturedValue
       );
     }
     // any context has changed, we need to treat is as if the input might have changed.
@@ -15347,7 +15450,13 @@ function updateDehydratedSuspenseComponent(
           suspenseState.retryLane = attemptHydrationAtLane; // TODO: Ideally this would inherit the event time of the current render
 
           var eventTime = NoTimestamp;
-          scheduleUpdateOnFiber(current, attemptHydrationAtLane, eventTime);
+          enqueueConcurrentRenderForLane(current, attemptHydrationAtLane);
+          scheduleUpdateOnFiber(
+            root,
+            current,
+            attemptHydrationAtLane,
+            eventTime
+          );
         }
       } // If we have scheduled higher pri work above, this will probably just abort the render
       // since we now have higher priority work, but in case it doesn't, we need to prepare to
@@ -15356,10 +15465,8 @@ function updateDehydratedSuspenseComponent(
       // Delay having to do this as long as the suspense timeout allows us.
 
       renderDidSuspendDelayIfPossible();
-      return retrySuspenseComponentWithoutHydrating(
-        current,
-        workInProgress,
-        renderLanes,
+
+      var _capturedValue = createCapturedValue(
         new Error(
           "This Suspense boundary received an update before it finished " +
             "hydrating. This caused the boundary to switch to client rendering. " +
@@ -15367,6 +15474,13 @@ function updateDehydratedSuspenseComponent(
             "in startTransition."
         )
       );
+
+      return retrySuspenseComponentWithoutHydrating(
+        current,
+        workInProgress,
+        renderLanes,
+        _capturedValue
+      );
     } else if (isSuspenseInstancePending()) {
       // This component is still pending more data from the server, so we can't hydrate its
       // content. We treat it as if this component suspended itself. It might seem as if
@@ -15411,15 +15525,20 @@ function updateDehydratedSuspenseComponent(
     if (workInProgress.flags & ForceClientRender) {
       // Something errored during hydration. Try again without hydrating.
       workInProgress.flags &= ~ForceClientRender;
-      return retrySuspenseComponentWithoutHydrating(
-        current,
-        workInProgress,
-        renderLanes,
+
+      var _capturedValue2 = createCapturedValue(
         new Error(
           "There was an error while hydrating this Suspense boundary. " +
             "Switched to client rendering."
         )
       );
+
+      return retrySuspenseComponentWithoutHydrating(
+        current,
+        workInProgress,
+        renderLanes,
+        _capturedValue2
+      );
     } else if (workInProgress.memoizedState !== null) {
       // Something suspended and we should still be in dehydrated mode.
       // Leave the existing child in place.
@@ -19198,8 +19317,12 @@ function commitMutationEffectsOnFiber(finishedWork, root, lanes) {
       var offscreenFiber = finishedWork.child;
 
       if (offscreenFiber.flags & Visibility) {
+        var offscreenInstance = offscreenFiber.stateNode;
         var newState = offscreenFiber.memoizedState;
-        var isHidden = newState !== null;
+        var isHidden = newState !== null; // Track the current state on the Offscreen instance so we can
+        // read it during an event
+
+        offscreenInstance.isHidden = isHidden;
 
         if (isHidden) {
           var wasHidden =
@@ -19236,7 +19359,13 @@ function commitMutationEffectsOnFiber(finishedWork, root, lanes) {
       commitReconciliationEffects(finishedWork);
 
       if (flags & Visibility) {
+        var _offscreenInstance = finishedWork.stateNode;
         var _newState = finishedWork.memoizedState;
+
+        var _isHidden = _newState !== null;
+        // read it during an event
+
+        _offscreenInstance.isHidden = _isHidden;
       }
 
       return;
@@ -19900,7 +20029,7 @@ function requestRetryLane(fiber) {
   return claimNextRetryLane();
 }
 
-function scheduleUpdateOnFiber(fiber, lane, eventTime) {
+function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
   checkForNestedUpdates();
 
   {
@@ -19909,12 +20038,6 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     }
   }
 
-  var root = markUpdateLaneFromFiberToRoot(fiber, lane);
-
-  if (root === null) {
-    return null;
-  }
-
   {
     if (isFlushingPassiveEffects) {
       didScheduleUpdateDuringPassiveEffects = true;
@@ -19945,7 +20068,6 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     warnIfUpdatesNotWrappedWithActDEV(fiber);
 
     if (root === workInProgressRoot) {
-      // TODO: Consolidate with `isInterleavedUpdate` check
       // Received an update to a tree that's in the middle of rendering. Mark
       // that there was an interleaved update work on this root. Unless the
       // `deferRenderPhaseUpdateToNextBatch` flag is off and this is a render
@@ -19986,76 +20108,14 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
       flushSyncCallbacksOnlyInLegacyMode();
     }
   }
-
-  return root;
 }
-// work without treating it as a typical update that originates from an event;
-// e.g. retrying a Suspense boundary isn't an update, but it does schedule work
-// on a fiber.
-
-function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
-  // Update the source fiber's lanes
-  sourceFiber.lanes = mergeLanes(sourceFiber.lanes, lane);
-  var alternate = sourceFiber.alternate;
-
-  if (alternate !== null) {
-    alternate.lanes = mergeLanes(alternate.lanes, lane);
-  }
-
-  {
-    if (
-      alternate === null &&
-      (sourceFiber.flags & (Placement | Hydrating)) !== NoFlags
-    ) {
-      warnAboutUpdateOnNotYetMountedFiberInDEV(sourceFiber);
-    }
-  } // Walk the parent path to the root and update the child lanes.
-
-  var node = sourceFiber;
-  var parent = sourceFiber.return;
-
-  while (parent !== null) {
-    parent.childLanes = mergeLanes(parent.childLanes, lane);
-    alternate = parent.alternate;
-
-    if (alternate !== null) {
-      alternate.childLanes = mergeLanes(alternate.childLanes, lane);
-    } else {
-      {
-        if ((parent.flags & (Placement | Hydrating)) !== NoFlags) {
-          warnAboutUpdateOnNotYetMountedFiberInDEV(sourceFiber);
-        }
-      }
-    }
-
-    node = parent;
-    parent = parent.return;
-  }
-
-  if (node.tag === HostRoot) {
-    var root = node.stateNode;
-    return root;
-  } else {
-    return null;
-  }
-}
-
-function isInterleavedUpdate(fiber, lane) {
+function isUnsafeClassRenderPhaseUpdate(fiber) {
+  // Check if this is a render phase update. Only called by class components,
+  // which special (deprecated) behavior for UNSAFE_componentWillReceive props.
   return (
-    // TODO: Optimize slightly by comparing to root that fiber belongs to.
-    // Requires some refactoring. Not a big deal though since it's rare for
-    // concurrent apps to have more than a single root.
-    (workInProgressRoot !== null || // If the interleaved updates queue hasn't been cleared yet, then
-      // we should treat this as an interleaved update, too. This is also a
-      // defensive coding measure in case a new update comes in between when
-      // rendering has finished and when the interleaved updates are transferred
-      // to the main queue.
-      hasInterleavedUpdates()) &&
-    (fiber.mode & ConcurrentMode) !== NoMode && // If this is a render phase update (i.e. UNSAFE_componentWillReceiveProps),
-    // then don't treat this as an interleaved update. This pattern is
-    // accompanied by a warning but we haven't fully deprecated it yet. We can
-    // remove once the deferRenderPhaseUpdateToNextBatch flag is enabled.
-    (executionContext & RenderContext) === NoContext
+    // TODO: Remove outdated deferRenderPhaseUpdateToNextBatch experiment. We
+    // decided not to enable it.
+    (executionContext & RenderContext) !== NoContext
   );
 } // Use this function to schedule a task for a root. There's only one task per
 // root; if a task was already scheduled, we'll check to make sure the priority
@@ -20752,7 +20812,7 @@ function prepareFreshStack(root, lanes) {
   workInProgressRootPingedLanes = NoLanes;
   workInProgressRootConcurrentErrors = null;
   workInProgressRootRecoverableErrors = null;
-  enqueueInterleavedUpdates();
+  finishQueueingConcurrentUpdates();
 
   {
     ReactStrictModeWarnings.discardPendingWarnings();
@@ -21397,7 +21457,12 @@ function commitRootImpl(
 
     for (var i = 0; i < recoverableErrors.length; i++) {
       var recoverableError = recoverableErrors[i];
-      onRecoverableError(recoverableError);
+      var componentStack = recoverableError.stack;
+      var digest = recoverableError.digest;
+      onRecoverableError(recoverableError.value, {
+        componentStack: componentStack,
+        digest: digest
+      });
     }
   }
 
@@ -21579,11 +21644,10 @@ function prepareToThrowUncaughtError(error) {
 var onUncaughtError = prepareToThrowUncaughtError;
 
 function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
-  var errorInfo = createCapturedValue(error, sourceFiber);
+  var errorInfo = createCapturedValueAtFiber(error, sourceFiber);
   var update = createRootErrorUpdate(rootFiber, errorInfo, SyncLane);
-  enqueueUpdate(rootFiber, update);
+  var root = enqueueUpdate(rootFiber, update, SyncLane);
   var eventTime = requestEventTime();
-  var root = markUpdateLaneFromFiberToRoot(rootFiber, SyncLane);
 
   if (root !== null) {
     markRootUpdated(root, SyncLane, eventTime);
@@ -21623,11 +21687,10 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
         (typeof instance.componentDidCatch === "function" &&
           !isAlreadyFailedLegacyErrorBoundary(instance))
       ) {
-        var errorInfo = createCapturedValue(error$1, sourceFiber);
+        var errorInfo = createCapturedValueAtFiber(error$1, sourceFiber);
         var update = createClassErrorUpdate(fiber, errorInfo, SyncLane);
-        enqueueUpdate(fiber, update);
+        var root = enqueueUpdate(fiber, update, SyncLane);
         var eventTime = requestEventTime();
-        var root = markUpdateLaneFromFiberToRoot(fiber, SyncLane);
 
         if (root !== null) {
           markRootUpdated(root, SyncLane, eventTime);
@@ -21714,7 +21777,7 @@ function retryTimedOutBoundary(boundaryFiber, retryLane) {
   } // TODO: Special case idle priority?
 
   var eventTime = requestEventTime();
-  var root = markUpdateLaneFromFiberToRoot(boundaryFiber, retryLane);
+  var root = enqueueConcurrentRenderForLane(boundaryFiber, retryLane);
 
   if (root !== null) {
     markRootUpdated(root, retryLane, eventTime);
@@ -21830,7 +21893,6 @@ function flushRenderPhaseStrictModeWarningsInDEV() {
 }
 
 var didWarnStateUpdateForNotYetMountedComponent = null;
-
 function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
   {
     if ((executionContext & RenderContext) !== NoContext) {
@@ -21890,7 +21952,6 @@ function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
     }
   }
 }
-
 var beginWork$1;
 
 {
@@ -22416,7 +22477,11 @@ function scheduleFibersWithFamiliesRecursively(
     }
 
     if (needsRemount || needsRender) {
-      scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+      var _root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+      if (_root !== null) {
+        scheduleUpdateOnFiber(_root, fiber, SyncLane, NoTimestamp);
+      }
     }
 
     if (child !== null && !needsRemount) {
@@ -23121,7 +23186,9 @@ function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
   var fiber = createFiber(OffscreenComponent, pendingProps, key, mode);
   fiber.elementType = REACT_OFFSCREEN_TYPE;
   fiber.lanes = lanes;
-  var primaryChildInstance = {};
+  var primaryChildInstance = {
+    isHidden: false
+  };
   fiber.stateNode = primaryChildInstance;
   return fiber;
 }
@@ -23293,7 +23360,7 @@ function createFiberRoot(
   return root;
 }
 
-var ReactVersion = "18.2.0-next-d300cebde-20220601";
+var ReactVersion = "18.2.0-next-9e3b772b8-20220608";
 
 function createPortal(
   children,
@@ -23491,10 +23558,10 @@ function updateContainer(element, container, parentComponent, callback) {
     update.callback = callback;
   }
 
-  enqueueUpdate(current$1, update);
-  var root = scheduleUpdateOnFiber(current$1, lane, eventTime);
+  var root = enqueueUpdate(current$1, update, lane);
 
   if (root !== null) {
+    scheduleUpdateOnFiber(root, current$1, lane, eventTime);
     entangleTransitions(root, current$1, lane);
   }
 
@@ -23654,7 +23721,11 @@ var setSuspenseHandler = null;
       // Shallow cloning props works as a workaround for now to bypass the bailout check.
 
       fiber.memoizedProps = assign({}, fiber.memoizedProps);
-      scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+      var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+      if (root !== null) {
+        scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+      }
     }
   };
 
@@ -23671,7 +23742,11 @@ var setSuspenseHandler = null;
       // Shallow cloning props works as a workaround for now to bypass the bailout check.
 
       fiber.memoizedProps = assign({}, fiber.memoizedProps);
-      scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+      var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+      if (root !== null) {
+        scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+      }
     }
   };
 
@@ -23688,7 +23763,11 @@ var setSuspenseHandler = null;
       // Shallow cloning props works as a workaround for now to bypass the bailout check.
 
       fiber.memoizedProps = assign({}, fiber.memoizedProps);
-      scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+      var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+      if (root !== null) {
+        scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+      }
     }
   }; // Support DevTools props for function components, forwardRef, memo, host components, etc.
 
@@ -23699,7 +23778,11 @@ var setSuspenseHandler = null;
       fiber.alternate.pendingProps = fiber.pendingProps;
     }
 
-    scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+    var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+    if (root !== null) {
+      scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+    }
   };
 
   overridePropsDeletePath = function(fiber, path) {
@@ -23709,7 +23792,11 @@ var setSuspenseHandler = null;
       fiber.alternate.pendingProps = fiber.pendingProps;
     }
 
-    scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+    var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+    if (root !== null) {
+      scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+    }
   };
 
   overridePropsRenamePath = function(fiber, oldPath, newPath) {
@@ -23719,11 +23806,19 @@ var setSuspenseHandler = null;
       fiber.alternate.pendingProps = fiber.pendingProps;
     }
 
-    scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+    var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+    if (root !== null) {
+      scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+    }
   };
 
   scheduleUpdate = function(fiber) {
-    scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+    var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+    if (root !== null) {
+      scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+    }
   };
 
   setErrorHandler = function(newShouldErrorImpl) {
diff --git a/Libraries/Renderer/implementations/ReactFabric-prod.js b/Libraries/Renderer/implementations/ReactFabric-prod.js
index 9f83af5c81ec..7da25248f032 100644
--- a/Libraries/Renderer/implementations/ReactFabric-prod.js
+++ b/Libraries/Renderer/implementations/ReactFabric-prod.js
@@ -8,7 +8,7 @@
  * @nolint
  * @providesModule ReactFabric-prod
  * @preventMunge
- * @generated SignedSource<<da4adb6862dba6980fe677cde685b767>>
+ * @generated SignedSource<<fd9d50d45a1497af23e636e66fa0284b>>
  */
 
 "use strict";
@@ -1017,7 +1017,7 @@ eventPluginOrder = Array.prototype.slice.call([
   "ReactNativeBridgeEventPlugin"
 ]);
 recomputePluginOrdering();
-var injectedNamesToPlugins$jscomp$inline_218 = {
+var injectedNamesToPlugins$jscomp$inline_223 = {
     ResponderEventPlugin: ResponderEventPlugin,
     ReactNativeBridgeEventPlugin: {
       eventTypes: {},
@@ -1063,33 +1063,33 @@ var injectedNamesToPlugins$jscomp$inline_218 = {
       }
     }
   },
-  isOrderingDirty$jscomp$inline_219 = !1,
-  pluginName$jscomp$inline_220;
-for (pluginName$jscomp$inline_220 in injectedNamesToPlugins$jscomp$inline_218)
+  isOrderingDirty$jscomp$inline_224 = !1,
+  pluginName$jscomp$inline_225;
+for (pluginName$jscomp$inline_225 in injectedNamesToPlugins$jscomp$inline_223)
   if (
-    injectedNamesToPlugins$jscomp$inline_218.hasOwnProperty(
-      pluginName$jscomp$inline_220
+    injectedNamesToPlugins$jscomp$inline_223.hasOwnProperty(
+      pluginName$jscomp$inline_225
     )
   ) {
-    var pluginModule$jscomp$inline_221 =
-      injectedNamesToPlugins$jscomp$inline_218[pluginName$jscomp$inline_220];
+    var pluginModule$jscomp$inline_226 =
+      injectedNamesToPlugins$jscomp$inline_223[pluginName$jscomp$inline_225];
     if (
-      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_220) ||
-      namesToPlugins[pluginName$jscomp$inline_220] !==
-        pluginModule$jscomp$inline_221
+      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_225) ||
+      namesToPlugins[pluginName$jscomp$inline_225] !==
+        pluginModule$jscomp$inline_226
     ) {
-      if (namesToPlugins[pluginName$jscomp$inline_220])
+      if (namesToPlugins[pluginName$jscomp$inline_225])
         throw Error(
           "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" +
-            (pluginName$jscomp$inline_220 + "`.")
+            (pluginName$jscomp$inline_225 + "`.")
         );
       namesToPlugins[
-        pluginName$jscomp$inline_220
-      ] = pluginModule$jscomp$inline_221;
-      isOrderingDirty$jscomp$inline_219 = !0;
+        pluginName$jscomp$inline_225
+      ] = pluginModule$jscomp$inline_226;
+      isOrderingDirty$jscomp$inline_224 = !0;
     }
   }
-isOrderingDirty$jscomp$inline_219 && recomputePluginOrdering();
+isOrderingDirty$jscomp$inline_224 && recomputePluginOrdering();
 function getInstanceFromInstance(instanceHandle) {
   return instanceHandle;
 }
@@ -2325,8 +2325,34 @@ function readContext(context) {
     } else lastContextDependency = lastContextDependency.next = context;
   return value;
 }
-var interleavedQueues = null,
-  hasForceUpdate = !1;
+var concurrentQueues = null;
+function pushConcurrentUpdateQueue(queue) {
+  null === concurrentQueues
+    ? (concurrentQueues = [queue])
+    : concurrentQueues.push(queue);
+}
+function enqueueConcurrentHookUpdate(fiber, queue, update, lane) {
+  var interleaved = queue.interleaved;
+  null === interleaved
+    ? ((update.next = update), pushConcurrentUpdateQueue(queue))
+    : ((update.next = interleaved.next), (interleaved.next = update));
+  queue.interleaved = update;
+  return markUpdateLaneFromFiberToRoot(fiber, lane);
+}
+function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
+  sourceFiber.lanes |= lane;
+  var alternate = sourceFiber.alternate;
+  null !== alternate && (alternate.lanes |= lane);
+  alternate = sourceFiber;
+  for (sourceFiber = sourceFiber.return; null !== sourceFiber; )
+    (sourceFiber.childLanes |= lane),
+      (alternate = sourceFiber.alternate),
+      null !== alternate && (alternate.childLanes |= lane),
+      (alternate = sourceFiber),
+      (sourceFiber = sourceFiber.return);
+  return 3 === alternate.tag ? alternate.stateNode : null;
+}
+var hasForceUpdate = !1;
 function initializeUpdateQueue(fiber) {
   fiber.updateQueue = {
     baseState: fiber.memoizedState,
@@ -2357,24 +2383,24 @@ function createUpdate(eventTime, lane) {
     next: null
   };
 }
-function enqueueUpdate(fiber, update) {
+function enqueueUpdate(fiber, update, lane) {
   var updateQueue = fiber.updateQueue;
-  null !== updateQueue &&
-    ((updateQueue = updateQueue.shared),
-    isInterleavedUpdate(fiber)
-      ? ((fiber = updateQueue.interleaved),
-        null === fiber
-          ? ((update.next = update),
-            null === interleavedQueues
-              ? (interleavedQueues = [updateQueue])
-              : interleavedQueues.push(updateQueue))
-          : ((update.next = fiber.next), (fiber.next = update)),
-        (updateQueue.interleaved = update))
-      : ((fiber = updateQueue.pending),
-        null === fiber
-          ? (update.next = update)
-          : ((update.next = fiber.next), (fiber.next = update)),
-        (updateQueue.pending = update)));
+  if (null === updateQueue) return null;
+  updateQueue = updateQueue.shared;
+  if (0 !== (executionContext & 2)) {
+    var pending = updateQueue.pending;
+    null === pending
+      ? (update.next = update)
+      : ((update.next = pending.next), (pending.next = update));
+    updateQueue.pending = update;
+    return markUpdateLaneFromFiberToRoot(fiber, lane);
+  }
+  pending = updateQueue.interleaved;
+  null === pending
+    ? ((update.next = update), pushConcurrentUpdateQueue(updateQueue))
+    : ((update.next = pending.next), (pending.next = update));
+  updateQueue.interleaved = update;
+  return markUpdateLaneFromFiberToRoot(fiber, lane);
 }
 function entangleTransitions(root, fiber, lane) {
   fiber = fiber.updateQueue;
@@ -2611,9 +2637,10 @@ var classComponentUpdater = {
       update = createUpdate(eventTime, lane);
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update);
-    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
-    null !== payload && entangleTransitions(payload, inst, lane);
+    payload = enqueueUpdate(inst, update, lane);
+    null !== payload &&
+      (scheduleUpdateOnFiber(payload, inst, lane, eventTime),
+      entangleTransitions(payload, inst, lane));
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternals;
@@ -2623,9 +2650,10 @@ var classComponentUpdater = {
     update.tag = 1;
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update);
-    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
-    null !== payload && entangleTransitions(payload, inst, lane);
+    payload = enqueueUpdate(inst, update, lane);
+    null !== payload &&
+      (scheduleUpdateOnFiber(payload, inst, lane, eventTime),
+      entangleTransitions(payload, inst, lane));
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternals;
@@ -2634,9 +2662,10 @@ var classComponentUpdater = {
       update = createUpdate(eventTime, lane);
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update);
-    callback = scheduleUpdateOnFiber(inst, lane, eventTime);
-    null !== callback && entangleTransitions(callback, inst, lane);
+    callback = enqueueUpdate(inst, update, lane);
+    null !== callback &&
+      (scheduleUpdateOnFiber(callback, inst, lane, eventTime),
+      entangleTransitions(callback, inst, lane));
   }
 };
 function checkShouldComponentUpdate(
@@ -3741,11 +3770,11 @@ function pushStoreConsistencyCheck(fiber, getSnapshot, renderedSnapshot) {
 function updateStoreInstance(fiber, inst, nextSnapshot, getSnapshot) {
   inst.value = nextSnapshot;
   inst.getSnapshot = getSnapshot;
-  checkIfSnapshotChanged(inst) && scheduleUpdateOnFiber(fiber, 1, -1);
+  checkIfSnapshotChanged(inst) && forceStoreRerender(fiber);
 }
 function subscribeToStore(fiber, inst, subscribe) {
   return subscribe(function() {
-    checkIfSnapshotChanged(inst) && scheduleUpdateOnFiber(fiber, 1, -1);
+    checkIfSnapshotChanged(inst) && forceStoreRerender(fiber);
   });
 }
 function checkIfSnapshotChanged(inst) {
@@ -3758,6 +3787,10 @@ function checkIfSnapshotChanged(inst) {
     return !0;
   }
 }
+function forceStoreRerender(fiber) {
+  var root = markUpdateLaneFromFiberToRoot(fiber, 1);
+  null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1);
+}
 function mountState(initialState) {
   var hook = mountWorkInProgressHook();
   "function" === typeof initialState && (initialState = initialState());
@@ -3928,12 +3961,15 @@ function dispatchReducerAction(fiber, queue, action) {
     eagerState: null,
     next: null
   };
-  isRenderPhaseUpdate(fiber)
-    ? enqueueRenderPhaseUpdate(queue, action)
-    : (enqueueUpdate$1(fiber, queue, action),
-      (action = requestEventTime()),
-      (fiber = scheduleUpdateOnFiber(fiber, lane, action)),
-      null !== fiber && entangleTransitionUpdate(fiber, queue, lane));
+  if (isRenderPhaseUpdate(fiber)) enqueueRenderPhaseUpdate(queue, action);
+  else if (
+    ((action = enqueueConcurrentHookUpdate(fiber, queue, action, lane)),
+    null !== action)
+  ) {
+    var eventTime = requestEventTime();
+    scheduleUpdateOnFiber(action, fiber, lane, eventTime);
+    entangleTransitionUpdate(action, queue, lane);
+  }
 }
 function dispatchSetState(fiber, queue, action) {
   var lane = requestUpdateLane(fiber),
@@ -3946,7 +3982,6 @@ function dispatchSetState(fiber, queue, action) {
     };
   if (isRenderPhaseUpdate(fiber)) enqueueRenderPhaseUpdate(queue, update);
   else {
-    enqueueUpdate$1(fiber, queue, update);
     var alternate = fiber.alternate;
     if (
       0 === fiber.lanes &&
@@ -3958,13 +3993,22 @@ function dispatchSetState(fiber, queue, action) {
           eagerState = alternate(currentState, action);
         update.hasEagerState = !0;
         update.eagerState = eagerState;
-        if (objectIs(eagerState, currentState)) return;
+        if (objectIs(eagerState, currentState)) {
+          var interleaved = queue.interleaved;
+          null === interleaved
+            ? ((update.next = update), pushConcurrentUpdateQueue(queue))
+            : ((update.next = interleaved.next), (interleaved.next = update));
+          queue.interleaved = update;
+          return;
+        }
       } catch (error) {
       } finally {
       }
-    action = requestEventTime();
-    fiber = scheduleUpdateOnFiber(fiber, lane, action);
-    null !== fiber && entangleTransitionUpdate(fiber, queue, lane);
+    action = enqueueConcurrentHookUpdate(fiber, queue, update, lane);
+    null !== action &&
+      ((update = requestEventTime()),
+      scheduleUpdateOnFiber(action, fiber, lane, update),
+      entangleTransitionUpdate(action, queue, lane));
   }
 }
 function isRenderPhaseUpdate(fiber) {
@@ -3982,22 +4026,6 @@ function enqueueRenderPhaseUpdate(queue, update) {
     : ((update.next = pending.next), (pending.next = update));
   queue.pending = update;
 }
-function enqueueUpdate$1(fiber, queue, update) {
-  isInterleavedUpdate(fiber)
-    ? ((fiber = queue.interleaved),
-      null === fiber
-        ? ((update.next = update),
-          null === interleavedQueues
-            ? (interleavedQueues = [queue])
-            : interleavedQueues.push(queue))
-        : ((update.next = fiber.next), (fiber.next = update)),
-      (queue.interleaved = update))
-    : ((fiber = queue.pending),
-      null === fiber
-        ? (update.next = update)
-        : ((update.next = fiber.next), (fiber.next = update)),
-      (queue.pending = update));
-}
 function entangleTransitionUpdate(root, queue, lane) {
   if (0 !== (lane & 4194240)) {
     var queueLanes = queue.lanes;
@@ -4193,7 +4221,7 @@ var ContextOnlyDispatcher = {
     useId: updateId,
     unstable_isNewReconciler: !1
   };
-function createCapturedValue(value, source) {
+function createCapturedValueAtFiber(value, source) {
   try {
     var info = "",
       node = source;
@@ -4204,7 +4232,20 @@ function createCapturedValue(value, source) {
     JSCompiler_inline_result =
       "\nError generating stack: " + x.message + "\n" + x.stack;
   }
-  return { value: value, source: source, stack: JSCompiler_inline_result };
+  return {
+    value: value,
+    source: source,
+    stack: JSCompiler_inline_result,
+    digest: null
+  };
+}
+function createCapturedValue(value, digest, stack) {
+  return {
+    value: value,
+    source: null,
+    stack: null != stack ? stack : null,
+    digest: null != digest ? digest : null
+  };
 }
 if (
   "function" !==
@@ -4930,13 +4971,16 @@ function updateDehydratedSuspenseComponent(
     if (workInProgress.flags & 256)
       return (
         (workInProgress.flags &= -257),
+        (suspenseState = createCapturedValue(
+          Error(
+            "There was an error while hydrating this Suspense boundary. Switched to client rendering."
+          )
+        )),
         retrySuspenseComponentWithoutHydrating(
           current,
           workInProgress,
           renderLanes,
-          Error(
-            "There was an error while hydrating this Suspense boundary. Switched to client rendering."
-          )
+          suspenseState
         )
       );
     if (null !== workInProgress.memoizedState)
@@ -4981,16 +5025,19 @@ function updateDehydratedSuspenseComponent(
     );
   if (shim$1())
     return (
-      (suspenseState = shim$1().errorMessage),
+      (suspenseState = shim$1().digest),
+      (suspenseState = createCapturedValue(
+        Error(
+          "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering."
+        ),
+        suspenseState,
+        void 0
+      )),
       retrySuspenseComponentWithoutHydrating(
         current,
         workInProgress,
         renderLanes,
         suspenseState
-          ? Error(suspenseState)
-          : Error(
-              "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering."
-            )
       )
     );
   didSuspend = 0 !== (renderLanes & current.childLanes);
@@ -5033,23 +5080,27 @@ function updateDehydratedSuspenseComponent(
         default:
           didSuspend = 0;
       }
-      nextProps =
+      didSuspend =
         0 !== (didSuspend & (nextProps.suspendedLanes | renderLanes))
           ? 0
           : didSuspend;
-      0 !== nextProps &&
-        nextProps !== suspenseState.retryLane &&
-        ((suspenseState.retryLane = nextProps),
-        scheduleUpdateOnFiber(current, nextProps, -1));
+      0 !== didSuspend &&
+        didSuspend !== suspenseState.retryLane &&
+        ((suspenseState.retryLane = didSuspend),
+        markUpdateLaneFromFiberToRoot(current, didSuspend),
+        scheduleUpdateOnFiber(nextProps, current, didSuspend, -1));
     }
     renderDidSuspendDelayIfPossible();
+    suspenseState = createCapturedValue(
+      Error(
+        "This Suspense boundary received an update before it finished hydrating. This caused the boundary to switch to client rendering. The usual way to fix this is to wrap the original update in startTransition."
+      )
+    );
     return retrySuspenseComponentWithoutHydrating(
       current,
       workInProgress,
       renderLanes,
-      Error(
-        "This Suspense boundary received an update before it finished hydrating. This caused the boundary to switch to client rendering. The usual way to fix this is to wrap the original update in startTransition."
-      )
+      suspenseState
     );
   }
   if (shim$1())
@@ -5450,14 +5501,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
       break;
     case "collapsed":
       lastTailNode = renderState.tail;
-      for (var lastTailNode$60 = null; null !== lastTailNode; )
-        null !== lastTailNode.alternate && (lastTailNode$60 = lastTailNode),
+      for (var lastTailNode$62 = null; null !== lastTailNode; )
+        null !== lastTailNode.alternate && (lastTailNode$62 = lastTailNode),
           (lastTailNode = lastTailNode.sibling);
-      null === lastTailNode$60
+      null === lastTailNode$62
         ? hasRenderedATailFallback || null === renderState.tail
           ? (renderState.tail = null)
           : (renderState.tail.sibling = null)
-        : (lastTailNode$60.sibling = null);
+        : (lastTailNode$62.sibling = null);
   }
 }
 function bubbleProperties(completedWork) {
@@ -5467,19 +5518,19 @@ function bubbleProperties(completedWork) {
     newChildLanes = 0,
     subtreeFlags = 0;
   if (didBailout)
-    for (var child$61 = completedWork.child; null !== child$61; )
-      (newChildLanes |= child$61.lanes | child$61.childLanes),
-        (subtreeFlags |= child$61.subtreeFlags & 14680064),
-        (subtreeFlags |= child$61.flags & 14680064),
-        (child$61.return = completedWork),
-        (child$61 = child$61.sibling);
+    for (var child$63 = completedWork.child; null !== child$63; )
+      (newChildLanes |= child$63.lanes | child$63.childLanes),
+        (subtreeFlags |= child$63.subtreeFlags & 14680064),
+        (subtreeFlags |= child$63.flags & 14680064),
+        (child$63.return = completedWork),
+        (child$63 = child$63.sibling);
   else
-    for (child$61 = completedWork.child; null !== child$61; )
-      (newChildLanes |= child$61.lanes | child$61.childLanes),
-        (subtreeFlags |= child$61.subtreeFlags),
-        (subtreeFlags |= child$61.flags),
-        (child$61.return = completedWork),
-        (child$61 = child$61.sibling);
+    for (child$63 = completedWork.child; null !== child$63; )
+      (newChildLanes |= child$63.lanes | child$63.childLanes),
+        (subtreeFlags |= child$63.subtreeFlags),
+        (subtreeFlags |= child$63.flags),
+        (child$63.return = completedWork),
+        (child$63 = child$63.sibling);
   completedWork.subtreeFlags |= subtreeFlags;
   completedWork.childLanes = newChildLanes;
   return didBailout;
@@ -5971,8 +6022,8 @@ function commitHookEffectListMount(flags, finishedWork) {
     var effect = (finishedWork = finishedWork.next);
     do {
       if ((effect.tag & flags) === flags) {
-        var create$73 = effect.create;
-        effect.destroy = create$73();
+        var create$75 = effect.create;
+        effect.destroy = create$75();
       }
       effect = effect.next;
     } while (effect !== finishedWork);
@@ -6155,8 +6206,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
         }
         try {
           commitHookEffectListUnmount(5, finishedWork, finishedWork.return);
-        } catch (error$77) {
-          captureCommitPhaseError(finishedWork, finishedWork.return, error$77);
+        } catch (error$79) {
+          captureCommitPhaseError(finishedWork, finishedWork.return, error$79);
         }
       }
       break;
@@ -6191,14 +6242,18 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
       commitReconciliationEffects(finishedWork);
       root = finishedWork.child;
       root.flags & 8192 &&
-        null !== root.memoizedState &&
-        (null === root.alternate || null === root.alternate.memoizedState) &&
-        (globalMostRecentFallbackTime = now());
+        ((current = null !== root.memoizedState),
+        (root.stateNode.isHidden = current),
+        !current ||
+          (null !== root.alternate && null !== root.alternate.memoizedState) ||
+          (globalMostRecentFallbackTime = now()));
       flags & 4 && attachSuspenseRetryListeners(finishedWork);
       break;
     case 22:
       recursivelyTraverseMutationEffects(root, finishedWork);
       commitReconciliationEffects(finishedWork);
+      flags & 8192 &&
+        (finishedWork.stateNode.isHidden = null !== finishedWork.memoizedState);
       break;
     case 19:
       recursivelyTraverseMutationEffects(root, finishedWork);
@@ -6259,8 +6314,8 @@ function commitLayoutEffects(finishedWork) {
                     commitUpdateQueue(firstChild, updateQueue, instance);
                   break;
                 case 3:
-                  var updateQueue$74 = firstChild.updateQueue;
-                  if (null !== updateQueue$74) {
+                  var updateQueue$76 = firstChild.updateQueue;
+                  if (null !== updateQueue$76) {
                     current = null;
                     if (null !== firstChild.child)
                       switch (firstChild.child.tag) {
@@ -6270,7 +6325,7 @@ function commitLayoutEffects(finishedWork) {
                         case 1:
                           current = firstChild.child.stateNode;
                       }
-                    commitUpdateQueue(firstChild, updateQueue$74, current);
+                    commitUpdateQueue(firstChild, updateQueue$76, current);
                   }
                   break;
                 case 5:
@@ -6397,15 +6452,13 @@ function requestUpdateLane(fiber) {
     }
   return fiber;
 }
-function scheduleUpdateOnFiber(fiber, lane, eventTime) {
+function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
   if (50 < nestedUpdateCount)
     throw ((nestedUpdateCount = 0),
     (rootWithNestedUpdates = null),
     Error(
       "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
     ));
-  var root = markUpdateLaneFromFiberToRoot(fiber, lane);
-  if (null === root) return null;
   markRootUpdated(root, lane, eventTime);
   if (0 === (executionContext & 2) || root !== workInProgressRoot)
     root === workInProgressRoot &&
@@ -6419,27 +6472,6 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
         0 === (fiber.mode & 1) &&
         ((workInProgressRootRenderTargetTime = now() + 500),
         includesLegacySyncCallbacks && flushSyncCallbacks());
-  return root;
-}
-function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
-  sourceFiber.lanes |= lane;
-  var alternate = sourceFiber.alternate;
-  null !== alternate && (alternate.lanes |= lane);
-  alternate = sourceFiber;
-  for (sourceFiber = sourceFiber.return; null !== sourceFiber; )
-    (sourceFiber.childLanes |= lane),
-      (alternate = sourceFiber.alternate),
-      null !== alternate && (alternate.childLanes |= lane),
-      (alternate = sourceFiber),
-      (sourceFiber = sourceFiber.return);
-  return 3 === alternate.tag ? alternate.stateNode : null;
-}
-function isInterleavedUpdate(fiber) {
-  return (
-    (null !== workInProgressRoot || null !== interleavedQueues) &&
-    0 !== (fiber.mode & 1) &&
-    0 === (executionContext & 2)
-  );
 }
 function ensureRootIsScheduled(root, currentTime) {
   for (
@@ -6844,10 +6876,10 @@ function prepareFreshStack(root, lanes) {
   workInProgressRootFatalError = null;
   workInProgressRootPingedLanes = workInProgressRootInterleavedUpdatedLanes = workInProgressRootSkippedLanes = 0;
   workInProgressRootRecoverableErrors = workInProgressRootConcurrentErrors = null;
-  if (null !== interleavedQueues) {
-    for (lanes = 0; lanes < interleavedQueues.length; lanes++)
+  if (null !== concurrentQueues) {
+    for (lanes = 0; lanes < concurrentQueues.length; lanes++)
       if (
-        ((timeoutHandle = interleavedQueues[lanes]),
+        ((timeoutHandle = concurrentQueues[lanes]),
         (interruptedWork = timeoutHandle.interleaved),
         null !== interruptedWork)
       ) {
@@ -6861,7 +6893,7 @@ function prepareFreshStack(root, lanes) {
         }
         timeoutHandle.pending = interruptedWork;
       }
-    interleavedQueues = null;
+    concurrentQueues = null;
   }
   return root;
 }
@@ -6957,7 +6989,7 @@ function handleError(root$jscomp$0, thrownValue) {
                   else {
                     var update = createUpdate(-1, 1);
                     update.tag = 2;
-                    enqueueUpdate(sourceFiber, update);
+                    enqueueUpdate(sourceFiber, update, 1);
                   }
                 sourceFiber.lanes |= 1;
               }
@@ -6984,13 +7016,12 @@ function handleError(root$jscomp$0, thrownValue) {
             );
           }
         }
-        root = value;
+        root = value = createCapturedValueAtFiber(value, sourceFiber);
         4 !== workInProgressRootExitStatus &&
           (workInProgressRootExitStatus = 2);
         null === workInProgressRootConcurrentErrors
           ? (workInProgressRootConcurrentErrors = [root])
           : workInProgressRootConcurrentErrors.push(root);
-        value = createCapturedValue(value, sourceFiber);
         root = returnFiber;
         do {
           switch (root.tag) {
@@ -7222,7 +7253,11 @@ function commitRootImpl(
       transitions < recoverableErrors.length;
       transitions++
     )
-      renderPriorityLevel(recoverableErrors[transitions]);
+      (lanes = recoverableErrors[transitions]),
+        renderPriorityLevel(lanes.value, {
+          componentStack: lanes.stack,
+          digest: lanes.digest
+        });
   if (hasUncaughtError)
     throw ((hasUncaughtError = !1),
     (root = firstUncaughtError),
@@ -7386,11 +7421,10 @@ function flushPassiveEffects() {
   return !1;
 }
 function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
-  sourceFiber = createCapturedValue(error, sourceFiber);
+  sourceFiber = createCapturedValueAtFiber(error, sourceFiber);
   sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1);
-  enqueueUpdate(rootFiber, sourceFiber);
+  rootFiber = enqueueUpdate(rootFiber, sourceFiber, 1);
   sourceFiber = requestEventTime();
-  rootFiber = markUpdateLaneFromFiberToRoot(rootFiber, 1);
   null !== rootFiber &&
     (markRootUpdated(rootFiber, 1, sourceFiber),
     ensureRootIsScheduled(rootFiber, sourceFiber));
@@ -7420,18 +7454,18 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
             (null === legacyErrorBoundariesThatAlreadyFailed ||
               !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
         ) {
-          sourceFiber = createCapturedValue(error, sourceFiber);
+          sourceFiber = createCapturedValueAtFiber(error, sourceFiber);
           sourceFiber = createClassErrorUpdate(
             nearestMountedAncestor,
             sourceFiber,
             1
           );
-          enqueueUpdate(nearestMountedAncestor, sourceFiber);
-          sourceFiber = requestEventTime();
-          nearestMountedAncestor = markUpdateLaneFromFiberToRoot(
+          nearestMountedAncestor = enqueueUpdate(
             nearestMountedAncestor,
+            sourceFiber,
             1
           );
+          sourceFiber = requestEventTime();
           null !== nearestMountedAncestor &&
             (markRootUpdated(nearestMountedAncestor, 1, sourceFiber),
             ensureRootIsScheduled(nearestMountedAncestor, sourceFiber));
@@ -8086,7 +8120,7 @@ function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
   pendingProps = createFiber(22, pendingProps, key, mode);
   pendingProps.elementType = REACT_OFFSCREEN_TYPE;
   pendingProps.lanes = lanes;
-  pendingProps.stateNode = {};
+  pendingProps.stateNode = { isHidden: !1 };
   return pendingProps;
 }
 function createFiberFromText(content, mode, lanes) {
@@ -8208,9 +8242,10 @@ function updateContainer(element, container, parentComponent, callback) {
   container.payload = { element: element };
   callback = void 0 === callback ? null : callback;
   null !== callback && (container.callback = callback);
-  enqueueUpdate(current, container);
-  element = scheduleUpdateOnFiber(current, lane, eventTime);
-  null !== element && entangleTransitions(element, current, lane);
+  element = enqueueUpdate(current, container, lane);
+  null !== element &&
+    (scheduleUpdateOnFiber(element, current, lane, eventTime),
+    entangleTransitions(element, current, lane));
   return lane;
 }
 function emptyFindFiberByHostInstance() {
@@ -8245,10 +8280,10 @@ batchedUpdatesImpl = function(fn, a) {
   }
 };
 var roots = new Map(),
-  devToolsConfig$jscomp$inline_925 = {
+  devToolsConfig$jscomp$inline_938 = {
     findFiberByHostInstance: getInstanceFromInstance,
     bundleType: 0,
-    version: "18.2.0-next-d300cebde-20220601",
+    version: "18.2.0-next-9e3b772b8-20220608",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function() {
@@ -8263,11 +8298,11 @@ var roots = new Map(),
       }.bind(null, findNodeHandle)
     }
   };
-var internals$jscomp$inline_1171 = {
-  bundleType: devToolsConfig$jscomp$inline_925.bundleType,
-  version: devToolsConfig$jscomp$inline_925.version,
-  rendererPackageName: devToolsConfig$jscomp$inline_925.rendererPackageName,
-  rendererConfig: devToolsConfig$jscomp$inline_925.rendererConfig,
+var internals$jscomp$inline_1180 = {
+  bundleType: devToolsConfig$jscomp$inline_938.bundleType,
+  version: devToolsConfig$jscomp$inline_938.version,
+  rendererPackageName: devToolsConfig$jscomp$inline_938.rendererPackageName,
+  rendererConfig: devToolsConfig$jscomp$inline_938.rendererConfig,
   overrideHookState: null,
   overrideHookStateDeletePath: null,
   overrideHookStateRenamePath: null,
@@ -8283,26 +8318,26 @@ var internals$jscomp$inline_1171 = {
     return null === fiber ? null : fiber.stateNode;
   },
   findFiberByHostInstance:
-    devToolsConfig$jscomp$inline_925.findFiberByHostInstance ||
+    devToolsConfig$jscomp$inline_938.findFiberByHostInstance ||
     emptyFindFiberByHostInstance,
   findHostInstancesForRefresh: null,
   scheduleRefresh: null,
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.2.0-next-d300cebde-20220601"
+  reconcilerVersion: "18.2.0-next-9e3b772b8-20220608"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
-  var hook$jscomp$inline_1172 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  var hook$jscomp$inline_1181 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
   if (
-    !hook$jscomp$inline_1172.isDisabled &&
-    hook$jscomp$inline_1172.supportsFiber
+    !hook$jscomp$inline_1181.isDisabled &&
+    hook$jscomp$inline_1181.supportsFiber
   )
     try {
-      (rendererID = hook$jscomp$inline_1172.inject(
-        internals$jscomp$inline_1171
+      (rendererID = hook$jscomp$inline_1181.inject(
+        internals$jscomp$inline_1180
       )),
-        (injectedHook = hook$jscomp$inline_1172);
+        (injectedHook = hook$jscomp$inline_1181);
     } catch (err) {}
 }
 exports.createPortal = function(children, containerTag) {
diff --git a/Libraries/Renderer/implementations/ReactFabric-profiling.js b/Libraries/Renderer/implementations/ReactFabric-profiling.js
index d8823b6d8e76..9ea3a0f9deb6 100644
--- a/Libraries/Renderer/implementations/ReactFabric-profiling.js
+++ b/Libraries/Renderer/implementations/ReactFabric-profiling.js
@@ -8,7 +8,7 @@
  * @nolint
  * @providesModule ReactFabric-profiling
  * @preventMunge
- * @generated SignedSource<<fd8c8eef5a1108a23d586e36861855b9>>
+ * @generated SignedSource<<1466b90312f81bedd331ce30d8d61240>>
  */
 
 
@@ -1028,7 +1028,7 @@ eventPluginOrder = Array.prototype.slice.call([
   "ReactNativeBridgeEventPlugin"
 ]);
 recomputePluginOrdering();
-var injectedNamesToPlugins$jscomp$inline_229 = {
+var injectedNamesToPlugins$jscomp$inline_234 = {
     ResponderEventPlugin: ResponderEventPlugin,
     ReactNativeBridgeEventPlugin: {
       eventTypes: {},
@@ -1074,33 +1074,33 @@ var injectedNamesToPlugins$jscomp$inline_229 = {
       }
     }
   },
-  isOrderingDirty$jscomp$inline_230 = !1,
-  pluginName$jscomp$inline_231;
-for (pluginName$jscomp$inline_231 in injectedNamesToPlugins$jscomp$inline_229)
+  isOrderingDirty$jscomp$inline_235 = !1,
+  pluginName$jscomp$inline_236;
+for (pluginName$jscomp$inline_236 in injectedNamesToPlugins$jscomp$inline_234)
   if (
-    injectedNamesToPlugins$jscomp$inline_229.hasOwnProperty(
-      pluginName$jscomp$inline_231
+    injectedNamesToPlugins$jscomp$inline_234.hasOwnProperty(
+      pluginName$jscomp$inline_236
     )
   ) {
-    var pluginModule$jscomp$inline_232 =
-      injectedNamesToPlugins$jscomp$inline_229[pluginName$jscomp$inline_231];
+    var pluginModule$jscomp$inline_237 =
+      injectedNamesToPlugins$jscomp$inline_234[pluginName$jscomp$inline_236];
     if (
-      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_231) ||
-      namesToPlugins[pluginName$jscomp$inline_231] !==
-        pluginModule$jscomp$inline_232
+      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_236) ||
+      namesToPlugins[pluginName$jscomp$inline_236] !==
+        pluginModule$jscomp$inline_237
     ) {
-      if (namesToPlugins[pluginName$jscomp$inline_231])
+      if (namesToPlugins[pluginName$jscomp$inline_236])
         throw Error(
           "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" +
-            (pluginName$jscomp$inline_231 + "`.")
+            (pluginName$jscomp$inline_236 + "`.")
         );
       namesToPlugins[
-        pluginName$jscomp$inline_231
-      ] = pluginModule$jscomp$inline_232;
-      isOrderingDirty$jscomp$inline_230 = !0;
+        pluginName$jscomp$inline_236
+      ] = pluginModule$jscomp$inline_237;
+      isOrderingDirty$jscomp$inline_235 = !0;
     }
   }
-isOrderingDirty$jscomp$inline_230 && recomputePluginOrdering();
+isOrderingDirty$jscomp$inline_235 && recomputePluginOrdering();
 function getInstanceFromInstance(instanceHandle) {
   return instanceHandle;
 }
@@ -2384,8 +2384,34 @@ function readContext(context) {
     } else lastContextDependency = lastContextDependency.next = context;
   return value;
 }
-var interleavedQueues = null,
-  hasForceUpdate = !1;
+var concurrentQueues = null;
+function pushConcurrentUpdateQueue(queue) {
+  null === concurrentQueues
+    ? (concurrentQueues = [queue])
+    : concurrentQueues.push(queue);
+}
+function enqueueConcurrentHookUpdate(fiber, queue, update, lane) {
+  var interleaved = queue.interleaved;
+  null === interleaved
+    ? ((update.next = update), pushConcurrentUpdateQueue(queue))
+    : ((update.next = interleaved.next), (interleaved.next = update));
+  queue.interleaved = update;
+  return markUpdateLaneFromFiberToRoot(fiber, lane);
+}
+function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
+  sourceFiber.lanes |= lane;
+  var alternate = sourceFiber.alternate;
+  null !== alternate && (alternate.lanes |= lane);
+  alternate = sourceFiber;
+  for (sourceFiber = sourceFiber.return; null !== sourceFiber; )
+    (sourceFiber.childLanes |= lane),
+      (alternate = sourceFiber.alternate),
+      null !== alternate && (alternate.childLanes |= lane),
+      (alternate = sourceFiber),
+      (sourceFiber = sourceFiber.return);
+  return 3 === alternate.tag ? alternate.stateNode : null;
+}
+var hasForceUpdate = !1;
 function initializeUpdateQueue(fiber) {
   fiber.updateQueue = {
     baseState: fiber.memoizedState,
@@ -2416,24 +2442,24 @@ function createUpdate(eventTime, lane) {
     next: null
   };
 }
-function enqueueUpdate(fiber, update) {
+function enqueueUpdate(fiber, update, lane) {
   var updateQueue = fiber.updateQueue;
-  null !== updateQueue &&
-    ((updateQueue = updateQueue.shared),
-    isInterleavedUpdate(fiber)
-      ? ((fiber = updateQueue.interleaved),
-        null === fiber
-          ? ((update.next = update),
-            null === interleavedQueues
-              ? (interleavedQueues = [updateQueue])
-              : interleavedQueues.push(updateQueue))
-          : ((update.next = fiber.next), (fiber.next = update)),
-        (updateQueue.interleaved = update))
-      : ((fiber = updateQueue.pending),
-        null === fiber
-          ? (update.next = update)
-          : ((update.next = fiber.next), (fiber.next = update)),
-        (updateQueue.pending = update)));
+  if (null === updateQueue) return null;
+  updateQueue = updateQueue.shared;
+  if (0 !== (executionContext & 2)) {
+    var pending = updateQueue.pending;
+    null === pending
+      ? (update.next = update)
+      : ((update.next = pending.next), (pending.next = update));
+    updateQueue.pending = update;
+    return markUpdateLaneFromFiberToRoot(fiber, lane);
+  }
+  pending = updateQueue.interleaved;
+  null === pending
+    ? ((update.next = update), pushConcurrentUpdateQueue(updateQueue))
+    : ((update.next = pending.next), (pending.next = update));
+  updateQueue.interleaved = update;
+  return markUpdateLaneFromFiberToRoot(fiber, lane);
 }
 function entangleTransitions(root, fiber, lane) {
   fiber = fiber.updateQueue;
@@ -2670,9 +2696,10 @@ var classComponentUpdater = {
       update = createUpdate(eventTime, lane);
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update);
-    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
-    null !== payload && entangleTransitions(payload, inst, lane);
+    payload = enqueueUpdate(inst, update, lane);
+    null !== payload &&
+      (scheduleUpdateOnFiber(payload, inst, lane, eventTime),
+      entangleTransitions(payload, inst, lane));
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternals;
@@ -2682,9 +2709,10 @@ var classComponentUpdater = {
     update.tag = 1;
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update);
-    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
-    null !== payload && entangleTransitions(payload, inst, lane);
+    payload = enqueueUpdate(inst, update, lane);
+    null !== payload &&
+      (scheduleUpdateOnFiber(payload, inst, lane, eventTime),
+      entangleTransitions(payload, inst, lane));
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternals;
@@ -2693,9 +2721,10 @@ var classComponentUpdater = {
       update = createUpdate(eventTime, lane);
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update);
-    callback = scheduleUpdateOnFiber(inst, lane, eventTime);
-    null !== callback && entangleTransitions(callback, inst, lane);
+    callback = enqueueUpdate(inst, update, lane);
+    null !== callback &&
+      (scheduleUpdateOnFiber(callback, inst, lane, eventTime),
+      entangleTransitions(callback, inst, lane));
   }
 };
 function checkShouldComponentUpdate(
@@ -3800,11 +3829,11 @@ function pushStoreConsistencyCheck(fiber, getSnapshot, renderedSnapshot) {
 function updateStoreInstance(fiber, inst, nextSnapshot, getSnapshot) {
   inst.value = nextSnapshot;
   inst.getSnapshot = getSnapshot;
-  checkIfSnapshotChanged(inst) && scheduleUpdateOnFiber(fiber, 1, -1);
+  checkIfSnapshotChanged(inst) && forceStoreRerender(fiber);
 }
 function subscribeToStore(fiber, inst, subscribe) {
   return subscribe(function() {
-    checkIfSnapshotChanged(inst) && scheduleUpdateOnFiber(fiber, 1, -1);
+    checkIfSnapshotChanged(inst) && forceStoreRerender(fiber);
   });
 }
 function checkIfSnapshotChanged(inst) {
@@ -3817,6 +3846,10 @@ function checkIfSnapshotChanged(inst) {
     return !0;
   }
 }
+function forceStoreRerender(fiber) {
+  var root = markUpdateLaneFromFiberToRoot(fiber, 1);
+  null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1);
+}
 function mountState(initialState) {
   var hook = mountWorkInProgressHook();
   "function" === typeof initialState && (initialState = initialState());
@@ -3987,12 +4020,15 @@ function dispatchReducerAction(fiber, queue, action) {
     eagerState: null,
     next: null
   };
-  isRenderPhaseUpdate(fiber)
-    ? enqueueRenderPhaseUpdate(queue, action)
-    : (enqueueUpdate$1(fiber, queue, action),
-      (action = requestEventTime()),
-      (fiber = scheduleUpdateOnFiber(fiber, lane, action)),
-      null !== fiber && entangleTransitionUpdate(fiber, queue, lane));
+  if (isRenderPhaseUpdate(fiber)) enqueueRenderPhaseUpdate(queue, action);
+  else if (
+    ((action = enqueueConcurrentHookUpdate(fiber, queue, action, lane)),
+    null !== action)
+  ) {
+    var eventTime = requestEventTime();
+    scheduleUpdateOnFiber(action, fiber, lane, eventTime);
+    entangleTransitionUpdate(action, queue, lane);
+  }
 }
 function dispatchSetState(fiber, queue, action) {
   var lane = requestUpdateLane(fiber),
@@ -4005,7 +4041,6 @@ function dispatchSetState(fiber, queue, action) {
     };
   if (isRenderPhaseUpdate(fiber)) enqueueRenderPhaseUpdate(queue, update);
   else {
-    enqueueUpdate$1(fiber, queue, update);
     var alternate = fiber.alternate;
     if (
       0 === fiber.lanes &&
@@ -4017,13 +4052,22 @@ function dispatchSetState(fiber, queue, action) {
           eagerState = alternate(currentState, action);
         update.hasEagerState = !0;
         update.eagerState = eagerState;
-        if (objectIs(eagerState, currentState)) return;
+        if (objectIs(eagerState, currentState)) {
+          var interleaved = queue.interleaved;
+          null === interleaved
+            ? ((update.next = update), pushConcurrentUpdateQueue(queue))
+            : ((update.next = interleaved.next), (interleaved.next = update));
+          queue.interleaved = update;
+          return;
+        }
       } catch (error) {
       } finally {
       }
-    action = requestEventTime();
-    fiber = scheduleUpdateOnFiber(fiber, lane, action);
-    null !== fiber && entangleTransitionUpdate(fiber, queue, lane);
+    action = enqueueConcurrentHookUpdate(fiber, queue, update, lane);
+    null !== action &&
+      ((update = requestEventTime()),
+      scheduleUpdateOnFiber(action, fiber, lane, update),
+      entangleTransitionUpdate(action, queue, lane));
   }
 }
 function isRenderPhaseUpdate(fiber) {
@@ -4041,22 +4085,6 @@ function enqueueRenderPhaseUpdate(queue, update) {
     : ((update.next = pending.next), (pending.next = update));
   queue.pending = update;
 }
-function enqueueUpdate$1(fiber, queue, update) {
-  isInterleavedUpdate(fiber)
-    ? ((fiber = queue.interleaved),
-      null === fiber
-        ? ((update.next = update),
-          null === interleavedQueues
-            ? (interleavedQueues = [queue])
-            : interleavedQueues.push(queue))
-        : ((update.next = fiber.next), (fiber.next = update)),
-      (queue.interleaved = update))
-    : ((fiber = queue.pending),
-      null === fiber
-        ? (update.next = update)
-        : ((update.next = fiber.next), (fiber.next = update)),
-      (queue.pending = update));
-}
 function entangleTransitionUpdate(root, queue, lane) {
   if (0 !== (lane & 4194240)) {
     var queueLanes = queue.lanes;
@@ -4310,7 +4338,7 @@ function transferActualDuration(fiber) {
   for (var child = fiber.child; child; )
     (fiber.actualDuration += child.actualDuration), (child = child.sibling);
 }
-function createCapturedValue(value, source) {
+function createCapturedValueAtFiber(value, source) {
   try {
     var info = "",
       node = source;
@@ -4321,7 +4349,20 @@ function createCapturedValue(value, source) {
     JSCompiler_inline_result =
       "\nError generating stack: " + x.message + "\n" + x.stack;
   }
-  return { value: value, source: source, stack: JSCompiler_inline_result };
+  return {
+    value: value,
+    source: source,
+    stack: JSCompiler_inline_result,
+    digest: null
+  };
+}
+function createCapturedValue(value, digest, stack) {
+  return {
+    value: value,
+    source: null,
+    stack: null != stack ? stack : null,
+    digest: null != digest ? digest : null
+  };
 }
 if (
   "function" !==
@@ -5062,13 +5103,16 @@ function updateDehydratedSuspenseComponent(
     if (workInProgress.flags & 256)
       return (
         (workInProgress.flags &= -257),
+        (suspenseState = createCapturedValue(
+          Error(
+            "There was an error while hydrating this Suspense boundary. Switched to client rendering."
+          )
+        )),
         retrySuspenseComponentWithoutHydrating(
           current,
           workInProgress,
           renderLanes,
-          Error(
-            "There was an error while hydrating this Suspense boundary. Switched to client rendering."
-          )
+          suspenseState
         )
       );
     if (null !== workInProgress.memoizedState)
@@ -5113,16 +5157,19 @@ function updateDehydratedSuspenseComponent(
     );
   if (shim$1())
     return (
-      (suspenseState = shim$1().errorMessage),
+      (suspenseState = shim$1().digest),
+      (suspenseState = createCapturedValue(
+        Error(
+          "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering."
+        ),
+        suspenseState,
+        void 0
+      )),
       retrySuspenseComponentWithoutHydrating(
         current,
         workInProgress,
         renderLanes,
         suspenseState
-          ? Error(suspenseState)
-          : Error(
-              "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering."
-            )
       )
     );
   didSuspend = 0 !== (renderLanes & current.childLanes);
@@ -5165,23 +5212,27 @@ function updateDehydratedSuspenseComponent(
         default:
           didSuspend = 0;
       }
-      nextProps =
+      didSuspend =
         0 !== (didSuspend & (nextProps.suspendedLanes | renderLanes))
           ? 0
           : didSuspend;
-      0 !== nextProps &&
-        nextProps !== suspenseState.retryLane &&
-        ((suspenseState.retryLane = nextProps),
-        scheduleUpdateOnFiber(current, nextProps, -1));
+      0 !== didSuspend &&
+        didSuspend !== suspenseState.retryLane &&
+        ((suspenseState.retryLane = didSuspend),
+        markUpdateLaneFromFiberToRoot(current, didSuspend),
+        scheduleUpdateOnFiber(nextProps, current, didSuspend, -1));
     }
     renderDidSuspendDelayIfPossible();
+    suspenseState = createCapturedValue(
+      Error(
+        "This Suspense boundary received an update before it finished hydrating. This caused the boundary to switch to client rendering. The usual way to fix this is to wrap the original update in startTransition."
+      )
+    );
     return retrySuspenseComponentWithoutHydrating(
       current,
       workInProgress,
       renderLanes,
-      Error(
-        "This Suspense boundary received an update before it finished hydrating. This caused the boundary to switch to client rendering. The usual way to fix this is to wrap the original update in startTransition."
-      )
+      suspenseState
     );
   }
   if (shim$1())
@@ -5590,14 +5641,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
       break;
     case "collapsed":
       lastTailNode = renderState.tail;
-      for (var lastTailNode$63 = null; null !== lastTailNode; )
-        null !== lastTailNode.alternate && (lastTailNode$63 = lastTailNode),
+      for (var lastTailNode$65 = null; null !== lastTailNode; )
+        null !== lastTailNode.alternate && (lastTailNode$65 = lastTailNode),
           (lastTailNode = lastTailNode.sibling);
-      null === lastTailNode$63
+      null === lastTailNode$65
         ? hasRenderedATailFallback || null === renderState.tail
           ? (renderState.tail = null)
           : (renderState.tail.sibling = null)
-        : (lastTailNode$63.sibling = null);
+        : (lastTailNode$65.sibling = null);
   }
 }
 function bubbleProperties(completedWork) {
@@ -5609,53 +5660,53 @@ function bubbleProperties(completedWork) {
   if (didBailout)
     if (0 !== (completedWork.mode & 2)) {
       for (
-        var treeBaseDuration$65 = completedWork.selfBaseDuration,
-          child$66 = completedWork.child;
-        null !== child$66;
+        var treeBaseDuration$67 = completedWork.selfBaseDuration,
+          child$68 = completedWork.child;
+        null !== child$68;
 
       )
-        (newChildLanes |= child$66.lanes | child$66.childLanes),
-          (subtreeFlags |= child$66.subtreeFlags & 14680064),
-          (subtreeFlags |= child$66.flags & 14680064),
-          (treeBaseDuration$65 += child$66.treeBaseDuration),
-          (child$66 = child$66.sibling);
-      completedWork.treeBaseDuration = treeBaseDuration$65;
+        (newChildLanes |= child$68.lanes | child$68.childLanes),
+          (subtreeFlags |= child$68.subtreeFlags & 14680064),
+          (subtreeFlags |= child$68.flags & 14680064),
+          (treeBaseDuration$67 += child$68.treeBaseDuration),
+          (child$68 = child$68.sibling);
+      completedWork.treeBaseDuration = treeBaseDuration$67;
     } else
       for (
-        treeBaseDuration$65 = completedWork.child;
-        null !== treeBaseDuration$65;
+        treeBaseDuration$67 = completedWork.child;
+        null !== treeBaseDuration$67;
 
       )
         (newChildLanes |=
-          treeBaseDuration$65.lanes | treeBaseDuration$65.childLanes),
-          (subtreeFlags |= treeBaseDuration$65.subtreeFlags & 14680064),
-          (subtreeFlags |= treeBaseDuration$65.flags & 14680064),
-          (treeBaseDuration$65.return = completedWork),
-          (treeBaseDuration$65 = treeBaseDuration$65.sibling);
+          treeBaseDuration$67.lanes | treeBaseDuration$67.childLanes),
+          (subtreeFlags |= treeBaseDuration$67.subtreeFlags & 14680064),
+          (subtreeFlags |= treeBaseDuration$67.flags & 14680064),
+          (treeBaseDuration$67.return = completedWork),
+          (treeBaseDuration$67 = treeBaseDuration$67.sibling);
   else if (0 !== (completedWork.mode & 2)) {
-    treeBaseDuration$65 = completedWork.actualDuration;
-    child$66 = completedWork.selfBaseDuration;
+    treeBaseDuration$67 = completedWork.actualDuration;
+    child$68 = completedWork.selfBaseDuration;
     for (var child = completedWork.child; null !== child; )
       (newChildLanes |= child.lanes | child.childLanes),
         (subtreeFlags |= child.subtreeFlags),
         (subtreeFlags |= child.flags),
-        (treeBaseDuration$65 += child.actualDuration),
-        (child$66 += child.treeBaseDuration),
+        (treeBaseDuration$67 += child.actualDuration),
+        (child$68 += child.treeBaseDuration),
         (child = child.sibling);
-    completedWork.actualDuration = treeBaseDuration$65;
-    completedWork.treeBaseDuration = child$66;
+    completedWork.actualDuration = treeBaseDuration$67;
+    completedWork.treeBaseDuration = child$68;
   } else
     for (
-      treeBaseDuration$65 = completedWork.child;
-      null !== treeBaseDuration$65;
+      treeBaseDuration$67 = completedWork.child;
+      null !== treeBaseDuration$67;
 
     )
       (newChildLanes |=
-        treeBaseDuration$65.lanes | treeBaseDuration$65.childLanes),
-        (subtreeFlags |= treeBaseDuration$65.subtreeFlags),
-        (subtreeFlags |= treeBaseDuration$65.flags),
-        (treeBaseDuration$65.return = completedWork),
-        (treeBaseDuration$65 = treeBaseDuration$65.sibling);
+        treeBaseDuration$67.lanes | treeBaseDuration$67.childLanes),
+        (subtreeFlags |= treeBaseDuration$67.subtreeFlags),
+        (subtreeFlags |= treeBaseDuration$67.flags),
+        (treeBaseDuration$67.return = completedWork),
+        (treeBaseDuration$67 = treeBaseDuration$67.sibling);
   completedWork.subtreeFlags |= subtreeFlags;
   completedWork.childLanes = newChildLanes;
   return didBailout;
@@ -6180,8 +6231,8 @@ function commitHookEffectListMount(flags, finishedWork) {
     var effect = (finishedWork = finishedWork.next);
     do {
       if ((effect.tag & flags) === flags) {
-        var create$81 = effect.create;
-        effect.destroy = create$81();
+        var create$83 = effect.create;
+        effect.destroy = create$83();
       }
       effect = effect.next;
     } while (effect !== finishedWork);
@@ -6397,22 +6448,22 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
           try {
             startLayoutEffectTimer(),
               commitHookEffectListUnmount(5, finishedWork, finishedWork.return);
-          } catch (error$87) {
+          } catch (error$89) {
             captureCommitPhaseError(
               finishedWork,
               finishedWork.return,
-              error$87
+              error$89
             );
           }
           recordLayoutEffectDuration(finishedWork);
         } else
           try {
             commitHookEffectListUnmount(5, finishedWork, finishedWork.return);
-          } catch (error$88) {
+          } catch (error$90) {
             captureCommitPhaseError(
               finishedWork,
               finishedWork.return,
-              error$88
+              error$90
             );
           }
       }
@@ -6448,14 +6499,18 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
       commitReconciliationEffects(finishedWork);
       root = finishedWork.child;
       root.flags & 8192 &&
-        null !== root.memoizedState &&
-        (null === root.alternate || null === root.alternate.memoizedState) &&
-        (globalMostRecentFallbackTime = now());
+        ((current = null !== root.memoizedState),
+        (root.stateNode.isHidden = current),
+        !current ||
+          (null !== root.alternate && null !== root.alternate.memoizedState) ||
+          (globalMostRecentFallbackTime = now()));
       flags & 4 && attachSuspenseRetryListeners(finishedWork);
       break;
     case 22:
       recursivelyTraverseMutationEffects(root, finishedWork);
       commitReconciliationEffects(finishedWork);
+      flags & 8192 &&
+        (finishedWork.stateNode.isHidden = null !== finishedWork.memoizedState);
       break;
     case 19:
       recursivelyTraverseMutationEffects(root, finishedWork);
@@ -6548,22 +6603,22 @@ function commitLayoutEffects(finishedWork, root, committedLanes) {
                     commitUpdateQueue(committedLanes, updateQueue, instance);
                   break;
                 case 3:
-                  var updateQueue$83 = committedLanes.updateQueue;
-                  if (null !== updateQueue$83) {
-                    var instance$84 = null;
+                  var updateQueue$85 = committedLanes.updateQueue;
+                  if (null !== updateQueue$85) {
+                    var instance$86 = null;
                     if (null !== committedLanes.child)
                       switch (committedLanes.child.tag) {
                         case 5:
-                          instance$84 =
+                          instance$86 =
                             committedLanes.child.stateNode.canonical;
                           break;
                         case 1:
-                          instance$84 = committedLanes.child.stateNode;
+                          instance$86 = committedLanes.child.stateNode;
                       }
                     commitUpdateQueue(
                       committedLanes,
-                      updateQueue$83,
-                      instance$84
+                      updateQueue$85,
+                      instance$86
                     );
                   }
                   break;
@@ -6582,7 +6637,7 @@ function commitLayoutEffects(finishedWork, root, committedLanes) {
                     onCommit = _finishedWork$memoize2.onCommit,
                     onRender = _finishedWork$memoize2.onRender,
                     effectDuration = committedLanes.stateNode.effectDuration;
-                  instance$84 = commitTime;
+                  instance$86 = commitTime;
                   current = null === current ? "mount" : "update";
                   currentUpdateIsNested && (current = "nested-update");
                   "function" === typeof onRender &&
@@ -6592,14 +6647,14 @@ function commitLayoutEffects(finishedWork, root, committedLanes) {
                       committedLanes.actualDuration,
                       committedLanes.treeBaseDuration,
                       committedLanes.actualStartTime,
-                      instance$84
+                      instance$86
                     );
                   "function" === typeof onCommit &&
                     onCommit(
                       committedLanes.memoizedProps.id,
                       current,
                       effectDuration,
-                      instance$84
+                      instance$86
                     );
                   enqueuePendingPassiveProfilerEffect(committedLanes);
                   var parentFiber = committedLanes.return;
@@ -6630,27 +6685,27 @@ function commitLayoutEffects(finishedWork, root, committedLanes) {
                   );
               }
             if (committedLanes.flags & 512) {
-              instance$84 = void 0;
+              instance$86 = void 0;
               current = committedLanes;
               var ref = current.ref;
               if (null !== ref) {
                 var instance$jscomp$0 = current.stateNode;
                 switch (current.tag) {
                   case 5:
-                    instance$84 = instance$jscomp$0.canonical;
+                    instance$86 = instance$jscomp$0.canonical;
                     break;
                   default:
-                    instance$84 = instance$jscomp$0;
+                    instance$86 = instance$jscomp$0;
                 }
                 if ("function" === typeof ref)
                   if (current.mode & 2)
                     try {
-                      startLayoutEffectTimer(), ref(instance$84);
+                      startLayoutEffectTimer(), ref(instance$86);
                     } finally {
                       recordLayoutEffectDuration(current);
                     }
-                  else ref(instance$84);
-                else ref.current = instance$84;
+                  else ref(instance$86);
+                else ref.current = instance$86;
               }
             }
           } catch (error) {
@@ -6665,10 +6720,10 @@ function commitLayoutEffects(finishedWork, root, committedLanes) {
           nextEffect = null;
           break;
         }
-        instance$84 = committedLanes.sibling;
-        if (null !== instance$84) {
-          instance$84.return = committedLanes.return;
-          nextEffect = instance$84;
+        instance$86 = committedLanes.sibling;
+        if (null !== instance$86) {
+          instance$86.return = committedLanes.return;
+          nextEffect = instance$86;
           break;
         }
         nextEffect = committedLanes.return;
@@ -6739,15 +6794,13 @@ function requestUpdateLane(fiber) {
     }
   return fiber;
 }
-function scheduleUpdateOnFiber(fiber, lane, eventTime) {
+function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
   if (50 < nestedUpdateCount)
     throw ((nestedUpdateCount = 0),
     (rootWithNestedUpdates = null),
     Error(
       "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
     ));
-  var root = markUpdateLaneFromFiberToRoot(fiber, lane);
-  if (null === root) return null;
   markRootUpdated(root, lane, eventTime);
   if (0 === (executionContext & 2) || root !== workInProgressRoot)
     isDevToolsPresent && addFiberToLanesMap(root, fiber, lane),
@@ -6762,27 +6815,6 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
         0 === (fiber.mode & 1) &&
         ((workInProgressRootRenderTargetTime = now() + 500),
         includesLegacySyncCallbacks && flushSyncCallbacks());
-  return root;
-}
-function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
-  sourceFiber.lanes |= lane;
-  var alternate = sourceFiber.alternate;
-  null !== alternate && (alternate.lanes |= lane);
-  alternate = sourceFiber;
-  for (sourceFiber = sourceFiber.return; null !== sourceFiber; )
-    (sourceFiber.childLanes |= lane),
-      (alternate = sourceFiber.alternate),
-      null !== alternate && (alternate.childLanes |= lane),
-      (alternate = sourceFiber),
-      (sourceFiber = sourceFiber.return);
-  return 3 === alternate.tag ? alternate.stateNode : null;
-}
-function isInterleavedUpdate(fiber) {
-  return (
-    (null !== workInProgressRoot || null !== interleavedQueues) &&
-    0 !== (fiber.mode & 1) &&
-    0 === (executionContext & 2)
-  );
 }
 function ensureRootIsScheduled(root, currentTime) {
   for (
@@ -7198,10 +7230,10 @@ function prepareFreshStack(root, lanes) {
   workInProgressRootFatalError = null;
   workInProgressRootPingedLanes = workInProgressRootInterleavedUpdatedLanes = workInProgressRootSkippedLanes = 0;
   workInProgressRootRecoverableErrors = workInProgressRootConcurrentErrors = null;
-  if (null !== interleavedQueues) {
-    for (lanes = 0; lanes < interleavedQueues.length; lanes++)
+  if (null !== concurrentQueues) {
+    for (lanes = 0; lanes < concurrentQueues.length; lanes++)
       if (
-        ((timeoutHandle = interleavedQueues[lanes]),
+        ((timeoutHandle = concurrentQueues[lanes]),
         (interruptedWork = timeoutHandle.interleaved),
         null !== interruptedWork)
       ) {
@@ -7215,7 +7247,7 @@ function prepareFreshStack(root, lanes) {
         }
         timeoutHandle.pending = interruptedWork;
       }
-    interleavedQueues = null;
+    concurrentQueues = null;
   }
   return root;
 }
@@ -7314,7 +7346,7 @@ function handleError(root$jscomp$0, thrownValue) {
                   else {
                     var update = createUpdate(-1, 1);
                     update.tag = 2;
-                    enqueueUpdate(sourceFiber, update);
+                    enqueueUpdate(sourceFiber, update, 1);
                   }
                 sourceFiber.lanes |= 1;
               }
@@ -7341,13 +7373,12 @@ function handleError(root$jscomp$0, thrownValue) {
             );
           }
         }
-        root = value;
+        root = value = createCapturedValueAtFiber(value, sourceFiber);
         4 !== workInProgressRootExitStatus &&
           (workInProgressRootExitStatus = 2);
         null === workInProgressRootConcurrentErrors
           ? (workInProgressRootConcurrentErrors = [root])
           : workInProgressRootConcurrentErrors.push(root);
-        value = createCapturedValue(value, sourceFiber);
         root = returnFiber;
         do {
           switch (root.tag) {
@@ -7611,7 +7642,11 @@ function commitRootImpl(
       transitions < recoverableErrors.length;
       transitions++
     )
-      renderPriorityLevel(recoverableErrors[transitions]);
+      (lanes = recoverableErrors[transitions]),
+        renderPriorityLevel(lanes.value, {
+          componentStack: lanes.stack,
+          digest: lanes.digest
+        });
   if (hasUncaughtError)
     throw ((hasUncaughtError = !1),
     (root = firstUncaughtError),
@@ -7841,11 +7876,10 @@ function enqueuePendingPassiveProfilerEffect(fiber) {
     }));
 }
 function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
-  sourceFiber = createCapturedValue(error, sourceFiber);
+  sourceFiber = createCapturedValueAtFiber(error, sourceFiber);
   sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1);
-  enqueueUpdate(rootFiber, sourceFiber);
+  rootFiber = enqueueUpdate(rootFiber, sourceFiber, 1);
   sourceFiber = requestEventTime();
-  rootFiber = markUpdateLaneFromFiberToRoot(rootFiber, 1);
   null !== rootFiber &&
     (markRootUpdated(rootFiber, 1, sourceFiber),
     ensureRootIsScheduled(rootFiber, sourceFiber));
@@ -7875,18 +7909,18 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
             (null === legacyErrorBoundariesThatAlreadyFailed ||
               !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
         ) {
-          sourceFiber = createCapturedValue(error, sourceFiber);
+          sourceFiber = createCapturedValueAtFiber(error, sourceFiber);
           sourceFiber = createClassErrorUpdate(
             nearestMountedAncestor,
             sourceFiber,
             1
           );
-          enqueueUpdate(nearestMountedAncestor, sourceFiber);
-          sourceFiber = requestEventTime();
-          nearestMountedAncestor = markUpdateLaneFromFiberToRoot(
+          nearestMountedAncestor = enqueueUpdate(
             nearestMountedAncestor,
+            sourceFiber,
             1
           );
+          sourceFiber = requestEventTime();
           null !== nearestMountedAncestor &&
             (markRootUpdated(nearestMountedAncestor, 1, sourceFiber),
             ensureRootIsScheduled(nearestMountedAncestor, sourceFiber));
@@ -8559,7 +8593,7 @@ function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
   pendingProps = createFiber(22, pendingProps, key, mode);
   pendingProps.elementType = REACT_OFFSCREEN_TYPE;
   pendingProps.lanes = lanes;
-  pendingProps.stateNode = {};
+  pendingProps.stateNode = { isHidden: !1 };
   return pendingProps;
 }
 function createFiberFromText(content, mode, lanes) {
@@ -8685,9 +8719,10 @@ function updateContainer(element, container, parentComponent, callback) {
   container.payload = { element: element };
   callback = void 0 === callback ? null : callback;
   null !== callback && (container.callback = callback);
-  enqueueUpdate(current, container);
-  element = scheduleUpdateOnFiber(current, lane, eventTime);
-  null !== element && entangleTransitions(element, current, lane);
+  element = enqueueUpdate(current, container, lane);
+  null !== element &&
+    (scheduleUpdateOnFiber(element, current, lane, eventTime),
+    entangleTransitions(element, current, lane));
   return lane;
 }
 function emptyFindFiberByHostInstance() {
@@ -8722,10 +8757,10 @@ batchedUpdatesImpl = function(fn, a) {
   }
 };
 var roots = new Map(),
-  devToolsConfig$jscomp$inline_968 = {
+  devToolsConfig$jscomp$inline_981 = {
     findFiberByHostInstance: getInstanceFromInstance,
     bundleType: 0,
-    version: "18.2.0-next-d300cebde-20220601",
+    version: "18.2.0-next-9e3b772b8-20220608",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function() {
@@ -8740,11 +8775,11 @@ var roots = new Map(),
       }.bind(null, findNodeHandle)
     }
   };
-var internals$jscomp$inline_1234 = {
-  bundleType: devToolsConfig$jscomp$inline_968.bundleType,
-  version: devToolsConfig$jscomp$inline_968.version,
-  rendererPackageName: devToolsConfig$jscomp$inline_968.rendererPackageName,
-  rendererConfig: devToolsConfig$jscomp$inline_968.rendererConfig,
+var internals$jscomp$inline_1243 = {
+  bundleType: devToolsConfig$jscomp$inline_981.bundleType,
+  version: devToolsConfig$jscomp$inline_981.version,
+  rendererPackageName: devToolsConfig$jscomp$inline_981.rendererPackageName,
+  rendererConfig: devToolsConfig$jscomp$inline_981.rendererConfig,
   overrideHookState: null,
   overrideHookStateDeletePath: null,
   overrideHookStateRenamePath: null,
@@ -8760,26 +8795,26 @@ var internals$jscomp$inline_1234 = {
     return null === fiber ? null : fiber.stateNode;
   },
   findFiberByHostInstance:
-    devToolsConfig$jscomp$inline_968.findFiberByHostInstance ||
+    devToolsConfig$jscomp$inline_981.findFiberByHostInstance ||
     emptyFindFiberByHostInstance,
   findHostInstancesForRefresh: null,
   scheduleRefresh: null,
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.2.0-next-d300cebde-20220601"
+  reconcilerVersion: "18.2.0-next-9e3b772b8-20220608"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
-  var hook$jscomp$inline_1235 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  var hook$jscomp$inline_1244 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
   if (
-    !hook$jscomp$inline_1235.isDisabled &&
-    hook$jscomp$inline_1235.supportsFiber
+    !hook$jscomp$inline_1244.isDisabled &&
+    hook$jscomp$inline_1244.supportsFiber
   )
     try {
-      (rendererID = hook$jscomp$inline_1235.inject(
-        internals$jscomp$inline_1234
+      (rendererID = hook$jscomp$inline_1244.inject(
+        internals$jscomp$inline_1243
       )),
-        (injectedHook = hook$jscomp$inline_1235);
+        (injectedHook = hook$jscomp$inline_1244);
     } catch (err) {}
 }
 exports.createPortal = function(children, containerTag) {
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js b/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js
index 18a204692a60..6c7116eae438 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js
@@ -8,7 +8,7 @@
  * @nolint
  * @providesModule ReactNativeRenderer-dev
  * @preventMunge
- * @generated SignedSource<<8a3af3b821da6ecad0d3cd1faee60e8f>>
+ * @generated SignedSource<<bfa2bf0648000d40e0e1b109070049f6>>
  */
 
 'use strict';
@@ -7326,30 +7326,27 @@ function readContext(context) {
   return value;
 }
 
-// An array of all update queues that received updates during the current
 // render. When this render exits, either because it finishes or because it is
 // interrupted, the interleaved updates will be transferred onto the main part
 // of the queue.
-var interleavedQueues = null;
-function pushInterleavedQueue(queue) {
-  if (interleavedQueues === null) {
-    interleavedQueues = [queue];
+
+var concurrentQueues = null;
+function pushConcurrentUpdateQueue(queue) {
+  if (concurrentQueues === null) {
+    concurrentQueues = [queue];
   } else {
-    interleavedQueues.push(queue);
+    concurrentQueues.push(queue);
   }
 }
-function hasInterleavedUpdates() {
-  return interleavedQueues !== null;
-}
-function enqueueInterleavedUpdates() {
+function finishQueueingConcurrentUpdates() {
   // Transfer the interleaved updates onto the main queue. Each queue has a
   // `pending` field and an `interleaved` field. When they are not null, they
   // point to the last node in a circular linked list. We need to append the
   // interleaved list to the end of the pending list by joining them into a
   // single, circular list.
-  if (interleavedQueues !== null) {
-    for (var i = 0; i < interleavedQueues.length; i++) {
-      var queue = interleavedQueues[i];
+  if (concurrentQueues !== null) {
+    for (var i = 0; i < concurrentQueues.length; i++) {
+      var queue = concurrentQueues[i];
       var lastInterleavedUpdate = queue.interleaved;
 
       if (lastInterleavedUpdate !== null) {
@@ -7367,7 +7364,115 @@ function enqueueInterleavedUpdates() {
       }
     }
 
-    interleavedQueues = null;
+    concurrentQueues = null;
+  }
+}
+function enqueueConcurrentHookUpdate(fiber, queue, update, lane) {
+  var interleaved = queue.interleaved;
+
+  if (interleaved === null) {
+    // This is the first update. Create a circular list.
+    update.next = update; // At the end of the current render, this queue's interleaved updates will
+    // be transferred to the pending queue.
+
+    pushConcurrentUpdateQueue(queue);
+  } else {
+    update.next = interleaved.next;
+    interleaved.next = update;
+  }
+
+  queue.interleaved = update;
+  return markUpdateLaneFromFiberToRoot(fiber, lane);
+}
+function enqueueConcurrentHookUpdateAndEagerlyBailout(
+  fiber,
+  queue,
+  update,
+  lane
+) {
+  var interleaved = queue.interleaved;
+
+  if (interleaved === null) {
+    // This is the first update. Create a circular list.
+    update.next = update; // At the end of the current render, this queue's interleaved updates will
+    // be transferred to the pending queue.
+
+    pushConcurrentUpdateQueue(queue);
+  } else {
+    update.next = interleaved.next;
+    interleaved.next = update;
+  }
+
+  queue.interleaved = update;
+}
+function enqueueConcurrentClassUpdate(fiber, queue, update, lane) {
+  var interleaved = queue.interleaved;
+
+  if (interleaved === null) {
+    // This is the first update. Create a circular list.
+    update.next = update; // At the end of the current render, this queue's interleaved updates will
+    // be transferred to the pending queue.
+
+    pushConcurrentUpdateQueue(queue);
+  } else {
+    update.next = interleaved.next;
+    interleaved.next = update;
+  }
+
+  queue.interleaved = update;
+  return markUpdateLaneFromFiberToRoot(fiber, lane);
+}
+function enqueueConcurrentRenderForLane(fiber, lane) {
+  return markUpdateLaneFromFiberToRoot(fiber, lane);
+} // Calling this function outside this module should only be done for backwards
+// compatibility and should always be accompanied by a warning.
+
+var unsafe_markUpdateLaneFromFiberToRoot = markUpdateLaneFromFiberToRoot;
+
+function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
+  // Update the source fiber's lanes
+  sourceFiber.lanes = mergeLanes(sourceFiber.lanes, lane);
+  var alternate = sourceFiber.alternate;
+
+  if (alternate !== null) {
+    alternate.lanes = mergeLanes(alternate.lanes, lane);
+  }
+
+  {
+    if (
+      alternate === null &&
+      (sourceFiber.flags & (Placement | Hydrating)) !== NoFlags
+    ) {
+      warnAboutUpdateOnNotYetMountedFiberInDEV(sourceFiber);
+    }
+  } // Walk the parent path to the root and update the child lanes.
+
+  var node = sourceFiber;
+  var parent = sourceFiber.return;
+
+  while (parent !== null) {
+    parent.childLanes = mergeLanes(parent.childLanes, lane);
+    alternate = parent.alternate;
+
+    if (alternate !== null) {
+      alternate.childLanes = mergeLanes(alternate.childLanes, lane);
+    } else {
+      {
+        if ((parent.flags & (Placement | Hydrating)) !== NoFlags) {
+          warnAboutUpdateOnNotYetMountedFiberInDEV(sourceFiber);
+        }
+      }
+    }
+
+    node = parent;
+    parent = parent.return;
+  }
+
+  if (node.tag === HostRoot) {
+    var root = node.stateNode;
+    return root;
+  } else {
+    return null;
   }
 }
 
@@ -7433,40 +7538,11 @@ function enqueueUpdate(fiber, update, lane) {
 
   if (updateQueue === null) {
     // Only occurs if the fiber has been unmounted.
-    return;
+    return null;
   }
 
   var sharedQueue = updateQueue.shared;
 
-  if (isInterleavedUpdate(fiber)) {
-    var interleaved = sharedQueue.interleaved;
-
-    if (interleaved === null) {
-      // This is the first update. Create a circular list.
-      update.next = update; // At the end of the current render, this queue's interleaved updates will
-      // be transferred to the pending queue.
-
-      pushInterleavedQueue(sharedQueue);
-    } else {
-      update.next = interleaved.next;
-      interleaved.next = update;
-    }
-
-    sharedQueue.interleaved = update;
-  } else {
-    var pending = sharedQueue.pending;
-
-    if (pending === null) {
-      // This is the first update. Create a circular list.
-      update.next = update;
-    } else {
-      update.next = pending.next;
-      pending.next = update;
-    }
-
-    sharedQueue.pending = update;
-  }
-
   {
     if (
       currentlyProcessingQueue === sharedQueue &&
@@ -7482,6 +7558,29 @@ function enqueueUpdate(fiber, update, lane) {
       didWarnUpdateInsideUpdate = true;
     }
   }
+
+  if (isUnsafeClassRenderPhaseUpdate()) {
+    // This is an unsafe render phase update. Add directly to the update
+    // queue so we can process it immediately during the current render.
+    var pending = sharedQueue.pending;
+
+    if (pending === null) {
+      // This is the first update. Create a circular list.
+      update.next = update;
+    } else {
+      update.next = pending.next;
+      pending.next = update;
+    }
+
+    sharedQueue.pending = update; // Update the childLanes even though we're most likely already rendering
+    // this fiber. This is for backwards compatibility in the case where you
+    // update a different component during render phase than the one that is
+    // currently renderings (a pattern that is accompanied by a warning).
+
+    return unsafe_markUpdateLaneFromFiberToRoot(fiber, lane);
+  } else {
+    return enqueueConcurrentClassUpdate(fiber, sharedQueue, update, lane);
+  }
 }
 function entangleTransitions(root, fiber, lane) {
   var updateQueue = fiber.updateQueue;
@@ -8018,10 +8117,10 @@ var classComponentUpdater = {
       update.callback = callback;
     }
 
-    enqueueUpdate(fiber, update);
-    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = enqueueUpdate(fiber, update, lane);
 
     if (root !== null) {
+      scheduleUpdateOnFiber(root, fiber, lane, eventTime);
       entangleTransitions(root, fiber, lane);
     }
   },
@@ -8041,10 +8140,10 @@ var classComponentUpdater = {
       update.callback = callback;
     }
 
-    enqueueUpdate(fiber, update);
-    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = enqueueUpdate(fiber, update, lane);
 
     if (root !== null) {
+      scheduleUpdateOnFiber(root, fiber, lane, eventTime);
       entangleTransitions(root, fiber, lane);
     }
   },
@@ -8063,10 +8162,10 @@ var classComponentUpdater = {
       update.callback = callback;
     }
 
-    enqueueUpdate(fiber, update);
-    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = enqueueUpdate(fiber, update, lane);
 
     if (root !== null) {
+      scheduleUpdateOnFiber(root, fiber, lane, eventTime);
       entangleTransitions(root, fiber, lane);
     }
   }
@@ -11447,7 +11546,11 @@ function checkIfSnapshotChanged(inst) {
 }
 
 function forceStoreRerender(fiber) {
-  scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+  var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+  if (root !== null) {
+    scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+  }
 }
 
 function mountState(initialState) {
@@ -11933,11 +12036,11 @@ function dispatchReducerAction(fiber, queue, action) {
   if (isRenderPhaseUpdate(fiber)) {
     enqueueRenderPhaseUpdate(queue, update);
   } else {
-    enqueueUpdate$1(fiber, queue, update);
-    var eventTime = requestEventTime();
-    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = enqueueConcurrentHookUpdate(fiber, queue, update, lane);
 
     if (root !== null) {
+      var eventTime = requestEventTime();
+      scheduleUpdateOnFiber(root, fiber, lane, eventTime);
       entangleTransitionUpdate(root, queue, lane);
     }
   }
@@ -11966,7 +12069,6 @@ function dispatchSetState(fiber, queue, action) {
   if (isRenderPhaseUpdate(fiber)) {
     enqueueRenderPhaseUpdate(queue, update);
   } else {
-    enqueueUpdate$1(fiber, queue, update);
     var alternate = fiber.alternate;
 
     if (
@@ -12001,6 +12103,13 @@ function dispatchSetState(fiber, queue, action) {
             // It's still possible that we'll need to rebase this update later,
             // if the component re-renders for a different reason and by that
             // time the reducer has changed.
+            // TODO: Do we still need to entangle transitions in this case?
+            enqueueConcurrentHookUpdateAndEagerlyBailout(
+              fiber,
+              queue,
+              update,
+              lane
+            );
             return;
           }
         } catch (error) {
@@ -12013,10 +12122,11 @@ function dispatchSetState(fiber, queue, action) {
       }
     }
 
-    var eventTime = requestEventTime();
-    var root = scheduleUpdateOnFiber(fiber, lane, eventTime);
+    var root = enqueueConcurrentHookUpdate(fiber, queue, update, lane);
 
     if (root !== null) {
+      var eventTime = requestEventTime();
+      scheduleUpdateOnFiber(root, fiber, lane, eventTime);
       entangleTransitionUpdate(root, queue, lane);
     }
   }
@@ -12046,38 +12156,7 @@ function enqueueRenderPhaseUpdate(queue, update) {
   }
 
   queue.pending = update;
-}
-
-function enqueueUpdate$1(fiber, queue, update, lane) {
-  if (isInterleavedUpdate(fiber)) {
-    var interleaved = queue.interleaved;
-
-    if (interleaved === null) {
-      // This is the first update. Create a circular list.
-      update.next = update; // At the end of the current render, this queue's interleaved updates will
-      // be transferred to the pending queue.
-
-      pushInterleavedQueue(queue);
-    } else {
-      update.next = interleaved.next;
-      interleaved.next = update;
-    }
-
-    queue.interleaved = update;
-  } else {
-    var pending = queue.pending;
-
-    if (pending === null) {
-      // This is the first update. Create a circular list.
-      update.next = update;
-    } else {
-      update.next = pending.next;
-      pending.next = update;
-    }
-
-    queue.pending = update;
-  }
-}
+} // TODO: Move to ReactFiberConcurrentUpdates?
 
 function entangleTransitionUpdate(root, queue, lane) {
   if (isTransitionLane(lane)) {
@@ -13125,13 +13204,22 @@ function transferActualDuration(fiber) {
   }
 }
 
-function createCapturedValue(value, source) {
+function createCapturedValueAtFiber(value, source) {
   // If the value is an error, call this function immediately after it is thrown
   // so the stack is accurate.
   return {
     value: value,
     source: source,
-    stack: getStackByFiberInDevAndProd(source)
+    stack: getStackByFiberInDevAndProd(source),
+    digest: null
+  };
+}
+function createCapturedValue(value, digest, stack) {
+  return {
+    value: value,
+    source: null,
+    stack: stack != null ? stack : null,
+    digest: digest != null ? digest : null
   };
 }
 
@@ -13487,7 +13575,7 @@ function markSuspenseBoundaryShouldCapture(
           // prevent a bail out.
           var update = createUpdate(NoTimestamp, SyncLane);
           update.tag = ForceUpdate;
-          enqueueUpdate(sourceFiber, update);
+          enqueueUpdate(sourceFiber, update, SyncLane);
         }
       } // The source fiber did not complete. Mark it with Sync priority to
       // indicate that it still has pending work.
@@ -13617,12 +13705,13 @@ function throwException(
 
       value = uncaughtSuspenseError;
     }
-  } // We didn't find a boundary that could handle this type of exception. Start
+  }
+
+  value = createCapturedValueAtFiber(value, sourceFiber);
+  renderDidError(value); // We didn't find a boundary that could handle this type of exception. Start
   // over and traverse parent path again, this time treating the exception
   // as an error.
 
-  renderDidError(value);
-  value = createCapturedValue(value, sourceFiber);
   var workInProgress = returnFiber;
 
   do {
@@ -14260,7 +14349,7 @@ function updateClassComponent(
 
         var update = createClassErrorUpdate(
           workInProgress,
-          createCapturedValue(error$1, workInProgress),
+          createCapturedValueAtFiber(error$1, workInProgress),
           lane
         );
         enqueueCapturedUpdate(workInProgress, update);
@@ -15434,21 +15523,35 @@ function updateDehydratedSuspenseComponent(
       // This boundary is in a permanent fallback state. In this case, we'll never
       // get an update and we'll never be able to hydrate the final content. Let's just try the
       // client side render instead.
-      var _getSuspenseInstanceF = getSuspenseInstanceFallbackErrorDetails(),
-        errorMessage = _getSuspenseInstanceF.errorMessage;
-
-      var error = errorMessage // eslint-disable-next-line react-internal/prod-error-codes
-        ? new Error(errorMessage)
-        : new Error(
-            "The server could not finish this Suspense boundary, likely " +
-              "due to an error during server rendering. Switched to " +
-              "client rendering."
-          );
+      var digest, message, stack;
+
+      {
+        var _getSuspenseInstanceF = getSuspenseInstanceFallbackErrorDetails();
+
+        digest = _getSuspenseInstanceF.digest;
+        message = _getSuspenseInstanceF.message;
+        stack = _getSuspenseInstanceF.stack;
+      }
+
+      var error;
+
+      if (message) {
+        // eslint-disable-next-line react-internal/prod-error-codes
+        error = new Error(message);
+      } else {
+        error = new Error(
+          "The server could not finish this Suspense boundary, likely " +
+            "due to an error during server rendering. Switched to " +
+            "client rendering."
+        );
+      }
+
+      var capturedValue = createCapturedValue(error, digest, stack);
       return retrySuspenseComponentWithoutHydrating(
         current,
         workInProgress,
         renderLanes,
-        error
+        capturedValue
       );
     }
     // any context has changed, we need to treat is as if the input might have changed.
@@ -15476,7 +15579,13 @@ function updateDehydratedSuspenseComponent(
           suspenseState.retryLane = attemptHydrationAtLane; // TODO: Ideally this would inherit the event time of the current render
 
           var eventTime = NoTimestamp;
-          scheduleUpdateOnFiber(current, attemptHydrationAtLane, eventTime);
+          enqueueConcurrentRenderForLane(current, attemptHydrationAtLane);
+          scheduleUpdateOnFiber(
+            root,
+            current,
+            attemptHydrationAtLane,
+            eventTime
+          );
         }
       } // If we have scheduled higher pri work above, this will probably just abort the render
       // since we now have higher priority work, but in case it doesn't, we need to prepare to
@@ -15485,10 +15594,8 @@ function updateDehydratedSuspenseComponent(
       // Delay having to do this as long as the suspense timeout allows us.
 
       renderDidSuspendDelayIfPossible();
-      return retrySuspenseComponentWithoutHydrating(
-        current,
-        workInProgress,
-        renderLanes,
+
+      var _capturedValue = createCapturedValue(
         new Error(
           "This Suspense boundary received an update before it finished " +
             "hydrating. This caused the boundary to switch to client rendering. " +
@@ -15496,6 +15603,13 @@ function updateDehydratedSuspenseComponent(
             "in startTransition."
         )
       );
+
+      return retrySuspenseComponentWithoutHydrating(
+        current,
+        workInProgress,
+        renderLanes,
+        _capturedValue
+      );
     } else if (isSuspenseInstancePending()) {
       // This component is still pending more data from the server, so we can't hydrate its
       // content. We treat it as if this component suspended itself. It might seem as if
@@ -15540,15 +15654,20 @@ function updateDehydratedSuspenseComponent(
     if (workInProgress.flags & ForceClientRender) {
       // Something errored during hydration. Try again without hydrating.
       workInProgress.flags &= ~ForceClientRender;
-      return retrySuspenseComponentWithoutHydrating(
-        current,
-        workInProgress,
-        renderLanes,
+
+      var _capturedValue2 = createCapturedValue(
         new Error(
           "There was an error while hydrating this Suspense boundary. " +
             "Switched to client rendering."
         )
       );
+
+      return retrySuspenseComponentWithoutHydrating(
+        current,
+        workInProgress,
+        renderLanes,
+        _capturedValue2
+      );
     } else if (workInProgress.memoizedState !== null) {
       // Something suspended and we should still be in dehydrated mode.
       // Leave the existing child in place.
@@ -19540,8 +19659,12 @@ function commitMutationEffectsOnFiber(finishedWork, root, lanes) {
       var offscreenFiber = finishedWork.child;
 
       if (offscreenFiber.flags & Visibility) {
+        var offscreenInstance = offscreenFiber.stateNode;
         var newState = offscreenFiber.memoizedState;
-        var isHidden = newState !== null;
+        var isHidden = newState !== null; // Track the current state on the Offscreen instance so we can
+        // read it during an event
+
+        offscreenInstance.isHidden = isHidden;
 
         if (isHidden) {
           var wasHidden =
@@ -19578,11 +19701,15 @@ function commitMutationEffectsOnFiber(finishedWork, root, lanes) {
       commitReconciliationEffects(finishedWork);
 
       if (flags & Visibility) {
+        var _offscreenInstance = finishedWork.stateNode;
         var _newState = finishedWork.memoizedState;
 
         var _isHidden = _newState !== null;
 
-        var offscreenBoundary = finishedWork;
+        var offscreenBoundary = finishedWork; // Track the current state on the Offscreen instance so we can
+        // read it during an event
+
+        _offscreenInstance.isHidden = _isHidden;
 
         {
           // TODO: This needs to run whenever there's an insertion or update
@@ -20254,7 +20381,7 @@ function requestRetryLane(fiber) {
   return claimNextRetryLane();
 }
 
-function scheduleUpdateOnFiber(fiber, lane, eventTime) {
+function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
   checkForNestedUpdates();
 
   {
@@ -20263,12 +20390,6 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     }
   }
 
-  var root = markUpdateLaneFromFiberToRoot(fiber, lane);
-
-  if (root === null) {
-    return null;
-  }
-
   {
     if (isFlushingPassiveEffects) {
       didScheduleUpdateDuringPassiveEffects = true;
@@ -20299,7 +20420,6 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
     warnIfUpdatesNotWrappedWithActDEV(fiber);
 
     if (root === workInProgressRoot) {
-      // TODO: Consolidate with `isInterleavedUpdate` check
       // Received an update to a tree that's in the middle of rendering. Mark
       // that there was an interleaved update work on this root. Unless the
       // `deferRenderPhaseUpdateToNextBatch` flag is off and this is a render
@@ -20340,76 +20460,14 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
       flushSyncCallbacksOnlyInLegacyMode();
     }
   }
-
-  return root;
-}
-// work without treating it as a typical update that originates from an event;
-// e.g. retrying a Suspense boundary isn't an update, but it does schedule work
-// on a fiber.
-
-function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
-  // Update the source fiber's lanes
-  sourceFiber.lanes = mergeLanes(sourceFiber.lanes, lane);
-  var alternate = sourceFiber.alternate;
-
-  if (alternate !== null) {
-    alternate.lanes = mergeLanes(alternate.lanes, lane);
-  }
-
-  {
-    if (
-      alternate === null &&
-      (sourceFiber.flags & (Placement | Hydrating)) !== NoFlags
-    ) {
-      warnAboutUpdateOnNotYetMountedFiberInDEV(sourceFiber);
-    }
-  } // Walk the parent path to the root and update the child lanes.
-
-  var node = sourceFiber;
-  var parent = sourceFiber.return;
-
-  while (parent !== null) {
-    parent.childLanes = mergeLanes(parent.childLanes, lane);
-    alternate = parent.alternate;
-
-    if (alternate !== null) {
-      alternate.childLanes = mergeLanes(alternate.childLanes, lane);
-    } else {
-      {
-        if ((parent.flags & (Placement | Hydrating)) !== NoFlags) {
-          warnAboutUpdateOnNotYetMountedFiberInDEV(sourceFiber);
-        }
-      }
-    }
-
-    node = parent;
-    parent = parent.return;
-  }
-
-  if (node.tag === HostRoot) {
-    var root = node.stateNode;
-    return root;
-  } else {
-    return null;
-  }
 }
-
-function isInterleavedUpdate(fiber, lane) {
+function isUnsafeClassRenderPhaseUpdate(fiber) {
+  // Check if this is a render phase update. Only called by class components,
+  // which special (deprecated) behavior for UNSAFE_componentWillReceive props.
   return (
-    // TODO: Optimize slightly by comparing to root that fiber belongs to.
-    // Requires some refactoring. Not a big deal though since it's rare for
-    // concurrent apps to have more than a single root.
-    (workInProgressRoot !== null || // If the interleaved updates queue hasn't been cleared yet, then
-      // we should treat this as an interleaved update, too. This is also a
-      // defensive coding measure in case a new update comes in between when
-      // rendering has finished and when the interleaved updates are transferred
-      // to the main queue.
-      hasInterleavedUpdates()) &&
-    (fiber.mode & ConcurrentMode) !== NoMode && // If this is a render phase update (i.e. UNSAFE_componentWillReceiveProps),
-    // then don't treat this as an interleaved update. This pattern is
-    // accompanied by a warning but we haven't fully deprecated it yet. We can
-    // remove once the deferRenderPhaseUpdateToNextBatch flag is enabled.
-    (executionContext & RenderContext) === NoContext
+    // TODO: Remove outdated deferRenderPhaseUpdateToNextBatch experiment. We
+    // decided not to enable it.
+    (executionContext & RenderContext) !== NoContext
   );
 } // Use this function to schedule a task for a root. There's only one task per
 // root; if a task was already scheduled, we'll check to make sure the priority
@@ -21106,7 +21164,7 @@ function prepareFreshStack(root, lanes) {
   workInProgressRootPingedLanes = NoLanes;
   workInProgressRootConcurrentErrors = null;
   workInProgressRootRecoverableErrors = null;
-  enqueueInterleavedUpdates();
+  finishQueueingConcurrentUpdates();
 
   {
     ReactStrictModeWarnings.discardPendingWarnings();
@@ -21751,7 +21809,12 @@ function commitRootImpl(
 
     for (var i = 0; i < recoverableErrors.length; i++) {
       var recoverableError = recoverableErrors[i];
-      onRecoverableError(recoverableError);
+      var componentStack = recoverableError.stack;
+      var digest = recoverableError.digest;
+      onRecoverableError(recoverableError.value, {
+        componentStack: componentStack,
+        digest: digest
+      });
     }
   }
 
@@ -21933,11 +21996,10 @@ function prepareToThrowUncaughtError(error) {
 var onUncaughtError = prepareToThrowUncaughtError;
 
 function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
-  var errorInfo = createCapturedValue(error, sourceFiber);
+  var errorInfo = createCapturedValueAtFiber(error, sourceFiber);
   var update = createRootErrorUpdate(rootFiber, errorInfo, SyncLane);
-  enqueueUpdate(rootFiber, update);
+  var root = enqueueUpdate(rootFiber, update, SyncLane);
   var eventTime = requestEventTime();
-  var root = markUpdateLaneFromFiberToRoot(rootFiber, SyncLane);
 
   if (root !== null) {
     markRootUpdated(root, SyncLane, eventTime);
@@ -21977,11 +22039,10 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error$1) {
         (typeof instance.componentDidCatch === "function" &&
           !isAlreadyFailedLegacyErrorBoundary(instance))
       ) {
-        var errorInfo = createCapturedValue(error$1, sourceFiber);
+        var errorInfo = createCapturedValueAtFiber(error$1, sourceFiber);
         var update = createClassErrorUpdate(fiber, errorInfo, SyncLane);
-        enqueueUpdate(fiber, update);
+        var root = enqueueUpdate(fiber, update, SyncLane);
         var eventTime = requestEventTime();
-        var root = markUpdateLaneFromFiberToRoot(fiber, SyncLane);
 
         if (root !== null) {
           markRootUpdated(root, SyncLane, eventTime);
@@ -22068,7 +22129,7 @@ function retryTimedOutBoundary(boundaryFiber, retryLane) {
   } // TODO: Special case idle priority?
 
   var eventTime = requestEventTime();
-  var root = markUpdateLaneFromFiberToRoot(boundaryFiber, retryLane);
+  var root = enqueueConcurrentRenderForLane(boundaryFiber, retryLane);
 
   if (root !== null) {
     markRootUpdated(root, retryLane, eventTime);
@@ -22184,7 +22245,6 @@ function flushRenderPhaseStrictModeWarningsInDEV() {
 }
 
 var didWarnStateUpdateForNotYetMountedComponent = null;
-
 function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
   {
     if ((executionContext & RenderContext) !== NoContext) {
@@ -22244,7 +22304,6 @@ function warnAboutUpdateOnNotYetMountedFiberInDEV(fiber) {
     }
   }
 }
-
 var beginWork$1;
 
 {
@@ -22770,7 +22829,11 @@ function scheduleFibersWithFamiliesRecursively(
     }
 
     if (needsRemount || needsRender) {
-      scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+      var _root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+      if (_root !== null) {
+        scheduleUpdateOnFiber(_root, fiber, SyncLane, NoTimestamp);
+      }
     }
 
     if (child !== null && !needsRemount) {
@@ -23475,7 +23538,9 @@ function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
   var fiber = createFiber(OffscreenComponent, pendingProps, key, mode);
   fiber.elementType = REACT_OFFSCREEN_TYPE;
   fiber.lanes = lanes;
-  var primaryChildInstance = {};
+  var primaryChildInstance = {
+    isHidden: false
+  };
   fiber.stateNode = primaryChildInstance;
   return fiber;
 }
@@ -23647,7 +23712,7 @@ function createFiberRoot(
   return root;
 }
 
-var ReactVersion = "18.2.0-next-d300cebde-20220601";
+var ReactVersion = "18.2.0-next-9e3b772b8-20220608";
 
 function createPortal(
   children,
@@ -23845,10 +23910,10 @@ function updateContainer(element, container, parentComponent, callback) {
     update.callback = callback;
   }
 
-  enqueueUpdate(current$1, update);
-  var root = scheduleUpdateOnFiber(current$1, lane, eventTime);
+  var root = enqueueUpdate(current$1, update, lane);
 
   if (root !== null) {
+    scheduleUpdateOnFiber(root, current$1, lane, eventTime);
     entangleTransitions(root, current$1, lane);
   }
 
@@ -24008,7 +24073,11 @@ var setSuspenseHandler = null;
       // Shallow cloning props works as a workaround for now to bypass the bailout check.
 
       fiber.memoizedProps = assign({}, fiber.memoizedProps);
-      scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+      var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+      if (root !== null) {
+        scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+      }
     }
   };
 
@@ -24025,7 +24094,11 @@ var setSuspenseHandler = null;
       // Shallow cloning props works as a workaround for now to bypass the bailout check.
 
       fiber.memoizedProps = assign({}, fiber.memoizedProps);
-      scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+      var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+      if (root !== null) {
+        scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+      }
     }
   };
 
@@ -24042,7 +24115,11 @@ var setSuspenseHandler = null;
       // Shallow cloning props works as a workaround for now to bypass the bailout check.
 
       fiber.memoizedProps = assign({}, fiber.memoizedProps);
-      scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+      var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+      if (root !== null) {
+        scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+      }
     }
   }; // Support DevTools props for function components, forwardRef, memo, host components, etc.
 
@@ -24053,7 +24130,11 @@ var setSuspenseHandler = null;
       fiber.alternate.pendingProps = fiber.pendingProps;
     }
 
-    scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+    var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+    if (root !== null) {
+      scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+    }
   };
 
   overridePropsDeletePath = function(fiber, path) {
@@ -24063,7 +24144,11 @@ var setSuspenseHandler = null;
       fiber.alternate.pendingProps = fiber.pendingProps;
     }
 
-    scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+    var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+    if (root !== null) {
+      scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+    }
   };
 
   overridePropsRenamePath = function(fiber, oldPath, newPath) {
@@ -24073,11 +24158,19 @@ var setSuspenseHandler = null;
       fiber.alternate.pendingProps = fiber.pendingProps;
     }
 
-    scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+    var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+    if (root !== null) {
+      scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+    }
   };
 
   scheduleUpdate = function(fiber) {
-    scheduleUpdateOnFiber(fiber, SyncLane, NoTimestamp);
+    var root = enqueueConcurrentRenderForLane(fiber, SyncLane);
+
+    if (root !== null) {
+      scheduleUpdateOnFiber(root, fiber, SyncLane, NoTimestamp);
+    }
   };
 
   setErrorHandler = function(newShouldErrorImpl) {
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js b/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js
index 5e26abc86f44..2bdbbc11af28 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js
@@ -8,7 +8,7 @@
  * @nolint
  * @providesModule ReactNativeRenderer-prod
  * @preventMunge
- * @generated SignedSource<<9f59a543175acb00b00023e9ed7d8c38>>
+ * @generated SignedSource<<07cf699c0d1c149943b7a02432aa1550>>
  */
 
 "use strict";
@@ -1017,7 +1017,7 @@ eventPluginOrder = Array.prototype.slice.call([
   "ReactNativeBridgeEventPlugin"
 ]);
 recomputePluginOrdering();
-var injectedNamesToPlugins$jscomp$inline_225 = {
+var injectedNamesToPlugins$jscomp$inline_229 = {
     ResponderEventPlugin: ResponderEventPlugin,
     ReactNativeBridgeEventPlugin: {
       eventTypes: {},
@@ -1063,33 +1063,33 @@ var injectedNamesToPlugins$jscomp$inline_225 = {
       }
     }
   },
-  isOrderingDirty$jscomp$inline_226 = !1,
-  pluginName$jscomp$inline_227;
-for (pluginName$jscomp$inline_227 in injectedNamesToPlugins$jscomp$inline_225)
+  isOrderingDirty$jscomp$inline_230 = !1,
+  pluginName$jscomp$inline_231;
+for (pluginName$jscomp$inline_231 in injectedNamesToPlugins$jscomp$inline_229)
   if (
-    injectedNamesToPlugins$jscomp$inline_225.hasOwnProperty(
-      pluginName$jscomp$inline_227
+    injectedNamesToPlugins$jscomp$inline_229.hasOwnProperty(
+      pluginName$jscomp$inline_231
     )
   ) {
-    var pluginModule$jscomp$inline_228 =
-      injectedNamesToPlugins$jscomp$inline_225[pluginName$jscomp$inline_227];
+    var pluginModule$jscomp$inline_232 =
+      injectedNamesToPlugins$jscomp$inline_229[pluginName$jscomp$inline_231];
     if (
-      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_227) ||
-      namesToPlugins[pluginName$jscomp$inline_227] !==
-        pluginModule$jscomp$inline_228
+      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_231) ||
+      namesToPlugins[pluginName$jscomp$inline_231] !==
+        pluginModule$jscomp$inline_232
     ) {
-      if (namesToPlugins[pluginName$jscomp$inline_227])
+      if (namesToPlugins[pluginName$jscomp$inline_231])
         throw Error(
           "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" +
-            (pluginName$jscomp$inline_227 + "`.")
+            (pluginName$jscomp$inline_231 + "`.")
         );
       namesToPlugins[
-        pluginName$jscomp$inline_227
-      ] = pluginModule$jscomp$inline_228;
-      isOrderingDirty$jscomp$inline_226 = !0;
+        pluginName$jscomp$inline_231
+      ] = pluginModule$jscomp$inline_232;
+      isOrderingDirty$jscomp$inline_230 = !0;
     }
   }
-isOrderingDirty$jscomp$inline_226 && recomputePluginOrdering();
+isOrderingDirty$jscomp$inline_230 && recomputePluginOrdering();
 var instanceCache = new Map(),
   instanceProps = new Map();
 function getInstanceFromTag(tag) {
@@ -2300,8 +2300,34 @@ function readContext(context) {
     } else lastContextDependency = lastContextDependency.next = context;
   return value;
 }
-var interleavedQueues = null,
-  hasForceUpdate = !1;
+var concurrentQueues = null;
+function pushConcurrentUpdateQueue(queue) {
+  null === concurrentQueues
+    ? (concurrentQueues = [queue])
+    : concurrentQueues.push(queue);
+}
+function enqueueConcurrentHookUpdate(fiber, queue, update, lane) {
+  var interleaved = queue.interleaved;
+  null === interleaved
+    ? ((update.next = update), pushConcurrentUpdateQueue(queue))
+    : ((update.next = interleaved.next), (interleaved.next = update));
+  queue.interleaved = update;
+  return markUpdateLaneFromFiberToRoot(fiber, lane);
+}
+function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
+  sourceFiber.lanes |= lane;
+  var alternate = sourceFiber.alternate;
+  null !== alternate && (alternate.lanes |= lane);
+  alternate = sourceFiber;
+  for (sourceFiber = sourceFiber.return; null !== sourceFiber; )
+    (sourceFiber.childLanes |= lane),
+      (alternate = sourceFiber.alternate),
+      null !== alternate && (alternate.childLanes |= lane),
+      (alternate = sourceFiber),
+      (sourceFiber = sourceFiber.return);
+  return 3 === alternate.tag ? alternate.stateNode : null;
+}
+var hasForceUpdate = !1;
 function initializeUpdateQueue(fiber) {
   fiber.updateQueue = {
     baseState: fiber.memoizedState,
@@ -2332,24 +2358,24 @@ function createUpdate(eventTime, lane) {
     next: null
   };
 }
-function enqueueUpdate(fiber, update) {
+function enqueueUpdate(fiber, update, lane) {
   var updateQueue = fiber.updateQueue;
-  null !== updateQueue &&
-    ((updateQueue = updateQueue.shared),
-    isInterleavedUpdate(fiber)
-      ? ((fiber = updateQueue.interleaved),
-        null === fiber
-          ? ((update.next = update),
-            null === interleavedQueues
-              ? (interleavedQueues = [updateQueue])
-              : interleavedQueues.push(updateQueue))
-          : ((update.next = fiber.next), (fiber.next = update)),
-        (updateQueue.interleaved = update))
-      : ((fiber = updateQueue.pending),
-        null === fiber
-          ? (update.next = update)
-          : ((update.next = fiber.next), (fiber.next = update)),
-        (updateQueue.pending = update)));
+  if (null === updateQueue) return null;
+  updateQueue = updateQueue.shared;
+  if (0 !== (executionContext & 2)) {
+    var pending = updateQueue.pending;
+    null === pending
+      ? (update.next = update)
+      : ((update.next = pending.next), (pending.next = update));
+    updateQueue.pending = update;
+    return markUpdateLaneFromFiberToRoot(fiber, lane);
+  }
+  pending = updateQueue.interleaved;
+  null === pending
+    ? ((update.next = update), pushConcurrentUpdateQueue(updateQueue))
+    : ((update.next = pending.next), (pending.next = update));
+  updateQueue.interleaved = update;
+  return markUpdateLaneFromFiberToRoot(fiber, lane);
 }
 function entangleTransitions(root, fiber, lane) {
   fiber = fiber.updateQueue;
@@ -2586,9 +2612,10 @@ var classComponentUpdater = {
       update = createUpdate(eventTime, lane);
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update);
-    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
-    null !== payload && entangleTransitions(payload, inst, lane);
+    payload = enqueueUpdate(inst, update, lane);
+    null !== payload &&
+      (scheduleUpdateOnFiber(payload, inst, lane, eventTime),
+      entangleTransitions(payload, inst, lane));
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternals;
@@ -2598,9 +2625,10 @@ var classComponentUpdater = {
     update.tag = 1;
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update);
-    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
-    null !== payload && entangleTransitions(payload, inst, lane);
+    payload = enqueueUpdate(inst, update, lane);
+    null !== payload &&
+      (scheduleUpdateOnFiber(payload, inst, lane, eventTime),
+      entangleTransitions(payload, inst, lane));
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternals;
@@ -2609,9 +2637,10 @@ var classComponentUpdater = {
       update = createUpdate(eventTime, lane);
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update);
-    callback = scheduleUpdateOnFiber(inst, lane, eventTime);
-    null !== callback && entangleTransitions(callback, inst, lane);
+    callback = enqueueUpdate(inst, update, lane);
+    null !== callback &&
+      (scheduleUpdateOnFiber(callback, inst, lane, eventTime),
+      entangleTransitions(callback, inst, lane));
   }
 };
 function checkShouldComponentUpdate(
@@ -3716,11 +3745,11 @@ function pushStoreConsistencyCheck(fiber, getSnapshot, renderedSnapshot) {
 function updateStoreInstance(fiber, inst, nextSnapshot, getSnapshot) {
   inst.value = nextSnapshot;
   inst.getSnapshot = getSnapshot;
-  checkIfSnapshotChanged(inst) && scheduleUpdateOnFiber(fiber, 1, -1);
+  checkIfSnapshotChanged(inst) && forceStoreRerender(fiber);
 }
 function subscribeToStore(fiber, inst, subscribe) {
   return subscribe(function() {
-    checkIfSnapshotChanged(inst) && scheduleUpdateOnFiber(fiber, 1, -1);
+    checkIfSnapshotChanged(inst) && forceStoreRerender(fiber);
   });
 }
 function checkIfSnapshotChanged(inst) {
@@ -3733,6 +3762,10 @@ function checkIfSnapshotChanged(inst) {
     return !0;
   }
 }
+function forceStoreRerender(fiber) {
+  var root = markUpdateLaneFromFiberToRoot(fiber, 1);
+  null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1);
+}
 function mountState(initialState) {
   var hook = mountWorkInProgressHook();
   "function" === typeof initialState && (initialState = initialState());
@@ -3903,12 +3936,15 @@ function dispatchReducerAction(fiber, queue, action) {
     eagerState: null,
     next: null
   };
-  isRenderPhaseUpdate(fiber)
-    ? enqueueRenderPhaseUpdate(queue, action)
-    : (enqueueUpdate$1(fiber, queue, action),
-      (action = requestEventTime()),
-      (fiber = scheduleUpdateOnFiber(fiber, lane, action)),
-      null !== fiber && entangleTransitionUpdate(fiber, queue, lane));
+  if (isRenderPhaseUpdate(fiber)) enqueueRenderPhaseUpdate(queue, action);
+  else if (
+    ((action = enqueueConcurrentHookUpdate(fiber, queue, action, lane)),
+    null !== action)
+  ) {
+    var eventTime = requestEventTime();
+    scheduleUpdateOnFiber(action, fiber, lane, eventTime);
+    entangleTransitionUpdate(action, queue, lane);
+  }
 }
 function dispatchSetState(fiber, queue, action) {
   var lane = requestUpdateLane(fiber),
@@ -3921,7 +3957,6 @@ function dispatchSetState(fiber, queue, action) {
     };
   if (isRenderPhaseUpdate(fiber)) enqueueRenderPhaseUpdate(queue, update);
   else {
-    enqueueUpdate$1(fiber, queue, update);
     var alternate = fiber.alternate;
     if (
       0 === fiber.lanes &&
@@ -3933,13 +3968,22 @@ function dispatchSetState(fiber, queue, action) {
           eagerState = alternate(currentState, action);
         update.hasEagerState = !0;
         update.eagerState = eagerState;
-        if (objectIs(eagerState, currentState)) return;
+        if (objectIs(eagerState, currentState)) {
+          var interleaved = queue.interleaved;
+          null === interleaved
+            ? ((update.next = update), pushConcurrentUpdateQueue(queue))
+            : ((update.next = interleaved.next), (interleaved.next = update));
+          queue.interleaved = update;
+          return;
+        }
       } catch (error) {
       } finally {
       }
-    action = requestEventTime();
-    fiber = scheduleUpdateOnFiber(fiber, lane, action);
-    null !== fiber && entangleTransitionUpdate(fiber, queue, lane);
+    action = enqueueConcurrentHookUpdate(fiber, queue, update, lane);
+    null !== action &&
+      ((update = requestEventTime()),
+      scheduleUpdateOnFiber(action, fiber, lane, update),
+      entangleTransitionUpdate(action, queue, lane));
   }
 }
 function isRenderPhaseUpdate(fiber) {
@@ -3957,22 +4001,6 @@ function enqueueRenderPhaseUpdate(queue, update) {
     : ((update.next = pending.next), (pending.next = update));
   queue.pending = update;
 }
-function enqueueUpdate$1(fiber, queue, update) {
-  isInterleavedUpdate(fiber)
-    ? ((fiber = queue.interleaved),
-      null === fiber
-        ? ((update.next = update),
-          null === interleavedQueues
-            ? (interleavedQueues = [queue])
-            : interleavedQueues.push(queue))
-        : ((update.next = fiber.next), (fiber.next = update)),
-      (queue.interleaved = update))
-    : ((fiber = queue.pending),
-      null === fiber
-        ? (update.next = update)
-        : ((update.next = fiber.next), (fiber.next = update)),
-      (queue.pending = update));
-}
 function entangleTransitionUpdate(root, queue, lane) {
   if (0 !== (lane & 4194240)) {
     var queueLanes = queue.lanes;
@@ -4168,11 +4196,20 @@ var ContextOnlyDispatcher = {
     useId: updateId,
     unstable_isNewReconciler: !1
   };
-function createCapturedValue(value, source) {
+function createCapturedValueAtFiber(value, source) {
   return {
     value: value,
     source: source,
-    stack: getStackByFiberInDevAndProd(source)
+    stack: getStackByFiberInDevAndProd(source),
+    digest: null
+  };
+}
+function createCapturedValue(value, digest, stack) {
+  return {
+    value: value,
+    source: null,
+    stack: null != stack ? stack : null,
+    digest: null != digest ? digest : null
   };
 }
 if (
@@ -4899,13 +4936,16 @@ function updateDehydratedSuspenseComponent(
     if (workInProgress.flags & 256)
       return (
         (workInProgress.flags &= -257),
+        (suspenseState = createCapturedValue(
+          Error(
+            "There was an error while hydrating this Suspense boundary. Switched to client rendering."
+          )
+        )),
         retrySuspenseComponentWithoutHydrating(
           current,
           workInProgress,
           renderLanes,
-          Error(
-            "There was an error while hydrating this Suspense boundary. Switched to client rendering."
-          )
+          suspenseState
         )
       );
     if (null !== workInProgress.memoizedState)
@@ -4950,16 +4990,19 @@ function updateDehydratedSuspenseComponent(
     );
   if (shim())
     return (
-      (suspenseState = shim().errorMessage),
+      (suspenseState = shim().digest),
+      (suspenseState = createCapturedValue(
+        Error(
+          "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering."
+        ),
+        suspenseState,
+        void 0
+      )),
       retrySuspenseComponentWithoutHydrating(
         current,
         workInProgress,
         renderLanes,
         suspenseState
-          ? Error(suspenseState)
-          : Error(
-              "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering."
-            )
       )
     );
   didSuspend = 0 !== (renderLanes & current.childLanes);
@@ -5002,23 +5045,27 @@ function updateDehydratedSuspenseComponent(
         default:
           didSuspend = 0;
       }
-      nextProps =
+      didSuspend =
         0 !== (didSuspend & (nextProps.suspendedLanes | renderLanes))
           ? 0
           : didSuspend;
-      0 !== nextProps &&
-        nextProps !== suspenseState.retryLane &&
-        ((suspenseState.retryLane = nextProps),
-        scheduleUpdateOnFiber(current, nextProps, -1));
+      0 !== didSuspend &&
+        didSuspend !== suspenseState.retryLane &&
+        ((suspenseState.retryLane = didSuspend),
+        markUpdateLaneFromFiberToRoot(current, didSuspend),
+        scheduleUpdateOnFiber(nextProps, current, didSuspend, -1));
     }
     renderDidSuspendDelayIfPossible();
+    suspenseState = createCapturedValue(
+      Error(
+        "This Suspense boundary received an update before it finished hydrating. This caused the boundary to switch to client rendering. The usual way to fix this is to wrap the original update in startTransition."
+      )
+    );
     return retrySuspenseComponentWithoutHydrating(
       current,
       workInProgress,
       renderLanes,
-      Error(
-        "This Suspense boundary received an update before it finished hydrating. This caused the boundary to switch to client rendering. The usual way to fix this is to wrap the original update in startTransition."
-      )
+      suspenseState
     );
   }
   if (shim())
@@ -5297,14 +5344,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
       break;
     case "collapsed":
       lastTailNode = renderState.tail;
-      for (var lastTailNode$60 = null; null !== lastTailNode; )
-        null !== lastTailNode.alternate && (lastTailNode$60 = lastTailNode),
+      for (var lastTailNode$62 = null; null !== lastTailNode; )
+        null !== lastTailNode.alternate && (lastTailNode$62 = lastTailNode),
           (lastTailNode = lastTailNode.sibling);
-      null === lastTailNode$60
+      null === lastTailNode$62
         ? hasRenderedATailFallback || null === renderState.tail
           ? (renderState.tail = null)
           : (renderState.tail.sibling = null)
-        : (lastTailNode$60.sibling = null);
+        : (lastTailNode$62.sibling = null);
   }
 }
 function bubbleProperties(completedWork) {
@@ -5314,19 +5361,19 @@ function bubbleProperties(completedWork) {
     newChildLanes = 0,
     subtreeFlags = 0;
   if (didBailout)
-    for (var child$61 = completedWork.child; null !== child$61; )
-      (newChildLanes |= child$61.lanes | child$61.childLanes),
-        (subtreeFlags |= child$61.subtreeFlags & 14680064),
-        (subtreeFlags |= child$61.flags & 14680064),
-        (child$61.return = completedWork),
-        (child$61 = child$61.sibling);
+    for (var child$63 = completedWork.child; null !== child$63; )
+      (newChildLanes |= child$63.lanes | child$63.childLanes),
+        (subtreeFlags |= child$63.subtreeFlags & 14680064),
+        (subtreeFlags |= child$63.flags & 14680064),
+        (child$63.return = completedWork),
+        (child$63 = child$63.sibling);
   else
-    for (child$61 = completedWork.child; null !== child$61; )
-      (newChildLanes |= child$61.lanes | child$61.childLanes),
-        (subtreeFlags |= child$61.subtreeFlags),
-        (subtreeFlags |= child$61.flags),
-        (child$61.return = completedWork),
-        (child$61 = child$61.sibling);
+    for (child$63 = completedWork.child; null !== child$63; )
+      (newChildLanes |= child$63.lanes | child$63.childLanes),
+        (subtreeFlags |= child$63.subtreeFlags),
+        (subtreeFlags |= child$63.flags),
+        (child$63.return = completedWork),
+        (child$63 = child$63.sibling);
   completedWork.subtreeFlags |= subtreeFlags;
   completedWork.childLanes = newChildLanes;
   return didBailout;
@@ -5824,8 +5871,8 @@ function commitHookEffectListMount(flags, finishedWork) {
     var effect = (finishedWork = finishedWork.next);
     do {
       if ((effect.tag & flags) === flags) {
-        var create$73 = effect.create;
-        effect.destroy = create$73();
+        var create$75 = effect.create;
+        effect.destroy = create$75();
       }
       effect = effect.next;
     } while (effect !== finishedWork);
@@ -6177,8 +6224,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
         }
         try {
           commitHookEffectListUnmount(5, finishedWork, finishedWork.return);
-        } catch (error$83) {
-          captureCommitPhaseError(finishedWork, finishedWork.return, error$83);
+        } catch (error$85) {
+          captureCommitPhaseError(finishedWork, finishedWork.return, error$85);
         }
       }
       break;
@@ -6196,16 +6243,16 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
         null !== current &&
         safelyDetachRef(current, current.return);
       if (flags & 4) {
-        var instance$85 = finishedWork.stateNode;
-        if (null != instance$85) {
+        var instance$87 = finishedWork.stateNode;
+        if (null != instance$87) {
           var newProps = finishedWork.memoizedProps,
             oldProps = null !== current ? current.memoizedProps : newProps,
             updatePayload = finishedWork.updateQueue;
           finishedWork.updateQueue = null;
           if (null !== updatePayload)
             try {
-              var viewConfig = instance$85.viewConfig;
-              instanceProps.set(instance$85._nativeTag, newProps);
+              var viewConfig = instance$87.viewConfig;
+              instanceProps.set(instance$87._nativeTag, newProps);
               var updatePayload$jscomp$0 = diffProperties(
                 null,
                 oldProps,
@@ -6214,15 +6261,15 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
               );
               null != updatePayload$jscomp$0 &&
                 ReactNativePrivateInterface.UIManager.updateView(
-                  instance$85._nativeTag,
+                  instance$87._nativeTag,
                   viewConfig.uiViewClassName,
                   updatePayload$jscomp$0
                 );
-            } catch (error$86) {
+            } catch (error$88) {
               captureCommitPhaseError(
                 finishedWork,
                 finishedWork.return,
-                error$86
+                error$88
               );
             }
         }
@@ -6244,8 +6291,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
             "RCTRawText",
             { text: updatePayload$jscomp$0 }
           );
-        } catch (error$87) {
-          captureCommitPhaseError(finishedWork, finishedWork.return, error$87);
+        } catch (error$89) {
+          captureCommitPhaseError(finishedWork, finishedWork.return, error$89);
         }
       }
       break;
@@ -6262,10 +6309,12 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
       commitReconciliationEffects(finishedWork);
       viewConfig = finishedWork.child;
       viewConfig.flags & 8192 &&
-        null !== viewConfig.memoizedState &&
-        (null === viewConfig.alternate ||
-          null === viewConfig.alternate.memoizedState) &&
-        (globalMostRecentFallbackTime = now());
+        ((updatePayload$jscomp$0 = null !== viewConfig.memoizedState),
+        (viewConfig.stateNode.isHidden = updatePayload$jscomp$0),
+        !updatePayload$jscomp$0 ||
+          (null !== viewConfig.alternate &&
+            null !== viewConfig.alternate.memoizedState) ||
+          (globalMostRecentFallbackTime = now()));
       flags & 4 && attachSuspenseRetryListeners(finishedWork);
       break;
     case 22:
@@ -6274,6 +6323,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
       if (flags & 8192)
         a: for (
           viewConfig = null !== finishedWork.memoizedState,
+            finishedWork.stateNode.isHidden = viewConfig,
             updatePayload$jscomp$0 = null,
             current = finishedWork;
           ;
@@ -6283,8 +6333,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
             if (null === updatePayload$jscomp$0) {
               updatePayload$jscomp$0 = current;
               try {
-                if (((instance$85 = current.stateNode), viewConfig))
-                  (newProps = instance$85.viewConfig),
+                if (((instance$87 = current.stateNode), viewConfig))
+                  (newProps = instance$87.viewConfig),
                     (oldProps = diffProperties(
                       null,
                       emptyObject,
@@ -6292,7 +6342,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
                       newProps.validAttributes
                     )),
                     ReactNativePrivateInterface.UIManager.updateView(
-                      instance$85._nativeTag,
+                      instance$87._nativeTag,
                       newProps.uiViewClassName,
                       oldProps
                     );
@@ -6327,11 +6377,11 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
             if (null === updatePayload$jscomp$0)
               try {
                 throw Error("Not yet implemented.");
-              } catch (error$78) {
+              } catch (error$80) {
                 captureCommitPhaseError(
                   finishedWork,
                   finishedWork.return,
-                  error$78
+                  error$80
                 );
               }
           } else if (
@@ -6395,12 +6445,12 @@ function commitReconciliationEffects(finishedWork) {
           break;
         case 3:
         case 4:
-          var parent$79 = JSCompiler_inline_result.stateNode.containerInfo,
-            before$80 = getHostSibling(finishedWork);
+          var parent$81 = JSCompiler_inline_result.stateNode.containerInfo,
+            before$82 = getHostSibling(finishedWork);
           insertOrAppendPlacementNodeIntoContainer(
             finishedWork,
-            before$80,
-            parent$79
+            before$82,
+            parent$81
           );
           break;
         default:
@@ -6457,8 +6507,8 @@ function commitLayoutEffects(finishedWork) {
                     commitUpdateQueue(firstChild, updateQueue, instance);
                   break;
                 case 3:
-                  var updateQueue$74 = firstChild.updateQueue;
-                  if (null !== updateQueue$74) {
+                  var updateQueue$76 = firstChild.updateQueue;
+                  if (null !== updateQueue$76) {
                     current = null;
                     if (null !== firstChild.child)
                       switch (firstChild.child.tag) {
@@ -6468,7 +6518,7 @@ function commitLayoutEffects(finishedWork) {
                         case 1:
                           current = firstChild.child.stateNode;
                       }
-                    commitUpdateQueue(firstChild, updateQueue$74, current);
+                    commitUpdateQueue(firstChild, updateQueue$76, current);
                   }
                   break;
                 case 5:
@@ -6578,15 +6628,13 @@ function requestUpdateLane(fiber) {
   fiber = currentUpdatePriority;
   return 0 !== fiber ? fiber : 16;
 }
-function scheduleUpdateOnFiber(fiber, lane, eventTime) {
+function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
   if (50 < nestedUpdateCount)
     throw ((nestedUpdateCount = 0),
     (rootWithNestedUpdates = null),
     Error(
       "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
     ));
-  var root = markUpdateLaneFromFiberToRoot(fiber, lane);
-  if (null === root) return null;
   markRootUpdated(root, lane, eventTime);
   if (0 === (executionContext & 2) || root !== workInProgressRoot)
     root === workInProgressRoot &&
@@ -6600,27 +6648,6 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
         0 === (fiber.mode & 1) &&
         ((workInProgressRootRenderTargetTime = now() + 500),
         includesLegacySyncCallbacks && flushSyncCallbacks());
-  return root;
-}
-function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
-  sourceFiber.lanes |= lane;
-  var alternate = sourceFiber.alternate;
-  null !== alternate && (alternate.lanes |= lane);
-  alternate = sourceFiber;
-  for (sourceFiber = sourceFiber.return; null !== sourceFiber; )
-    (sourceFiber.childLanes |= lane),
-      (alternate = sourceFiber.alternate),
-      null !== alternate && (alternate.childLanes |= lane),
-      (alternate = sourceFiber),
-      (sourceFiber = sourceFiber.return);
-  return 3 === alternate.tag ? alternate.stateNode : null;
-}
-function isInterleavedUpdate(fiber) {
-  return (
-    (null !== workInProgressRoot || null !== interleavedQueues) &&
-    0 !== (fiber.mode & 1) &&
-    0 === (executionContext & 2)
-  );
 }
 function ensureRootIsScheduled(root, currentTime) {
   for (
@@ -7025,10 +7052,10 @@ function prepareFreshStack(root, lanes) {
   workInProgressRootFatalError = null;
   workInProgressRootPingedLanes = workInProgressRootInterleavedUpdatedLanes = workInProgressRootSkippedLanes = 0;
   workInProgressRootRecoverableErrors = workInProgressRootConcurrentErrors = null;
-  if (null !== interleavedQueues) {
-    for (lanes = 0; lanes < interleavedQueues.length; lanes++)
+  if (null !== concurrentQueues) {
+    for (lanes = 0; lanes < concurrentQueues.length; lanes++)
       if (
-        ((timeoutHandle = interleavedQueues[lanes]),
+        ((timeoutHandle = concurrentQueues[lanes]),
         (interruptedWork = timeoutHandle.interleaved),
         null !== interruptedWork)
       ) {
@@ -7042,7 +7069,7 @@ function prepareFreshStack(root, lanes) {
         }
         timeoutHandle.pending = interruptedWork;
       }
-    interleavedQueues = null;
+    concurrentQueues = null;
   }
   return root;
 }
@@ -7138,7 +7165,7 @@ function handleError(root$jscomp$0, thrownValue) {
                   else {
                     var update = createUpdate(-1, 1);
                     update.tag = 2;
-                    enqueueUpdate(sourceFiber, update);
+                    enqueueUpdate(sourceFiber, update, 1);
                   }
                 sourceFiber.lanes |= 1;
               }
@@ -7165,13 +7192,12 @@ function handleError(root$jscomp$0, thrownValue) {
             );
           }
         }
-        root = value;
+        root = value = createCapturedValueAtFiber(value, sourceFiber);
         4 !== workInProgressRootExitStatus &&
           (workInProgressRootExitStatus = 2);
         null === workInProgressRootConcurrentErrors
           ? (workInProgressRootConcurrentErrors = [root])
           : workInProgressRootConcurrentErrors.push(root);
-        value = createCapturedValue(value, sourceFiber);
         root = returnFiber;
         do {
           switch (root.tag) {
@@ -7403,7 +7429,11 @@ function commitRootImpl(
       transitions < recoverableErrors.length;
       transitions++
     )
-      renderPriorityLevel(recoverableErrors[transitions]);
+      (lanes = recoverableErrors[transitions]),
+        renderPriorityLevel(lanes.value, {
+          componentStack: lanes.stack,
+          digest: lanes.digest
+        });
   if (hasUncaughtError)
     throw ((hasUncaughtError = !1),
     (root = firstUncaughtError),
@@ -7567,11 +7597,10 @@ function flushPassiveEffects() {
   return !1;
 }
 function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
-  sourceFiber = createCapturedValue(error, sourceFiber);
+  sourceFiber = createCapturedValueAtFiber(error, sourceFiber);
   sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1);
-  enqueueUpdate(rootFiber, sourceFiber);
+  rootFiber = enqueueUpdate(rootFiber, sourceFiber, 1);
   sourceFiber = requestEventTime();
-  rootFiber = markUpdateLaneFromFiberToRoot(rootFiber, 1);
   null !== rootFiber &&
     (markRootUpdated(rootFiber, 1, sourceFiber),
     ensureRootIsScheduled(rootFiber, sourceFiber));
@@ -7601,18 +7630,18 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
             (null === legacyErrorBoundariesThatAlreadyFailed ||
               !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
         ) {
-          sourceFiber = createCapturedValue(error, sourceFiber);
+          sourceFiber = createCapturedValueAtFiber(error, sourceFiber);
           sourceFiber = createClassErrorUpdate(
             nearestMountedAncestor,
             sourceFiber,
             1
           );
-          enqueueUpdate(nearestMountedAncestor, sourceFiber);
-          sourceFiber = requestEventTime();
-          nearestMountedAncestor = markUpdateLaneFromFiberToRoot(
+          nearestMountedAncestor = enqueueUpdate(
             nearestMountedAncestor,
+            sourceFiber,
             1
           );
+          sourceFiber = requestEventTime();
           null !== nearestMountedAncestor &&
             (markRootUpdated(nearestMountedAncestor, 1, sourceFiber),
             ensureRootIsScheduled(nearestMountedAncestor, sourceFiber));
@@ -8267,7 +8296,7 @@ function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
   pendingProps = createFiber(22, pendingProps, key, mode);
   pendingProps.elementType = REACT_OFFSCREEN_TYPE;
   pendingProps.lanes = lanes;
-  pendingProps.stateNode = {};
+  pendingProps.stateNode = { isHidden: !1 };
   return pendingProps;
 }
 function createFiberFromText(content, mode, lanes) {
@@ -8389,9 +8418,10 @@ function updateContainer(element, container, parentComponent, callback) {
   container.payload = { element: element };
   callback = void 0 === callback ? null : callback;
   null !== callback && (container.callback = callback);
-  enqueueUpdate(current, container);
-  element = scheduleUpdateOnFiber(current, lane, eventTime);
-  null !== element && entangleTransitions(element, current, lane);
+  element = enqueueUpdate(current, container, lane);
+  null !== element &&
+    (scheduleUpdateOnFiber(element, current, lane, eventTime),
+    entangleTransitions(element, current, lane));
   return lane;
 }
 function emptyFindFiberByHostInstance() {
@@ -8433,10 +8463,10 @@ batchedUpdatesImpl = function(fn, a) {
   }
 };
 var roots = new Map(),
-  devToolsConfig$jscomp$inline_967 = {
+  devToolsConfig$jscomp$inline_979 = {
     findFiberByHostInstance: getInstanceFromTag,
     bundleType: 0,
-    version: "18.2.0-next-d300cebde-20220601",
+    version: "18.2.0-next-9e3b772b8-20220608",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function() {
@@ -8451,11 +8481,11 @@ var roots = new Map(),
       }.bind(null, findNodeHandle)
     }
   };
-var internals$jscomp$inline_1239 = {
-  bundleType: devToolsConfig$jscomp$inline_967.bundleType,
-  version: devToolsConfig$jscomp$inline_967.version,
-  rendererPackageName: devToolsConfig$jscomp$inline_967.rendererPackageName,
-  rendererConfig: devToolsConfig$jscomp$inline_967.rendererConfig,
+var internals$jscomp$inline_1247 = {
+  bundleType: devToolsConfig$jscomp$inline_979.bundleType,
+  version: devToolsConfig$jscomp$inline_979.version,
+  rendererPackageName: devToolsConfig$jscomp$inline_979.rendererPackageName,
+  rendererConfig: devToolsConfig$jscomp$inline_979.rendererConfig,
   overrideHookState: null,
   overrideHookStateDeletePath: null,
   overrideHookStateRenamePath: null,
@@ -8471,26 +8501,26 @@ var internals$jscomp$inline_1239 = {
     return null === fiber ? null : fiber.stateNode;
   },
   findFiberByHostInstance:
-    devToolsConfig$jscomp$inline_967.findFiberByHostInstance ||
+    devToolsConfig$jscomp$inline_979.findFiberByHostInstance ||
     emptyFindFiberByHostInstance,
   findHostInstancesForRefresh: null,
   scheduleRefresh: null,
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.2.0-next-d300cebde-20220601"
+  reconcilerVersion: "18.2.0-next-9e3b772b8-20220608"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
-  var hook$jscomp$inline_1240 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  var hook$jscomp$inline_1248 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
   if (
-    !hook$jscomp$inline_1240.isDisabled &&
-    hook$jscomp$inline_1240.supportsFiber
+    !hook$jscomp$inline_1248.isDisabled &&
+    hook$jscomp$inline_1248.supportsFiber
   )
     try {
-      (rendererID = hook$jscomp$inline_1240.inject(
-        internals$jscomp$inline_1239
+      (rendererID = hook$jscomp$inline_1248.inject(
+        internals$jscomp$inline_1247
       )),
-        (injectedHook = hook$jscomp$inline_1240);
+        (injectedHook = hook$jscomp$inline_1248);
     } catch (err) {}
 }
 exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js b/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js
index 3a9a2679c42a..04ceb304db50 100644
--- a/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js
@@ -8,7 +8,7 @@
  * @nolint
  * @providesModule ReactNativeRenderer-profiling
  * @preventMunge
- * @generated SignedSource<<2bf865cebf1e47b3fc0284498b4571db>>
+ * @generated SignedSource<<380a53922e2dcceb4a32c98acc12f578>>
  */
 
 
@@ -1028,7 +1028,7 @@ eventPluginOrder = Array.prototype.slice.call([
   "ReactNativeBridgeEventPlugin"
 ]);
 recomputePluginOrdering();
-var injectedNamesToPlugins$jscomp$inline_236 = {
+var injectedNamesToPlugins$jscomp$inline_240 = {
     ResponderEventPlugin: ResponderEventPlugin,
     ReactNativeBridgeEventPlugin: {
       eventTypes: {},
@@ -1074,33 +1074,33 @@ var injectedNamesToPlugins$jscomp$inline_236 = {
       }
     }
   },
-  isOrderingDirty$jscomp$inline_237 = !1,
-  pluginName$jscomp$inline_238;
-for (pluginName$jscomp$inline_238 in injectedNamesToPlugins$jscomp$inline_236)
+  isOrderingDirty$jscomp$inline_241 = !1,
+  pluginName$jscomp$inline_242;
+for (pluginName$jscomp$inline_242 in injectedNamesToPlugins$jscomp$inline_240)
   if (
-    injectedNamesToPlugins$jscomp$inline_236.hasOwnProperty(
-      pluginName$jscomp$inline_238
+    injectedNamesToPlugins$jscomp$inline_240.hasOwnProperty(
+      pluginName$jscomp$inline_242
     )
   ) {
-    var pluginModule$jscomp$inline_239 =
-      injectedNamesToPlugins$jscomp$inline_236[pluginName$jscomp$inline_238];
+    var pluginModule$jscomp$inline_243 =
+      injectedNamesToPlugins$jscomp$inline_240[pluginName$jscomp$inline_242];
     if (
-      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_238) ||
-      namesToPlugins[pluginName$jscomp$inline_238] !==
-        pluginModule$jscomp$inline_239
+      !namesToPlugins.hasOwnProperty(pluginName$jscomp$inline_242) ||
+      namesToPlugins[pluginName$jscomp$inline_242] !==
+        pluginModule$jscomp$inline_243
     ) {
-      if (namesToPlugins[pluginName$jscomp$inline_238])
+      if (namesToPlugins[pluginName$jscomp$inline_242])
         throw Error(
           "EventPluginRegistry: Cannot inject two different event plugins using the same name, `" +
-            (pluginName$jscomp$inline_238 + "`.")
+            (pluginName$jscomp$inline_242 + "`.")
         );
       namesToPlugins[
-        pluginName$jscomp$inline_238
-      ] = pluginModule$jscomp$inline_239;
-      isOrderingDirty$jscomp$inline_237 = !0;
+        pluginName$jscomp$inline_242
+      ] = pluginModule$jscomp$inline_243;
+      isOrderingDirty$jscomp$inline_241 = !0;
     }
   }
-isOrderingDirty$jscomp$inline_237 && recomputePluginOrdering();
+isOrderingDirty$jscomp$inline_241 && recomputePluginOrdering();
 var instanceCache = new Map(),
   instanceProps = new Map();
 function getInstanceFromTag(tag) {
@@ -2359,8 +2359,34 @@ function readContext(context) {
     } else lastContextDependency = lastContextDependency.next = context;
   return value;
 }
-var interleavedQueues = null,
-  hasForceUpdate = !1;
+var concurrentQueues = null;
+function pushConcurrentUpdateQueue(queue) {
+  null === concurrentQueues
+    ? (concurrentQueues = [queue])
+    : concurrentQueues.push(queue);
+}
+function enqueueConcurrentHookUpdate(fiber, queue, update, lane) {
+  var interleaved = queue.interleaved;
+  null === interleaved
+    ? ((update.next = update), pushConcurrentUpdateQueue(queue))
+    : ((update.next = interleaved.next), (interleaved.next = update));
+  queue.interleaved = update;
+  return markUpdateLaneFromFiberToRoot(fiber, lane);
+}
+function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
+  sourceFiber.lanes |= lane;
+  var alternate = sourceFiber.alternate;
+  null !== alternate && (alternate.lanes |= lane);
+  alternate = sourceFiber;
+  for (sourceFiber = sourceFiber.return; null !== sourceFiber; )
+    (sourceFiber.childLanes |= lane),
+      (alternate = sourceFiber.alternate),
+      null !== alternate && (alternate.childLanes |= lane),
+      (alternate = sourceFiber),
+      (sourceFiber = sourceFiber.return);
+  return 3 === alternate.tag ? alternate.stateNode : null;
+}
+var hasForceUpdate = !1;
 function initializeUpdateQueue(fiber) {
   fiber.updateQueue = {
     baseState: fiber.memoizedState,
@@ -2391,24 +2417,24 @@ function createUpdate(eventTime, lane) {
     next: null
   };
 }
-function enqueueUpdate(fiber, update) {
+function enqueueUpdate(fiber, update, lane) {
   var updateQueue = fiber.updateQueue;
-  null !== updateQueue &&
-    ((updateQueue = updateQueue.shared),
-    isInterleavedUpdate(fiber)
-      ? ((fiber = updateQueue.interleaved),
-        null === fiber
-          ? ((update.next = update),
-            null === interleavedQueues
-              ? (interleavedQueues = [updateQueue])
-              : interleavedQueues.push(updateQueue))
-          : ((update.next = fiber.next), (fiber.next = update)),
-        (updateQueue.interleaved = update))
-      : ((fiber = updateQueue.pending),
-        null === fiber
-          ? (update.next = update)
-          : ((update.next = fiber.next), (fiber.next = update)),
-        (updateQueue.pending = update)));
+  if (null === updateQueue) return null;
+  updateQueue = updateQueue.shared;
+  if (0 !== (executionContext & 2)) {
+    var pending = updateQueue.pending;
+    null === pending
+      ? (update.next = update)
+      : ((update.next = pending.next), (pending.next = update));
+    updateQueue.pending = update;
+    return markUpdateLaneFromFiberToRoot(fiber, lane);
+  }
+  pending = updateQueue.interleaved;
+  null === pending
+    ? ((update.next = update), pushConcurrentUpdateQueue(updateQueue))
+    : ((update.next = pending.next), (pending.next = update));
+  updateQueue.interleaved = update;
+  return markUpdateLaneFromFiberToRoot(fiber, lane);
 }
 function entangleTransitions(root, fiber, lane) {
   fiber = fiber.updateQueue;
@@ -2645,9 +2671,10 @@ var classComponentUpdater = {
       update = createUpdate(eventTime, lane);
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update);
-    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
-    null !== payload && entangleTransitions(payload, inst, lane);
+    payload = enqueueUpdate(inst, update, lane);
+    null !== payload &&
+      (scheduleUpdateOnFiber(payload, inst, lane, eventTime),
+      entangleTransitions(payload, inst, lane));
   },
   enqueueReplaceState: function(inst, payload, callback) {
     inst = inst._reactInternals;
@@ -2657,9 +2684,10 @@ var classComponentUpdater = {
     update.tag = 1;
     update.payload = payload;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update);
-    payload = scheduleUpdateOnFiber(inst, lane, eventTime);
-    null !== payload && entangleTransitions(payload, inst, lane);
+    payload = enqueueUpdate(inst, update, lane);
+    null !== payload &&
+      (scheduleUpdateOnFiber(payload, inst, lane, eventTime),
+      entangleTransitions(payload, inst, lane));
   },
   enqueueForceUpdate: function(inst, callback) {
     inst = inst._reactInternals;
@@ -2668,9 +2696,10 @@ var classComponentUpdater = {
       update = createUpdate(eventTime, lane);
     update.tag = 2;
     void 0 !== callback && null !== callback && (update.callback = callback);
-    enqueueUpdate(inst, update);
-    callback = scheduleUpdateOnFiber(inst, lane, eventTime);
-    null !== callback && entangleTransitions(callback, inst, lane);
+    callback = enqueueUpdate(inst, update, lane);
+    null !== callback &&
+      (scheduleUpdateOnFiber(callback, inst, lane, eventTime),
+      entangleTransitions(callback, inst, lane));
   }
 };
 function checkShouldComponentUpdate(
@@ -3775,11 +3804,11 @@ function pushStoreConsistencyCheck(fiber, getSnapshot, renderedSnapshot) {
 function updateStoreInstance(fiber, inst, nextSnapshot, getSnapshot) {
   inst.value = nextSnapshot;
   inst.getSnapshot = getSnapshot;
-  checkIfSnapshotChanged(inst) && scheduleUpdateOnFiber(fiber, 1, -1);
+  checkIfSnapshotChanged(inst) && forceStoreRerender(fiber);
 }
 function subscribeToStore(fiber, inst, subscribe) {
   return subscribe(function() {
-    checkIfSnapshotChanged(inst) && scheduleUpdateOnFiber(fiber, 1, -1);
+    checkIfSnapshotChanged(inst) && forceStoreRerender(fiber);
   });
 }
 function checkIfSnapshotChanged(inst) {
@@ -3792,6 +3821,10 @@ function checkIfSnapshotChanged(inst) {
     return !0;
   }
 }
+function forceStoreRerender(fiber) {
+  var root = markUpdateLaneFromFiberToRoot(fiber, 1);
+  null !== root && scheduleUpdateOnFiber(root, fiber, 1, -1);
+}
 function mountState(initialState) {
   var hook = mountWorkInProgressHook();
   "function" === typeof initialState && (initialState = initialState());
@@ -3962,12 +3995,15 @@ function dispatchReducerAction(fiber, queue, action) {
     eagerState: null,
     next: null
   };
-  isRenderPhaseUpdate(fiber)
-    ? enqueueRenderPhaseUpdate(queue, action)
-    : (enqueueUpdate$1(fiber, queue, action),
-      (action = requestEventTime()),
-      (fiber = scheduleUpdateOnFiber(fiber, lane, action)),
-      null !== fiber && entangleTransitionUpdate(fiber, queue, lane));
+  if (isRenderPhaseUpdate(fiber)) enqueueRenderPhaseUpdate(queue, action);
+  else if (
+    ((action = enqueueConcurrentHookUpdate(fiber, queue, action, lane)),
+    null !== action)
+  ) {
+    var eventTime = requestEventTime();
+    scheduleUpdateOnFiber(action, fiber, lane, eventTime);
+    entangleTransitionUpdate(action, queue, lane);
+  }
 }
 function dispatchSetState(fiber, queue, action) {
   var lane = requestUpdateLane(fiber),
@@ -3980,7 +4016,6 @@ function dispatchSetState(fiber, queue, action) {
     };
   if (isRenderPhaseUpdate(fiber)) enqueueRenderPhaseUpdate(queue, update);
   else {
-    enqueueUpdate$1(fiber, queue, update);
     var alternate = fiber.alternate;
     if (
       0 === fiber.lanes &&
@@ -3992,13 +4027,22 @@ function dispatchSetState(fiber, queue, action) {
           eagerState = alternate(currentState, action);
         update.hasEagerState = !0;
         update.eagerState = eagerState;
-        if (objectIs(eagerState, currentState)) return;
+        if (objectIs(eagerState, currentState)) {
+          var interleaved = queue.interleaved;
+          null === interleaved
+            ? ((update.next = update), pushConcurrentUpdateQueue(queue))
+            : ((update.next = interleaved.next), (interleaved.next = update));
+          queue.interleaved = update;
+          return;
+        }
       } catch (error) {
       } finally {
       }
-    action = requestEventTime();
-    fiber = scheduleUpdateOnFiber(fiber, lane, action);
-    null !== fiber && entangleTransitionUpdate(fiber, queue, lane);
+    action = enqueueConcurrentHookUpdate(fiber, queue, update, lane);
+    null !== action &&
+      ((update = requestEventTime()),
+      scheduleUpdateOnFiber(action, fiber, lane, update),
+      entangleTransitionUpdate(action, queue, lane));
   }
 }
 function isRenderPhaseUpdate(fiber) {
@@ -4016,22 +4060,6 @@ function enqueueRenderPhaseUpdate(queue, update) {
     : ((update.next = pending.next), (pending.next = update));
   queue.pending = update;
 }
-function enqueueUpdate$1(fiber, queue, update) {
-  isInterleavedUpdate(fiber)
-    ? ((fiber = queue.interleaved),
-      null === fiber
-        ? ((update.next = update),
-          null === interleavedQueues
-            ? (interleavedQueues = [queue])
-            : interleavedQueues.push(queue))
-        : ((update.next = fiber.next), (fiber.next = update)),
-      (queue.interleaved = update))
-    : ((fiber = queue.pending),
-      null === fiber
-        ? (update.next = update)
-        : ((update.next = fiber.next), (fiber.next = update)),
-      (queue.pending = update));
-}
 function entangleTransitionUpdate(root, queue, lane) {
   if (0 !== (lane & 4194240)) {
     var queueLanes = queue.lanes;
@@ -4285,11 +4313,20 @@ function transferActualDuration(fiber) {
   for (var child = fiber.child; child; )
     (fiber.actualDuration += child.actualDuration), (child = child.sibling);
 }
-function createCapturedValue(value, source) {
+function createCapturedValueAtFiber(value, source) {
   return {
     value: value,
     source: source,
-    stack: getStackByFiberInDevAndProd(source)
+    stack: getStackByFiberInDevAndProd(source),
+    digest: null
+  };
+}
+function createCapturedValue(value, digest, stack) {
+  return {
+    value: value,
+    source: null,
+    stack: null != stack ? stack : null,
+    digest: null != digest ? digest : null
   };
 }
 if (
@@ -5031,13 +5068,16 @@ function updateDehydratedSuspenseComponent(
     if (workInProgress.flags & 256)
       return (
         (workInProgress.flags &= -257),
+        (suspenseState = createCapturedValue(
+          Error(
+            "There was an error while hydrating this Suspense boundary. Switched to client rendering."
+          )
+        )),
         retrySuspenseComponentWithoutHydrating(
           current,
           workInProgress,
           renderLanes,
-          Error(
-            "There was an error while hydrating this Suspense boundary. Switched to client rendering."
-          )
+          suspenseState
         )
       );
     if (null !== workInProgress.memoizedState)
@@ -5082,16 +5122,19 @@ function updateDehydratedSuspenseComponent(
     );
   if (shim())
     return (
-      (suspenseState = shim().errorMessage),
+      (suspenseState = shim().digest),
+      (suspenseState = createCapturedValue(
+        Error(
+          "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering."
+        ),
+        suspenseState,
+        void 0
+      )),
       retrySuspenseComponentWithoutHydrating(
         current,
         workInProgress,
         renderLanes,
         suspenseState
-          ? Error(suspenseState)
-          : Error(
-              "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering."
-            )
       )
     );
   didSuspend = 0 !== (renderLanes & current.childLanes);
@@ -5134,23 +5177,27 @@ function updateDehydratedSuspenseComponent(
         default:
           didSuspend = 0;
       }
-      nextProps =
+      didSuspend =
         0 !== (didSuspend & (nextProps.suspendedLanes | renderLanes))
           ? 0
           : didSuspend;
-      0 !== nextProps &&
-        nextProps !== suspenseState.retryLane &&
-        ((suspenseState.retryLane = nextProps),
-        scheduleUpdateOnFiber(current, nextProps, -1));
+      0 !== didSuspend &&
+        didSuspend !== suspenseState.retryLane &&
+        ((suspenseState.retryLane = didSuspend),
+        markUpdateLaneFromFiberToRoot(current, didSuspend),
+        scheduleUpdateOnFiber(nextProps, current, didSuspend, -1));
     }
     renderDidSuspendDelayIfPossible();
+    suspenseState = createCapturedValue(
+      Error(
+        "This Suspense boundary received an update before it finished hydrating. This caused the boundary to switch to client rendering. The usual way to fix this is to wrap the original update in startTransition."
+      )
+    );
     return retrySuspenseComponentWithoutHydrating(
       current,
       workInProgress,
       renderLanes,
-      Error(
-        "This Suspense boundary received an update before it finished hydrating. This caused the boundary to switch to client rendering. The usual way to fix this is to wrap the original update in startTransition."
-      )
+      suspenseState
     );
   }
   if (shim())
@@ -5437,14 +5484,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) {
       break;
     case "collapsed":
       lastTailNode = renderState.tail;
-      for (var lastTailNode$63 = null; null !== lastTailNode; )
-        null !== lastTailNode.alternate && (lastTailNode$63 = lastTailNode),
+      for (var lastTailNode$65 = null; null !== lastTailNode; )
+        null !== lastTailNode.alternate && (lastTailNode$65 = lastTailNode),
           (lastTailNode = lastTailNode.sibling);
-      null === lastTailNode$63
+      null === lastTailNode$65
         ? hasRenderedATailFallback || null === renderState.tail
           ? (renderState.tail = null)
           : (renderState.tail.sibling = null)
-        : (lastTailNode$63.sibling = null);
+        : (lastTailNode$65.sibling = null);
   }
 }
 function bubbleProperties(completedWork) {
@@ -5456,53 +5503,53 @@ function bubbleProperties(completedWork) {
   if (didBailout)
     if (0 !== (completedWork.mode & 2)) {
       for (
-        var treeBaseDuration$65 = completedWork.selfBaseDuration,
-          child$66 = completedWork.child;
-        null !== child$66;
+        var treeBaseDuration$67 = completedWork.selfBaseDuration,
+          child$68 = completedWork.child;
+        null !== child$68;
 
       )
-        (newChildLanes |= child$66.lanes | child$66.childLanes),
-          (subtreeFlags |= child$66.subtreeFlags & 14680064),
-          (subtreeFlags |= child$66.flags & 14680064),
-          (treeBaseDuration$65 += child$66.treeBaseDuration),
-          (child$66 = child$66.sibling);
-      completedWork.treeBaseDuration = treeBaseDuration$65;
+        (newChildLanes |= child$68.lanes | child$68.childLanes),
+          (subtreeFlags |= child$68.subtreeFlags & 14680064),
+          (subtreeFlags |= child$68.flags & 14680064),
+          (treeBaseDuration$67 += child$68.treeBaseDuration),
+          (child$68 = child$68.sibling);
+      completedWork.treeBaseDuration = treeBaseDuration$67;
     } else
       for (
-        treeBaseDuration$65 = completedWork.child;
-        null !== treeBaseDuration$65;
+        treeBaseDuration$67 = completedWork.child;
+        null !== treeBaseDuration$67;
 
       )
         (newChildLanes |=
-          treeBaseDuration$65.lanes | treeBaseDuration$65.childLanes),
-          (subtreeFlags |= treeBaseDuration$65.subtreeFlags & 14680064),
-          (subtreeFlags |= treeBaseDuration$65.flags & 14680064),
-          (treeBaseDuration$65.return = completedWork),
-          (treeBaseDuration$65 = treeBaseDuration$65.sibling);
+          treeBaseDuration$67.lanes | treeBaseDuration$67.childLanes),
+          (subtreeFlags |= treeBaseDuration$67.subtreeFlags & 14680064),
+          (subtreeFlags |= treeBaseDuration$67.flags & 14680064),
+          (treeBaseDuration$67.return = completedWork),
+          (treeBaseDuration$67 = treeBaseDuration$67.sibling);
   else if (0 !== (completedWork.mode & 2)) {
-    treeBaseDuration$65 = completedWork.actualDuration;
-    child$66 = completedWork.selfBaseDuration;
+    treeBaseDuration$67 = completedWork.actualDuration;
+    child$68 = completedWork.selfBaseDuration;
     for (var child = completedWork.child; null !== child; )
       (newChildLanes |= child.lanes | child.childLanes),
         (subtreeFlags |= child.subtreeFlags),
         (subtreeFlags |= child.flags),
-        (treeBaseDuration$65 += child.actualDuration),
-        (child$66 += child.treeBaseDuration),
+        (treeBaseDuration$67 += child.actualDuration),
+        (child$68 += child.treeBaseDuration),
         (child = child.sibling);
-    completedWork.actualDuration = treeBaseDuration$65;
-    completedWork.treeBaseDuration = child$66;
+    completedWork.actualDuration = treeBaseDuration$67;
+    completedWork.treeBaseDuration = child$68;
   } else
     for (
-      treeBaseDuration$65 = completedWork.child;
-      null !== treeBaseDuration$65;
+      treeBaseDuration$67 = completedWork.child;
+      null !== treeBaseDuration$67;
 
     )
       (newChildLanes |=
-        treeBaseDuration$65.lanes | treeBaseDuration$65.childLanes),
-        (subtreeFlags |= treeBaseDuration$65.subtreeFlags),
-        (subtreeFlags |= treeBaseDuration$65.flags),
-        (treeBaseDuration$65.return = completedWork),
-        (treeBaseDuration$65 = treeBaseDuration$65.sibling);
+        treeBaseDuration$67.lanes | treeBaseDuration$67.childLanes),
+        (subtreeFlags |= treeBaseDuration$67.subtreeFlags),
+        (subtreeFlags |= treeBaseDuration$67.flags),
+        (treeBaseDuration$67.return = completedWork),
+        (treeBaseDuration$67 = treeBaseDuration$67.sibling);
   completedWork.subtreeFlags |= subtreeFlags;
   completedWork.childLanes = newChildLanes;
   return didBailout;
@@ -6033,8 +6080,8 @@ function commitHookEffectListMount(flags, finishedWork) {
     var effect = (finishedWork = finishedWork.next);
     do {
       if ((effect.tag & flags) === flags) {
-        var create$81 = effect.create;
-        effect.destroy = create$81();
+        var create$83 = effect.create;
+        effect.destroy = create$83();
       }
       effect = effect.next;
     } while (effect !== finishedWork);
@@ -6419,22 +6466,22 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
           try {
             startLayoutEffectTimer(),
               commitHookEffectListUnmount(5, finishedWork, finishedWork.return);
-          } catch (error$93) {
+          } catch (error$95) {
             captureCommitPhaseError(
               finishedWork,
               finishedWork.return,
-              error$93
+              error$95
             );
           }
           recordLayoutEffectDuration(finishedWork);
         } else
           try {
             commitHookEffectListUnmount(5, finishedWork, finishedWork.return);
-          } catch (error$94) {
+          } catch (error$96) {
             captureCommitPhaseError(
               finishedWork,
               finishedWork.return,
-              error$94
+              error$96
             );
           }
       }
@@ -6453,16 +6500,16 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
         null !== current &&
         safelyDetachRef(current, current.return);
       if (flags & 4) {
-        var instance$96 = finishedWork.stateNode;
-        if (null != instance$96) {
+        var instance$98 = finishedWork.stateNode;
+        if (null != instance$98) {
           var newProps = finishedWork.memoizedProps,
             oldProps = null !== current ? current.memoizedProps : newProps,
             updatePayload = finishedWork.updateQueue;
           finishedWork.updateQueue = null;
           if (null !== updatePayload)
             try {
-              var viewConfig = instance$96.viewConfig;
-              instanceProps.set(instance$96._nativeTag, newProps);
+              var viewConfig = instance$98.viewConfig;
+              instanceProps.set(instance$98._nativeTag, newProps);
               var updatePayload$jscomp$0 = diffProperties(
                 null,
                 oldProps,
@@ -6471,15 +6518,15 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
               );
               null != updatePayload$jscomp$0 &&
                 ReactNativePrivateInterface.UIManager.updateView(
-                  instance$96._nativeTag,
+                  instance$98._nativeTag,
                   viewConfig.uiViewClassName,
                   updatePayload$jscomp$0
                 );
-            } catch (error$97) {
+            } catch (error$99) {
               captureCommitPhaseError(
                 finishedWork,
                 finishedWork.return,
-                error$97
+                error$99
               );
             }
         }
@@ -6501,8 +6548,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
             "RCTRawText",
             { text: updatePayload$jscomp$0 }
           );
-        } catch (error$98) {
-          captureCommitPhaseError(finishedWork, finishedWork.return, error$98);
+        } catch (error$100) {
+          captureCommitPhaseError(finishedWork, finishedWork.return, error$100);
         }
       }
       break;
@@ -6519,10 +6566,12 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
       commitReconciliationEffects(finishedWork);
       viewConfig = finishedWork.child;
       viewConfig.flags & 8192 &&
-        null !== viewConfig.memoizedState &&
-        (null === viewConfig.alternate ||
-          null === viewConfig.alternate.memoizedState) &&
-        (globalMostRecentFallbackTime = now());
+        ((updatePayload$jscomp$0 = null !== viewConfig.memoizedState),
+        (viewConfig.stateNode.isHidden = updatePayload$jscomp$0),
+        !updatePayload$jscomp$0 ||
+          (null !== viewConfig.alternate &&
+            null !== viewConfig.alternate.memoizedState) ||
+          (globalMostRecentFallbackTime = now()));
       flags & 4 && attachSuspenseRetryListeners(finishedWork);
       break;
     case 22:
@@ -6531,6 +6580,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
       if (flags & 8192)
         a: for (
           viewConfig = null !== finishedWork.memoizedState,
+            finishedWork.stateNode.isHidden = viewConfig,
             updatePayload$jscomp$0 = null,
             current = finishedWork;
           ;
@@ -6540,8 +6590,8 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
             if (null === updatePayload$jscomp$0) {
               updatePayload$jscomp$0 = current;
               try {
-                if (((instance$96 = current.stateNode), viewConfig))
-                  (newProps = instance$96.viewConfig),
+                if (((instance$98 = current.stateNode), viewConfig))
+                  (newProps = instance$98.viewConfig),
                     (oldProps = diffProperties(
                       null,
                       emptyObject,
@@ -6549,7 +6599,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
                       newProps.validAttributes
                     )),
                     ReactNativePrivateInterface.UIManager.updateView(
-                      instance$96._nativeTag,
+                      instance$98._nativeTag,
                       newProps.uiViewClassName,
                       oldProps
                     );
@@ -6584,11 +6634,11 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
             if (null === updatePayload$jscomp$0)
               try {
                 throw Error("Not yet implemented.");
-              } catch (error$88) {
+              } catch (error$90) {
                 captureCommitPhaseError(
                   finishedWork,
                   finishedWork.return,
-                  error$88
+                  error$90
                 );
               }
           } else if (
@@ -6652,12 +6702,12 @@ function commitReconciliationEffects(finishedWork) {
           break;
         case 3:
         case 4:
-          var parent$89 = JSCompiler_inline_result.stateNode.containerInfo,
-            before$90 = getHostSibling(finishedWork);
+          var parent$91 = JSCompiler_inline_result.stateNode.containerInfo,
+            before$92 = getHostSibling(finishedWork);
           insertOrAppendPlacementNodeIntoContainer(
             finishedWork,
-            before$90,
-            parent$89
+            before$92,
+            parent$91
           );
           break;
         default:
@@ -6746,21 +6796,21 @@ function commitLayoutEffects(finishedWork, root, committedLanes) {
                     commitUpdateQueue(committedLanes, updateQueue, instance);
                   break;
                 case 3:
-                  var updateQueue$83 = committedLanes.updateQueue;
-                  if (null !== updateQueue$83) {
-                    var instance$84 = null;
+                  var updateQueue$85 = committedLanes.updateQueue;
+                  if (null !== updateQueue$85) {
+                    var instance$86 = null;
                     if (null !== committedLanes.child)
                       switch (committedLanes.child.tag) {
                         case 5:
-                          instance$84 = committedLanes.child.stateNode;
+                          instance$86 = committedLanes.child.stateNode;
                           break;
                         case 1:
-                          instance$84 = committedLanes.child.stateNode;
+                          instance$86 = committedLanes.child.stateNode;
                       }
                     commitUpdateQueue(
                       committedLanes,
-                      updateQueue$83,
-                      instance$84
+                      updateQueue$85,
+                      instance$86
                     );
                   }
                   break;
@@ -6775,7 +6825,7 @@ function commitLayoutEffects(finishedWork, root, committedLanes) {
                     onCommit = _finishedWork$memoize2.onCommit,
                     onRender = _finishedWork$memoize2.onRender,
                     effectDuration = committedLanes.stateNode.effectDuration;
-                  instance$84 = commitTime;
+                  instance$86 = commitTime;
                   current = null === current ? "mount" : "update";
                   currentUpdateIsNested && (current = "nested-update");
                   "function" === typeof onRender &&
@@ -6785,14 +6835,14 @@ function commitLayoutEffects(finishedWork, root, committedLanes) {
                       committedLanes.actualDuration,
                       committedLanes.treeBaseDuration,
                       committedLanes.actualStartTime,
-                      instance$84
+                      instance$86
                     );
                   "function" === typeof onCommit &&
                     onCommit(
                       committedLanes.memoizedProps.id,
                       current,
                       effectDuration,
-                      instance$84
+                      instance$86
                     );
                   enqueuePendingPassiveProfilerEffect(committedLanes);
                   var parentFiber = committedLanes.return;
@@ -6823,27 +6873,27 @@ function commitLayoutEffects(finishedWork, root, committedLanes) {
                   );
               }
             if (committedLanes.flags & 512) {
-              instance$84 = void 0;
+              instance$86 = void 0;
               current = committedLanes;
               var ref = current.ref;
               if (null !== ref) {
                 var instance$jscomp$0 = current.stateNode;
                 switch (current.tag) {
                   case 5:
-                    instance$84 = instance$jscomp$0;
+                    instance$86 = instance$jscomp$0;
                     break;
                   default:
-                    instance$84 = instance$jscomp$0;
+                    instance$86 = instance$jscomp$0;
                 }
                 if ("function" === typeof ref)
                   if (current.mode & 2)
                     try {
-                      startLayoutEffectTimer(), ref(instance$84);
+                      startLayoutEffectTimer(), ref(instance$86);
                     } finally {
                       recordLayoutEffectDuration(current);
                     }
-                  else ref(instance$84);
-                else ref.current = instance$84;
+                  else ref(instance$86);
+                else ref.current = instance$86;
               }
             }
           } catch (error) {
@@ -6858,10 +6908,10 @@ function commitLayoutEffects(finishedWork, root, committedLanes) {
           nextEffect = null;
           break;
         }
-        instance$84 = committedLanes.sibling;
-        if (null !== instance$84) {
-          instance$84.return = committedLanes.return;
-          nextEffect = instance$84;
+        instance$86 = committedLanes.sibling;
+        if (null !== instance$86) {
+          instance$86.return = committedLanes.return;
+          nextEffect = instance$86;
           break;
         }
         nextEffect = committedLanes.return;
@@ -6919,15 +6969,13 @@ function requestUpdateLane(fiber) {
   fiber = currentUpdatePriority;
   return 0 !== fiber ? fiber : 16;
 }
-function scheduleUpdateOnFiber(fiber, lane, eventTime) {
+function scheduleUpdateOnFiber(root, fiber, lane, eventTime) {
   if (50 < nestedUpdateCount)
     throw ((nestedUpdateCount = 0),
     (rootWithNestedUpdates = null),
     Error(
       "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
     ));
-  var root = markUpdateLaneFromFiberToRoot(fiber, lane);
-  if (null === root) return null;
   markRootUpdated(root, lane, eventTime);
   if (0 === (executionContext & 2) || root !== workInProgressRoot)
     isDevToolsPresent && addFiberToLanesMap(root, fiber, lane),
@@ -6942,27 +6990,6 @@ function scheduleUpdateOnFiber(fiber, lane, eventTime) {
         0 === (fiber.mode & 1) &&
         ((workInProgressRootRenderTargetTime = now() + 500),
         includesLegacySyncCallbacks && flushSyncCallbacks());
-  return root;
-}
-function markUpdateLaneFromFiberToRoot(sourceFiber, lane) {
-  sourceFiber.lanes |= lane;
-  var alternate = sourceFiber.alternate;
-  null !== alternate && (alternate.lanes |= lane);
-  alternate = sourceFiber;
-  for (sourceFiber = sourceFiber.return; null !== sourceFiber; )
-    (sourceFiber.childLanes |= lane),
-      (alternate = sourceFiber.alternate),
-      null !== alternate && (alternate.childLanes |= lane),
-      (alternate = sourceFiber),
-      (sourceFiber = sourceFiber.return);
-  return 3 === alternate.tag ? alternate.stateNode : null;
-}
-function isInterleavedUpdate(fiber) {
-  return (
-    (null !== workInProgressRoot || null !== interleavedQueues) &&
-    0 !== (fiber.mode & 1) &&
-    0 === (executionContext & 2)
-  );
 }
 function ensureRootIsScheduled(root, currentTime) {
   for (
@@ -7378,10 +7405,10 @@ function prepareFreshStack(root, lanes) {
   workInProgressRootFatalError = null;
   workInProgressRootPingedLanes = workInProgressRootInterleavedUpdatedLanes = workInProgressRootSkippedLanes = 0;
   workInProgressRootRecoverableErrors = workInProgressRootConcurrentErrors = null;
-  if (null !== interleavedQueues) {
-    for (lanes = 0; lanes < interleavedQueues.length; lanes++)
+  if (null !== concurrentQueues) {
+    for (lanes = 0; lanes < concurrentQueues.length; lanes++)
       if (
-        ((timeoutHandle = interleavedQueues[lanes]),
+        ((timeoutHandle = concurrentQueues[lanes]),
         (interruptedWork = timeoutHandle.interleaved),
         null !== interruptedWork)
       ) {
@@ -7395,7 +7422,7 @@ function prepareFreshStack(root, lanes) {
         }
         timeoutHandle.pending = interruptedWork;
       }
-    interleavedQueues = null;
+    concurrentQueues = null;
   }
   return root;
 }
@@ -7494,7 +7521,7 @@ function handleError(root$jscomp$0, thrownValue) {
                   else {
                     var update = createUpdate(-1, 1);
                     update.tag = 2;
-                    enqueueUpdate(sourceFiber, update);
+                    enqueueUpdate(sourceFiber, update, 1);
                   }
                 sourceFiber.lanes |= 1;
               }
@@ -7521,13 +7548,12 @@ function handleError(root$jscomp$0, thrownValue) {
             );
           }
         }
-        root = value;
+        root = value = createCapturedValueAtFiber(value, sourceFiber);
         4 !== workInProgressRootExitStatus &&
           (workInProgressRootExitStatus = 2);
         null === workInProgressRootConcurrentErrors
           ? (workInProgressRootConcurrentErrors = [root])
           : workInProgressRootConcurrentErrors.push(root);
-        value = createCapturedValue(value, sourceFiber);
         root = returnFiber;
         do {
           switch (root.tag) {
@@ -7791,7 +7817,11 @@ function commitRootImpl(
       transitions < recoverableErrors.length;
       transitions++
     )
-      renderPriorityLevel(recoverableErrors[transitions]);
+      (lanes = recoverableErrors[transitions]),
+        renderPriorityLevel(lanes.value, {
+          componentStack: lanes.stack,
+          digest: lanes.digest
+        });
   if (hasUncaughtError)
     throw ((hasUncaughtError = !1),
     (root = firstUncaughtError),
@@ -8021,11 +8051,10 @@ function enqueuePendingPassiveProfilerEffect(fiber) {
     }));
 }
 function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) {
-  sourceFiber = createCapturedValue(error, sourceFiber);
+  sourceFiber = createCapturedValueAtFiber(error, sourceFiber);
   sourceFiber = createRootErrorUpdate(rootFiber, sourceFiber, 1);
-  enqueueUpdate(rootFiber, sourceFiber);
+  rootFiber = enqueueUpdate(rootFiber, sourceFiber, 1);
   sourceFiber = requestEventTime();
-  rootFiber = markUpdateLaneFromFiberToRoot(rootFiber, 1);
   null !== rootFiber &&
     (markRootUpdated(rootFiber, 1, sourceFiber),
     ensureRootIsScheduled(rootFiber, sourceFiber));
@@ -8055,18 +8084,18 @@ function captureCommitPhaseError(sourceFiber, nearestMountedAncestor, error) {
             (null === legacyErrorBoundariesThatAlreadyFailed ||
               !legacyErrorBoundariesThatAlreadyFailed.has(instance)))
         ) {
-          sourceFiber = createCapturedValue(error, sourceFiber);
+          sourceFiber = createCapturedValueAtFiber(error, sourceFiber);
           sourceFiber = createClassErrorUpdate(
             nearestMountedAncestor,
             sourceFiber,
             1
           );
-          enqueueUpdate(nearestMountedAncestor, sourceFiber);
-          sourceFiber = requestEventTime();
-          nearestMountedAncestor = markUpdateLaneFromFiberToRoot(
+          nearestMountedAncestor = enqueueUpdate(
             nearestMountedAncestor,
+            sourceFiber,
             1
           );
+          sourceFiber = requestEventTime();
           null !== nearestMountedAncestor &&
             (markRootUpdated(nearestMountedAncestor, 1, sourceFiber),
             ensureRootIsScheduled(nearestMountedAncestor, sourceFiber));
@@ -8739,7 +8768,7 @@ function createFiberFromOffscreen(pendingProps, mode, lanes, key) {
   pendingProps = createFiber(22, pendingProps, key, mode);
   pendingProps.elementType = REACT_OFFSCREEN_TYPE;
   pendingProps.lanes = lanes;
-  pendingProps.stateNode = {};
+  pendingProps.stateNode = { isHidden: !1 };
   return pendingProps;
 }
 function createFiberFromText(content, mode, lanes) {
@@ -8865,9 +8894,10 @@ function updateContainer(element, container, parentComponent, callback) {
   container.payload = { element: element };
   callback = void 0 === callback ? null : callback;
   null !== callback && (container.callback = callback);
-  enqueueUpdate(current, container);
-  element = scheduleUpdateOnFiber(current, lane, eventTime);
-  null !== element && entangleTransitions(element, current, lane);
+  element = enqueueUpdate(current, container, lane);
+  null !== element &&
+    (scheduleUpdateOnFiber(element, current, lane, eventTime),
+    entangleTransitions(element, current, lane));
   return lane;
 }
 function emptyFindFiberByHostInstance() {
@@ -8909,10 +8939,10 @@ batchedUpdatesImpl = function(fn, a) {
   }
 };
 var roots = new Map(),
-  devToolsConfig$jscomp$inline_1010 = {
+  devToolsConfig$jscomp$inline_1022 = {
     findFiberByHostInstance: getInstanceFromTag,
     bundleType: 0,
-    version: "18.2.0-next-d300cebde-20220601",
+    version: "18.2.0-next-9e3b772b8-20220608",
     rendererPackageName: "react-native-renderer",
     rendererConfig: {
       getInspectorDataForViewTag: function() {
@@ -8927,11 +8957,11 @@ var roots = new Map(),
       }.bind(null, findNodeHandle)
     }
   };
-var internals$jscomp$inline_1302 = {
-  bundleType: devToolsConfig$jscomp$inline_1010.bundleType,
-  version: devToolsConfig$jscomp$inline_1010.version,
-  rendererPackageName: devToolsConfig$jscomp$inline_1010.rendererPackageName,
-  rendererConfig: devToolsConfig$jscomp$inline_1010.rendererConfig,
+var internals$jscomp$inline_1310 = {
+  bundleType: devToolsConfig$jscomp$inline_1022.bundleType,
+  version: devToolsConfig$jscomp$inline_1022.version,
+  rendererPackageName: devToolsConfig$jscomp$inline_1022.rendererPackageName,
+  rendererConfig: devToolsConfig$jscomp$inline_1022.rendererConfig,
   overrideHookState: null,
   overrideHookStateDeletePath: null,
   overrideHookStateRenamePath: null,
@@ -8947,26 +8977,26 @@ var internals$jscomp$inline_1302 = {
     return null === fiber ? null : fiber.stateNode;
   },
   findFiberByHostInstance:
-    devToolsConfig$jscomp$inline_1010.findFiberByHostInstance ||
+    devToolsConfig$jscomp$inline_1022.findFiberByHostInstance ||
     emptyFindFiberByHostInstance,
   findHostInstancesForRefresh: null,
   scheduleRefresh: null,
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.2.0-next-d300cebde-20220601"
+  reconcilerVersion: "18.2.0-next-9e3b772b8-20220608"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
-  var hook$jscomp$inline_1303 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  var hook$jscomp$inline_1311 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
   if (
-    !hook$jscomp$inline_1303.isDisabled &&
-    hook$jscomp$inline_1303.supportsFiber
+    !hook$jscomp$inline_1311.isDisabled &&
+    hook$jscomp$inline_1311.supportsFiber
   )
     try {
-      (rendererID = hook$jscomp$inline_1303.inject(
-        internals$jscomp$inline_1302
+      (rendererID = hook$jscomp$inline_1311.inject(
+        internals$jscomp$inline_1310
       )),
-        (injectedHook = hook$jscomp$inline_1303);
+        (injectedHook = hook$jscomp$inline_1311);
     } catch (err) {}
 }
 exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer.d.ts b/Libraries/Renderer/implementations/ReactNativeRenderer.d.ts
new file mode 100644
index 000000000000..2624d4a78ce0
--- /dev/null
+++ b/Libraries/Renderer/implementations/ReactNativeRenderer.d.ts
@@ -0,0 +1,149 @@
+/**
+ * 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
+ */
+
+import {GestureResponderEvent} from '../../Types/CoreEventTypes';
+
+/**
+ * Gesture recognition on mobile devices is much more complicated than web.
+ * A touch can go through several phases as the app determines what the user's intention is.
+ * For example, the app needs to determine if the touch is scrolling, sliding on a widget, or tapping.
+ * This can even change during the duration of a touch. There can also be multiple simultaneous touches.
+ *
+ * The touch responder system is needed to allow components to negotiate these touch interactions
+ * without any additional knowledge about their parent or child components.
+ * This system is implemented in ResponderEventPlugin.js, which contains further details and documentation.
+ *
+ * Best Practices
+ * Users can feel huge differences in the usability of web apps vs. native, and this is one of the big causes.
+ * Every action should have the following attributes:
+ *      Feedback/highlighting- show the user what is handling their touch, and what will happen when they release the gesture
+ *      Cancel-ability- when making an action, the user should be able to abort it mid-touch by dragging their finger away
+ *
+ * These features make users more comfortable while using an app,
+ * because it allows people to experiment and interact without fear of making mistakes.
+ *
+ * TouchableHighlight and Touchable*
+ * The responder system can be complicated to use.
+ * So we have provided an abstract Touchable implementation for things that should be "tappable".
+ * This uses the responder system and allows you to easily configure tap interactions declaratively.
+ * Use TouchableHighlight anywhere where you would use a button or link on web.
+ */
+export interface GestureResponderHandlers {
+  /**
+   * A view can become the touch responder by implementing the correct negotiation methods.
+   * There are two methods to ask the view if it wants to become responder:
+   */
+
+  /**
+   * Does this view want to become responder on the start of a touch?
+   */
+  onStartShouldSetResponder?:
+    | ((event: GestureResponderEvent) => boolean)
+    | undefined;
+
+  /**
+   * Called for every touch move on the View when it is not the responder: does this view want to "claim" touch responsiveness?
+   */
+  onMoveShouldSetResponder?:
+    | ((event: GestureResponderEvent) => boolean)
+    | undefined;
+
+  /**
+   * If the View returns true and attempts to become the responder, one of the following will happen:
+   */
+
+  onResponderEnd?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * The View is now responding for touch events.
+   * This is the time to highlight and show the user what is happening
+   */
+  onResponderGrant?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * Something else is the responder right now and will not release it
+   */
+  onResponderReject?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * If the view is responding, the following handlers can be called:
+   */
+
+  /**
+   * The user is moving their finger
+   */
+  onResponderMove?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * Fired at the end of the touch, ie "touchUp"
+   */
+  onResponderRelease?: ((event: GestureResponderEvent) => void) | undefined;
+
+  onResponderStart?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   *  Something else wants to become responder.
+   *  Should this view release the responder? Returning true allows release
+   */
+  onResponderTerminationRequest?:
+    | ((event: GestureResponderEvent) => boolean)
+    | undefined;
+
+  /**
+   * The responder has been taken from the View.
+   * Might be taken by other views after a call to onResponderTerminationRequest,
+   * or might be taken by the OS without asking (happens with control center/ notification center on iOS)
+   */
+  onResponderTerminate?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * onStartShouldSetResponder and onMoveShouldSetResponder are called with a bubbling pattern,
+   * where the deepest node is called first.
+   * That means that the deepest component will become responder when multiple Views return true for *ShouldSetResponder handlers.
+   * This is desirable in most cases, because it makes sure all controls and buttons are usable.
+   *
+   * However, sometimes a parent will want to make sure that it becomes responder.
+   * This can be handled by using the capture phase.
+   * Before the responder system bubbles up from the deepest component,
+   * it will do a capture phase, firing on*ShouldSetResponderCapture.
+   * So if a parent View wants to prevent the child from becoming responder on a touch start,
+   * it should have a onStartShouldSetResponderCapture handler which returns true.
+   */
+  onStartShouldSetResponderCapture?:
+    | ((event: GestureResponderEvent) => boolean)
+    | undefined;
+
+  /**
+   * onStartShouldSetResponder and onMoveShouldSetResponder are called with a bubbling pattern,
+   * where the deepest node is called first.
+   * That means that the deepest component will become responder when multiple Views return true for *ShouldSetResponder handlers.
+   * This is desirable in most cases, because it makes sure all controls and buttons are usable.
+   *
+   * However, sometimes a parent will want to make sure that it becomes responder.
+   * This can be handled by using the capture phase.
+   * Before the responder system bubbles up from the deepest component,
+   * it will do a capture phase, firing on*ShouldSetResponderCapture.
+   * So if a parent View wants to prevent the child from becoming responder on a touch start,
+   * it should have a onStartShouldSetResponderCapture handler which returns true.
+   */
+  onMoveShouldSetResponderCapture?:
+    | ((event: GestureResponderEvent) => boolean)
+    | undefined;
+}
+
+/**
+ * React Native also implements unstable_batchedUpdates
+ */
+export function unstable_batchedUpdates<A, B>(
+  callback: (a: A, b: B) => any,
+  a: A,
+  b: B,
+): void;
+export function unstable_batchedUpdates<A>(callback: (a: A) => any, a: A): void;
+export function unstable_batchedUpdates(callback: () => any): void;
diff --git a/Libraries/Renderer/shims/ReactFabric.js b/Libraries/Renderer/shims/ReactFabric.js
index e9897f032c32..6ce97d995266 100644
--- a/Libraries/Renderer/shims/ReactFabric.js
+++ b/Libraries/Renderer/shims/ReactFabric.js
@@ -1,12 +1,12 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
  *
  * @noformat
  * @flow
- * @generated SignedSource<<ca65d187831e77f0f589dfd9fa8775bc>>
+ * @generated SignedSource<<ef2742380b2b2c69cea8618289eea086>>
  *
  * This file was sync'd from the facebook/react repository.
  */
diff --git a/Libraries/Renderer/shims/ReactFeatureFlags.js b/Libraries/Renderer/shims/ReactFeatureFlags.js
index d7101030a3e2..19914b304c53 100644
--- a/Libraries/Renderer/shims/ReactFeatureFlags.js
+++ b/Libraries/Renderer/shims/ReactFeatureFlags.js
@@ -1,12 +1,12 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
  *
  * @noformat
  * @flow strict-local
- * @generated SignedSource<<b17df4f82c9d4fe20645f360eadf82bc>>
+ * @generated SignedSource<<47062f1b1abd7428381f0362986d9c0e>>
  *
  * This file was sync'd from the facebook/react repository.
  */
diff --git a/Libraries/Renderer/shims/ReactNative.js b/Libraries/Renderer/shims/ReactNative.js
index eb3322c0cff2..e2cff0253cc0 100644
--- a/Libraries/Renderer/shims/ReactNative.js
+++ b/Libraries/Renderer/shims/ReactNative.js
@@ -1,12 +1,12 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
  *
  * @noformat
  * @flow
- * @generated SignedSource<<45ec3626ad048b08dac9b031b02bc0a8>>
+ * @generated SignedSource<<744176db456e2656dac661d36e55f42a>>
  *
  * This file was sync'd from the facebook/react repository.
  */
diff --git a/Libraries/Renderer/shims/ReactNativeTypes.d.ts b/Libraries/Renderer/shims/ReactNativeTypes.d.ts
new file mode 100644
index 000000000000..38e00e1cc933
--- /dev/null
+++ b/Libraries/Renderer/shims/ReactNativeTypes.d.ts
@@ -0,0 +1,141 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+
+export type MeasureOnSuccessCallback = (
+  x: number,
+  y: number,
+  width: number,
+  height: number,
+  pageX: number,
+  pageY: number,
+) => void;
+
+export type MeasureInWindowOnSuccessCallback = (
+  x: number,
+  y: number,
+  width: number,
+  height: number,
+) => void;
+
+export type MeasureLayoutOnSuccessCallback = (
+  left: number,
+  top: number,
+  width: number,
+  height: number,
+) => void;
+
+/**
+ * NativeMethods provides methods to access the underlying native component directly.
+ * This can be useful in cases when you want to focus a view or measure its on-screen dimensions,
+ * for example.
+ * The methods described here are available on most of the default components provided by React Native.
+ * Note, however, that they are not available on composite components that aren't directly backed by a
+ * native view. This will generally include most components that you define in your own app.
+ * For more information, see [Direct Manipulation](https://reactnative.dev/docs/direct-manipulation).
+ * @see https://github.com/facebook/react-native/blob/master/Libraries/Renderer/shims/ReactNativeTypes.js#L87
+ */
+export interface NativeMethods {
+  /**
+   * Determines the location on screen, width, and height of the given view and
+   * returns the values via an async callback. If successful, the callback will
+   * be called with the following arguments:
+   *
+   *  - x
+   *  - y
+   *  - width
+   *  - height
+   *  - pageX
+   *  - pageY
+   *
+   * Note that these measurements are not available until after the rendering
+   * has been completed in native. If you need the measurements as soon as
+   * possible, consider using the [`onLayout`
+   * prop](docs/view.html#onlayout) instead.
+   */
+  measure(callback: MeasureOnSuccessCallback): void;
+
+  /**
+   * Determines the location of the given view in the window and returns the
+   * values via an async callback. If the React root view is embedded in
+   * another native view, this will give you the absolute coordinates. If
+   * successful, the callback will be called with the following
+   * arguments:
+   *
+   *  - x
+   *  - y
+   *  - width
+   *  - height
+   *
+   * Note that these measurements are not available until after the rendering
+   * has been completed in native.
+   */
+  measureInWindow(callback: MeasureInWindowOnSuccessCallback): void;
+
+  /**
+   * Like [`measure()`](#measure), but measures the view relative an ancestor,
+   * specified as `relativeToNativeComponentRef`. This means that the returned x, y
+   * are relative to the origin x, y of the ancestor view.
+   * _Can also be called with a relativeNativeNodeHandle but is deprecated._
+   */
+  measureLayout(
+    relativeToNativeComponentRef: HostComponent<unknown> | number,
+    onSuccess: MeasureLayoutOnSuccessCallback,
+    onFail: () => void /* currently unused */,
+  ): void;
+
+  /**
+   * This function sends props straight to native. They will not participate in
+   * future diff process - this means that if you do not include them in the
+   * next render, they will remain active (see [Direct
+   * Manipulation](https://reactnative.dev/docs/direct-manipulation)).
+   */
+  setNativeProps(nativeProps: object): void;
+
+  /**
+   * Requests focus for the given input or view. The exact behavior triggered
+   * will depend on the platform and type of view.
+   */
+  focus(): void;
+
+  /**
+   * Removes focus from an input or view. This is the opposite of `focus()`.
+   */
+  blur(): void;
+
+  refs: {
+    [key: string]: React.Component<any, any>;
+  };
+}
+
+/**
+ * @deprecated Use NativeMethods instead.
+ */
+export type NativeMethodsMixin = NativeMethods;
+/**
+ * @deprecated Use NativeMethods instead.
+ */
+export type NativeMethodsMixinType = NativeMethods;
+
+/**
+ * Represents a native component, such as those returned from `requireNativeComponent`.
+ *
+ * @see https://github.com/facebook/react-native/blob/v0.62.0-rc.5/Libraries/Renderer/shims/ReactNativeTypes.js
+ *
+ * @todo This should eventually be defined as an AbstractComponent, but that
+ *       should first be introduced in the React typings.
+ */
+export interface HostComponent<P>
+  extends Pick<
+    React.ComponentClass<P>,
+    Exclude<keyof React.ComponentClass<P>, 'new'>
+  > {
+  new (props: P, context?: any): React.Component<P> & Readonly<NativeMethods>;
+}
diff --git a/Libraries/Renderer/shims/ReactNativeTypes.js b/Libraries/Renderer/shims/ReactNativeTypes.js
index bc5d12038ef8..39ecaf5257a8 100644
--- a/Libraries/Renderer/shims/ReactNativeTypes.js
+++ b/Libraries/Renderer/shims/ReactNativeTypes.js
@@ -1,12 +1,12 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
  *
  * @noformat
  * @flow strict
- * @generated SignedSource<<fb8a7e52d219403fad0cf916954e5185>>
+ * @generated SignedSource<<d9fed8e0aacc3113ceaf7d8e266300c6>>
  *
  * This file was sync'd from the facebook/react repository.
  */
@@ -38,10 +38,10 @@ export type MeasureLayoutOnSuccessCallback = (
 
 export type AttributeType<T, V> =
   | true
-  | $ReadOnly<{|
+  | $ReadOnly<{
       diff?: (arg1: T, arg2: T) => boolean,
       process?: (arg1: V) => T,
-    |}>;
+    }>;
 
 // We either force that `diff` and `process` always use mixed,
 // or we allow them to define specific types and use this hack
@@ -98,7 +98,7 @@ export type PartialViewConfig = $ReadOnly<{
   validAttributes?: PartialAttributeConfiguration,
 }>;
 
-export type NativeMethods = $ReadOnly<{|
+export type NativeMethods = $ReadOnly<{
   blur(): void,
   focus(): void,
   measure(callback: MeasureOnSuccessCallback): void,
@@ -109,7 +109,7 @@ export type NativeMethods = $ReadOnly<{|
     onFail?: () => void,
   ): void,
   setNativeProps(nativeProps: {...}): void,
-|}>;
+}>;
 
 export type HostComponent<T> = AbstractComponent<T, $ReadOnly<NativeMethods>>;
 
@@ -125,42 +125,43 @@ type InspectorDataProps = $ReadOnly<{
   ...,
 }>;
 
-type InspectorDataSource = $ReadOnly<{|
+type InspectorDataSource = $ReadOnly<{
   fileName?: string,
   lineNumber?: number,
-|}>;
+}>;
 
 type InspectorDataGetter = (
   <TElementType: ElementType>(
     componentOrHandle: ElementRef<TElementType> | number,
   ) => ?number,
-) => $ReadOnly<{|
+) => $ReadOnly<{
   measure: (callback: MeasureOnSuccessCallback) => void,
   props: InspectorDataProps,
   source: InspectorDataSource,
-|}>;
+}>;
 
-export type InspectorData = $ReadOnly<{|
-  hierarchy: Array<{|
+export type InspectorData = $ReadOnly<{
+  closestInstance?: mixed,
+  hierarchy: Array<{
     name: ?string,
     getInspectorData: InspectorDataGetter,
-  |}>,
+  }>,
   selectedIndex: ?number,
   props: InspectorDataProps,
   source: ?InspectorDataSource,
-|}>;
+}>;
 
-export type TouchedViewDataAtPoint = $ReadOnly<{|
+export type TouchedViewDataAtPoint = $ReadOnly<{
   pointerY: number,
   touchedViewTag?: number,
-  frame: $ReadOnly<{|
+  frame: $ReadOnly<{
     top: number,
     left: number,
     width: number,
     height: number,
-  |}>,
+  }>,
   ...InspectorData,
-|}>;
+}>;
 
 /**
  * Flat ReactNative renderer bundles are too big for Flow to parse efficiently.
@@ -270,18 +271,18 @@ export type LayoutAnimationProperty =
   | 'scaleY'
   | 'scaleXY';
 
-export type LayoutAnimationAnimationConfig = $ReadOnly<{|
+export type LayoutAnimationAnimationConfig = $ReadOnly<{
   duration?: number,
   delay?: number,
   springDamping?: number,
   initialVelocity?: number,
   type?: LayoutAnimationType,
   property?: LayoutAnimationProperty,
-|}>;
+}>;
 
-export type LayoutAnimationConfig = $ReadOnly<{|
+export type LayoutAnimationConfig = $ReadOnly<{
   duration: number,
   create?: LayoutAnimationAnimationConfig,
   update?: LayoutAnimationAnimationConfig,
   delete?: LayoutAnimationAnimationConfig,
-|}>;
+}>;
diff --git a/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js b/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js
index 981117e21b3f..d46f2f70abc4 100644
--- a/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js
+++ b/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js
@@ -1,12 +1,12 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
  *
  * @noformat
  * @flow strict-local
- * @generated SignedSource<<a5b40ebf1f5b17d6dc83479c1c597566>>
+ * @generated SignedSource<<bda490a01513d4526005c1e029d5ce93>>
  *
  * This file was sync'd from the facebook/react repository.
  */
@@ -18,19 +18,19 @@ import invariant from 'invariant';
 
 // Event configs
 const customBubblingEventTypes: {
-  [eventName: string]: $ReadOnly<{|
-    phasedRegistrationNames: $ReadOnly<{|
+  [eventName: string]: $ReadOnly<{
+    phasedRegistrationNames: $ReadOnly<{
       captured: string,
       bubbled: string,
       skipBubbling?: ?boolean,
-    |}>,
-  |}>,
+    }>,
+  }>,
   ...,
 } = {};
 const customDirectEventTypes: {
-  [eventName: string]: $ReadOnly<{|
+  [eventName: string]: $ReadOnly<{
     registrationName: string,
-  |}>,
+  }>,
   ...,
 } = {};
 
diff --git a/Libraries/Renderer/shims/createReactNativeComponentClass.js b/Libraries/Renderer/shims/createReactNativeComponentClass.js
index 51bf22b7965b..e1aee01e405d 100644
--- a/Libraries/Renderer/shims/createReactNativeComponentClass.js
+++ b/Libraries/Renderer/shims/createReactNativeComponentClass.js
@@ -1,12 +1,12 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
  *
  * @noformat
  * @flow strict-local
- * @generated SignedSource<<4f1549884fbe8fc2aea495692e3f665d>>
+ * @generated SignedSource<<7d3d4090dadea2daa09d92e5e66f6e5d>>
  *
  * This file was sync'd from the facebook/react repository.
  */
diff --git a/Libraries/Settings/NativeSettingsManager.js b/Libraries/Settings/NativeSettingsManager.js
index d64309a7d9cc..e0219e66195c 100644
--- a/Libraries/Settings/NativeSettingsManager.js
+++ b/Libraries/Settings/NativeSettingsManager.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Settings/RCTSettingsManager.mm b/Libraries/Settings/RCTSettingsManager.mm
index 4badb6068eba..e0f37c9a6de3 100644
--- a/Libraries/Settings/RCTSettingsManager.mm
+++ b/Libraries/Settings/RCTSettingsManager.mm
@@ -15,11 +15,10 @@
 
 #import "RCTSettingsPlugins.h"
 
-@interface RCTSettingsManager() <NativeSettingsManagerSpec>
+@interface RCTSettingsManager () <NativeSettingsManagerSpec>
 @end
 
-@implementation RCTSettingsManager
-{
+@implementation RCTSettingsManager {
   BOOL _ignoringUpdates;
   NSUserDefaults *_defaults;
 }
@@ -43,7 +42,6 @@ - (instancetype)initWithUserDefaults:(NSUserDefaults *)defaults
   if ((self = [super init])) {
     _defaults = defaults;
 
-
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(userDefaultsDidChange:)
                                                  name:NSUserDefaultsDidChangeNotification
@@ -59,9 +57,8 @@ - (instancetype)initWithUserDefaults:(NSUserDefaults *)defaults
 
 - (facebook::react::ModuleConstants<JS::NativeSettingsManager::Constants>)getConstants
 {
-  return facebook::react::typedConstants<JS::NativeSettingsManager::Constants>({
-    .settings = RCTJSONClean([_defaults dictionaryRepresentation])
-  });
+  return facebook::react::typedConstants<JS::NativeSettingsManager::Constants>(
+      {.settings = RCTJSONClean([_defaults dictionaryRepresentation])});
 }
 
 - (void)userDefaultsDidChange:(NSNotification *)note
@@ -73,8 +70,8 @@ - (void)userDefaultsDidChange:(NSNotification *)note
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
   [[_moduleRegistry moduleForName:"EventDispatcher"]
-   sendDeviceEventWithName:@"settingsUpdated"
-   body:RCTJSONClean([_defaults dictionaryRepresentation])];
+      sendDeviceEventWithName:@"settingsUpdated"
+                         body:RCTJSONClean([_defaults dictionaryRepresentation])];
 #pragma clang diagnostic pop
 }
 
@@ -82,7 +79,7 @@ - (void)userDefaultsDidChange:(NSNotification *)note
  * Set one or more values in the settings.
  * TODO: would it be useful to have a callback for when this has completed?
  */
-RCT_EXPORT_METHOD(setValues:(NSDictionary *)values)
+RCT_EXPORT_METHOD(setValues : (NSDictionary *)values)
 {
   _ignoringUpdates = YES;
   [values enumerateKeysAndObjectsUsingBlock:^(NSString *key, id json, BOOL *stop) {
@@ -101,7 +98,7 @@ - (void)userDefaultsDidChange:(NSNotification *)note
 /**
  * Remove some values from the settings.
  */
-RCT_EXPORT_METHOD(deleteValues:(NSArray<NSString *> *)keys)
+RCT_EXPORT_METHOD(deleteValues : (NSArray<NSString *> *)keys)
 {
   _ignoringUpdates = YES;
   for (NSString *key in keys) {
@@ -112,7 +109,8 @@ - (void)userDefaultsDidChange:(NSNotification *)note
   _ignoringUpdates = NO;
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   return std::make_shared<facebook::react::NativeSettingsManagerSpecJSI>(params);
 }
diff --git a/Libraries/Settings/Settings.d.ts b/Libraries/Settings/Settings.d.ts
new file mode 100644
index 000000000000..552e3257dde7
--- /dev/null
+++ b/Libraries/Settings/Settings.d.ts
@@ -0,0 +1,18 @@
+/**
+ * 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 SettingsStatic {
+  get(key: string): any;
+  set(settings: Object): void;
+  watchKeys(keys: string | Array<string>, callback: () => void): number;
+  clearWatch(watchId: number): void;
+}
+
+export const Settings: SettingsStatic;
+export type Settings = SettingsStatic;
diff --git a/Libraries/Share/NativeShareModule.js b/Libraries/Share/NativeShareModule.js
index bc03735b9149..39b877cd0982 100644
--- a/Libraries/Share/NativeShareModule.js
+++ b/Libraries/Share/NativeShareModule.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Share/Share.d.ts b/Libraries/Share/Share.d.ts
new file mode 100644
index 000000000000..76ac757c97e8
--- /dev/null
+++ b/Libraries/Share/Share.d.ts
@@ -0,0 +1,80 @@
+/**
+ * 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
+ */
+
+import {ColorValue} from '../StyleSheet/StyleSheet';
+
+export type ShareContent =
+  | {
+      title?: string | undefined;
+      message: string;
+    }
+  | {
+      title?: string | undefined;
+      url: string;
+    };
+
+export type ShareOptions = {
+  dialogTitle?: string | undefined;
+  excludedActivityTypes?: Array<string> | undefined;
+  tintColor?: ColorValue | undefined;
+  subject?: string | undefined;
+  anchor?: number | undefined;
+};
+
+export type ShareSharedAction = {
+  action: 'sharedAction';
+  activityType?: string | undefined;
+};
+
+export type ShareDismissedAction = {
+  action: 'dismissedAction';
+};
+
+export type ShareAction = ShareSharedAction | ShareDismissedAction;
+
+export interface ShareStatic {
+  /**
+   * Open a dialog to share text content.
+   *
+   * In iOS, Returns a Promise which will be invoked an object containing `action`, `activityType`.
+   * If the user dismissed the dialog, the Promise will still be resolved with action being `Share.dismissedAction`
+   * and all the other keys being undefined.
+   *
+   * In Android, Returns a Promise which always be resolved with action being `Share.sharedAction`.
+   *
+   * ### Content
+   *
+   *  - `message` - a message to share
+   *  - `title` - title of the message
+   *
+   * #### iOS
+   *
+   *  - `url` - an URL to share
+   *
+   * At least one of URL and message is required.
+   *
+   * ### Options
+   *
+   * #### iOS
+   *
+   * - `excludedActivityTypes`
+   * - `tintColor`
+   *
+   * #### Android
+   *
+   * - `dialogTitle`
+   *
+   */
+  share(content: ShareContent, options?: ShareOptions): Promise<ShareAction>;
+  sharedAction: 'sharedAction';
+  dismissedAction: 'dismissedAction';
+}
+
+export const Share: ShareStatic;
+export type Share = ShareStatic;
diff --git a/Libraries/Share/Share.js b/Libraries/Share/Share.js
index e2e7656de866..10fff7443e03 100644
--- a/Libraries/Share/Share.js
+++ b/Libraries/Share/Share.js
@@ -8,14 +8,13 @@
  * @flow strict-local
  */
 
-const Platform = require('../Utilities/Platform');
-
-const invariant = require('invariant');
-const processColor = require('../StyleSheet/processColor');
-
 import NativeActionSheetManager from '../ActionSheetIOS/NativeActionSheetManager';
 import NativeShareModule from './NativeShareModule';
 
+const processColor = require('../StyleSheet/processColor');
+const Platform = require('../Utilities/Platform');
+const invariant = require('invariant');
+
 type Content =
   | {
       title?: string,
@@ -32,6 +31,7 @@ type Options = {
   excludedActivityTypes?: Array<string>,
   tintColor?: string,
   subject?: string,
+  anchor?: number,
   ...
 };
 
@@ -132,6 +132,8 @@ class Share {
             url: typeof content.url === 'string' ? content.url : undefined,
             subject: options.subject,
             tintColor: typeof tintColor === 'number' ? tintColor : undefined,
+            anchor:
+              typeof options.anchor === 'number' ? options.anchor : undefined,
             excludedActivityTypes: options.excludedActivityTypes,
           },
           error => reject(error),
diff --git a/Libraries/Storage/AsyncStorage.js b/Libraries/Storage/AsyncStorage.js
deleted file mode 100644
index e9683ab0cf7a..000000000000
--- a/Libraries/Storage/AsyncStorage.js
+++ /dev/null
@@ -1,385 +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
- * @jsdoc
- */
-
-import NativeAsyncLocalStorage from './NativeAsyncLocalStorage';
-import NativeAsyncSQLiteDBStorage from './NativeAsyncSQLiteDBStorage';
-import invariant from 'invariant';
-
-// Use SQLite if available, otherwise file storage.
-const RCTAsyncStorage = NativeAsyncSQLiteDBStorage || NativeAsyncLocalStorage;
-
-type GetRequest = {
-  keys: Array<string>,
-  callback: ?(errors: ?Array<Error>, result: ?Array<Array<string>>) => void,
-  keyIndex: number,
-  resolve: (
-    result?:
-      | void
-      | null
-      | Promise<?Array<Array<string>>>
-      | Array<Array<string>>,
-  ) => void,
-  reject: (error?: mixed) => void,
-};
-
-/**
- * `AsyncStorage` is a simple, unencrypted, asynchronous, persistent, key-value
- * storage system that is global to the app.  It should be used instead of
- * LocalStorage.
- *
- * See https://reactnative.dev/docs/asyncstorage
- */
-const AsyncStorage = {
-  _getRequests: ([]: Array<GetRequest>),
-  _getKeys: ([]: Array<string>),
-  _immediate: (null: ?number),
-
-  /**
-   * Fetches an item for a `key` and invokes a callback upon completion.
-   *
-   * See https://reactnative.dev/docs/asyncstorage#getitem
-   */
-  getItem: function (
-    key: string,
-    callback?: ?(error: ?Error, result: ?string) => void,
-  ): Promise<?string> {
-    invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
-    return new Promise((resolve, reject) => {
-      RCTAsyncStorage.multiGet([key], function (errors, result) {
-        // Unpack result to get value from [[key,value]]
-        const value = result && result[0] && result[0][1] ? result[0][1] : null;
-        const errs = convertErrors(errors);
-        callback && callback(errs && errs[0], value);
-        if (errs) {
-          reject(errs[0]);
-        } else {
-          resolve(value);
-        }
-      });
-    });
-  },
-
-  /**
-   * Sets the value for a `key` and invokes a callback upon completion.
-   *
-   * See https://reactnative.dev/docs/asyncstorage#setitem
-   */
-  setItem: function (
-    key: string,
-    value: string,
-    callback?: ?(error: ?Error) => void,
-  ): Promise<void> {
-    invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
-    return new Promise((resolve, reject) => {
-      RCTAsyncStorage.multiSet([[key, value]], function (errors) {
-        const errs = convertErrors(errors);
-        callback && callback(errs && errs[0]);
-        if (errs) {
-          reject(errs[0]);
-        } else {
-          resolve();
-        }
-      });
-    });
-  },
-
-  /**
-   * Removes an item for a `key` and invokes a callback upon completion.
-   *
-   * See https://reactnative.dev/docs/asyncstorage#removeitem
-   */
-  removeItem: function (
-    key: string,
-    callback?: ?(error: ?Error) => void,
-  ): Promise<void> {
-    invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
-    return new Promise((resolve, reject) => {
-      RCTAsyncStorage.multiRemove([key], function (errors) {
-        const errs = convertErrors(errors);
-        callback && callback(errs && errs[0]);
-        if (errs) {
-          reject(errs[0]);
-        } else {
-          resolve();
-        }
-      });
-    });
-  },
-
-  /**
-   * Merges an existing `key` value with an input value, assuming both values
-   * are stringified JSON.
-   *
-   * **NOTE:** This is not supported by all native implementations.
-   *
-   * See https://reactnative.dev/docs/asyncstorage#mergeitem
-   */
-  mergeItem: function (
-    key: string,
-    value: string,
-    callback?: ?(error: ?Error) => void,
-  ): Promise<void> {
-    invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
-    return new Promise((resolve, reject) => {
-      RCTAsyncStorage.multiMerge([[key, value]], function (errors) {
-        const errs = convertErrors(errors);
-        callback && callback(errs && errs[0]);
-        if (errs) {
-          reject(errs[0]);
-        } else {
-          resolve();
-        }
-      });
-    });
-  },
-
-  /**
-   * Erases *all* `AsyncStorage` for all clients, libraries, etc. You probably
-   * don't want to call this; use `removeItem` or `multiRemove` to clear only
-   * your app's keys.
-   *
-   * See https://reactnative.dev/docs/asyncstorage#clear
-   */
-  clear: function (callback?: ?(error: ?Error) => void): Promise<void> {
-    invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
-    return new Promise((resolve, reject) => {
-      RCTAsyncStorage.clear(function (error) {
-        callback && callback(convertError(error));
-        if (error && convertError(error)) {
-          reject(convertError(error));
-        } else {
-          resolve();
-        }
-      });
-    });
-  },
-
-  /**
-   * Gets *all* keys known to your app; for all callers, libraries, etc.
-   *
-   * See https://reactnative.dev/docs/asyncstorage#getallkeys
-   */
-  getAllKeys: function (
-    callback?: ?(error: ?Error, keys: ?Array<string>) => void,
-  ): Promise<?Array<string>> {
-    invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
-    return new Promise((resolve, reject) => {
-      RCTAsyncStorage.getAllKeys(function (error, keys) {
-        callback && callback(convertError(error), keys);
-        if (error) {
-          reject(convertError(error));
-        } else {
-          resolve(keys);
-        }
-      });
-    });
-  },
-
-  /**
-   * The following batched functions are useful for executing a lot of
-   * operations at once, allowing for native optimizations and provide the
-   * convenience of a single callback after all operations are complete.
-   *
-   * These functions return arrays of errors, potentially one for every key.
-   * For key-specific errors, the Error object will have a key property to
-   * indicate which key caused the error.
-   */
-
-  /**
-   * Flushes any pending requests using a single batch call to get the data.
-   *
-   * See https://reactnative.dev/docs/asyncstorage#flushgetrequests
-   * */
-  /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
-   * Flow's LTI update could not be added via codemod */
-  flushGetRequests: function (): void {
-    const getRequests = this._getRequests;
-    const getKeys = this._getKeys;
-
-    this._getRequests = [];
-    this._getKeys = [];
-
-    invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
-    RCTAsyncStorage.multiGet(getKeys, function (errors, result) {
-      // Even though the runtime complexity of this is theoretically worse vs if we used a map,
-      // it's much, much faster in practice for the data sets we deal with (we avoid
-      // allocating result pair arrays). This was heavily benchmarked.
-      //
-      // Is there a way to avoid using the map but fix the bug in this breaking test?
-      // https://github.com/facebook/react-native/commit/8dd8ad76579d7feef34c014d387bf02065692264
-      const map: {[string]: string} = {};
-      result &&
-        result.forEach(([key, value]) => {
-          map[key] = value;
-          return value;
-        });
-      const reqLength = getRequests.length;
-      for (let i = 0; i < reqLength; i++) {
-        const request = getRequests[i];
-        const requestKeys = request.keys;
-        const requestResult = requestKeys.map(key => [key, map[key]]);
-        request.callback && request.callback(null, requestResult);
-        request.resolve && request.resolve(requestResult);
-      }
-    });
-  },
-
-  /**
-   * This allows you to batch the fetching of items given an array of `key`
-   * inputs. Your callback will be invoked with an array of corresponding
-   * key-value pairs found.
-   *
-   * See https://reactnative.dev/docs/asyncstorage#multiget
-   */
-  /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
-   * Flow's LTI update could not be added via codemod */
-  multiGet: function (
-    keys: Array<string>,
-    callback?: ?(errors: ?Array<Error>, result: ?Array<Array<string>>) => void,
-  ): Promise<?Array<Array<string>>> {
-    if (!this._immediate) {
-      this._immediate = setImmediate(() => {
-        this._immediate = null;
-        this.flushGetRequests();
-      });
-    }
-
-    return new Promise<?Array<Array<string>>>((resolve, reject) => {
-      this._getRequests.push({
-        keys,
-        callback,
-        // do we need this?
-        keyIndex: this._getKeys.length,
-        resolve,
-        reject,
-      });
-      // avoid fetching duplicates
-      keys.forEach(key => {
-        if (this._getKeys.indexOf(key) === -1) {
-          this._getKeys.push(key);
-        }
-      });
-    });
-  },
-
-  /**
-   * Use this as a batch operation for storing multiple key-value pairs. When
-   * the operation completes you'll get a single callback with any errors.
-   *
-   * See https://reactnative.dev/docs/asyncstorage#multiset
-   */
-  multiSet: function (
-    keyValuePairs: Array<Array<string>>,
-    callback?: ?(errors: ?Array<Error>) => void,
-  ): Promise<void> {
-    invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
-    return new Promise((resolve, reject) => {
-      RCTAsyncStorage.multiSet(keyValuePairs, function (errors) {
-        const error = convertErrors(errors);
-        callback && callback(error);
-        if (error) {
-          reject(error);
-        } else {
-          resolve();
-        }
-      });
-    });
-  },
-
-  /**
-   * Call this to batch the deletion of all keys in the `keys` array.
-   *
-   * See https://reactnative.dev/docs/asyncstorage#multiremove
-   */
-  multiRemove: function (
-    keys: Array<string>,
-    callback?: ?(errors: ?Array<Error>) => void,
-  ): Promise<void> {
-    invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
-    return new Promise((resolve, reject) => {
-      RCTAsyncStorage.multiRemove(keys, function (errors) {
-        const error = convertErrors(errors);
-        callback && callback(error);
-        if (error) {
-          reject(error);
-        } else {
-          resolve();
-        }
-      });
-    });
-  },
-
-  /**
-   * Batch operation to merge in existing and new values for a given set of
-   * keys. This assumes that the values are stringified JSON.
-   *
-   * **NOTE**: This is not supported by all native implementations.
-   *
-   * See https://reactnative.dev/docs/asyncstorage#multimerge
-   */
-  multiMerge: function (
-    keyValuePairs: Array<Array<string>>,
-    callback?: ?(errors: ?Array<Error>) => void,
-  ): Promise<void> {
-    invariant(RCTAsyncStorage, 'RCTAsyncStorage not available');
-    return new Promise((resolve, reject) => {
-      RCTAsyncStorage.multiMerge(keyValuePairs, function (errors) {
-        const error = convertErrors(errors);
-        callback && callback(error);
-        if (error) {
-          reject(error);
-        } else {
-          resolve();
-        }
-      });
-    });
-  },
-};
-
-// Not all native implementations support merge.
-// TODO: Check whether above comment is correct. multiMerge is guaranteed to
-// exist in the module spec so we should be able to just remove this check.
-if (RCTAsyncStorage && !RCTAsyncStorage.multiMerge) {
-  // $FlowFixMe[unclear-type]
-  delete (AsyncStorage: any).mergeItem;
-  // $FlowFixMe[unclear-type]
-  delete (AsyncStorage: any).multiMerge;
-}
-
-function convertErrors(
-  // NOTE: The native module spec only has the Array case, but the Android
-  // implementation passes a single object.
-  errs: ?(
-    | {message: string, key?: string}
-    | Array<{message: string, key?: string}>
-  ),
-) {
-  if (!errs) {
-    return null;
-  }
-  return (Array.isArray(errs) ? errs : [errs]).map(e => convertError(e));
-}
-
-declare function convertError(void | null): null;
-declare function convertError({message: string, key?: string}): Error;
-/* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
- * LTI update could not be added via codemod */
-function convertError(error) {
-  if (!error) {
-    return null;
-  }
-  const out = new Error(error.message);
-  // $FlowFixMe[unclear-type]
-  (out: any).key = error.key;
-  return out;
-}
-
-module.exports = AsyncStorage;
diff --git a/Libraries/Storage/NativeAsyncLocalStorage.js b/Libraries/Storage/NativeAsyncLocalStorage.js
deleted file mode 100644
index 10cf10049b39..000000000000
--- a/Libraries/Storage/NativeAsyncLocalStorage.js
+++ /dev/null
@@ -1,44 +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: () => {};
-  +multiGet: (
-    keys: Array<string>,
-    callback: (
-      errors: ?Array<{message: string, key?: string}>,
-      kvPairs: ?Array<Array<string>>,
-    ) => void,
-  ) => void;
-  +multiSet: (
-    kvPairs: Array<Array<string>>,
-    callback: (errors: ?Array<{message: string, key?: string}>) => void,
-  ) => void;
-  +multiMerge: (
-    kvPairs: Array<Array<string>>,
-    callback: (errors: ?Array<{message: string, key?: string}>) => void,
-  ) => void;
-  +multiRemove: (
-    keys: Array<string>,
-    callback: (errors: ?Array<{message: string, key?: string}>) => void,
-  ) => void;
-  +clear: (callback: (error: {message: string, key?: string}) => void) => void;
-  +getAllKeys: (
-    callback: (
-      error: ?{message: string, key?: string},
-      allKeys: ?Array<string>,
-    ) => void,
-  ) => void;
-}
-
-export default (TurboModuleRegistry.get<Spec>('AsyncLocalStorage'): ?Spec);
diff --git a/Libraries/Storage/NativeAsyncSQLiteDBStorage.js b/Libraries/Storage/NativeAsyncSQLiteDBStorage.js
deleted file mode 100644
index 2b6bfe846752..000000000000
--- a/Libraries/Storage/NativeAsyncSQLiteDBStorage.js
+++ /dev/null
@@ -1,44 +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: () => {};
-  +multiGet: (
-    keys: Array<string>,
-    callback: (
-      errors: ?Array<{message: string, key?: string}>,
-      kvPairs: ?Array<Array<string>>,
-    ) => void,
-  ) => void;
-  +multiSet: (
-    kvPairs: Array<Array<string>>,
-    callback: (errors: ?Array<{message: string, key?: string}>) => void,
-  ) => void;
-  +multiMerge: (
-    kvPairs: Array<Array<string>>,
-    callback: (errors: ?Array<{message: string, key?: string}>) => void,
-  ) => void;
-  +multiRemove: (
-    keys: Array<string>,
-    callback: (errors: ?Array<{message: string, key?: string}>) => void,
-  ) => void;
-  +clear: (callback: (error: {message: string, key?: string}) => void) => void;
-  +getAllKeys: (
-    callback: (
-      error: ?{message: string, key?: string},
-      allKeys: ?Array<string>,
-    ) => void,
-  ) => void;
-}
-
-export default (TurboModuleRegistry.get<Spec>('AsyncSQLiteDBStorage'): ?Spec);
diff --git a/Libraries/StyleSheet/PlatformColorValueTypes.android.js b/Libraries/StyleSheet/PlatformColorValueTypes.android.js
index 96a8ee14e549..50a28c94c539 100644
--- a/Libraries/StyleSheet/PlatformColorValueTypes.android.js
+++ b/Libraries/StyleSheet/PlatformColorValueTypes.android.js
@@ -8,8 +8,8 @@
  * @flow strict-local
  */
 
-import type {ColorValue} from './StyleSheet';
 import type {ProcessedColorValue} from './processColor';
+import type {ColorValue} from './StyleSheet';
 
 export opaque type NativeColorValue = {
   resource_paths?: Array<string>,
diff --git a/Libraries/StyleSheet/PlatformColorValueTypes.d.ts b/Libraries/StyleSheet/PlatformColorValueTypes.d.ts
new file mode 100644
index 000000000000..909f73d596e7
--- /dev/null
+++ b/Libraries/StyleSheet/PlatformColorValueTypes.d.ts
@@ -0,0 +1,18 @@
+/**
+ * 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
+ */
+
+import {OpaqueColorValue} from './StyleSheet';
+
+/**
+ * Select native platform color
+ * The color must match the string that exists on the native platform
+ *
+ * @see https://reactnative.dev/docs/platformcolor#example
+ */
+export function PlatformColor(...colors: string[]): OpaqueColorValue;
diff --git a/Libraries/StyleSheet/PlatformColorValueTypes.ios.js b/Libraries/StyleSheet/PlatformColorValueTypes.ios.js
index 9d16405b7dbe..091a5f61fc0e 100644
--- a/Libraries/StyleSheet/PlatformColorValueTypes.ios.js
+++ b/Libraries/StyleSheet/PlatformColorValueTypes.ios.js
@@ -8,8 +8,8 @@
  * @flow strict-local
  */
 
-import type {ColorValue} from './StyleSheet';
 import type {ProcessedColorValue} from './processColor';
+import type {ColorValue} from './StyleSheet';
 
 export opaque type NativeColorValue = {
   semantic?: Array<string>,
diff --git a/Libraries/StyleSheet/PlatformColorValueTypesIOS.d.ts b/Libraries/StyleSheet/PlatformColorValueTypesIOS.d.ts
new file mode 100644
index 000000000000..43720c759a38
--- /dev/null
+++ b/Libraries/StyleSheet/PlatformColorValueTypesIOS.d.ts
@@ -0,0 +1,25 @@
+/**
+ * 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
+ */
+
+import {ColorValue, OpaqueColorValue} from './StyleSheet';
+
+type DynamicColorIOSTuple = {
+  light: ColorValue;
+  dark: ColorValue;
+  highContrastLight?: ColorValue | undefined;
+  highContrastDark?: ColorValue | undefined;
+};
+
+/**
+ * Specify color to display depending on the current system appearance settings
+ *
+ * @param tuple Colors you want to use for "light mode" and "dark mode"
+ * @platform ios
+ */
+export function DynamicColorIOS(tuple: DynamicColorIOSTuple): OpaqueColorValue;
diff --git a/Libraries/StyleSheet/PlatformColorValueTypesIOS.ios.js b/Libraries/StyleSheet/PlatformColorValueTypesIOS.ios.js
index 9e5234b7cf4c..a476e74b3147 100644
--- a/Libraries/StyleSheet/PlatformColorValueTypesIOS.ios.js
+++ b/Libraries/StyleSheet/PlatformColorValueTypesIOS.ios.js
@@ -9,6 +9,7 @@
  */
 
 import type {ColorValue} from './StyleSheet';
+
 import {DynamicColorIOSPrivate} from './PlatformColorValueTypes';
 
 export type DynamicColorIOSTuple = {
diff --git a/Libraries/StyleSheet/StyleSheet.d.ts b/Libraries/StyleSheet/StyleSheet.d.ts
new file mode 100644
index 000000000000..53ab3e1f2784
--- /dev/null
+++ b/Libraries/StyleSheet/StyleSheet.d.ts
@@ -0,0 +1,160 @@
+/**
+ * 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
+ */
+
+import {ImageStyle, TextStyle, ViewStyle} from './StyleSheetTypes';
+
+export interface StyleSheetProperties {
+  hairlineWidth: number;
+  flatten<T extends string>(style: T): T;
+}
+
+type Falsy = undefined | null | false;
+interface RecursiveArray<T>
+  extends Array<T | ReadonlyArray<T> | RecursiveArray<T>> {}
+/** Keep a brand of 'T' so that calls to `StyleSheet.flatten` can take `RegisteredStyle<T>` and return `T`. */
+type RegisteredStyle<T> = number & {__registeredStyleBrand: T};
+export type StyleProp<T> =
+  | T
+  | RegisteredStyle<T>
+  | RecursiveArray<T | RegisteredStyle<T> | Falsy>
+  | Falsy;
+
+type OpaqueColorValue = symbol & {__TYPE__: 'Color'};
+export type ColorValue = string | OpaqueColorValue;
+
+export namespace StyleSheet {
+  type NamedStyles<T> = {[P in keyof T]: ViewStyle | TextStyle | ImageStyle};
+
+  /**
+   * Creates a StyleSheet style reference from the given object.
+   */
+  export function create<T extends NamedStyles<T> | NamedStyles<any>>(
+    styles: T | NamedStyles<T>,
+  ): T;
+
+  /**
+   * Flattens an array of style objects, into one aggregated style object.
+   * Alternatively, this method can be used to lookup IDs, returned by
+   * StyleSheet.register.
+   *
+   * > **NOTE**: Exercise caution as abusing this can tax you in terms of
+   * > optimizations.
+   * >
+   * > IDs enable optimizations through the bridge and memory in general. Referring
+   * > to style objects directly will deprive you of these optimizations.
+   *
+   * Example:
+   * ```
+   * const styles = StyleSheet.create({
+   *   listItem: {
+   *     flex: 1,
+   *     fontSize: 16,
+   *     color: 'white'
+   *   },
+   *   selectedListItem: {
+   *     color: 'green'
+   *   }
+   * });
+   *
+   * StyleSheet.flatten([styles.listItem, styles.selectedListItem])
+   * // returns { flex: 1, fontSize: 16, color: 'green' }
+   * ```
+   * Alternative use:
+   * ```
+   * StyleSheet.flatten(styles.listItem);
+   * // return { flex: 1, fontSize: 16, color: 'white' }
+   * // Simply styles.listItem would return its ID (number)
+   * ```
+   * This method internally uses `StyleSheetRegistry.getStyleByID(style)`
+   * to resolve style objects represented by IDs. Thus, an array of style
+   * objects (instances of StyleSheet.create), are individually resolved to,
+   * their respective objects, merged as one and then returned. This also explains
+   * the alternative use.
+   */
+  export function flatten<T>(
+    style?: StyleProp<T>,
+  ): T extends (infer U)[] ? U : T;
+
+  /**
+   * Combines two styles such that style2 will override any styles in style1.
+   * If either style is falsy, the other one is returned without allocating
+   * an array, saving allocations and maintaining reference equality for
+   * PureComponent checks.
+   */
+  export function compose<
+    T extends ViewStyle | TextStyle | ImageStyle,
+    U extends T,
+    V extends T,
+  >(
+    style1: StyleProp<U> | Array<StyleProp<U>>,
+    style2: StyleProp<V> | Array<StyleProp<V>>,
+  ): StyleProp<T>;
+
+  /**
+   * WARNING: EXPERIMENTAL. Breaking changes will probably happen a lot and will
+   * not be reliably announced. The whole thing might be deleted, who knows? Use
+   * at your own risk.
+   *
+   * Sets a function to use to pre-process a style property value. This is used
+   * internally to process color and transform values. You should not use this
+   * unless you really know what you are doing and have exhausted other options.
+   */
+  export function setStyleAttributePreprocessor(
+    property: string,
+    process: (nextProp: any) => any,
+  ): void;
+
+  /**
+   * This is defined as the width of a thin line on the platform. It can be
+   * used as the thickness of a border or division between two elements.
+   * Example:
+   * ```
+   *   {
+   *     borderBottomColor: '#bbb',
+   *     borderBottomWidth: StyleSheet.hairlineWidth
+   *   }
+   * ```
+   *
+   * This constant will always be a round number of pixels (so a line defined
+   * by it look crisp) and will try to match the standard width of a thin line
+   * on the underlying platform. However, you should not rely on it being a
+   * constant size, because on different platforms and screen densities its
+   * value may be calculated differently.
+   */
+  export const hairlineWidth: number;
+
+  interface AbsoluteFillStyle {
+    position: 'absolute';
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+  }
+
+  /**
+   * Sometimes you may want `absoluteFill` but with a couple tweaks - `absoluteFillObject` can be
+   * used to create a customized entry in a `StyleSheet`, e.g.:
+   *
+   *   const styles = StyleSheet.create({
+   *     wrapper: {
+   *       ...StyleSheet.absoluteFillObject,
+   *       top: 10,
+   *       backgroundColor: 'transparent',
+   *     },
+   *   });
+   */
+  export const absoluteFillObject: AbsoluteFillStyle;
+
+  /**
+   * A very common pattern is to create overlays with position absolute and zero positioning,
+   * so `absoluteFill` can be used for convenience and to reduce duplication of these repeated
+   * styles.
+   */
+  export const absoluteFill: RegisteredStyle<AbsoluteFillStyle>;
+}
diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js
index ca22b918bd6e..e68df4b3efc0 100644
--- a/Libraries/StyleSheet/StyleSheet.js
+++ b/Libraries/StyleSheet/StyleSheet.js
@@ -10,24 +10,23 @@
 
 'use strict';
 
-const PixelRatio = require('../Utilities/PixelRatio');
-const ReactNativeStyleAttributes = require('../Components/View/ReactNativeStyleAttributes');
-
-const flatten = require('./flattenStyle');
-
 import type {
   ____ColorValue_Internal,
-  ____Styles_Internal,
   ____DangerouslyImpreciseStyle_Internal,
   ____DangerouslyImpreciseStyleProp_Internal,
-  ____ViewStyle_Internal,
-  ____ViewStyleProp_Internal,
-  ____TextStyle_Internal,
-  ____TextStyleProp_Internal,
   ____ImageStyle_Internal,
   ____ImageStyleProp_Internal,
+  ____Styles_Internal,
+  ____TextStyle_Internal,
+  ____TextStyleProp_Internal,
+  ____ViewStyle_Internal,
+  ____ViewStyleProp_Internal,
 } from './StyleSheetTypes';
 
+const ReactNativeStyleAttributes = require('../Components/View/ReactNativeStyleAttributes');
+const PixelRatio = require('../Utilities/PixelRatio');
+const flatten = require('./flattenStyle');
+
 /**
  * This type should be used as the type for anything that is a color. It is
  * most useful when using DynamicColorIOS which can be a string or a dynamic
@@ -347,7 +346,12 @@ module.exports = {
       return;
     }
 
-    if (__DEV__ && typeof value.process === 'function') {
+    if (
+      __DEV__ &&
+      typeof value.process === 'function' &&
+      typeof ReactNativeStyleAttributes[property]?.process === 'function' &&
+      value.process !== ReactNativeStyleAttributes[property]?.process
+    ) {
       console.warn(`Overwriting ${property} style attribute preprocessor`);
     }
 
diff --git a/Libraries/StyleSheet/StyleSheetTypes.d.ts b/Libraries/StyleSheet/StyleSheetTypes.d.ts
new file mode 100644
index 000000000000..ac557bd68fb0
--- /dev/null
+++ b/Libraries/StyleSheet/StyleSheetTypes.d.ts
@@ -0,0 +1,331 @@
+/**
+ * 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
+ */
+
+import {ImageResizeMode} from '../Image/ImageResizeMode';
+import {ColorValue} from './StyleSheet';
+
+type FlexAlignType =
+  | 'flex-start'
+  | 'flex-end'
+  | 'center'
+  | 'stretch'
+  | 'baseline';
+
+/**
+ * Flex Prop Types
+ * @see https://reactnative.dev/docs/flexbox
+ * @see https://reactnative.dev/docs/layout-props
+ */
+export interface FlexStyle {
+  alignContent?:
+    | 'flex-start'
+    | 'flex-end'
+    | 'center'
+    | 'stretch'
+    | 'space-between'
+    | 'space-around'
+    | undefined;
+  alignItems?: FlexAlignType | undefined;
+  alignSelf?: 'auto' | FlexAlignType | undefined;
+  aspectRatio?: number | string | undefined;
+  borderBottomWidth?: number | undefined;
+  borderEndWidth?: number | string | undefined;
+  borderLeftWidth?: number | undefined;
+  borderRightWidth?: number | undefined;
+  borderStartWidth?: number | string | undefined;
+  borderTopWidth?: number | undefined;
+  borderWidth?: number | undefined;
+  bottom?: number | string | undefined;
+  display?: 'none' | 'flex' | undefined;
+  end?: number | string | undefined;
+  flex?: number | undefined;
+  flexBasis?: number | string | undefined;
+  flexDirection?:
+    | 'row'
+    | 'column'
+    | 'row-reverse'
+    | 'column-reverse'
+    | undefined;
+  rowGap?: number | undefined;
+  gap?: number | undefined;
+  columnGap?: number | undefined;
+  flexGrow?: number | undefined;
+  flexShrink?: number | undefined;
+  flexWrap?: 'wrap' | 'nowrap' | 'wrap-reverse' | undefined;
+  height?: number | string | undefined;
+  justifyContent?:
+    | 'flex-start'
+    | 'flex-end'
+    | 'center'
+    | 'space-between'
+    | 'space-around'
+    | 'space-evenly'
+    | undefined;
+  left?: number | string | undefined;
+  margin?: number | string | undefined;
+  marginBottom?: number | string | undefined;
+  marginEnd?: number | string | undefined;
+  marginHorizontal?: number | string | undefined;
+  marginLeft?: number | string | undefined;
+  marginRight?: number | string | undefined;
+  marginStart?: number | string | undefined;
+  marginTop?: number | string | undefined;
+  marginVertical?: number | string | undefined;
+  maxHeight?: number | string | undefined;
+  maxWidth?: number | string | undefined;
+  minHeight?: number | string | undefined;
+  minWidth?: number | string | undefined;
+  overflow?: 'visible' | 'hidden' | 'scroll' | undefined;
+  padding?: number | string | undefined;
+  paddingBottom?: number | string | undefined;
+  paddingEnd?: number | string | undefined;
+  paddingHorizontal?: number | string | undefined;
+  paddingLeft?: number | string | undefined;
+  paddingRight?: number | string | undefined;
+  paddingStart?: number | string | undefined;
+  paddingTop?: number | string | undefined;
+  paddingVertical?: number | string | undefined;
+  position?: 'absolute' | 'relative' | undefined;
+  right?: number | string | undefined;
+  start?: number | string | undefined;
+  top?: number | string | undefined;
+  width?: number | string | undefined;
+  zIndex?: number | undefined;
+
+  /**
+   * @platform ios
+   */
+  direction?: 'inherit' | 'ltr' | 'rtl' | undefined;
+}
+
+export interface ShadowStyleIOS {
+  shadowColor?: ColorValue | undefined;
+  shadowOffset?: {width: number; height: number} | undefined;
+  shadowOpacity?: number | undefined;
+  shadowRadius?: number | undefined;
+}
+
+interface PerpectiveTransform {
+  perspective: number;
+}
+
+interface RotateTransform {
+  rotate: string;
+}
+
+interface RotateXTransform {
+  rotateX: string;
+}
+
+interface RotateYTransform {
+  rotateY: string;
+}
+
+interface RotateZTransform {
+  rotateZ: string;
+}
+
+interface ScaleTransform {
+  scale: number;
+}
+
+interface ScaleXTransform {
+  scaleX: number;
+}
+
+interface ScaleYTransform {
+  scaleY: number;
+}
+
+interface TranslateXTransform {
+  translateX: number;
+}
+
+interface TranslateYTransform {
+  translateY: number;
+}
+
+interface SkewXTransform {
+  skewX: string;
+}
+
+interface SkewYTransform {
+  skewY: string;
+}
+
+interface MatrixTransform {
+  matrix: number[];
+}
+
+export interface TransformsStyle {
+  transform?:
+    | (
+        | PerpectiveTransform
+        | RotateTransform
+        | RotateXTransform
+        | RotateYTransform
+        | RotateZTransform
+        | ScaleTransform
+        | ScaleXTransform
+        | ScaleYTransform
+        | TranslateXTransform
+        | TranslateYTransform
+        | SkewXTransform
+        | SkewYTransform
+        | MatrixTransform
+      )[]
+    | undefined;
+  /**
+   * @deprecated Use matrix in transform prop instead.
+   */
+  transformMatrix?: Array<number> | undefined;
+  /**
+   * @deprecated Use rotate in transform prop instead.
+   */
+  rotation?: number | undefined;
+  /**
+   * @deprecated Use scaleX in transform prop instead.
+   */
+  scaleX?: number | undefined;
+  /**
+   * @deprecated Use scaleY in transform prop instead.
+   */
+  scaleY?: number | undefined;
+  /**
+   * @deprecated Use translateX in transform prop instead.
+   */
+  translateX?: number | undefined;
+  /**
+   * @deprecated Use translateY in transform prop instead.
+   */
+  translateY?: number | undefined;
+}
+
+/**
+ * @see https://reactnative.dev/docs/view#style
+ */
+export interface ViewStyle extends FlexStyle, ShadowStyleIOS, TransformsStyle {
+  backfaceVisibility?: 'visible' | 'hidden' | undefined;
+  backgroundColor?: ColorValue | undefined;
+  borderBottomColor?: ColorValue | undefined;
+  borderBottomEndRadius?: number | undefined;
+  borderBottomLeftRadius?: number | undefined;
+  borderBottomRightRadius?: number | undefined;
+  borderBottomStartRadius?: number | undefined;
+  borderBottomWidth?: number | undefined;
+  borderColor?: ColorValue | undefined;
+  borderEndColor?: ColorValue | undefined;
+  borderLeftColor?: ColorValue | undefined;
+  borderLeftWidth?: number | undefined;
+  borderRadius?: number | undefined;
+  borderRightColor?: ColorValue | undefined;
+  borderRightWidth?: number | undefined;
+  borderStartColor?: ColorValue | undefined;
+  borderStyle?: 'solid' | 'dotted' | 'dashed' | undefined;
+  borderTopColor?: ColorValue | undefined;
+  borderTopEndRadius?: number | undefined;
+  borderTopLeftRadius?: number | undefined;
+  borderTopRightRadius?: number | undefined;
+  borderTopStartRadius?: number | undefined;
+  borderTopWidth?: number | undefined;
+  borderWidth?: number | undefined;
+  opacity?: number | undefined;
+  /**
+   * Sets the elevation of a view, using Android's underlying
+   * [elevation API](https://developer.android.com/training/material/shadows-clipping.html#Elevation).
+   * This adds a drop shadow to the item and affects z-order for overlapping views.
+   * Only supported on Android 5.0+, has no effect on earlier versions.
+   *
+   * @platform android
+   */
+  elevation?: number | undefined;
+}
+
+export type FontVariant =
+  | 'small-caps'
+  | 'oldstyle-nums'
+  | 'lining-nums'
+  | 'tabular-nums'
+  | 'proportional-nums';
+export interface TextStyleIOS extends ViewStyle {
+  fontVariant?: FontVariant[] | undefined;
+  letterSpacing?: number | undefined;
+  textDecorationColor?: ColorValue | undefined;
+  textDecorationStyle?: 'solid' | 'double' | 'dotted' | 'dashed' | undefined;
+  writingDirection?: 'auto' | 'ltr' | 'rtl' | undefined;
+}
+
+export interface TextStyleAndroid extends ViewStyle {
+  textAlignVertical?: 'auto' | 'top' | 'bottom' | 'center' | undefined;
+  verticalAlign?: 'auto' | 'top' | 'bottom' | 'middle' | undefined;
+  includeFontPadding?: boolean | undefined;
+}
+
+// @see https://reactnative.dev/docs/text#style
+export interface TextStyle extends TextStyleIOS, TextStyleAndroid, ViewStyle {
+  color?: ColorValue | undefined;
+  fontFamily?: string | undefined;
+  fontSize?: number | undefined;
+  fontStyle?: 'normal' | 'italic' | undefined;
+  /**
+   * Specifies font weight. The values 'normal' and 'bold' are supported
+   * for most fonts. Not all fonts have a variant for each of the numeric
+   * values, in that case the closest one is chosen.
+   */
+  fontWeight?:
+    | 'normal'
+    | 'bold'
+    | '100'
+    | '200'
+    | '300'
+    | '400'
+    | '500'
+    | '600'
+    | '700'
+    | '800'
+    | '900'
+    | undefined;
+  letterSpacing?: number | undefined;
+  lineHeight?: number | undefined;
+  textAlign?: 'auto' | 'left' | 'right' | 'center' | 'justify' | undefined;
+  textDecorationLine?:
+    | 'none'
+    | 'underline'
+    | 'line-through'
+    | 'underline line-through'
+    | undefined;
+  textDecorationStyle?: 'solid' | 'double' | 'dotted' | 'dashed' | undefined;
+  textDecorationColor?: ColorValue | undefined;
+  textShadowColor?: ColorValue | undefined;
+  textShadowOffset?: {width: number; height: number} | undefined;
+  textShadowRadius?: number | undefined;
+  textTransform?: 'none' | 'capitalize' | 'uppercase' | 'lowercase' | undefined;
+  testID?: string | undefined;
+}
+
+/**
+ * Image style
+ * @see https://reactnative.dev/docs/image#style
+ */
+export interface ImageStyle extends FlexStyle, ShadowStyleIOS, TransformsStyle {
+  resizeMode?: ImageResizeMode | undefined;
+  backfaceVisibility?: 'visible' | 'hidden' | undefined;
+  borderBottomLeftRadius?: number | undefined;
+  borderBottomRightRadius?: number | undefined;
+  backgroundColor?: ColorValue | undefined;
+  borderColor?: ColorValue | undefined;
+  borderWidth?: number | undefined;
+  borderRadius?: number | undefined;
+  borderTopLeftRadius?: number | undefined;
+  borderTopRightRadius?: number | undefined;
+  overflow?: 'visible' | 'hidden' | undefined;
+  overlayColor?: ColorValue | undefined;
+  tintColor?: ColorValue | undefined;
+  opacity?: number | undefined;
+}
diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index a12ed0cafc1a..14cf6d7dc947 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -10,12 +10,18 @@
 
 'use strict';
 
-const AnimatedNode = require('../Animated/nodes/AnimatedNode');
-
+import type AnimatedNode from '../Animated/nodes/AnimatedNode';
 import type {NativeColorValue} from './PlatformColorValueTypes';
+import type {
+  ____DangerouslyImpreciseStyle_InternalOverrides,
+  ____ImageStyle_InternalOverrides,
+  ____ShadowStyle_InternalOverrides,
+  ____TextStyle_InternalOverrides,
+  ____ViewStyle_InternalOverrides,
+} from './private/_StyleSheetTypesOverrides';
+import type {____TransformStyle_Internal} from './private/_TransformStyle';
 
 export type ____ColorValue_Internal = null | string | number | NativeColorValue;
-
 export type ColorArrayValue = null | $ReadOnlyArray<____ColorValue_Internal>;
 export type PointValue = {
   x: number,
@@ -29,16 +35,6 @@ export type EdgeInsetsValue = {
 };
 export type DimensionValue = null | number | string | AnimatedNode;
 
-import type {
-  ____DangerouslyImpreciseStyle_InternalOverrides,
-  ____ImageStyle_InternalOverrides,
-  ____ShadowStyle_InternalOverrides,
-  ____TextStyle_InternalOverrides,
-  ____ViewStyle_InternalOverrides,
-} from './private/_StyleSheetTypesOverrides';
-
-import type {____TransformStyle_Internal} from './private/_TransformStyle';
-
 /**
  * React Native's layout system is based on Flexbox and is powered both
  * on iOS and Android by an open source project called `Yoga`:
@@ -446,8 +442,7 @@ type ____LayoutStyle_Internal = $ReadOnly<{
   flexBasis?: number | string,
 
   /**
-   * Aspect ratio control the size of the undefined dimension of a node. Aspect ratio is a
-   * non-standard property only available in react native and not CSS.
+   * Aspect ratio control the size of the undefined dimension of a node.
    *
    * - On a node with a set width/height aspect ratio control the size of the unset dimension
    * - On a node with a set flex basis aspect ratio controls the size of the node in the cross axis
@@ -457,8 +452,13 @@ type ____LayoutStyle_Internal = $ReadOnly<{
    * - On a node with flex grow/shrink aspect ratio controls the size of the node in the cross axis
    *   if unset
    * - Aspect ratio takes min/max dimensions into account
+   *
+   * Supports a number or a ratio, e.g.:
+   * - aspectRatio: '1 / 1'
+   * - aspectRatio: '1'
+   * - aspectRatio: '1'
    */
-  aspectRatio?: number,
+  aspectRatio?: number | string,
 
   /** `zIndex` controls which components display on top of others.
    *  Normally, you don't use `zIndex`. Components render according to
@@ -518,6 +518,19 @@ export type ____ShadowStyle_InternalCore = $ReadOnly<{
    * @platform ios
    */
   shadowRadius?: number,
+
+  /**
+   * In React Native, gap works the same way it does in CSS.
+   * If there are two or more children in a container, they will be separated from each other
+   * by the value of the gap - but the children will not be separated from the edges of their parent container.
+   * For horizontal gaps, use columnGap, for vertical gaps, use rowGap, and to apply both at the same time, it's gap.
+   * When align-content or justify-content are set to space-between or space-around, the separation
+   * between children may be larger than the gap value.
+   * See https://developer.mozilla.org/en-US/docs/Web/CSS/gap for more details.
+   */
+  rowGap?: number,
+  columnGap?: number,
+  gap?: number,
 }>;
 
 export type ____ShadowStyle_Internal = $ReadOnly<{
@@ -532,6 +545,7 @@ export type ____ViewStyle_InternalCore = $ReadOnly<{
   backfaceVisibility?: 'visible' | 'hidden',
   backgroundColor?: ____ColorValue_Internal,
   borderColor?: ____ColorValue_Internal,
+  borderCurve?: 'circular' | 'continuous',
   borderBottomColor?: ____ColorValue_Internal,
   borderEndColor?: ____ColorValue_Internal,
   borderLeftColor?: ____ColorValue_Internal,
@@ -557,6 +571,7 @@ export type ____ViewStyle_InternalCore = $ReadOnly<{
   borderTopWidth?: number | AnimatedNode,
   opacity?: number | AnimatedNode,
   elevation?: number,
+  pointerEvents?: 'auto' | 'none' | 'box-none' | 'box-only',
 }>;
 
 export type ____ViewStyle_Internal = $ReadOnly<{
@@ -564,6 +579,23 @@ export type ____ViewStyle_Internal = $ReadOnly<{
   ...____ViewStyle_InternalOverrides,
 }>;
 
+export type FontStyleType = {
+  fontFamily: string,
+  fontWeight: ____FontWeight_Internal,
+};
+
+export type FontStyleMap = {
+  ultraLight: FontStyleType,
+  thin: FontStyleType,
+  light: FontStyleType,
+  regular: FontStyleType,
+  medium: FontStyleType,
+  semibold: FontStyleType,
+  bold: FontStyleType,
+  heavy: FontStyleType,
+  black: FontStyleType,
+};
+
 export type ____FontWeight_Internal =
   | 'normal'
   | 'bold'
@@ -575,7 +607,54 @@ export type ____FontWeight_Internal =
   | '600'
   | '700'
   | '800'
-  | '900';
+  | '900'
+  | 100
+  | 200
+  | 300
+  | 400
+  | 500
+  | 600
+  | 700
+  | 800
+  | 900
+  | 'ultralight'
+  | 'thin'
+  | 'light'
+  | 'medium'
+  | 'regular'
+  | 'semibold'
+  | 'condensedBold'
+  | 'condensed'
+  | 'heavy'
+  | 'black';
+
+export type ____FontVariantArray_Internal = $ReadOnlyArray<
+  | 'small-caps'
+  | 'oldstyle-nums'
+  | 'lining-nums'
+  | 'tabular-nums'
+  | 'proportional-nums'
+  | 'stylistic-one'
+  | 'stylistic-two'
+  | 'stylistic-three'
+  | 'stylistic-four'
+  | 'stylistic-five'
+  | 'stylistic-six'
+  | 'stylistic-seven'
+  | 'stylistic-eight'
+  | 'stylistic-nine'
+  | 'stylistic-ten'
+  | 'stylistic-eleven'
+  | 'stylistic-twelve'
+  | 'stylistic-thirteen'
+  | 'stylistic-fourteen'
+  | 'stylistic-fifteen'
+  | 'stylistic-sixteen'
+  | 'stylistic-seventeen'
+  | 'stylistic-eighteen'
+  | 'stylistic-nineteen'
+  | 'stylistic-twenty',
+>;
 
 export type ____TextStyle_InternalCore = $ReadOnly<{
   ...$Exact<____ViewStyle_Internal>,
@@ -584,13 +663,7 @@ export type ____TextStyle_InternalCore = $ReadOnly<{
   fontSize?: number,
   fontStyle?: 'normal' | 'italic',
   fontWeight?: ____FontWeight_Internal,
-  fontVariant?: $ReadOnlyArray<
-    | 'small-caps'
-    | 'oldstyle-nums'
-    | 'lining-nums'
-    | 'tabular-nums'
-    | 'proportional-nums',
-  >,
+  fontVariant?: ____FontVariantArray_Internal | string,
   textShadowOffset?: $ReadOnly<{
     width: number,
     height: number,
@@ -610,6 +683,8 @@ export type ____TextStyle_InternalCore = $ReadOnly<{
   textDecorationStyle?: 'solid' | 'double' | 'dotted' | 'dashed',
   textDecorationColor?: ____ColorValue_Internal,
   textTransform?: 'none' | 'capitalize' | 'uppercase' | 'lowercase',
+  userSelect?: 'auto' | 'text' | 'none' | 'contain' | 'all',
+  verticalAlign?: 'auto' | 'top' | 'bottom' | 'middle',
   writingDirection?: 'auto' | 'ltr' | 'rtl',
 }>;
 
@@ -621,6 +696,7 @@ export type ____TextStyle_Internal = $ReadOnly<{
 export type ____ImageStyle_InternalCore = $ReadOnly<{
   ...$Exact<____ViewStyle_Internal>,
   resizeMode?: 'contain' | 'cover' | 'stretch' | 'center' | 'repeat',
+  objectFit?: 'cover' | 'contain' | 'fill' | 'scale-down',
   tintColor?: ____ColorValue_Internal,
   overlayColor?: string,
 }>;
@@ -633,6 +709,7 @@ export type ____ImageStyle_Internal = $ReadOnly<{
 export type ____DangerouslyImpreciseStyle_InternalCore = $ReadOnly<{
   ...$Exact<____TextStyle_Internal>,
   resizeMode?: 'contain' | 'cover' | 'stretch' | 'center' | 'repeat',
+  objectFit?: 'cover' | 'contain' | 'fill' | 'scale-down',
   tintColor?: ____ColorValue_Internal,
   overlayColor?: string,
 }>;
diff --git a/Libraries/StyleSheet/__flowtests__/StyleSheet-flowtest.js b/Libraries/StyleSheet/__flowtests__/StyleSheet-flowtest.js
index a7dbaafe08fb..c8d564ac1c5f 100644
--- a/Libraries/StyleSheet/__flowtests__/StyleSheet-flowtest.js
+++ b/Libraries/StyleSheet/__flowtests__/StyleSheet-flowtest.js
@@ -10,9 +10,9 @@
 
 'use strict';
 
-const StyleSheet = require('../StyleSheet');
-
 import type {ImageStyleProp, TextStyleProp} from '../StyleSheet';
+
+const StyleSheet = require('../StyleSheet');
 const imageStyle = {tintColor: 'rgb(0, 0, 0)'};
 const textStyle = {color: 'rgb(0, 0, 0)'};
 
diff --git a/Libraries/StyleSheet/__tests__/StyleSheet-test.js b/Libraries/StyleSheet/__tests__/StyleSheet-test.js
new file mode 100644
index 000000000000..75bd1ef71a98
--- /dev/null
+++ b/Libraries/StyleSheet/__tests__/StyleSheet-test.js
@@ -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.
+ *
+ * @format
+ * @oncall react_native
+ */
+
+import {setStyleAttributePreprocessor} from '../StyleSheet';
+
+describe(setStyleAttributePreprocessor, () => {
+  const originalConsoleWarn = console.warn;
+
+  beforeEach(() => {
+    jest.resetModules();
+    console.warn = jest.fn();
+  });
+
+  afterEach(() => {
+    console.warn = originalConsoleWarn;
+  });
+
+  it('should not show warning when set preprocessor first time', () => {
+    const spyConsole = jest.spyOn(global.console, 'warn');
+    setStyleAttributePreprocessor(
+      'fontFamily',
+      (fontFamily: string) => fontFamily,
+    );
+    expect(spyConsole).not.toHaveBeenCalled();
+  });
+
+  it('should show warning when overwrite the preprocessor', () => {
+    const spyConsole = jest.spyOn(global.console, 'warn');
+    setStyleAttributePreprocessor(
+      'fontFamily',
+      (fontFamily: string) => fontFamily,
+    );
+    setStyleAttributePreprocessor(
+      'fontFamily',
+      (fontFamily: string) => `Scoped-${fontFamily}`,
+    );
+    expect(spyConsole).toHaveBeenCalledWith(
+      'Overwriting fontFamily style attribute preprocessor',
+    );
+  });
+});
diff --git a/Libraries/StyleSheet/__tests__/__snapshots__/processAspectRatio-test.js.snap b/Libraries/StyleSheet/__tests__/__snapshots__/processAspectRatio-test.js.snap
new file mode 100644
index 000000000000..bf6d088a9415
--- /dev/null
+++ b/Libraries/StyleSheet/__tests__/__snapshots__/processAspectRatio-test.js.snap
@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`processAspectRatio should not accept invalid formats 1`] = `"aspectRatio must either be a number, a ratio or \`auto\`. You passed: 0a"`;
+
+exports[`processAspectRatio should not accept invalid formats 2`] = `"aspectRatio must either be a number, a ratio or \`auto\`. You passed: 1 / 1 1"`;
+
+exports[`processAspectRatio should not accept invalid formats 3`] = `"aspectRatio must either be a number, a ratio or \`auto\`. You passed: auto 1/1"`;
diff --git a/Libraries/StyleSheet/__tests__/__snapshots__/processTransform-test.js.snap b/Libraries/StyleSheet/__tests__/__snapshots__/processTransform-test.js.snap
index 9ec8fbc3cd66..dc8d045189ea 100644
--- a/Libraries/StyleSheet/__tests__/__snapshots__/processTransform-test.js.snap
+++ b/Libraries/StyleSheet/__tests__/__snapshots__/processTransform-test.js.snap
@@ -2,6 +2,8 @@
 
 exports[`processTransform validation should throw on invalid transform property 1`] = `"Invalid transform translateW: {\\"translateW\\":10}"`;
 
+exports[`processTransform validation should throw on invalid transform property 2`] = `"Invalid transform translateW: {\\"translateW\\":10}"`;
+
 exports[`processTransform validation should throw on object with multiple properties 1`] = `"You must specify exactly one property per transform object. Passed properties: {\\"scale\\":0.5,\\"translateY\\":10}"`;
 
 exports[`processTransform validation should throw when not passing an array to an array prop 1`] = `"Transform with key of matrix must have an array as the value: {\\"matrix\\":\\"not-a-matrix\\"}"`;
@@ -10,17 +12,25 @@ exports[`processTransform validation should throw when not passing an array to a
 
 exports[`processTransform validation should throw when passing a matrix of the wrong size 1`] = `"Matrix transform must have a length of 9 (2d) or 16 (3d). Provided matrix has a length of 4: {\\"matrix\\":[1,1,1,1]}"`;
 
+exports[`processTransform validation should throw when passing a matrix of the wrong size 2`] = `"Matrix transform must have a length of 9 (2d) or 16 (3d). Provided matrix has a length of 4: {\\"matrix\\":[1,1,1,1]}"`;
+
 exports[`processTransform validation should throw when passing a perspective of 0 1`] = `"Transform with key of \\"perspective\\" cannot be zero: {\\"perspective\\":0}"`;
 
 exports[`processTransform validation should throw when passing a translate of the wrong size 1`] = `"Transform with key translate must be an array of length 2 or 3, found 1: {\\"translate\\":[1]}"`;
 
 exports[`processTransform validation should throw when passing a translate of the wrong size 2`] = `"Transform with key translate must be an array of length 2 or 3, found 4: {\\"translate\\":[1,1,1,1]}"`;
 
+exports[`processTransform validation should throw when passing a translate of the wrong size 3`] = `"Transform with key translate must be an string with 1 or 2 parameters, found 4: translate(1px, 1px, 1px, 1px)"`;
+
 exports[`processTransform validation should throw when passing an Animated.Value 1`] = `"You passed an Animated.Value to a normal component. You need to wrap that component in an Animated. For example, replace <View /> by <Animated.View />."`;
 
 exports[`processTransform validation should throw when passing an invalid angle prop 1`] = `"Transform with key of \\"rotate\\" must be a string: {\\"rotate\\":10}"`;
 
-exports[`processTransform validation should throw when passing an invalid angle prop 2`] = `"Rotate transform must be expressed in degrees (deg) or radians (rad): {\\"skewX\\":\\"10drg\\"}"`;
+exports[`processTransform validation should throw when passing an invalid angle prop 2`] = `"Transform with key of \\"rotate\\" must be a string: {\\"rotate\\":10}"`;
+
+exports[`processTransform validation should throw when passing an invalid angle prop 3`] = `"Rotate transform must be expressed in degrees (deg) or radians (rad): {\\"skewX\\":\\"10drg\\"}"`;
+
+exports[`processTransform validation should throw when passing an invalid angle prop 4`] = `"Rotate transform must be expressed in degrees (deg) or radians (rad): {\\"skewX\\":\\"10drg\\"}"`;
 
 exports[`processTransform validation should throw when passing an invalid value to a number prop 1`] = `"Transform with key of \\"translateY\\" must be a number: {\\"translateY\\":\\"20deg\\"}"`;
 
diff --git a/Libraries/StyleSheet/__tests__/flattenStyle-test.js b/Libraries/StyleSheet/__tests__/flattenStyle-test.js
index e03a676f4a22..8d5404e81d31 100644
--- a/Libraries/StyleSheet/__tests__/flattenStyle-test.js
+++ b/Libraries/StyleSheet/__tests__/flattenStyle-test.js
@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
-const StyleSheet = require('../StyleSheet');
 const flattenStyle = require('../flattenStyle');
+const StyleSheet = require('../StyleSheet');
 
 function getFixture() {
   return StyleSheet.create({
diff --git a/Libraries/StyleSheet/__tests__/normalizeColor-test.js b/Libraries/StyleSheet/__tests__/normalizeColor-test.js
index 244fff9c38fd..b5e9732d4820 100644
--- a/Libraries/StyleSheet/__tests__/normalizeColor-test.js
+++ b/Libraries/StyleSheet/__tests__/normalizeColor-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/StyleSheet/__tests__/processAspectRatio-test.js b/Libraries/StyleSheet/__tests__/processAspectRatio-test.js
new file mode 100644
index 000000000000..7a3fbd313833
--- /dev/null
+++ b/Libraries/StyleSheet/__tests__/processAspectRatio-test.js
@@ -0,0 +1,50 @@
+/**
+ * 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
+ * @oncall react_native
+ */
+
+'use strict';
+
+const processAspectRatio = require('../processAspectRatio');
+
+describe('processAspectRatio', () => {
+  it('should accept numbers', () => {
+    expect(processAspectRatio(1)).toBe(1);
+    expect(processAspectRatio(0)).toBe(0);
+    expect(processAspectRatio(1.5)).toBe(1.5);
+  });
+
+  it('should accept string numbers', () => {
+    expect(processAspectRatio('1')).toBe(1);
+    expect(processAspectRatio('0')).toBe(0);
+    expect(processAspectRatio('1.5')).toBe(1.5);
+    expect(processAspectRatio('+1.5')).toBe(1.5);
+    expect(processAspectRatio('   1')).toBe(1);
+    expect(processAspectRatio('   0    ')).toBe(0);
+  });
+
+  it('should accept `auto`', () => {
+    expect(processAspectRatio('auto')).toBe(undefined);
+    expect(processAspectRatio(' auto')).toBe(undefined);
+    expect(processAspectRatio(' auto  ')).toBe(undefined);
+  });
+
+  it('should accept ratios', () => {
+    expect(processAspectRatio('+1/1')).toBe(1);
+    expect(processAspectRatio('0 / 10')).toBe(0);
+    expect(processAspectRatio('117/ 13')).toBe(9);
+    expect(processAspectRatio('1.5 /1.2')).toBe(1.25);
+    expect(processAspectRatio('1/0')).toBe(Infinity);
+  });
+
+  it('should not accept invalid formats', () => {
+    expect(() => processAspectRatio('0a')).toThrowErrorMatchingSnapshot();
+    expect(() => processAspectRatio('1 / 1 1')).toThrowErrorMatchingSnapshot();
+    expect(() => processAspectRatio('auto 1/1')).toThrowErrorMatchingSnapshot();
+  });
+});
diff --git a/Libraries/StyleSheet/__tests__/processColor-test.js b/Libraries/StyleSheet/__tests__/processColor-test.js
index c9d93bb2a0da..d908afed1d04 100644
--- a/Libraries/StyleSheet/__tests__/processColor-test.js
+++ b/Libraries/StyleSheet/__tests__/processColor-test.js
@@ -5,20 +5,19 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
 const {OS} = require('../../Utilities/Platform');
-const processColor = require('../processColor');
-
+const PlatformColorAndroid =
+  require('../PlatformColorValueTypes.android').PlatformColor;
 const PlatformColorIOS =
   require('../PlatformColorValueTypes.ios').PlatformColor;
 const DynamicColorIOS =
   require('../PlatformColorValueTypesIOS.ios').DynamicColorIOS;
-const PlatformColorAndroid =
-  require('../PlatformColorValueTypes.android').PlatformColor;
+const processColor = require('../processColor');
 
 const platformSpecific =
   OS === 'android'
diff --git a/Libraries/StyleSheet/__tests__/processColorArray-test.js b/Libraries/StyleSheet/__tests__/processColorArray-test.js
index 8703815cd861..0385dd7db757 100644
--- a/Libraries/StyleSheet/__tests__/processColorArray-test.js
+++ b/Libraries/StyleSheet/__tests__/processColorArray-test.js
@@ -5,20 +5,19 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
 const {OS} = require('../../Utilities/Platform');
-const processColorArray = require('../processColorArray');
-
+const PlatformColorAndroid =
+  require('../PlatformColorValueTypes.android').PlatformColor;
 const PlatformColorIOS =
   require('../PlatformColorValueTypes.ios').PlatformColor;
 const DynamicColorIOS =
   require('../PlatformColorValueTypesIOS.ios').DynamicColorIOS;
-const PlatformColorAndroid =
-  require('../PlatformColorValueTypes.android').PlatformColor;
+const processColorArray = require('../processColorArray');
 
 const platformSpecific =
   OS === 'android'
diff --git a/Libraries/StyleSheet/__tests__/processFontVariant-test.js b/Libraries/StyleSheet/__tests__/processFontVariant-test.js
new file mode 100644
index 000000000000..1d9185178be5
--- /dev/null
+++ b/Libraries/StyleSheet/__tests__/processFontVariant-test.js
@@ -0,0 +1,50 @@
+/**
+ * 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
+ * @oncall react_native
+ */
+
+'use strict';
+
+const processFontVariant = require('../processFontVariant');
+
+describe('processFontVariant', () => {
+  it('should accept arrays', () => {
+    expect(processFontVariant([])).toEqual([]);
+    expect(processFontVariant(['oldstyle-nums'])).toEqual(['oldstyle-nums']);
+    expect(processFontVariant(['proportional-nums', 'lining-nums'])).toEqual([
+      'proportional-nums',
+      'lining-nums',
+    ]);
+  });
+
+  it('should accept string values', () => {
+    expect(processFontVariant('oldstyle-nums')).toEqual(['oldstyle-nums']);
+    expect(processFontVariant('lining-nums  ')).toEqual(['lining-nums']);
+    expect(processFontVariant('   tabular-nums')).toEqual(['tabular-nums']);
+  });
+
+  it('should accept string with multiple values', () => {
+    expect(processFontVariant('oldstyle-nums lining-nums')).toEqual([
+      'oldstyle-nums',
+      'lining-nums',
+    ]);
+    expect(
+      processFontVariant('proportional-nums  oldstyle-nums   lining-nums'),
+    ).toEqual(['proportional-nums', 'oldstyle-nums', 'lining-nums']);
+    expect(
+      processFontVariant(
+        '   small-caps proportional-nums  oldstyle-nums lining-nums',
+      ),
+    ).toEqual([
+      'small-caps',
+      'proportional-nums',
+      'oldstyle-nums',
+      'lining-nums',
+    ]);
+  });
+});
diff --git a/Libraries/StyleSheet/__tests__/processTransform-test.js b/Libraries/StyleSheet/__tests__/processTransform-test.js
index 8a88c5bd4ac8..66ce708c0338 100644
--- a/Libraries/StyleSheet/__tests__/processTransform-test.js
+++ b/Libraries/StyleSheet/__tests__/processTransform-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
@@ -18,6 +18,10 @@ describe('processTransform', () => {
       processTransform([]);
     });
 
+    it('should accept an empty string', () => {
+      processTransform('');
+    });
+
     it('should accept a simple valid transform', () => {
       processTransform([
         {scale: 0.5},
@@ -25,6 +29,9 @@ describe('processTransform', () => {
         {translateY: 20},
         {rotate: '10deg'},
       ]);
+      processTransform(
+        'scale(0.5) translateX(10px) translateY(20px) rotate(10deg)',
+      );
     });
 
     it('should throw on object with multiple properties', () => {
@@ -37,6 +44,9 @@ describe('processTransform', () => {
       expect(() =>
         processTransform([{translateW: 10}]),
       ).toThrowErrorMatchingSnapshot();
+      expect(() =>
+        processTransform('translateW(10)'),
+      ).toThrowErrorMatchingSnapshot();
     });
 
     it('should throw when not passing an array to an array prop', () => {
@@ -50,19 +60,28 @@ describe('processTransform', () => {
 
     it('should accept a valid matrix', () => {
       processTransform([{matrix: [1, 1, 1, 1, 1, 1, 1, 1, 1]}]);
+      processTransform('matrix(1, 1, 1, 1, 1, 1, 1, 1, 1)');
       processTransform([
         {matrix: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]},
       ]);
+      processTransform(
+        'matrix(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1)',
+      );
     });
 
     it('should throw when passing a matrix of the wrong size', () => {
       expect(() =>
         processTransform([{matrix: [1, 1, 1, 1]}]),
       ).toThrowErrorMatchingSnapshot();
+      expect(() =>
+        processTransform('matrix(1, 1, 1, 1)'),
+      ).toThrowErrorMatchingSnapshot();
     });
 
     it('should accept a valid translate', () => {
       processTransform([{translate: [1, 1]}]);
+      processTransform('translate(1px)');
+      processTransform('translate(1px, 1px)');
       processTransform([{translate: [1, 1, 1]}]);
     });
 
@@ -73,6 +92,9 @@ describe('processTransform', () => {
       expect(() =>
         processTransform([{translate: [1, 1, 1, 1]}]),
       ).toThrowErrorMatchingSnapshot();
+      expect(() =>
+        processTransform('translate(1px, 1px, 1px, 1px)'),
+      ).toThrowErrorMatchingSnapshot();
     });
 
     it('should throw when passing an invalid value to a number prop', () => {
@@ -95,16 +117,24 @@ describe('processTransform', () => {
 
     it('should accept an angle in degrees or radians', () => {
       processTransform([{skewY: '10deg'}]);
+      processTransform('skewY(10deg)');
       processTransform([{rotateX: '1.16rad'}]);
+      processTransform('rotateX(1.16rad)');
     });
 
     it('should throw when passing an invalid angle prop', () => {
       expect(() =>
         processTransform([{rotate: 10}]),
       ).toThrowErrorMatchingSnapshot();
+      expect(() =>
+        processTransform('rotate(10)'),
+      ).toThrowErrorMatchingSnapshot();
       expect(() =>
         processTransform([{skewX: '10drg'}]),
       ).toThrowErrorMatchingSnapshot();
+      expect(() =>
+        processTransform('skewX(10drg)'),
+      ).toThrowErrorMatchingSnapshot();
     });
 
     it('should throw when passing an Animated.Value', () => {
diff --git a/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js b/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js
index 9ed61e51abb5..1f257514acfb 100644
--- a/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js
+++ b/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js
@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
-const setNormalizedColorAlpha = require('../setNormalizedColorAlpha');
 const normalizeColor = require('../normalizeColor');
+const setNormalizedColorAlpha = require('../setNormalizedColorAlpha');
 
 describe('setNormalizedColorAlpha', function () {
   it('should adjust the alpha of the color passed in', function () {
diff --git a/Libraries/StyleSheet/__tests__/splitLayoutProps-test.js b/Libraries/StyleSheet/__tests__/splitLayoutProps-test.js
index a948cc66b555..91c4bb60e824 100644
--- a/Libraries/StyleSheet/__tests__/splitLayoutProps-test.js
+++ b/Libraries/StyleSheet/__tests__/splitLayoutProps-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/StyleSheet/normalizeColor.js b/Libraries/StyleSheet/normalizeColor.js
index 46df7d988c75..dec9004d0821 100755
--- a/Libraries/StyleSheet/normalizeColor.js
+++ b/Libraries/StyleSheet/normalizeColor.js
@@ -10,10 +10,10 @@
 
 /* eslint no-bitwise: 0 */
 
-import _normalizeColor from '@react-native/normalize-color';
-
-import type {ColorValue} from './StyleSheet';
 import type {ProcessedColorValue} from './processColor';
+import type {ColorValue} from './StyleSheet';
+
+import _normalizeColor from '@react-native/normalize-color';
 
 function normalizeColor(
   color: ?(ColorValue | ProcessedColorValue),
diff --git a/Libraries/StyleSheet/private/_TransformStyle.js b/Libraries/StyleSheet/private/_TransformStyle.js
index b0f764b5c5ab..0a264a393e57 100644
--- a/Libraries/StyleSheet/private/_TransformStyle.js
+++ b/Libraries/StyleSheet/private/_TransformStyle.js
@@ -8,7 +8,7 @@
  * @format
  */
 
-const AnimatedNode = require('../../Animated/nodes/AnimatedNode');
+import type AnimatedNode from '../../Animated/nodes/AnimatedNode';
 
 export type ____TransformStyle_Internal = $ReadOnly<{|
   /**
@@ -27,27 +27,29 @@ export type ____TransformStyle_Internal = $ReadOnly<{|
    *
    * `transform([{ skewX: '45deg' }])`
    */
-  transform?: $ReadOnlyArray<
-    | {|+perspective: number | AnimatedNode|}
-    | {|+rotate: string | AnimatedNode|}
-    | {|+rotateX: string | AnimatedNode|}
-    | {|+rotateY: string | AnimatedNode|}
-    | {|+rotateZ: string | AnimatedNode|}
-    | {|+scale: number | AnimatedNode|}
-    | {|+scaleX: number | AnimatedNode|}
-    | {|+scaleY: number | AnimatedNode|}
-    | {|+translateX: number | AnimatedNode|}
-    | {|+translateY: number | AnimatedNode|}
-    | {|
-        +translate:
-          | [number | AnimatedNode, number | AnimatedNode]
-          | AnimatedNode,
-      |}
-    | {|+skewX: string|}
-    | {|+skewY: string|}
-    // TODO: what is the actual type it expects?
-    | {|
-        +matrix: $ReadOnlyArray<number | AnimatedNode> | AnimatedNode,
-      |},
-  >,
+  transform?:
+    | $ReadOnlyArray<
+        | {|+perspective: number | AnimatedNode|}
+        | {|+rotate: string | AnimatedNode|}
+        | {|+rotateX: string | AnimatedNode|}
+        | {|+rotateY: string | AnimatedNode|}
+        | {|+rotateZ: string | AnimatedNode|}
+        | {|+scale: number | AnimatedNode|}
+        | {|+scaleX: number | AnimatedNode|}
+        | {|+scaleY: number | AnimatedNode|}
+        | {|+translateX: number | AnimatedNode|}
+        | {|+translateY: number | AnimatedNode|}
+        | {|
+            +translate:
+              | [number | AnimatedNode, number | AnimatedNode]
+              | AnimatedNode,
+          |}
+        | {|+skewX: string|}
+        | {|+skewY: string|}
+        // TODO: what is the actual type it expects?
+        | {|
+            +matrix: $ReadOnlyArray<number | AnimatedNode> | AnimatedNode,
+          |},
+      >
+    | string,
 |}>;
diff --git a/Libraries/StyleSheet/processAspectRatio.js b/Libraries/StyleSheet/processAspectRatio.js
new file mode 100644
index 000000000000..bde4a4a645c0
--- /dev/null
+++ b/Libraries/StyleSheet/processAspectRatio.js
@@ -0,0 +1,53 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+const invariant = require('invariant');
+
+function processAspectRatio(aspectRatio: number | string): ?number {
+  if (typeof aspectRatio === 'number') {
+    return aspectRatio;
+  }
+
+  const matches = aspectRatio.split('/').map(s => s.trim());
+
+  if (matches.includes('auto')) {
+    if (__DEV__) {
+      invariant(
+        matches.length,
+        'aspectRatio does not support `auto <ratio>`. You passed: %s',
+        aspectRatio,
+      );
+    }
+    return;
+  }
+
+  const hasNonNumericValues = matches.some(n => Number.isNaN(Number(n)));
+  if (__DEV__) {
+    invariant(
+      !hasNonNumericValues && (matches.length === 1 || matches.length === 2),
+      'aspectRatio must either be a number, a ratio or `auto`. You passed: %s',
+      aspectRatio,
+    );
+  }
+
+  if (hasNonNumericValues) {
+    return;
+  }
+
+  if (matches.length === 2) {
+    return Number(matches[0]) / Number(matches[1]);
+  }
+
+  return Number(matches[0]);
+}
+
+module.exports = processAspectRatio;
diff --git a/Libraries/StyleSheet/processColor.d.ts b/Libraries/StyleSheet/processColor.d.ts
new file mode 100644
index 000000000000..d84a5a78fa41
--- /dev/null
+++ b/Libraries/StyleSheet/processColor.d.ts
@@ -0,0 +1,16 @@
+/**
+ * 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
+ */
+
+import {ColorValue, OpaqueColorValue} from './StyleSheet';
+
+export type ProcessedColorValue = number | OpaqueColorValue;
+
+export function processColor(
+  color?: number | ColorValue,
+): ProcessedColorValue | null | undefined;
diff --git a/Libraries/StyleSheet/processColor.js b/Libraries/StyleSheet/processColor.js
index e6f8aa372852..955f81c83043 100644
--- a/Libraries/StyleSheet/processColor.js
+++ b/Libraries/StyleSheet/processColor.js
@@ -10,13 +10,12 @@
 
 'use strict';
 
-const Platform = require('../Utilities/Platform');
+import type {NativeColorValue} from './PlatformColorValueTypes';
+import type {ColorValue} from './StyleSheet';
 
+const Platform = require('../Utilities/Platform');
 const normalizeColor = require('./normalizeColor');
 
-import type {ColorValue} from './StyleSheet';
-import type {NativeColorValue} from './PlatformColorValueTypes';
-
 export type ProcessedColorValue = number | NativeColorValue;
 
 /* eslint no-bitwise: 0 */
diff --git a/Libraries/StyleSheet/processColorArray.js b/Libraries/StyleSheet/processColorArray.js
index 8b773ecdd779..7b3d53517ef1 100644
--- a/Libraries/StyleSheet/processColorArray.js
+++ b/Libraries/StyleSheet/processColorArray.js
@@ -11,6 +11,7 @@
 'use strict';
 
 import type {ColorValue} from './StyleSheet';
+
 import processColor, {type ProcessedColorValue} from './processColor';
 
 const TRANSPARENT = 0; // rgba(0, 0, 0, 0)
diff --git a/Libraries/StyleSheet/processFontVariant.js b/Libraries/StyleSheet/processFontVariant.js
new file mode 100644
index 000000000000..9f11bbbe3bea
--- /dev/null
+++ b/Libraries/StyleSheet/processFontVariant.js
@@ -0,0 +1,30 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+import type {____FontVariantArray_Internal} from './StyleSheetTypes';
+
+function processFontVariant(
+  fontVariant: ____FontVariantArray_Internal | string,
+): ?____FontVariantArray_Internal {
+  if (Array.isArray(fontVariant)) {
+    return fontVariant;
+  }
+
+  // $FlowFixMe[incompatible-type]
+  const match: ?____FontVariantArray_Internal = fontVariant
+    .split(' ')
+    .filter(Boolean);
+
+  return match;
+}
+
+module.exports = processFontVariant;
diff --git a/Libraries/StyleSheet/processTransform.js b/Libraries/StyleSheet/processTransform.js
index 8edb62d853c3..a703ac471614 100644
--- a/Libraries/StyleSheet/processTransform.js
+++ b/Libraries/StyleSheet/processTransform.js
@@ -10,11 +10,8 @@
 
 'use strict';
 
-const MatrixMath = require('../Utilities/MatrixMath');
-const Platform = require('../Utilities/Platform');
-
-const invariant = require('invariant');
 const stringifySafe = require('../Utilities/stringifySafe').default;
+const invariant = require('invariant');
 
 /**
  * Generate a transform matrix based on the provided transforms, and use that
@@ -25,118 +22,130 @@ const stringifySafe = require('../Utilities/stringifySafe').default;
  * interface to native code.
  */
 function processTransform(
-  transform: Array<Object>,
+  transform: Array<Object> | string,
 ): Array<Object> | Array<number> {
+  if (typeof transform === 'string') {
+    const regex = new RegExp(/(\w+)\(([^)]+)\)/g);
+    let transformArray: Array<Object> = [];
+    let matches;
+
+    while ((matches = regex.exec(transform))) {
+      const {key, value} = _getKeyAndValueFromCSSTransform(
+        matches[1],
+        matches[2],
+      );
+
+      if (value !== undefined) {
+        transformArray.push({[key]: value});
+      }
+    }
+    transform = transformArray;
+  }
+
   if (__DEV__) {
     _validateTransforms(transform);
   }
 
-  // Android & iOS implementations of transform property accept the list of
-  // transform properties as opposed to a transform Matrix. This is necessary
-  // to control transform property updates completely on the native thread.
-  if (Platform.OS === 'android' || Platform.OS === 'ios') {
-    return transform;
-  }
+  return transform;
+}
+
+const _getKeyAndValueFromCSSTransform: (
+  key:
+    | string
+    | $TEMPORARY$string<'matrix'>
+    | $TEMPORARY$string<'perspective'>
+    | $TEMPORARY$string<'rotate'>
+    | $TEMPORARY$string<'rotateX'>
+    | $TEMPORARY$string<'rotateY'>
+    | $TEMPORARY$string<'rotateZ'>
+    | $TEMPORARY$string<'scale'>
+    | $TEMPORARY$string<'scaleX'>
+    | $TEMPORARY$string<'scaleY'>
+    | $TEMPORARY$string<'skewX'>
+    | $TEMPORARY$string<'skewY'>
+    | $TEMPORARY$string<'translate'>
+    | $TEMPORARY$string<'translate3d'>
+    | $TEMPORARY$string<'translateX'>
+    | $TEMPORARY$string<'translateY'>,
+  args: string,
+) => {key: string, value?: number[] | number | string} = (key, args) => {
+  const argsWithUnitsRegex = new RegExp(/([+-]?\d+(\.\d+)?)([a-zA-Z]+)?/g);
 
-  const result = MatrixMath.createIdentityMatrix();
+  switch (key) {
+    case 'matrix':
+      return {key, value: args.match(/[+-]?\d+(\.\d+)?/g)?.map(Number)};
+    case 'translate':
+    case 'translate3d':
+      const parsedArgs = [];
+      let missingUnitOfMeasurement = false;
 
-  transform.forEach(transformation => {
-    const key = Object.keys(transformation)[0];
-    const value = transformation[key];
+      let matches;
+      while ((matches = argsWithUnitsRegex.exec(args))) {
+        const value = Number(matches[1]);
+        const unitOfMeasurement = matches[3];
 
-    switch (key) {
-      case 'matrix':
-        MatrixMath.multiplyInto(result, result, value);
-        break;
-      case 'perspective':
-        _multiplyTransform(result, MatrixMath.reusePerspectiveCommand, [value]);
-        break;
-      case 'rotateX':
-        _multiplyTransform(result, MatrixMath.reuseRotateXCommand, [
-          _convertToRadians(value),
-        ]);
-        break;
-      case 'rotateY':
-        _multiplyTransform(result, MatrixMath.reuseRotateYCommand, [
-          _convertToRadians(value),
-        ]);
-        break;
-      case 'rotate':
-      case 'rotateZ':
-        _multiplyTransform(result, MatrixMath.reuseRotateZCommand, [
-          _convertToRadians(value),
-        ]);
-        break;
-      case 'scale':
-        _multiplyTransform(result, MatrixMath.reuseScaleCommand, [value]);
-        break;
-      case 'scaleX':
-        _multiplyTransform(result, MatrixMath.reuseScaleXCommand, [value]);
-        break;
-      case 'scaleY':
-        _multiplyTransform(result, MatrixMath.reuseScaleYCommand, [value]);
-        break;
-      case 'translate':
-        _multiplyTransform(result, MatrixMath.reuseTranslate3dCommand, [
-          value[0],
-          value[1],
-          value[2] || 0,
-        ]);
-        break;
-      case 'translateX':
-        _multiplyTransform(result, MatrixMath.reuseTranslate2dCommand, [
-          value,
-          0,
-        ]);
-        break;
-      case 'translateY':
-        _multiplyTransform(result, MatrixMath.reuseTranslate2dCommand, [
-          0,
-          value,
-        ]);
-        break;
-      case 'skewX':
-        _multiplyTransform(result, MatrixMath.reuseSkewXCommand, [
-          _convertToRadians(value),
-        ]);
-        break;
-      case 'skewY':
-        _multiplyTransform(result, MatrixMath.reuseSkewYCommand, [
-          _convertToRadians(value),
-        ]);
-        break;
-      default:
-        throw new Error('Invalid transform name: ' + key);
-    }
-  });
+        if (value !== 0 && !unitOfMeasurement) {
+          missingUnitOfMeasurement = true;
+        }
 
-  return result;
-}
+        parsedArgs.push(value);
+      }
 
-/**
- * Performs a destructive operation on a transform matrix.
- */
-/* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
- * Flow's LTI update could not be added via codemod */
-function _multiplyTransform(
-  result: Array<number>,
-  matrixMathFunction: Function,
-  args: Array<number>,
-): void {
-  const matrixToApply = MatrixMath.createIdentityMatrix();
-  const argsWithIdentity = [matrixToApply].concat(args);
-  matrixMathFunction.apply(this, argsWithIdentity);
-  MatrixMath.multiplyInto(result, result, matrixToApply);
-}
+      if (__DEV__) {
+        invariant(
+          !missingUnitOfMeasurement,
+          `Transform with key ${key} must have units unless the provided value is 0, found %s`,
+          `${key}(${args})`,
+        );
 
-/**
- * Parses a string like '0.5rad' or '60deg' into radians expressed in a float.
- * Note that validation on the string is done in `_validateTransform()`.
- */
-function _convertToRadians(value: string): number {
-  const floatValue = parseFloat(value);
-  return value.indexOf('rad') > -1 ? floatValue : (floatValue * Math.PI) / 180;
-}
+        if (key === 'translate') {
+          invariant(
+            parsedArgs?.length === 1 || parsedArgs?.length === 2,
+            'Transform with key translate must be an string with 1 or 2 parameters, found %s: %s',
+            parsedArgs?.length,
+            `${key}(${args})`,
+          );
+        } else {
+          invariant(
+            parsedArgs?.length === 3,
+            'Transform with key translate3d must be an string with 3 parameters, found %s: %s',
+            parsedArgs?.length,
+            `${key}(${args})`,
+          );
+        }
+      }
+
+      if (parsedArgs?.length === 1) {
+        parsedArgs.push(0);
+      }
+
+      return {key: 'translate', value: parsedArgs};
+    case 'translateX':
+    case 'translateY':
+    case 'perspective':
+      const argMatches = argsWithUnitsRegex.exec(args);
+
+      if (!argMatches?.length) {
+        return {key, value: undefined};
+      }
+
+      const value = Number(argMatches[1]);
+      const unitOfMeasurement = argMatches[3];
+
+      if (__DEV__) {
+        invariant(
+          value === 0 || unitOfMeasurement,
+          `Transform with key ${key} must have units unless the provided value is 0, found %s`,
+          `${key}(${args})`,
+        );
+      }
+
+      return {key, value};
+
+    default:
+      return {key, value: !isNaN(args) ? Number(args) : args};
+  }
+};
 
 function _validateTransforms(transform: Array<Object>): void {
   transform.forEach(transformation => {
diff --git a/Libraries/StyleSheet/splitLayoutProps.js b/Libraries/StyleSheet/splitLayoutProps.js
index 8575d2638738..b92f86d3ad25 100644
--- a/Libraries/StyleSheet/splitLayoutProps.js
+++ b/Libraries/StyleSheet/splitLayoutProps.js
@@ -49,13 +49,18 @@ export default function splitLayoutProps(props: ?____ViewStyle_Internal): {
         case 'bottom':
         case 'top':
         case 'transform':
+        case 'rowGap':
+        case 'columnGap':
+        case 'gap':
           // $FlowFixMe[cannot-write]
           // $FlowFixMe[incompatible-use]
+          // $FlowFixMe[prop-missing]
           outer[prop] = props[prop];
           break;
         default:
           // $FlowFixMe[cannot-write]
           // $FlowFixMe[incompatible-use]
+          // $FlowFixMe[prop-missing]
           inner[prop] = props[prop];
           break;
       }
diff --git a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm
index cb4c4ef27a2f..39517ac5e86e 100644
--- a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm
+++ b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm
@@ -12,8 +12,8 @@
 #import <ComponentKit/CKComponentSubclass.h>
 #import <ComponentKit/CKOverlayLayoutComponent.h>
 #import <RCTSurfaceHostingComponent/RCTSurfaceHostingComponent.h>
-#import <React/RCTSurface.h>
 #import <React/RCTFabricSurface.h>
+#import <React/RCTSurface.h>
 
 #import "RCTSurfaceBackedComponentState.h"
 
@@ -42,35 +42,32 @@ + (instancetype)newWithBridge:(RCTBridge *)bridge
     id<RCTSurfaceProtocol> surface;
     if (surfacePresenter) {
       surface = [[RCTFabricSurface alloc] initWithSurfacePresenter:surfacePresenter
-                                              moduleName:moduleName
-                                              initialProperties:adjustedProperties];
+                                                        moduleName:moduleName
+                                                 initialProperties:adjustedProperties];
     } else {
-      surface = [[RCTSurface alloc] initWithBridge:bridge
-                                moduleName:moduleName
-                         initialProperties:adjustedProperties];
+      surface = [[RCTSurface alloc] initWithBridge:bridge moduleName:moduleName initialProperties:adjustedProperties];
     }
     [surface start];
 
     state = [RCTSurfaceBackedComponentState newWithSurface:surface];
 
     CKComponentScope::replaceState(scope, state);
-  }
-  else {
+  } else {
     if (![state.surface.properties isEqualToDictionary:adjustedProperties]) {
       state.surface.properties = adjustedProperties;
     }
   }
 
-  RCTSurfaceHostingComponent *surfaceHostingComponent =
-    [RCTSurfaceHostingComponent newWithSurface:state.surface
-                                       options:options];
+  RCTSurfaceHostingComponent *surfaceHostingComponent = [RCTSurfaceHostingComponent newWithSurface:state.surface
+                                                                                           options:options];
 
   CKComponent *component;
   if (options.activityIndicatorComponentFactory == nil || RCTSurfaceStageIsRunning(state.surface.stage)) {
     component = surfaceHostingComponent;
   } else {
     component = [[CKOverlayLayoutComponent alloc] initWithComponent:surfaceHostingComponent
-                                                            overlay:options.activityIndicatorComponentFactory()];
+                                                            overlay:options.activityIndicatorComponentFactory()
+                                               accessibilityContext:{}];
   }
 
   return [super newWithComponent:component];
diff --git a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h
index b595e41872d4..665fb802abc3 100644
--- a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h
+++ b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h
@@ -9,7 +9,7 @@
 
 @protocol RCTSurfaceProtocol;
 
-@interface RCTSurfaceBackedComponentState: NSObject
+@interface RCTSurfaceBackedComponentState : NSObject
 
 @property (atomic, readonly, strong) id<RCTSurfaceProtocol> surface;
 
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm
index 64e6c124e172..28bc33e5933e 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm
@@ -37,15 +37,13 @@ + (instancetype)newWithSurface:(id<RCTSurfaceProtocol>)surface options:(RCTSurfa
   RCTSurfaceHostingComponentState *const state = scope.state();
 
   RCTSurfaceHostingComponentState *const newState =
-    [RCTSurfaceHostingComponentState newWithStage:surface.stage
-                                     intrinsicSize:surface.intrinsicSize];
+      [RCTSurfaceHostingComponentState newWithStage:surface.stage intrinsicSize:surface.intrinsicSize];
 
   if (![state isEqual:newState]) {
     CKComponentScope::replaceState(scope, newState);
   }
 
-  RCTSurfaceHostingComponent *const component =
-    [super newWithView:{[UIView class]} size:{}];
+  RCTSurfaceHostingComponent *const component = [super newWithView:{[UIView class]} size:{}];
 
   if (component) {
     component->_state = scope.state();
@@ -72,15 +70,14 @@ - (RCLayout)computeLayoutThatFits:(CKSizeRange)constrainedSize
   // interop compatibilities of React Native which will enable us granularly
   // control React Native mounting blocks and, as a result, implement
   // truly synchronous mounting stage between React Native and ComponentKit.
-  [_surface setMinimumSize:constrainedSize.min
-               maximumSize:constrainedSize.max];
+  [_surface setMinimumSize:constrainedSize.min maximumSize:constrainedSize.max];
 
   // Just in case of the very first building pass, we give React Native a chance
   // to prepare its internals for coming synchronous measuring.
   if ([_surface isKindOfClass:[RCTSurface class]]) {
     // Legacy Pre-Fabric Surface
     [(RCTSurface *)_surface synchronouslyWaitForStage:RCTSurfaceStageSurfaceDidInitialLayout
-                                      timeout:_options.synchronousLayoutingTimeout];
+                                              timeout:_options.synchronousLayoutingTimeout];
   } else if ([_surface isKindOfClass:[RCTFabricSurface class]]) {
     // Fabric Surface
     // Hack: Increase timeout because RCTFabricSurface stage will be RCTSurfaceStageSurfaceDidInitialLayout
@@ -94,10 +91,8 @@ - (RCLayout)computeLayoutThatFits:(CKSizeRange)constrainedSize
 
   CGSize fittingSize = CGSizeZero;
   if (_surface.stage & RCTSurfaceStageSurfaceDidInitialLayout) {
-    fittingSize = [_surface sizeThatFitsMinimumSize:constrainedSize.min
-                                        maximumSize:constrainedSize.max];
-  }
-  else {
+    fittingSize = [_surface sizeThatFitsMinimumSize:constrainedSize.min maximumSize:constrainedSize.max];
+  } else {
     fittingSize = _options.activityIndicatorSize;
   }
 
@@ -109,9 +104,9 @@ - (CKComponentBoundsAnimation)boundsAnimationFromPreviousComponent:(RCTSurfaceHo
 {
   if (_options.boundsAnimations && (previousComponent->_state.stage != _state.stage)) {
     return {
-      .mode = CKComponentBoundsAnimationModeDefault,
-      .duration = 0.25,
-      .options = UIViewAnimationOptionCurveEaseInOut,
+        .mode = CKComponentBoundsAnimationModeDefault,
+        .duration = 0.25,
+        .options = UIViewAnimationOptionCurveEaseInOut,
     };
   }
 
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm
index 581009784651..7f82cd415891 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm
@@ -17,7 +17,7 @@
 #import "RCTSurfaceHostingComponent.h"
 #import "RCTSurfaceHostingComponentState.h"
 
-@interface RCTSurfaceHostingComponentController() <RCTSurfaceDelegate>
+@interface RCTSurfaceHostingComponentController () <RCTSurfaceDelegate>
 @end
 
 @implementation RCTSurfaceHostingComponentController {
@@ -83,11 +83,12 @@ - (void)setIntrinsicSize:(CGSize)intrinsicSize
     if (!strongSelf) {
       return;
     }
-    
-    [strongSelf.component updateState:^(RCTSurfaceHostingComponentState *state) {
-      return [RCTSurfaceHostingComponentState newWithStage:state.stage
-                                             intrinsicSize:intrinsicSize];
-    } mode:[strongSelf suitableStateUpdateMode]];
+
+    [strongSelf.component
+        updateState:^(RCTSurfaceHostingComponentState *state) {
+          return [RCTSurfaceHostingComponentState newWithStage:state.stage intrinsicSize:intrinsicSize];
+        }
+               mode:[strongSelf suitableStateUpdateMode]];
   });
 }
 
@@ -99,17 +100,20 @@ - (void)setStage:(RCTSurfaceStage)stage
     if (!strongSelf) {
       return;
     }
-    
-    [strongSelf.component updateState:^(RCTSurfaceHostingComponentState *state) {
-      return [RCTSurfaceHostingComponentState newWithStage:stage
-                                             intrinsicSize:state.intrinsicSize];
-    } mode:[strongSelf suitableStateUpdateMode]];
+
+    [strongSelf.component
+        updateState:^(RCTSurfaceHostingComponentState *state) {
+          return [RCTSurfaceHostingComponentState newWithStage:stage intrinsicSize:state.intrinsicSize];
+        }
+               mode:[strongSelf suitableStateUpdateMode]];
   });
 }
 
 - (CKUpdateMode)suitableStateUpdateMode
 {
-  return ((RCTSurfaceHostingComponent *)self.component).options.synchronousStateUpdates && RCTIsMainQueue() ? CKUpdateModeSynchronous : CKUpdateModeAsynchronous;
+  return ((RCTSurfaceHostingComponent *)self.component).options.synchronousStateUpdates && RCTIsMainQueue()
+      ? CKUpdateModeSynchronous
+      : CKUpdateModeAsynchronous;
 }
 
 - (void)mountSurfaceView
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h
index cd6e6df89e4a..06819d99c809 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h
@@ -9,7 +9,7 @@
 
 #import <ComponentKit/CKComponent.h>
 
-typedef CKComponent *(^RCTSurfaceHostingComponentOptionsActivityIndicatorComponentFactory)();
+typedef CKComponent * (^RCTSurfaceHostingComponentOptionsActivityIndicatorComponentFactory)();
 
 struct RCTSurfaceHostingComponentOptions {
   NSTimeInterval synchronousLayoutingTimeout = 0.350;
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h
index 6e1651838f44..6036e74be774 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h
@@ -9,12 +9,11 @@
 
 #import <React/RCTSurfaceStage.h>
 
-@interface RCTSurfaceHostingComponentState: NSObject
+@interface RCTSurfaceHostingComponentState : NSObject
 
 @property (nonatomic, readonly, assign) CGSize intrinsicSize;
 @property (nonatomic, readonly, assign) RCTSurfaceStage stage;
 
-+ (instancetype)newWithStage:(RCTSurfaceStage)stage
-               intrinsicSize:(CGSize)intrinsicSize;
++ (instancetype)newWithStage:(RCTSurfaceStage)stage intrinsicSize:(CGSize)intrinsicSize;
 
 @end
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm
index 2d62ac426500..f108bff23833 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm
@@ -9,15 +9,12 @@
 
 @implementation RCTSurfaceHostingComponentState
 
-+ (instancetype)newWithStage:(RCTSurfaceStage)stage
-               intrinsicSize:(CGSize)intrinsicSize
++ (instancetype)newWithStage:(RCTSurfaceStage)stage intrinsicSize:(CGSize)intrinsicSize
 {
   return [[self alloc] initWithStage:stage intrinsicSize:intrinsicSize];
 }
 
-
-- (instancetype)initWithStage:(RCTSurfaceStage)stage
-                intrinsicSize:(CGSize)intrinsicSize
+- (instancetype)initWithStage:(RCTSurfaceStage)stage intrinsicSize:(CGSize)intrinsicSize
 {
   if (self = [super init]) {
     _stage = stage;
@@ -33,9 +30,7 @@ - (BOOL)isEqual:(RCTSurfaceHostingComponentState *)other
     return YES;
   }
 
-  return
-    _stage == other->_stage &&
-    CGSizeEqualToSize(_intrinsicSize, other->_intrinsicSize);
+  return _stage == other->_stage && CGSizeEqualToSize(_intrinsicSize, other->_intrinsicSize);
 }
 
 @end
diff --git a/Libraries/Text/BaseText/RCTBaseTextShadowView.h b/Libraries/Text/BaseText/RCTBaseTextShadowView.h
index 9d0affa3f03f..e87ad210d0db 100644
--- a/Libraries/Text/BaseText/RCTBaseTextShadowView.h
+++ b/Libraries/Text/BaseText/RCTBaseTextShadowView.h
@@ -14,8 +14,10 @@ NS_ASSUME_NONNULL_BEGIN
 extern NSString *const RCTBaseTextShadowViewEmbeddedShadowViewAttributeName;
 
 @interface RCTBaseTextShadowView : RCTShadowView {
-  @protected NSAttributedString *_Nullable cachedAttributedText;
-  @protected RCTTextAttributes *_Nullable cachedTextAttributes;
+ @protected
+  NSAttributedString *_Nullable cachedAttributedText;
+ @protected
+  RCTTextAttributes *_Nullable cachedTextAttributes;
 }
 
 @property (nonatomic, strong) RCTTextAttributes *textAttributes;
diff --git a/Libraries/Text/BaseText/RCTBaseTextShadowView.m b/Libraries/Text/BaseText/RCTBaseTextShadowView.m
index 23d38d120ac1..c8fd3b15a804 100644
--- a/Libraries/Text/BaseText/RCTBaseTextShadowView.m
+++ b/Libraries/Text/BaseText/RCTBaseTextShadowView.m
@@ -12,7 +12,8 @@
 #import <React/RCTRawTextShadowView.h>
 #import <React/RCTVirtualTextShadowView.h>
 
-NSString *const RCTBaseTextShadowViewEmbeddedShadowViewAttributeName = @"RCTBaseTextShadowViewEmbeddedShadowViewAttributeName";
+NSString *const RCTBaseTextShadowViewEmbeddedShadowViewAttributeName =
+    @"RCTBaseTextShadowViewEmbeddedShadowViewAttributeName";
 
 static void RCTInlineViewYogaNodeDirtied(YGNodeRef node)
 {
@@ -22,9 +23,8 @@ static void RCTInlineViewYogaNodeDirtied(YGNodeRef node)
   // the outermost text node which has a Yoga node and then Yoga will take over
   // the dirty signal propagation.
   RCTShadowView *inlineView = (__bridge RCTShadowView *)YGNodeGetContext(node);
-  RCTBaseTextShadowView *baseTextShadowView =
-    (RCTBaseTextShadowView *)inlineView.reactSuperview;
-  
+  RCTBaseTextShadowView *baseTextShadowView = (RCTBaseTextShadowView *)inlineView.reactSuperview;
+
   [baseTextShadowView dirtyLayout];
 }
 
@@ -50,9 +50,9 @@ - (void)setReactTag:(NSNumber *)reactTag
 - (void)insertReactSubview:(RCTShadowView *)subview atIndex:(NSInteger)index
 {
   [super insertReactSubview:subview atIndex:index];
-  
+
   [self dirtyLayout];
-  
+
   if (![subview isKindOfClass:[RCTVirtualTextShadowView class]]) {
     YGNodeSetDirtiedFunc(subview.yogaNode, RCTInlineViewYogaNodeDirtied);
   }
@@ -63,9 +63,9 @@ - (void)removeReactSubview:(RCTShadowView *)subview
   if (![subview isKindOfClass:[RCTVirtualTextShadowView class]]) {
     YGNodeSetDirtiedFunc(subview.yogaNode, NULL);
   }
-  
+
   [self dirtyLayout];
-  
+
   [super removeReactSubview:subview];
 }
 
@@ -97,8 +97,8 @@ - (NSAttributedString *)attributedTextWithBaseTextAttributes:(nullable RCTTextAt
       NSString *text = rawTextShadowView.text;
       if (text) {
         NSAttributedString *rawTextAttributedString =
-          [[NSAttributedString alloc] initWithString:[textAttributes applyTextAttributesToText:text]
-                                          attributes:textAttributes.effectiveTextAttributes];
+            [[NSAttributedString alloc] initWithString:[textAttributes applyTextAttributesToText:text]
+                                            attributes:textAttributes.effectiveTextAttributes];
         [attributedText appendAttributedString:rawTextAttributedString];
       }
       continue;
@@ -108,7 +108,7 @@ - (NSAttributedString *)attributedTextWithBaseTextAttributes:(nullable RCTTextAt
     if ([shadowView isKindOfClass:[RCTBaseTextShadowView class]]) {
       RCTBaseTextShadowView *baseTextShadowView = (RCTBaseTextShadowView *)shadowView;
       NSAttributedString *baseTextAttributedString =
-        [baseTextShadowView attributedTextWithBaseTextAttributes:textAttributes];
+          [baseTextShadowView attributedTextWithBaseTextAttributes:textAttributes];
       [attributedText appendAttributedString:baseTextAttributedString];
       continue;
     }
@@ -117,7 +117,8 @@ - (NSAttributedString *)attributedTextWithBaseTextAttributes:(nullable RCTTextAt
     NSTextAttachment *attachment = [NSTextAttachment new];
     NSMutableAttributedString *embeddedShadowViewAttributedString = [NSMutableAttributedString new];
     [embeddedShadowViewAttributedString beginEditing];
-    [embeddedShadowViewAttributedString appendAttributedString:[NSAttributedString attributedStringWithAttachment:attachment]];
+    [embeddedShadowViewAttributedString
+        appendAttributedString:[NSAttributedString attributedStringWithAttachment:attachment]];
     [embeddedShadowViewAttributedString addAttribute:RCTBaseTextShadowViewEmbeddedShadowViewAttributeName
                                                value:shadowView
                                                range:(NSRange){0, embeddedShadowViewAttributedString.length}];
diff --git a/Libraries/Text/BaseText/RCTBaseTextViewManager.m b/Libraries/Text/BaseText/RCTBaseTextViewManager.m
index fee8647bab15..ece68768c402 100644
--- a/Libraries/Text/BaseText/RCTBaseTextViewManager.m
+++ b/Libraries/Text/BaseText/RCTBaseTextViewManager.m
@@ -36,12 +36,14 @@ - (RCTShadowView *)shadowView
 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
 RCT_REMAP_SHADOW_PROPERTY(lineHeight, textAttributes.lineHeight, CGFloat)
 RCT_REMAP_SHADOW_PROPERTY(textAlign, textAttributes.alignment, NSTextAlignment)
 RCT_REMAP_SHADOW_PROPERTY(writingDirection, textAttributes.baseWritingDirection, NSWritingDirection)
+RCT_REMAP_SHADOW_PROPERTY(lineBreakStrategyIOS, textAttributes.lineBreakStrategy, NSLineBreakStrategy)
 // Decoration
 RCT_REMAP_SHADOW_PROPERTY(textDecorationColor, textAttributes.textDecorationColor, UIColor)
 RCT_REMAP_SHADOW_PROPERTY(textDecorationStyle, textAttributes.textDecorationStyle, NSUnderlineStyle)
diff --git a/Libraries/Text/RCTConvert+Text.m b/Libraries/Text/RCTConvert+Text.m
index da9fb7cb839f..aa6e5e30a590 100644
--- a/Libraries/Text/RCTConvert+Text.m
+++ b/Libraries/Text/RCTConvert+Text.m
@@ -11,25 +11,27 @@ @implementation RCTConvert (Text)
 
 + (UITextAutocorrectionType)UITextAutocorrectionType:(id)json
 {
-  return
-    json == nil ? UITextAutocorrectionTypeDefault :
-    [RCTConvert BOOL:json] ? UITextAutocorrectionTypeYes :
-    UITextAutocorrectionTypeNo;
+  return json == nil           ? UITextAutocorrectionTypeDefault
+      : [RCTConvert BOOL:json] ? UITextAutocorrectionTypeYes
+                               : UITextAutocorrectionTypeNo;
 }
 
 + (UITextSpellCheckingType)UITextSpellCheckingType:(id)json
 {
-  return
-    json == nil ? UITextSpellCheckingTypeDefault :
-    [RCTConvert BOOL:json] ? UITextSpellCheckingTypeYes :
-    UITextSpellCheckingTypeNo;
+  return json == nil           ? UITextSpellCheckingTypeDefault
+      : [RCTConvert BOOL:json] ? UITextSpellCheckingTypeYes
+                               : UITextSpellCheckingTypeNo;
 }
 
-RCT_ENUM_CONVERTER(RCTTextTransform, (@{
-  @"none": @(RCTTextTransformNone),
-  @"capitalize": @(RCTTextTransformCapitalize),
-  @"uppercase": @(RCTTextTransformUppercase),
-  @"lowercase": @(RCTTextTransformLowercase),
-}), RCTTextTransformUndefined, integerValue)
+RCT_ENUM_CONVERTER(
+    RCTTextTransform,
+    (@{
+      @"none" : @(RCTTextTransformNone),
+      @"capitalize" : @(RCTTextTransformCapitalize),
+      @"uppercase" : @(RCTTextTransformUppercase),
+      @"lowercase" : @(RCTTextTransformLowercase),
+    }),
+    RCTTextTransformUndefined,
+    integerValue)
 
 @end
diff --git a/Libraries/Text/RCTTextAttributes.h b/Libraries/Text/RCTTextAttributes.h
index a95536d1b671..22fb646d4349 100644
--- a/Libraries/Text/RCTTextAttributes.h
+++ b/Libraries/Text/RCTTextAttributes.h
@@ -7,6 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
+#import <React/RCTDynamicTypeRamp.h>
 #import <React/RCTTextDecorationLineType.h>
 
 #import "RCTTextTransform.h"
@@ -36,11 +37,13 @@ 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;
 @property (nonatomic, assign) NSTextAlignment alignment;
 @property (nonatomic, assign) NSWritingDirection baseWritingDirection;
+@property (nonatomic, assign) NSLineBreakStrategy lineBreakStrategy;
 // Decoration
 @property (nonatomic, strong, nullable) UIColor *textDecorationColor;
 @property (nonatomic, assign) NSUnderlineStyle textDecorationStyle;
diff --git a/Libraries/Text/RCTTextAttributes.m b/Libraries/Text/RCTTextAttributes.m
index 01131cfb20e2..c8323388ce68 100644
--- a/Libraries/Text/RCTTextAttributes.m
+++ b/Libraries/Text/RCTTextAttributes.m
@@ -27,6 +27,7 @@ - (instancetype)init
     _maxFontSizeMultiplier = NAN;
     _alignment = NSTextAlignmentNatural;
     _baseWritingDirection = NSWritingDirectionNatural;
+    _lineBreakStrategy = NSLineBreakStrategyNone;
     _textShadowRadius = NAN;
     _opacity = NAN;
     _textTransform = RCTTextTransformUndefined;
@@ -44,39 +45,56 @@ - (void)applyTextAttributes:(RCTTextAttributes *)textAttributes
   // Color
   _foregroundColor = textAttributes->_foregroundColor ?: _foregroundColor;
   _backgroundColor = textAttributes->_backgroundColor ?: _backgroundColor;
-  _opacity = !isnan(textAttributes->_opacity) ? (isnan(_opacity) ? 1.0 : _opacity) * textAttributes->_opacity : _opacity;
+  _opacity =
+      !isnan(textAttributes->_opacity) ? (isnan(_opacity) ? 1.0 : _opacity) * textAttributes->_opacity : _opacity;
 
   // Font
   _fontFamily = textAttributes->_fontFamily ?: _fontFamily;
   _fontSize = !isnan(textAttributes->_fontSize) ? textAttributes->_fontSize : _fontSize;
-  _fontSizeMultiplier = !isnan(textAttributes->_fontSizeMultiplier) ? textAttributes->_fontSizeMultiplier : _fontSizeMultiplier;
-  _maxFontSizeMultiplier = !isnan(textAttributes->_maxFontSizeMultiplier) ? textAttributes->_maxFontSizeMultiplier : _maxFontSizeMultiplier;
+  _fontSizeMultiplier =
+      !isnan(textAttributes->_fontSizeMultiplier) ? textAttributes->_fontSizeMultiplier : _fontSizeMultiplier;
+  _maxFontSizeMultiplier =
+      !isnan(textAttributes->_maxFontSizeMultiplier) ? textAttributes->_maxFontSizeMultiplier : _maxFontSizeMultiplier;
   _fontWeight = textAttributes->_fontWeight ?: _fontWeight;
   _fontStyle = textAttributes->_fontStyle ?: _fontStyle;
   _fontVariant = textAttributes->_fontVariant ?: _fontVariant;
-  _allowFontScaling = textAttributes->_allowFontScaling || _allowFontScaling;  // *
+  _allowFontScaling = textAttributes->_allowFontScaling || _allowFontScaling; // *
+  _dynamicTypeRamp = textAttributes->_dynamicTypeRamp != RCTDynamicTypeRampUndefined ? textAttributes->_dynamicTypeRamp
+                                                                                     : _dynamicTypeRamp;
   _letterSpacing = !isnan(textAttributes->_letterSpacing) ? textAttributes->_letterSpacing : _letterSpacing;
 
   // Paragraph Styles
   _lineHeight = !isnan(textAttributes->_lineHeight) ? textAttributes->_lineHeight : _lineHeight;
   _alignment = textAttributes->_alignment != NSTextAlignmentNatural ? textAttributes->_alignment : _alignment; // *
-  _baseWritingDirection = textAttributes->_baseWritingDirection != NSWritingDirectionNatural ? textAttributes->_baseWritingDirection : _baseWritingDirection; // *
+  _baseWritingDirection = textAttributes->_baseWritingDirection != NSWritingDirectionNatural
+      ? textAttributes->_baseWritingDirection
+      : _baseWritingDirection; // *
+  _lineBreakStrategy = textAttributes->_lineBreakStrategy ?: _lineBreakStrategy;
 
   // Decoration
   _textDecorationColor = textAttributes->_textDecorationColor ?: _textDecorationColor;
-  _textDecorationStyle = textAttributes->_textDecorationStyle != NSUnderlineStyleSingle ? textAttributes->_textDecorationStyle : _textDecorationStyle; // *
-  _textDecorationLine = textAttributes->_textDecorationLine != RCTTextDecorationLineTypeNone ? textAttributes->_textDecorationLine : _textDecorationLine; // *
+  _textDecorationStyle = textAttributes->_textDecorationStyle != NSUnderlineStyleSingle
+      ? textAttributes->_textDecorationStyle
+      : _textDecorationStyle; // *
+  _textDecorationLine = textAttributes->_textDecorationLine != RCTTextDecorationLineTypeNone
+      ? textAttributes->_textDecorationLine
+      : _textDecorationLine; // *
 
   // Shadow
-  _textShadowOffset = !CGSizeEqualToSize(textAttributes->_textShadowOffset, CGSizeZero) ? textAttributes->_textShadowOffset : _textShadowOffset; // *
+  _textShadowOffset = !CGSizeEqualToSize(textAttributes->_textShadowOffset, CGSizeZero)
+      ? textAttributes->_textShadowOffset
+      : _textShadowOffset; // *
   _textShadowRadius = !isnan(textAttributes->_textShadowRadius) ? textAttributes->_textShadowRadius : _textShadowRadius;
   _textShadowColor = textAttributes->_textShadowColor ?: _textShadowColor;
 
   // Special
-  _isHighlighted = textAttributes->_isHighlighted || _isHighlighted;  // *
+  _isHighlighted = textAttributes->_isHighlighted || _isHighlighted; // *
   _tag = textAttributes->_tag ?: _tag;
-  _layoutDirection = textAttributes->_layoutDirection != UIUserInterfaceLayoutDirectionLeftToRight ? textAttributes->_layoutDirection : _layoutDirection;
-  _textTransform = textAttributes->_textTransform != RCTTextTransformUndefined ? textAttributes->_textTransform : _textTransform;
+  _layoutDirection = textAttributes->_layoutDirection != UIUserInterfaceLayoutDirectionLeftToRight
+      ? textAttributes->_layoutDirection
+      : _layoutDirection;
+  _textTransform =
+      textAttributes->_textTransform != RCTTextTransformUndefined ? textAttributes->_textTransform : _textTransform;
 }
 
 - (NSParagraphStyle *)effectiveParagraphStyle
@@ -93,34 +111,40 @@ - (NSParagraphStyle *)effectiveParagraphStyle
         alignment = NSTextAlignmentRight;
       }
     }
-    
+
     paragraphStyle.alignment = alignment;
     isParagraphStyleUsed = YES;
   }
-  
+
   if (_baseWritingDirection != NSWritingDirectionNatural) {
     paragraphStyle.baseWritingDirection = _baseWritingDirection;
     isParagraphStyleUsed = YES;
   }
-  
+
+  if (_lineBreakStrategy != NSLineBreakStrategyNone) {
+    if (@available(iOS 14.0, *)) {
+      paragraphStyle.lineBreakStrategy = _lineBreakStrategy;
+      isParagraphStyleUsed = YES;
+    }
+  }
+
   if (!isnan(_lineHeight)) {
     CGFloat lineHeight = _lineHeight * self.effectiveFontSizeMultiplier;
     paragraphStyle.minimumLineHeight = lineHeight;
     paragraphStyle.maximumLineHeight = lineHeight;
     isParagraphStyleUsed = YES;
   }
-  
+
   if (isParagraphStyleUsed) {
     return [paragraphStyle copy];
   }
-  
+
   return nil;
 }
 
 - (NSDictionary<NSAttributedStringKey, id> *)effectiveTextAttributes
 {
-  NSMutableDictionary<NSAttributedStringKey, id> *attributes =
-    [NSMutableDictionary dictionaryWithCapacity:10];
+  NSMutableDictionary<NSAttributedStringKey, id> *attributes = [NSMutableDictionary dictionaryWithCapacity:10];
 
   // Font
   UIFont *font = self.effectiveFont;
@@ -159,7 +183,7 @@ - (NSParagraphStyle *)effectiveParagraphStyle
   }
 
   if (_textDecorationLine == RCTTextDecorationLineTypeStrikethrough ||
-      _textDecorationLine == RCTTextDecorationLineTypeUnderlineStrikethrough){
+      _textDecorationLine == RCTTextDecorationLineTypeUnderlineStrikethrough) {
     isTextDecorationEnabled = YES;
     attributes[NSStrikethroughStyleAttributeName] = @(_textDecorationStyle);
   }
@@ -208,6 +232,12 @@ - (CGFloat)effectiveFontSizeMultiplier
 
   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 {
@@ -220,7 +250,8 @@ - (UIColor *)effectiveForegroundColor
   UIColor *effectiveForegroundColor = _foregroundColor ?: [UIColor blackColor];
 
   if (!isnan(_opacity)) {
-    effectiveForegroundColor = [effectiveForegroundColor colorWithAlphaComponent:CGColorGetAlpha(effectiveForegroundColor.CGColor) * _opacity];
+    effectiveForegroundColor =
+        [effectiveForegroundColor colorWithAlphaComponent:CGColorGetAlpha(effectiveForegroundColor.CGColor) * _opacity];
   }
 
   return effectiveForegroundColor;
@@ -228,10 +259,11 @@ - (UIColor *)effectiveForegroundColor
 
 - (UIColor *)effectiveBackgroundColor
 {
-  UIColor *effectiveBackgroundColor = _backgroundColor;// ?: [[UIColor whiteColor] colorWithAlphaComponent:0];
+  UIColor *effectiveBackgroundColor = _backgroundColor; // ?: [[UIColor whiteColor] colorWithAlphaComponent:0];
 
   if (effectiveBackgroundColor && !isnan(_opacity)) {
-    effectiveBackgroundColor = [effectiveBackgroundColor colorWithAlphaComponent:CGColorGetAlpha(effectiveBackgroundColor.CGColor) * _opacity];
+    effectiveBackgroundColor =
+        [effectiveBackgroundColor colorWithAlphaComponent:CGColorGetAlpha(effectiveBackgroundColor.CGColor) * _opacity];
   }
 
   return effectiveBackgroundColor ?: [UIColor clearColor];
@@ -243,7 +275,7 @@ - (UIColor *)effectiveBackgroundColor
   NSMutableArray *newWords = [NSMutableArray new];
   NSNumberFormatter *num = [NSNumberFormatter new];
   for (NSString *item in words) {
-    NSString *word; 
+    NSString *word;
     if ([item length] > 0 && [num numberFromString:[item substringWithRange:NSMakeRange(0, 1)]] == nil) {
       word = [item capitalizedString];
     } else {
@@ -293,37 +325,26 @@ - (BOOL)isEqual:(RCTTextAttributes *)textAttributes
 #define RCTTextAttributesCompareStrings(a) ((a == textAttributes->a) || [a isEqualToString:textAttributes->a])
 #define RCTTextAttributesCompareOthers(a) (a == textAttributes->a)
 
-  return
-    RCTTextAttributesCompareObjects(_foregroundColor) &&
-    RCTTextAttributesCompareObjects(_backgroundColor) &&
-    RCTTextAttributesCompareFloats(_opacity) &&
-    // Font
-    RCTTextAttributesCompareObjects(_fontFamily) &&
-    RCTTextAttributesCompareFloats(_fontSize) &&
-    RCTTextAttributesCompareFloats(_fontSizeMultiplier) &&
-    RCTTextAttributesCompareFloats(_maxFontSizeMultiplier) &&
-    RCTTextAttributesCompareStrings(_fontWeight) &&
-    RCTTextAttributesCompareObjects(_fontStyle) &&
-    RCTTextAttributesCompareObjects(_fontVariant) &&
-    RCTTextAttributesCompareOthers(_allowFontScaling) &&
-    RCTTextAttributesCompareFloats(_letterSpacing) &&
-    // Paragraph Styles
-    RCTTextAttributesCompareFloats(_lineHeight) &&
-    RCTTextAttributesCompareFloats(_alignment) &&
-    RCTTextAttributesCompareOthers(_baseWritingDirection) &&
-    // Decoration
-    RCTTextAttributesCompareObjects(_textDecorationColor) &&
-    RCTTextAttributesCompareOthers(_textDecorationStyle) &&
-    RCTTextAttributesCompareOthers(_textDecorationLine) &&
-    // Shadow
-    RCTTextAttributesCompareSize(_textShadowOffset) &&
-    RCTTextAttributesCompareFloats(_textShadowRadius) &&
-    RCTTextAttributesCompareObjects(_textShadowColor) &&
-    // Special
-    RCTTextAttributesCompareOthers(_isHighlighted) &&
-    RCTTextAttributesCompareObjects(_tag) &&
-    RCTTextAttributesCompareOthers(_layoutDirection) &&
-    RCTTextAttributesCompareOthers(_textTransform);
+  return RCTTextAttributesCompareObjects(_foregroundColor) && RCTTextAttributesCompareObjects(_backgroundColor) &&
+      RCTTextAttributesCompareFloats(_opacity) &&
+      // Font
+      RCTTextAttributesCompareObjects(_fontFamily) && RCTTextAttributesCompareFloats(_fontSize) &&
+      RCTTextAttributesCompareFloats(_fontSizeMultiplier) && RCTTextAttributesCompareFloats(_maxFontSizeMultiplier) &&
+      RCTTextAttributesCompareStrings(_fontWeight) && RCTTextAttributesCompareObjects(_fontStyle) &&
+      RCTTextAttributesCompareObjects(_fontVariant) && RCTTextAttributesCompareOthers(_allowFontScaling) &&
+      RCTTextAttributesCompareOthers(_dynamicTypeRamp) && RCTTextAttributesCompareFloats(_letterSpacing) &&
+      // Paragraph Styles
+      RCTTextAttributesCompareFloats(_lineHeight) && RCTTextAttributesCompareFloats(_alignment) &&
+      RCTTextAttributesCompareOthers(_baseWritingDirection) && RCTTextAttributesCompareOthers(_lineBreakStrategy) &&
+      // Decoration
+      RCTTextAttributesCompareObjects(_textDecorationColor) && RCTTextAttributesCompareOthers(_textDecorationStyle) &&
+      RCTTextAttributesCompareOthers(_textDecorationLine) &&
+      // Shadow
+      RCTTextAttributesCompareSize(_textShadowOffset) && RCTTextAttributesCompareFloats(_textShadowRadius) &&
+      RCTTextAttributesCompareObjects(_textShadowColor) &&
+      // Special
+      RCTTextAttributesCompareOthers(_isHighlighted) && RCTTextAttributesCompareObjects(_tag) &&
+      RCTTextAttributesCompareOthers(_layoutDirection) && RCTTextAttributesCompareOthers(_textTransform);
 }
 
 @end
diff --git a/Libraries/Text/RawText/RCTRawTextShadowView.m b/Libraries/Text/RawText/RCTRawTextShadowView.m
index 9ddb69fed5d2..0ad4ecad42e9 100644
--- a/Libraries/Text/RawText/RCTRawTextShadowView.m
+++ b/Libraries/Text/RawText/RCTRawTextShadowView.m
@@ -27,7 +27,8 @@ - (void)dirtyLayout
 - (NSString *)description
 {
   NSString *superDescription = super.description;
-  return [[superDescription substringToIndex:superDescription.length - 1] stringByAppendingFormat:@"; text: %@>", self.text];
+  return [[superDescription substringToIndex:superDescription.length - 1]
+      stringByAppendingFormat:@"; text: %@>", self.text];
 }
 
 @end
diff --git a/Libraries/Text/Text.d.ts b/Libraries/Text/Text.d.ts
new file mode 100644
index 000000000000..a9d2a1b46a3a
--- /dev/null
+++ b/Libraries/Text/Text.d.ts
@@ -0,0 +1,209 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {Constructor} from '../../types/private/Utilities';
+import {AccessibilityProps} from '../Components/View/ViewAccessibility';
+import {NativeMethods} from '../../types/public/ReactNativeTypes';
+import {ColorValue, StyleProp} from '../StyleSheet/StyleSheet';
+import {TextStyle} from '../StyleSheet/StyleSheetTypes';
+import {
+  GestureResponderEvent,
+  LayoutChangeEvent,
+  NativeSyntheticEvent,
+  TextLayoutEventData,
+} from '../Types/CoreEventTypes';
+
+export interface TextPropsIOS {
+  /**
+   * Specifies whether font should be scaled down automatically to fit given style constraints.
+   */
+  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).
+   */
+  minimumFontScale?: number | undefined;
+
+  /**
+   * When `true`, no visual change is made when text is pressed down. By
+   * default, a gray oval highlights the text on press down.
+   */
+  suppressHighlighting?: boolean | undefined;
+}
+
+export interface TextPropsAndroid {
+  /**
+   * Specifies the disabled state of the text view for testing purposes.
+   */
+  disabled?: boolean | undefined;
+
+  /**
+   * Lets the user select text, to use the native copy and paste functionality.
+   */
+  selectable?: boolean | undefined;
+
+  /**
+   * The highlight color of the text.
+   */
+  selectionColor?: ColorValue | undefined;
+
+  /**
+   * Set text break strategy on Android API Level 23+
+   * default is `highQuality`.
+   */
+  textBreakStrategy?: 'simple' | 'highQuality' | 'balanced' | undefined;
+
+  /**
+   * Determines the types of data converted to clickable URLs in the text element.
+   * By default no data types are detected.
+   */
+  dataDetectorType?:
+    | null
+    | 'phoneNumber'
+    | 'link'
+    | 'email'
+    | 'none'
+    | 'all'
+    | undefined;
+
+  /**
+   * Hyphenation strategy
+   */
+  android_hyphenationFrequency?: 'normal' | 'none' | 'full' | undefined;
+}
+
+// https://reactnative.dev/docs/text#props
+export interface TextProps
+  extends TextPropsIOS,
+    TextPropsAndroid,
+    AccessibilityProps {
+  /**
+   * Specifies whether fonts should scale to respect Text Size accessibility settings.
+   * The default is `true`.
+   */
+  allowFontScaling?: boolean | undefined;
+
+  children?: React.ReactNode;
+
+  /**
+   * This can be one of the following values:
+   *
+   * - `head` - The line is displayed so that the end fits in the container and the missing text
+   * at the beginning of the line is indicated by an ellipsis glyph. e.g., "...wxyz"
+   * - `middle` - The line is displayed so that the beginning and end fit in the container and the
+   * missing text in the middle is indicated by an ellipsis glyph. "ab...yz"
+   * - `tail` - The line is displayed so that the beginning fits in the container and the
+   * missing text at the end of the line is indicated by an ellipsis glyph. e.g., "abcd..."
+   * - `clip` - Lines are not drawn past the edge of the text container.
+   *
+   * The default is `tail`.
+   *
+   * `numberOfLines` must be set in conjunction with this prop.
+   *
+   * > `clip` is working only for iOS
+   */
+  ellipsizeMode?: 'head' | 'middle' | 'tail' | 'clip' | undefined;
+
+  /**
+   * Used to reference react managed views from native code.
+   */
+  id?: string | undefined;
+
+  /**
+   * Line Break mode. Works only with numberOfLines.
+   * clip is working only for iOS
+   */
+  lineBreakMode?: 'head' | 'middle' | 'tail' | 'clip' | undefined;
+
+  /**
+   * Used to truncate the text with an ellipsis after computing the text
+   * layout, including line wrapping, such that the total number of lines
+   * does not exceed this number.
+   *
+   * This prop is commonly used with `ellipsizeMode`.
+   */
+  numberOfLines?: number | undefined;
+
+  /**
+   * Invoked on mount and layout changes with
+   *
+   * {nativeEvent: { layout: {x, y, width, height}}}.
+   */
+  onLayout?: ((event: LayoutChangeEvent) => void) | undefined;
+
+  /**
+   * Invoked on Text layout
+   */
+  onTextLayout?:
+    | ((event: NativeSyntheticEvent<TextLayoutEventData>) => void)
+    | undefined;
+
+  /**
+   * This function is called on press.
+   * Text intrinsically supports press handling with a default highlight state (which can be disabled with suppressHighlighting).
+   */
+  onPress?: ((event: GestureResponderEvent) => void) | undefined;
+
+  onPressIn?: ((event: GestureResponderEvent) => void) | undefined;
+  onPressOut?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * This function is called on long press.
+   * e.g., `onLongPress={this.increaseSize}>``
+   */
+  onLongPress?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * @see https://reactnative.dev/docs/text#style
+   */
+  style?: StyleProp<TextStyle> | undefined;
+
+  /**
+   * Used to locate this view in end-to-end tests.
+   */
+  testID?: string | undefined;
+
+  /**
+   * Used to reference react managed views from native code.
+   */
+  nativeID?: string | undefined;
+
+  /**
+   * Specifies largest possible scale a font can reach when allowFontScaling is enabled. Possible values:
+   * - null/undefined (default): inherit from the parent node or the global default (0)
+   * - 0: no max, ignore parent/global default
+   * - >= 1: sets the maxFontSizeMultiplier of this node to this value
+   */
+  maxFontSizeMultiplier?: number | null | undefined;
+}
+
+/**
+ * A React component for displaying text which supports nesting, styling, and touch handling.
+ */
+declare class TextComponent extends React.Component<TextProps> {}
+declare const TextBase: Constructor<NativeMethods> & typeof TextComponent;
+export class Text extends TextBase {}
diff --git a/Libraries/Text/Text.js b/Libraries/Text/Text.js
index 57b6a2ea82ca..1f6524721cc8 100644
--- a/Libraries/Text/Text.js
+++ b/Libraries/Text/Text.js
@@ -10,11 +10,13 @@
 
 import type {PressEvent} from '../Types/CoreEventTypes';
 
-import Platform from '../Utilities/Platform';
 import * as PressabilityDebug from '../Pressability/PressabilityDebug';
 import usePressability from '../Pressability/usePressability';
-import StyleSheet from '../StyleSheet/StyleSheet';
+import flattenStyle from '../StyleSheet/flattenStyle';
 import processColor from '../StyleSheet/processColor';
+import StyleSheet from '../StyleSheet/StyleSheet';
+import {getAccessibilityRoleFromRole} from '../Utilities/AcessibilityMapping';
+import Platform from '../Utilities/Platform';
 import TextAncestor from './TextAncestor';
 import {NativeText, NativeVirtualText} from './TextNativeComponent';
 import {type TextProps} from './TextProps';
@@ -32,8 +34,18 @@ const Text: React.AbstractComponent<
 > = React.forwardRef((props: TextProps, forwardedRef) => {
   const {
     accessible,
+    accessibilityLabel,
+    accessibilityRole,
     allowFontScaling,
+    'aria-busy': ariaBusy,
+    'aria-checked': ariaChecked,
+    'aria-disabled': ariaDisabled,
+    'aria-expanded': ariaExpanded,
+    'aria-label': ariaLabel,
+    'aria-selected': ariaSelected,
     ellipsizeMode,
+    id,
+    nativeID,
     onLongPress,
     onPress,
     onPressIn,
@@ -45,20 +57,30 @@ const Text: React.AbstractComponent<
     onResponderTerminationRequest,
     onStartShouldSetResponder,
     pressRetentionOffset,
+    role,
     suppressHighlighting,
     ...restProps
   } = props;
 
   const [isHighlighted, setHighlighted] = useState(false);
 
+  const _accessibilityState = {
+    busy: ariaBusy ?? props.accessibilityState?.busy,
+    checked: ariaChecked ?? props.accessibilityState?.checked,
+    disabled: ariaDisabled ?? props.accessibilityState?.disabled,
+    expanded: ariaExpanded ?? props.accessibilityState?.expanded,
+    selected: ariaSelected ?? props.accessibilityState?.selected,
+  };
+
   const _disabled =
     restProps.disabled != null
       ? restProps.disabled
-      : props.accessibilityState?.disabled;
-  const _accessibilityState =
-    _disabled !== props.accessibilityState?.disabled
-      ? {...props.accessibilityState, disabled: _disabled}
-      : props.accessibilityState;
+      : _accessibilityState?.disabled;
+
+  const nativeTextAccessibilityState =
+    _disabled !== _accessibilityState?.disabled
+      ? {..._accessibilityState, disabled: _disabled}
+      : _accessibilityState;
 
   const isPressable =
     (onPress != null ||
@@ -152,7 +174,20 @@ const Text: React.AbstractComponent<
       ? null
       : processColor(restProps.selectionColor);
 
-  let style = restProps.style;
+  let style = flattenStyle(restProps.style);
+
+  let _selectable = restProps.selectable;
+  if (style?.userSelect != null) {
+    _selectable = userSelectToSelectableMap[style.userSelect];
+  }
+
+  if (style?.verticalAlign != null) {
+    style = StyleSheet.compose(style, {
+      textAlignVertical:
+        verticalAlignToTextAlignVerticalMap[style.verticalAlign],
+    });
+  }
+
   if (__DEV__) {
     if (PressabilityDebug.isEnabled() && onPress != null) {
       style = StyleSheet.compose(restProps.style, {
@@ -176,15 +211,31 @@ const Text: React.AbstractComponent<
     default: accessible,
   });
 
+  let flattenedStyle = flattenStyle(style);
+
+  if (typeof flattenedStyle?.fontWeight === 'number') {
+    flattenedStyle.fontWeight = flattenedStyle?.fontWeight.toString();
+  }
+
+  const _hasOnPressOrOnLongPress =
+    props.onPress != null || props.onLongPress != null;
+
   return hasTextAncestor ? (
     <NativeVirtualText
       {...restProps}
+      accessibilityState={_accessibilityState}
       {...eventHandlersForText}
+      accessibilityLabel={ariaLabel ?? accessibilityLabel}
+      accessibilityRole={
+        role ? getAccessibilityRoleFromRole(role) : accessibilityRole
+      }
       isHighlighted={isHighlighted}
       isPressable={isPressable}
+      selectable={_selectable}
+      nativeID={id ?? nativeID}
       numberOfLines={numberOfLines}
       selectionColor={selectionColor}
-      style={style}
+      style={flattenedStyle}
       ref={forwardedRef}
     />
   ) : (
@@ -193,14 +244,24 @@ const Text: React.AbstractComponent<
         {...restProps}
         {...eventHandlersForText}
         disabled={_disabled}
-        accessible={_accessible}
-        accessibilityState={_accessibilityState}
+        selectable={_selectable}
+        accessible={
+          accessible == null && Platform.OS === 'android'
+            ? _hasOnPressOrOnLongPress
+            : _accessible
+        }
+        accessibilityLabel={ariaLabel ?? accessibilityLabel}
+        accessibilityState={nativeTextAccessibilityState}
+        accessibilityRole={
+          role ? getAccessibilityRoleFromRole(role) : accessibilityRole
+        }
         allowFontScaling={allowFontScaling !== false}
         ellipsizeMode={ellipsizeMode ?? 'tail'}
         isHighlighted={isHighlighted}
+        nativeID={id ?? nativeID}
         numberOfLines={numberOfLines}
         selectionColor={selectionColor}
-        style={style}
+        style={flattenedStyle}
         ref={forwardedRef}
       />
     </TextAncestor.Provider>
@@ -209,6 +270,12 @@ const Text: React.AbstractComponent<
 
 Text.displayName = 'Text';
 
+/**
+ * Switch to `deprecated-react-native-prop-types` for compatibility with future
+ * releases. This is deprecated and will be removed in the future.
+ */
+Text.propTypes = require('deprecated-react-native-prop-types').TextPropTypes;
+
 /**
  * Returns false until the first time `newValue` is true, after which this will
  * always return true. This is necessary to lazily initialize `Pressability` so
@@ -222,4 +289,19 @@ function useLazyInitialization(newValue: boolean): boolean {
   return oldValue;
 }
 
+const userSelectToSelectableMap = {
+  auto: true,
+  text: true,
+  none: false,
+  contain: true,
+  all: true,
+};
+
+const verticalAlignToTextAlignVerticalMap = {
+  auto: 'auto',
+  top: 'top',
+  bottom: 'bottom',
+  middle: 'center',
+};
+
 module.exports = Text;
diff --git a/Libraries/Text/Text/NSTextStorage+FontScaling.m b/Libraries/Text/Text/NSTextStorage+FontScaling.m
index e3752c7c774e..4c4cb670f48f 100644
--- a/Libraries/Text/Text/NSTextStorage+FontScaling.m
+++ b/Libraries/Text/Text/NSTextStorage+FontScaling.m
@@ -8,8 +8,8 @@
 #import "NSTextStorage+FontScaling.h"
 
 typedef NS_OPTIONS(NSInteger, RCTTextSizeComparisonOptions) {
-  RCTTextSizeComparisonSmaller     = 1 << 0,
-  RCTTextSizeComparisonLarger      = 1 << 1,
+  RCTTextSizeComparisonSmaller = 1 << 0,
+  RCTTextSizeComparisonLarger = 1 << 1,
   RCTTextSizeComparisonWithinRange = 1 << 2,
 };
 
@@ -19,7 +19,7 @@ - (void)scaleFontSizeToFitSize:(CGSize)size
                minimumFontSize:(CGFloat)minimumFontSize
                maximumFontSize:(CGFloat)maximumFontSize
 {
-  CGFloat bottomRatio = 1.0/128.0;
+  CGFloat bottomRatio = 1.0 / 128.0;
   CGFloat topRatio = 128.0;
   CGFloat ratio = 1.0;
 
@@ -28,17 +28,11 @@ - (void)scaleFontSizeToFitSize:(CGSize)size
   CGFloat lastRatioWhichFits = 0.02;
 
   while (true) {
-    [self scaleFontSizeWithRatio:ratio
-                 minimumFontSize:minimumFontSize
-                 maximumFontSize:maximumFontSize];
+    [self scaleFontSizeWithRatio:ratio minimumFontSize:minimumFontSize maximumFontSize:maximumFontSize];
 
-    RCTTextSizeComparisonOptions comparsion =
-      [self compareToSize:size thresholdRatio:0.01];
+    RCTTextSizeComparisonOptions comparsion = [self compareToSize:size thresholdRatio:0.01];
 
-    if (
-        (comparsion & RCTTextSizeComparisonWithinRange) &&
-        (comparsion & RCTTextSizeComparisonSmaller)
-    ) {
+    if ((comparsion & RCTTextSizeComparisonWithinRange) && (comparsion & RCTTextSizeComparisonSmaller)) {
       return;
     } else if (comparsion & RCTTextSizeComparisonSmaller) {
       bottomRatio = ratio;
@@ -50,26 +44,18 @@ - (void)scaleFontSizeToFitSize:(CGSize)size
     ratio = (topRatio + bottomRatio) / 2.0;
 
     CGFloat kRatioThreshold = 0.005;
-    if (
-        ABS(topRatio - bottomRatio) < kRatioThreshold ||
-        ABS(topRatio - ratio) < kRatioThreshold ||
-        ABS(bottomRatio - ratio) < kRatioThreshold
-    ) {
-      [self replaceCharactersInRange:(NSRange){0, self.length}
-                withAttributedString:originalAttributedString];
-
-      [self scaleFontSizeWithRatio:lastRatioWhichFits
-                   minimumFontSize:minimumFontSize
-                   maximumFontSize:maximumFontSize];
+    if (ABS(topRatio - bottomRatio) < kRatioThreshold || ABS(topRatio - ratio) < kRatioThreshold ||
+        ABS(bottomRatio - ratio) < kRatioThreshold) {
+      [self replaceCharactersInRange:(NSRange){0, self.length} withAttributedString:originalAttributedString];
+
+      [self scaleFontSizeWithRatio:lastRatioWhichFits minimumFontSize:minimumFontSize maximumFontSize:maximumFontSize];
       return;
     }
 
-    [self replaceCharactersInRange:(NSRange){0, self.length}
-              withAttributedString:originalAttributedString];
+    [self replaceCharactersInRange:(NSRange){0, self.length} withAttributedString:originalAttributedString];
   }
 }
 
-
 - (RCTTextSizeComparisonOptions)compareToSize:(CGSize)size thresholdRatio:(CGFloat)thresholdRatio
 {
   NSLayoutManager *layoutManager = self.layoutManagers.firstObject;
@@ -88,13 +74,11 @@ - (RCTTextSizeComparisonOptions)compareToSize:(CGSize)size thresholdRatio:(CGFlo
   CGSize measuredSize = [layoutManager usedRectForTextContainer:textContainer].size;
 
   // Does it fit the size?
-  BOOL fitsSize =
-    size.width >= measuredSize.width &&
-    size.height >= measuredSize.height;
+  BOOL fitsSize = size.width >= measuredSize.width && size.height >= measuredSize.height;
 
   CGSize thresholdSize = (CGSize){
-    size.width * thresholdRatio,
-    size.height * thresholdRatio,
+      size.width * thresholdRatio,
+      size.height * thresholdRatio,
   };
 
   RCTTextSizeComparisonOptions result = 0;
@@ -117,19 +101,15 @@ - (void)scaleFontSizeWithRatio:(CGFloat)ratio
   [self enumerateAttribute:NSFontAttributeName
                    inRange:(NSRange){0, self.length}
                    options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
-                usingBlock:
-    ^(UIFont *_Nullable font, NSRange range, BOOL *_Nonnull stop) {
-      if (!font) {
-        return;
-      }
+                usingBlock:^(UIFont *_Nullable font, NSRange range, BOOL *_Nonnull stop) {
+                  if (!font) {
+                    return;
+                  }
 
-      CGFloat fontSize = MAX(MIN(font.pointSize * ratio, maximumFontSize), minimumFontSize);
+                  CGFloat fontSize = MAX(MIN(font.pointSize * ratio, maximumFontSize), minimumFontSize);
 
-      [self addAttribute:NSFontAttributeName
-                   value:[font fontWithSize:fontSize]
-                   range:range];
-    }
-  ];
+                  [self addAttribute:NSFontAttributeName value:[font fontWithSize:fontSize] range:range];
+                }];
 
   [self endEditing];
 }
diff --git a/Libraries/Text/Text/RCTDynamicTypeRamp.h b/Libraries/Text/Text/RCTDynamicTypeRamp.h
new file mode 100644
index 000000000000..0a34a5a8a173
--- /dev/null
+++ b/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);
diff --git a/Libraries/Text/Text/RCTDynamicTypeRamp.m b/Libraries/Text/Text/RCTDynamicTypeRamp.m
new file mode 100644
index 000000000000..be97a50a61f4
--- /dev/null
+++ b/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];
+}
diff --git a/Libraries/Text/Text/RCTTextShadowView.m b/Libraries/Text/Text/RCTTextShadowView.m
index 5e39196cefd1..d84aca5d3447 100644
--- a/Libraries/Text/Text/RCTTextShadowView.m
+++ b/Libraries/Text/Text/RCTTextShadowView.m
@@ -12,11 +12,10 @@
 #import <React/RCTUIManager.h>
 #import <yoga/Yoga.h>
 
-#import "NSTextStorage+FontScaling.h"
 #import <React/RCTTextView.h>
+#import "NSTextStorage+FontScaling.h"
 
-@implementation RCTTextShadowView
-{
+@implementation RCTTextShadowView {
   __weak RCTBridge *_bridge;
   BOOL _needsUpdateView;
   NSMapTable<id, NSTextStorage *> *_cachedTextStorages;
@@ -89,15 +88,13 @@ - (void)uiManagerWillPerformMounting
   [textStorage enumerateAttribute:RCTBaseTextShadowViewEmbeddedShadowViewAttributeName
                           inRange:NSMakeRange(0, textStorage.length)
                           options:0
-                       usingBlock:
-   ^(RCTShadowView *shadowView, NSRange range, __unused BOOL *stop) {
-     if (!shadowView) {
-       return;
-     }
+                       usingBlock:^(RCTShadowView *shadowView, NSRange range, __unused BOOL *stop) {
+                         if (!shadowView) {
+                           return;
+                         }
 
-     [descendantViewTags addObject:shadowView.reactTag];
-   }
-  ];
+                         [descendantViewTags addObject:shadowView.reactTag];
+                       }];
 
   [_bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
     RCTTextView *textView = (RCTTextView *)viewRegistry[tag];
@@ -105,23 +102,22 @@ - (void)uiManagerWillPerformMounting
       return;
     }
 
-    NSMutableArray<UIView *> *descendantViews =
-      [NSMutableArray arrayWithCapacity:descendantViewTags.count];
-    [descendantViewTags enumerateObjectsUsingBlock:^(NSNumber *_Nonnull descendantViewTag, NSUInteger index, BOOL *_Nonnull stop) {
-      UIView *descendantView = viewRegistry[descendantViewTag];
-      if (!descendantView) {
-        return;
-      }
+    NSMutableArray<UIView *> *descendantViews = [NSMutableArray arrayWithCapacity:descendantViewTags.count];
+    [descendantViewTags
+        enumerateObjectsUsingBlock:^(NSNumber *_Nonnull descendantViewTag, NSUInteger index, BOOL *_Nonnull stop) {
+          UIView *descendantView = viewRegistry[descendantViewTag];
+          if (!descendantView) {
+            return;
+          }
 
-      [descendantViews addObject:descendantView];
-    }];
+          [descendantViews addObject:descendantView];
+        }];
 
     // Removing all references to Shadow Views to avoid unnecessary retaining.
-    [textStorage removeAttribute:RCTBaseTextShadowViewEmbeddedShadowViewAttributeName range:NSMakeRange(0, textStorage.length)];
+    [textStorage removeAttribute:RCTBaseTextShadowViewEmbeddedShadowViewAttributeName
+                           range:NSMakeRange(0, textStorage.length)];
 
-    [textView setTextStorage:textStorage
-                contentFrame:contentFrame
-             descendantViews:descendantViews];
+    [textView setTextStorage:textStorage contentFrame:contentFrame descendantViews:descendantViews];
   }];
 }
 
@@ -132,15 +128,13 @@ - (void)postprocessAttributedText:(NSMutableAttributedString *)attributedText
   [attributedText enumerateAttribute:NSParagraphStyleAttributeName
                              inRange:NSMakeRange(0, attributedText.length)
                              options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
-                          usingBlock:
-    ^(NSParagraphStyle *paragraphStyle, __unused NSRange range, __unused BOOL *stop) {
-      if (!paragraphStyle) {
-        return;
-      }
+                          usingBlock:^(NSParagraphStyle *paragraphStyle, __unused NSRange range, __unused BOOL *stop) {
+                            if (!paragraphStyle) {
+                              return;
+                            }
 
-      maximumLineHeight = MAX(paragraphStyle.maximumLineHeight, maximumLineHeight);
-    }
-  ];
+                            maximumLineHeight = MAX(paragraphStyle.maximumLineHeight, maximumLineHeight);
+                          }];
 
   if (maximumLineHeight == 0) {
     // `lineHeight` was not specified, nothing to do.
@@ -152,17 +146,15 @@ - (void)postprocessAttributedText:(NSMutableAttributedString *)attributedText
   [attributedText enumerateAttribute:NSFontAttributeName
                              inRange:NSMakeRange(0, attributedText.length)
                              options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
-                          usingBlock:
-    ^(UIFont *font, NSRange range, __unused BOOL *stop) {
-      if (!font) {
-        return;
-      }
-
-      if (maximumFontLineHeight <= font.lineHeight) {
-        maximumFontLineHeight = font.lineHeight;
-      }
-    }
-  ];
+                          usingBlock:^(UIFont *font, NSRange range, __unused BOOL *stop) {
+                            if (!font) {
+                              return;
+                            }
+
+                            if (maximumFontLineHeight <= font.lineHeight) {
+                              maximumFontLineHeight = font.lineHeight;
+                            }
+                          }];
 
   if (maximumLineHeight < maximumFontLineHeight) {
     return;
@@ -179,40 +171,36 @@ - (NSAttributedString *)attributedTextWithMeasuredAttachmentsThatFitSize:(CGSize
 {
   static UIImage *placeholderImage;
   static dispatch_once_t onceToken;
-   dispatch_once(&onceToken, ^{
-     placeholderImage = [UIImage new];
-   });
-  
+  dispatch_once(&onceToken, ^{
+    placeholderImage = [UIImage new];
+  });
+
   NSMutableAttributedString *attributedText =
-    [[NSMutableAttributedString alloc] initWithAttributedString:[self attributedTextWithBaseTextAttributes:nil]];
+      [[NSMutableAttributedString alloc] initWithAttributedString:[self attributedTextWithBaseTextAttributes:nil]];
 
   [attributedText beginEditing];
 
   [attributedText enumerateAttribute:RCTBaseTextShadowViewEmbeddedShadowViewAttributeName
-                               inRange:NSMakeRange(0, attributedText.length)
-                               options:0
-                            usingBlock:
-    ^(RCTShadowView *shadowView, NSRange range, __unused BOOL *stop) {
-      if (!shadowView) {
-        return;
-      }
-
-      CGSize fittingSize = [shadowView sizeThatFitsMinimumSize:CGSizeZero
-                                                   maximumSize:size];
-      NSTextAttachment *attachment = [NSTextAttachment new];
-      attachment.bounds = (CGRect){CGPointZero, fittingSize};
-      attachment.image = placeholderImage;
-      [attributedText addAttribute:NSAttachmentAttributeName value:attachment range:range];
-    }
-  ];
+                             inRange:NSMakeRange(0, attributedText.length)
+                             options:0
+                          usingBlock:^(RCTShadowView *shadowView, NSRange range, __unused BOOL *stop) {
+                            if (!shadowView) {
+                              return;
+                            }
+
+                            CGSize fittingSize = [shadowView sizeThatFitsMinimumSize:CGSizeZero maximumSize:size];
+                            NSTextAttachment *attachment = [NSTextAttachment new];
+                            attachment.bounds = (CGRect){CGPointZero, fittingSize};
+                            attachment.image = placeholderImage;
+                            [attributedText addAttribute:NSAttachmentAttributeName value:attachment range:range];
+                          }];
 
   [attributedText endEditing];
 
   return [attributedText copy];
 }
 
-- (NSTextStorage *)textStorageAndLayoutManagerThatFitsSize:(CGSize)size
-                                        exclusiveOwnership:(BOOL)exclusiveOwnership
+- (NSTextStorage *)textStorageAndLayoutManagerThatFitsSize:(CGSize)size exclusiveOwnership:(BOOL)exclusiveOwnership
 {
   NSValue *key = [NSValue valueWithCGSize:size];
   NSTextStorage *cachedTextStorage = [_cachedTextStorages objectForKey:key];
@@ -228,8 +216,7 @@ - (NSTextStorage *)textStorageAndLayoutManagerThatFitsSize:(CGSize)size
   NSTextContainer *textContainer = [[NSTextContainer alloc] initWithSize:size];
 
   textContainer.lineFragmentPadding = 0.0; // Note, the default value is 5.
-  textContainer.lineBreakMode =
-    _maximumNumberOfLines > 0 ? _lineBreakMode : NSLineBreakByClipping;
+  textContainer.lineBreakMode = _maximumNumberOfLines > 0 ? _lineBreakMode : NSLineBreakByClipping;
   textContainer.maximumNumberOfLines = _maximumNumberOfLines;
 
   NSLayoutManager *layoutManager = [NSLayoutManager new];
@@ -237,15 +224,14 @@ - (NSTextStorage *)textStorageAndLayoutManagerThatFitsSize:(CGSize)size
   [layoutManager addTextContainer:textContainer];
 
   NSTextStorage *textStorage =
-    [[NSTextStorage alloc] initWithAttributedString:[self attributedTextWithMeasuredAttachmentsThatFitSize:size]];
+      [[NSTextStorage alloc] initWithAttributedString:[self attributedTextWithMeasuredAttachmentsThatFitSize:size]];
 
   [self postprocessAttributedText:textStorage];
 
   [textStorage addLayoutManager:layoutManager];
 
   if (_adjustsFontSizeToFit) {
-    CGFloat minimumFontSize =
-      MAX(_minimumFontScale * (self.textAttributes.effectiveFont.pointSize), 4.0);
+    CGFloat minimumFontSize = MAX(_minimumFontScale * (self.textAttributes.effectiveFont.pointSize), 4.0);
     [textStorage scaleFontSizeToFitSize:size
                         minimumFontSize:minimumFontSize
                         maximumFontSize:self.textAttributes.effectiveFont.pointSize];
@@ -258,8 +244,7 @@ - (NSTextStorage *)textStorageAndLayoutManagerThatFitsSize:(CGSize)size
   return textStorage;
 }
 
-- (void)layoutWithMetrics:(RCTLayoutMetrics)layoutMetrics
-            layoutContext:(RCTLayoutContext)layoutContext
+- (void)layoutWithMetrics:(RCTLayoutMetrics)layoutMetrics layoutContext:(RCTLayoutContext)layoutContext
 {
   // If the view got new `contentFrame`, we have to redraw it because
   // and sizes of embedded views may change.
@@ -277,126 +262,124 @@ - (void)layoutWithMetrics:(RCTLayoutMetrics)layoutMetrics
 
 - (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext
 {
-  NSTextStorage *textStorage =
-    [self textStorageAndLayoutManagerThatFitsSize:self.availableSize
-                               exclusiveOwnership:NO];
+  NSTextStorage *textStorage = [self textStorageAndLayoutManagerThatFitsSize:self.availableSize exclusiveOwnership:NO];
   NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
   NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
   NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];
-  NSRange characterRange = [layoutManager characterRangeForGlyphRange:glyphRange
-                                                     actualGlyphRange:NULL];
-
-  [textStorage enumerateAttribute:RCTBaseTextShadowViewEmbeddedShadowViewAttributeName
-                          inRange:characterRange
-                          options:0
-                       usingBlock:
-    ^(RCTShadowView *shadowView, NSRange range, BOOL *stop) {
-      if (!shadowView) {
-        return;
-      }
-
-      CGRect glyphRect = [layoutManager boundingRectForGlyphRange:range
-                                                  inTextContainer:textContainer];
-
-      NSTextAttachment *attachment =
-        [textStorage attribute:NSAttachmentAttributeName atIndex:range.location effectiveRange:nil];
-
-      CGSize attachmentSize = attachment.bounds.size;
-
-      UIFont *font = [textStorage attribute:NSFontAttributeName atIndex:range.location effectiveRange:nil];
-
-      CGRect frame = {{
-        RCTRoundPixelValue(glyphRect.origin.x),
-        RCTRoundPixelValue(glyphRect.origin.y + glyphRect.size.height - attachmentSize.height + font.descender)
-      }, {
-        RCTRoundPixelValue(attachmentSize.width),
-        RCTRoundPixelValue(attachmentSize.height)
-      }};
-      
-      NSRange truncatedGlyphRange = [layoutManager truncatedGlyphRangeInLineFragmentForGlyphAtIndex:range.location];
-      BOOL viewIsTruncated = NSIntersectionRange(range, truncatedGlyphRange).length != 0;
-
-      RCTLayoutContext localLayoutContext = layoutContext;
-      localLayoutContext.absolutePosition.x += frame.origin.x;
-      localLayoutContext.absolutePosition.y += frame.origin.y;
-
-      [shadowView layoutWithMinimumSize:frame.size
-                            maximumSize:frame.size
-                        layoutDirection:self.layoutMetrics.layoutDirection
-                          layoutContext:localLayoutContext];
-
-      RCTLayoutMetrics localLayoutMetrics = shadowView.layoutMetrics;
-      localLayoutMetrics.frame.origin = frame.origin; // Reinforcing a proper frame origin for the Shadow View.
-      if (viewIsTruncated) {
-        localLayoutMetrics.displayType = RCTDisplayTypeNone;
-      }
-      [shadowView layoutWithMetrics:localLayoutMetrics layoutContext:localLayoutContext];
-    }
-  ];
-
+  NSRange characterRange = [layoutManager characterRangeForGlyphRange:glyphRange actualGlyphRange:NULL];
+
+  [textStorage
+      enumerateAttribute:RCTBaseTextShadowViewEmbeddedShadowViewAttributeName
+                 inRange:characterRange
+                 options:0
+              usingBlock:^(RCTShadowView *shadowView, NSRange range, BOOL *stop) {
+                if (!shadowView) {
+                  return;
+                }
+
+                CGRect glyphRect = [layoutManager boundingRectForGlyphRange:range inTextContainer:textContainer];
+
+                NSTextAttachment *attachment = [textStorage attribute:NSAttachmentAttributeName
+                                                              atIndex:range.location
+                                                       effectiveRange:nil];
+
+                CGSize attachmentSize = attachment.bounds.size;
+
+                UIFont *font = [textStorage attribute:NSFontAttributeName atIndex:range.location effectiveRange:nil];
+
+                CGRect frame = {
+                    {RCTRoundPixelValue(glyphRect.origin.x),
+                     RCTRoundPixelValue(
+                         glyphRect.origin.y + glyphRect.size.height - attachmentSize.height + font.descender)},
+                    {RCTRoundPixelValue(attachmentSize.width), RCTRoundPixelValue(attachmentSize.height)}};
+
+                NSRange truncatedGlyphRange =
+                    [layoutManager truncatedGlyphRangeInLineFragmentForGlyphAtIndex:range.location];
+                BOOL viewIsTruncated = NSIntersectionRange(range, truncatedGlyphRange).length != 0;
+
+                RCTLayoutContext localLayoutContext = layoutContext;
+                localLayoutContext.absolutePosition.x += frame.origin.x;
+                localLayoutContext.absolutePosition.y += frame.origin.y;
+
+                [shadowView layoutWithMinimumSize:frame.size
+                                      maximumSize:frame.size
+                                  layoutDirection:self.layoutMetrics.layoutDirection
+                                    layoutContext:localLayoutContext];
+
+                RCTLayoutMetrics localLayoutMetrics = shadowView.layoutMetrics;
+                localLayoutMetrics.frame.origin =
+                    frame.origin; // Reinforcing a proper frame origin for the Shadow View.
+                if (viewIsTruncated) {
+                  localLayoutMetrics.displayType = RCTDisplayTypeNone;
+                }
+                [shadowView layoutWithMetrics:localLayoutMetrics layoutContext:localLayoutContext];
+              }];
 
   if (_onTextLayout) {
     NSMutableArray *lineData = [NSMutableArray new];
-    [layoutManager
-     enumerateLineFragmentsForGlyphRange:glyphRange
-     usingBlock:^(CGRect overallRect, CGRect usedRect, NSTextContainer * _Nonnull usedTextContainer, NSRange lineGlyphRange, BOOL * _Nonnull stop) {
-       NSRange range = [layoutManager characterRangeForGlyphRange:lineGlyphRange actualGlyphRange:nil];
-       NSString *renderedString = [textStorage.string substringWithRange:range];
-       UIFont *font = [[textStorage attributedSubstringFromRange:range] attribute:NSFontAttributeName atIndex:0 effectiveRange:nil];
-       [lineData addObject:
-        @{
-          @"text": renderedString,
-          @"x": @(usedRect.origin.x),
-          @"y": @(usedRect.origin.y),
-          @"width": @(usedRect.size.width),
-          @"height": @(usedRect.size.height),
-          @"descender": @(-font.descender),
-          @"capHeight": @(font.capHeight),
-          @"ascender": @(font.ascender),
-          @"xHeight": @(font.xHeight),
-          }];
-     }];
-    NSDictionary *payload =
-    @{
-      @"lines": lineData,
-      };
+    [layoutManager enumerateLineFragmentsForGlyphRange:glyphRange
+                                            usingBlock:^(
+                                                CGRect overallRect,
+                                                CGRect usedRect,
+                                                NSTextContainer *_Nonnull usedTextContainer,
+                                                NSRange lineGlyphRange,
+                                                BOOL *_Nonnull stop) {
+                                              NSRange range = [layoutManager characterRangeForGlyphRange:lineGlyphRange
+                                                                                        actualGlyphRange:nil];
+                                              NSString *renderedString = [textStorage.string substringWithRange:range];
+                                              UIFont *font = [[textStorage attributedSubstringFromRange:range]
+                                                       attribute:NSFontAttributeName
+                                                         atIndex:0
+                                                  effectiveRange:nil];
+                                              [lineData addObject:@{
+                                                @"text" : renderedString,
+                                                @"x" : @(usedRect.origin.x),
+                                                @"y" : @(usedRect.origin.y),
+                                                @"width" : @(usedRect.size.width),
+                                                @"height" : @(usedRect.size.height),
+                                                @"descender" : @(-font.descender),
+                                                @"capHeight" : @(font.capHeight),
+                                                @"ascender" : @(font.ascender),
+                                                @"xHeight" : @(font.xHeight),
+                                              }];
+                                            }];
+    NSDictionary *payload = @{
+      @"lines" : lineData,
+    };
     _onTextLayout(payload);
   }
 }
 
 - (CGFloat)lastBaselineForSize:(CGSize)size
 {
-  NSAttributedString *attributedText =
-    [self textStorageAndLayoutManagerThatFitsSize:size exclusiveOwnership:NO];
+  NSAttributedString *attributedText = [self textStorageAndLayoutManagerThatFitsSize:size exclusiveOwnership:NO];
 
   __block CGFloat maximumDescender = 0.0;
 
   [attributedText enumerateAttribute:NSFontAttributeName
                              inRange:NSMakeRange(0, attributedText.length)
                              options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
-                          usingBlock:
-    ^(UIFont *font, NSRange range, __unused BOOL *stop) {
-      if (maximumDescender > font.descender) {
-        maximumDescender = font.descender;
-      }
-    }
-  ];
+                          usingBlock:^(UIFont *font, NSRange range, __unused BOOL *stop) {
+                            if (maximumDescender > font.descender) {
+                              maximumDescender = font.descender;
+                            }
+                          }];
 
   return size.height + maximumDescender;
 }
 
-static YGSize RCTTextShadowViewMeasure(YGNodeRef node, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode)
+static YGSize
+RCTTextShadowViewMeasure(YGNodeRef node, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode)
 {
   CGSize maximumSize = (CGSize){
-    widthMode == YGMeasureModeUndefined ? CGFLOAT_MAX : RCTCoreGraphicsFloatFromYogaFloat(width),
-    heightMode == YGMeasureModeUndefined ? CGFLOAT_MAX : RCTCoreGraphicsFloatFromYogaFloat(height),
+      widthMode == YGMeasureModeUndefined ? CGFLOAT_MAX : RCTCoreGraphicsFloatFromYogaFloat(width),
+      heightMode == YGMeasureModeUndefined ? CGFLOAT_MAX : RCTCoreGraphicsFloatFromYogaFloat(height),
   };
 
   RCTTextShadowView *shadowTextView = (__bridge RCTTextShadowView *)YGNodeGetContext(node);
 
-  NSTextStorage *textStorage =
-    [shadowTextView textStorageAndLayoutManagerThatFitsSize:maximumSize
-                                         exclusiveOwnership:NO];
+  NSTextStorage *textStorage = [shadowTextView textStorageAndLayoutManagerThatFitsSize:maximumSize
+                                                                    exclusiveOwnership:NO];
 
   NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
   NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
@@ -409,27 +392,21 @@ static YGSize RCTTextShadowViewMeasure(YGNodeRef node, float width, YGMeasureMod
   }
 
   size = (CGSize){
-    MIN(RCTCeilPixelValue(size.width), maximumSize.width),
-    MIN(RCTCeilPixelValue(size.height), maximumSize.height)
-  };
+      MIN(RCTCeilPixelValue(size.width), maximumSize.width), MIN(RCTCeilPixelValue(size.height), maximumSize.height)};
 
   // Adding epsilon value illuminates problems with converting values from
   // `double` to `float`, and then rounding them to pixel grid in Yoga.
   CGFloat epsilon = 0.001;
   return (YGSize){
-    RCTYogaFloatFromCoreGraphicsFloat(size.width + epsilon),
-    RCTYogaFloatFromCoreGraphicsFloat(size.height + epsilon)
-  };
+      RCTYogaFloatFromCoreGraphicsFloat(size.width + epsilon),
+      RCTYogaFloatFromCoreGraphicsFloat(size.height + epsilon)};
 }
 
 static float RCTTextShadowViewBaseline(YGNodeRef node, const float width, const float height)
 {
   RCTTextShadowView *shadowTextView = (__bridge RCTTextShadowView *)YGNodeGetContext(node);
 
-  CGSize size = (CGSize){
-    RCTCoreGraphicsFloatFromYogaFloat(width),
-    RCTCoreGraphicsFloatFromYogaFloat(height)
-  };
+  CGSize size = (CGSize){RCTCoreGraphicsFloatFromYogaFloat(width), RCTCoreGraphicsFloatFromYogaFloat(height)};
 
   CGFloat lastBaseline = [shadowTextView lastBaselineForSize:size];
 
diff --git a/Libraries/Text/Text/RCTTextView.m b/Libraries/Text/Text/RCTTextView.m
index 6726e12deab0..4ba41b9c8c75 100644
--- a/Libraries/Text/Text/RCTTextView.m
+++ b/Libraries/Text/Text/RCTTextView.m
@@ -14,8 +14,7 @@
 
 #import <React/RCTTextShadowView.h>
 
-@implementation RCTTextView
-{
+@implementation RCTTextView {
   CAShapeLayer *_highlightLayer;
   UILongPressGestureRecognizer *_longPressGestureRecognizer;
 
@@ -38,9 +37,9 @@ - (instancetype)initWithFrame:(CGRect)frame
 - (NSString *)description
 {
   NSString *superDescription = super.description;
-  NSRange semicolonRange = [superDescription rangeOfString:@";"];
-  NSString *replacement = [NSString stringWithFormat:@"; reactTag: %@; text: %@", self.reactTag, _textStorage.string];
-  return [superDescription stringByReplacingCharactersInRange:semicolonRange withString:replacement];
+  NSRange replacementRange = [superDescription rangeOfString:@">"];
+  NSString *replacement = [NSString stringWithFormat:@"; reactTag: %@; text: %@>", self.reactTag, _textStorage.string];
+  return [superDescription stringByReplacingCharactersInRange:replacementRange withString:replacement];
 }
 
 - (void)setSelectable:(BOOL)selectable
@@ -53,8 +52,7 @@ - (void)setSelectable:(BOOL)selectable
 
   if (_selectable) {
     [self enableContextMenu];
-  }
-  else {
+  } else {
     [self disableContextMenu];
   }
 }
@@ -101,7 +99,6 @@ - (void)drawRect:(CGRect)rect
     return;
   }
 
-
   NSLayoutManager *layoutManager = _textStorage.layoutManagers.firstObject;
   NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
 
@@ -113,37 +110,37 @@ - (void)drawRect:(CGRect)rect
   // CATextLayer disables font smoothing by default now on macOS; we follow suit.
   CGContextSetShouldSmoothFonts(context, NO);
 #endif
-  
+
   NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];
   [layoutManager drawBackgroundForGlyphRange:glyphRange atPoint:_contentFrame.origin];
   [layoutManager drawGlyphsForGlyphRange:glyphRange atPoint:_contentFrame.origin];
 
   __block UIBezierPath *highlightPath = nil;
-  NSRange characterRange = [layoutManager characterRangeForGlyphRange:glyphRange
-                                                     actualGlyphRange:NULL];
-  [_textStorage enumerateAttribute:RCTTextAttributesIsHighlightedAttributeName
-                           inRange:characterRange
-                           options:0
-                        usingBlock:
-    ^(NSNumber *value, NSRange range, __unused BOOL *stop) {
-      if (!value.boolValue) {
-        return;
-      }
-
-      [layoutManager enumerateEnclosingRectsForGlyphRange:range
-                                 withinSelectedGlyphRange:range
-                                          inTextContainer:textContainer
-                                               usingBlock:
-        ^(CGRect enclosingRect, __unused BOOL *anotherStop) {
-          UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:CGRectInset(enclosingRect, -2, -2) cornerRadius:2];
-          if (highlightPath) {
-            [highlightPath appendPath:path];
-          } else {
-            highlightPath = path;
-          }
-        }
-      ];
-  }];
+  NSRange characterRange = [layoutManager characterRangeForGlyphRange:glyphRange actualGlyphRange:NULL];
+  [_textStorage
+      enumerateAttribute:RCTTextAttributesIsHighlightedAttributeName
+                 inRange:characterRange
+                 options:0
+              usingBlock:^(NSNumber *value, NSRange range, __unused BOOL *stop) {
+                if (!value.boolValue) {
+                  return;
+                }
+
+                [layoutManager
+                    enumerateEnclosingRectsForGlyphRange:range
+                                withinSelectedGlyphRange:range
+                                         inTextContainer:textContainer
+                                              usingBlock:^(CGRect enclosingRect, __unused BOOL *anotherStop) {
+                                                UIBezierPath *path = [UIBezierPath
+                                                    bezierPathWithRoundedRect:CGRectInset(enclosingRect, -2, -2)
+                                                                 cornerRadius:2];
+                                                if (highlightPath) {
+                                                  [highlightPath appendPath:path];
+                                                } else {
+                                                  highlightPath = path;
+                                                }
+                                              }];
+              }];
 
   if (highlightPath) {
     if (!_highlightLayer) {
@@ -157,13 +154,12 @@ - (void)drawRect:(CGRect)rect
     [_highlightLayer removeFromSuperlayer];
     _highlightLayer = nil;
   }
-  
+
 #if TARGET_OS_MACCATALYST
   CGContextRestoreGState(context);
 #endif
 }
 
-
 - (NSNumber *)reactTagAtPoint:(CGPoint)point
 {
   NSNumber *reactTag = self.reactTag;
@@ -177,7 +173,8 @@ - (NSNumber *)reactTagAtPoint:(CGPoint)point
 
   // If the point is not before (fraction == 0.0) the first character and not
   // after (fraction == 1.0) the last character, then the attribute is valid.
-  if (_textStorage.length > 0 && (fraction > 0 || characterIndex > 0) && (fraction < 1 || characterIndex < _textStorage.length - 1)) {
+  if (_textStorage.length > 0 && (fraction > 0 || characterIndex > 0) &&
+      (fraction < 1 || characterIndex < _textStorage.length - 1)) {
     reactTag = [_textStorage attribute:RCTTextAttributesTagAttributeName atIndex:characterIndex effectiveRange:NULL];
   }
 
@@ -214,7 +211,8 @@ - (NSString *)accessibilityLabel
 
 - (void)enableContextMenu
 {
-  _longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleLongPress:)];
+  _longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self
+                                                                              action:@selector(handleLongPress:)];
   [self addGestureRecognizer:_longPressGestureRecognizer];
 }
 
@@ -264,7 +262,7 @@ - (void)copy:(id)sender
   NSMutableDictionary *item = [NSMutableDictionary new];
 
   NSData *rtf = [attributedText dataFromRange:NSMakeRange(0, attributedText.length)
-                           documentAttributes:@{NSDocumentTypeDocumentAttribute: NSRTFDTextDocumentType}
+                           documentAttributes:@{NSDocumentTypeDocumentAttribute : NSRTFDTextDocumentType}
                                         error:nil];
 
   if (rtf) {
@@ -274,7 +272,7 @@ - (void)copy:(id)sender
   [item setObject:attributedText.string forKey:(id)kUTTypeUTF8PlainText];
 
   UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
-  pasteboard.items = @[item];
+  pasteboard.items = @[ item ];
 }
 
 @end
diff --git a/Libraries/Text/Text/RCTTextViewManager.m b/Libraries/Text/Text/RCTTextViewManager.m
index ce0c44999a0d..7fec0b7b58b0 100644
--- a/Libraries/Text/Text/RCTTextViewManager.m
+++ b/Libraries/Text/Text/RCTTextViewManager.m
@@ -10,8 +10,8 @@
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTShadowView.h>
 #import <React/RCTUIManager.h>
-#import <React/RCTUIManagerUtils.h>
 #import <React/RCTUIManagerObserverCoordinator.h>
+#import <React/RCTUIManagerUtils.h>
 
 #import <React/RCTTextShadowView.h>
 #import <React/RCTTextView.h>
@@ -20,8 +20,7 @@ @interface RCTTextViewManager () <RCTUIManagerObserver>
 
 @end
 
-@implementation RCTTextViewManager
-{
+@implementation RCTTextViewManager {
   NSHashTable<RCTTextShadowView *> *_shadowViews;
 }
 
@@ -47,7 +46,7 @@ - (void)setBridge:(RCTBridge *)bridge
                                            selector:@selector(handleDidUpdateMultiplierNotification)
                                                name:@"RCTAccessibilityManagerDidUpdateMultiplierNotification"
                                              object:[bridge moduleForName:@"AccessibilityManager"
-                                                    lazilyLoadIfNecessary:YES]];
+                                                        lazilyLoadIfNecessary:YES]];
 }
 
 - (UIView *)view
@@ -58,8 +57,8 @@ - (UIView *)view
 - (RCTShadowView *)shadowView
 {
   RCTTextShadowView *shadowView = [[RCTTextShadowView alloc] initWithBridge:self.bridge];
-  shadowView.textAttributes.fontSizeMultiplier = [[[self.bridge moduleForName:@"AccessibilityManager"]
-                                                   valueForKey:@"multiplier"] floatValue];
+  shadowView.textAttributes.fontSizeMultiplier =
+      [[[self.bridge moduleForName:@"AccessibilityManager"] valueForKey:@"multiplier"] floatValue];
   [_shadowViews addObject:shadowView];
   return shadowView;
 }
@@ -77,8 +76,8 @@ - (void)uiManagerWillPerformMounting:(__unused RCTUIManager *)uiManager
 
 - (void)handleDidUpdateMultiplierNotification
 {
-  CGFloat fontSizeMultiplier = [[[self.bridge moduleForName:@"AccessibilityManager"]
-                                 valueForKey:@"multiplier"] floatValue];
+  CGFloat fontSizeMultiplier =
+      [[[self.bridge moduleForName:@"AccessibilityManager"] valueForKey:@"multiplier"] floatValue];
 
   NSHashTable<RCTTextShadowView *> *shadowViews = _shadowViews;
   RCTExecuteOnUIManagerQueue(^{
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m
index 0cbaea87b42c..e3a7c6be60eb 100644
--- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m
+++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m
@@ -11,17 +11,13 @@
 
 #import <React/RCTUITextView.h>
 
-@implementation RCTMultilineTextInputView
-{
+@implementation RCTMultilineTextInputView {
   RCTUITextView *_backedTextInputView;
 }
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
 {
   if (self = [super initWithBridge:bridge]) {
-    // `blurOnSubmit` defaults to `false` for <TextInput multiline={true}> by design.
-    self.blurOnSubmit = NO;
-
     _backedTextInputView = [[RCTUITextView alloc] initWithFrame:self.bounds];
     _backedTextInputView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     _backedTextInputView.textInputDelegate = self;
@@ -50,25 +46,16 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
     UIEdgeInsets contentInset = scrollView.contentInset;
 
     onScroll(@{
-      @"contentOffset": @{
-        @"x": @(contentOffset.x),
-        @"y": @(contentOffset.y)
-      },
-      @"contentInset": @{
-        @"top": @(contentInset.top),
-        @"left": @(contentInset.left),
-        @"bottom": @(contentInset.bottom),
-        @"right": @(contentInset.right)
-      },
-      @"contentSize": @{
-        @"width": @(contentSize.width),
-        @"height": @(contentSize.height)
-      },
-      @"layoutMeasurement": @{
-        @"width": @(size.width),
-        @"height": @(size.height)
+      @"contentOffset" : @{@"x" : @(contentOffset.x), @"y" : @(contentOffset.y)},
+      @"contentInset" : @{
+        @"top" : @(contentInset.top),
+        @"left" : @(contentInset.left),
+        @"bottom" : @(contentInset.bottom),
+        @"right" : @(contentInset.right)
       },
-      @"zoomScale": @(scrollView.zoomScale ?: 1),
+      @"contentSize" : @{@"width" : @(contentSize.width), @"height" : @(contentSize.height)},
+      @"layoutMeasurement" : @{@"width" : @(size.width), @"height" : @(size.height)},
+      @"zoomScale" : @(scrollView.zoomScale ?: 1),
     });
   }
 }
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m
index 6eb74da39e1c..e729bb7a222a 100644
--- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m
+++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTMultilineTextInputViewManager.h>
 #import <React/RCTMultilineTextInputView.h>
+#import <React/RCTMultilineTextInputViewManager.h>
 
 @implementation RCTMultilineTextInputViewManager
 
diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.h b/Libraries/Text/TextInput/Multiline/RCTUITextView.h
index 5ccb6b6d7d3f..1215ff084340 100644
--- a/Libraries/Text/TextInput/Multiline/RCTUITextView.h
+++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.h
@@ -7,8 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
-#import <React/RCTBackedTextInputViewProtocol.h>
 #import <React/RCTBackedTextInputDelegate.h>
+#import <React/RCTBackedTextInputViewProtocol.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
index 92371bc8bf61..62ec0d5354a5 100644
--- a/Libraries/Text/TextInput/Multiline/RCTUITextView.m
+++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
@@ -13,8 +13,7 @@
 #import <React/RCTBackedTextInputDelegateAdapter.h>
 #import <React/RCTTextAttributes.h>
 
-@implementation RCTUITextView
-{
+@implementation RCTUITextView {
   UILabel *_placeholderView;
   UITextView *_detachedTextView;
   RCTBackedTextViewDelegateAdapter *_textInputDelegateAdapter;
@@ -58,7 +57,8 @@ - (instancetype)initWithFrame:(CGRect)frame
   return self;
 }
 
-- (void)setDelegate:(id<UITextViewDelegate>)delegate {
+- (void)setDelegate:(id<UITextViewDelegate>)delegate
+{
   // Delegate is set inside `[RCTBackedTextViewDelegateAdapter initWithTextView]` and
   // it cannot be changed from outside.
   if (super.delegate) {
@@ -73,7 +73,8 @@ - (void)setIsAccessibilityElement:(BOOL)isAccessibilityElement
 {
   // UITextView is accessible by default (some nested views are) and disabling that is not supported.
   // On iOS accessible elements cannot be nested, therefore enabling accessibility for some container view
-  // (even in a case where this view is a part of public API of TextInput on iOS) shadows some features implemented inside the component.
+  // (even in a case where this view is a part of public API of TextInput on iOS) shadows some features implemented
+  // inside the component.
 }
 
 - (NSString *)accessibilityLabel
@@ -164,8 +165,8 @@ - (void)setSelectedTextRange:(UITextRange *)selectedTextRange notifyDelegate:(BO
 
 - (void)paste:(id)sender
 {
-  [super paste:sender];
   _textWasPasted = YES;
+  [super paste:sender];
 }
 
 // Turn off scroll animation to fix flaky scrolling.
@@ -200,8 +201,13 @@ - (CGSize)placeholderSize
 {
   UIEdgeInsets textContainerInset = self.textContainerInset;
   NSString *placeholder = self.placeholder ?: @"";
-  CGSize maxPlaceholderSize = CGSizeMake(UIEdgeInsetsInsetRect(self.bounds, textContainerInset).size.width, CGFLOAT_MAX);
-  CGSize placeholderSize = [placeholder boundingRectWithSize:maxPlaceholderSize options:NSStringDrawingUsesLineFragmentOrigin attributes:[self _placeholderTextAttributes] context:nil].size;
+  CGSize maxPlaceholderSize =
+      CGSizeMake(UIEdgeInsetsInsetRect(self.bounds, textContainerInset).size.width, CGFLOAT_MAX);
+  CGSize placeholderSize = [placeholder boundingRectWithSize:maxPlaceholderSize
+                                                     options:NSStringDrawingUsesLineFragmentOrigin
+                                                  attributes:[self _placeholderTextAttributes]
+                                                     context:nil]
+                               .size;
   placeholderSize = CGSizeMake(RCTCeilPixelValue(placeholderSize.width), RCTCeilPixelValue(placeholderSize.height));
   placeholderSize.width += textContainerInset.left + textContainerInset.right;
   placeholderSize.height += textContainerInset.top + textContainerInset.bottom;
@@ -216,9 +222,7 @@ - (CGSize)contentSize
   // When a text input is empty, it actually displays a placehoder.
   // So, we have to consider `placeholderSize` as a minimum `contentSize`.
   // Returning size DOES contain `textContainerInset` (aka `padding`).
-  return CGSizeMake(
-    MAX(contentSize.width, placeholderSize.width),
-    MAX(contentSize.height, placeholderSize.height));
+  return CGSizeMake(MAX(contentSize.width, placeholderSize.width), MAX(contentSize.height, placeholderSize.height));
 }
 
 - (void)layoutSubviews
@@ -267,13 +271,15 @@ - (void)_invalidatePlaceholderVisibility
 
 - (void)_updatePlaceholder
 {
-  _placeholderView.attributedText = [[NSAttributedString alloc] initWithString:_placeholder ?: @"" attributes:[self _placeholderTextAttributes]];
+  _placeholderView.attributedText = [[NSAttributedString alloc] initWithString:_placeholder ?: @""
+                                                                    attributes:[self _placeholderTextAttributes]];
   [self _invalidatePlaceholderVisibility];
 }
 
 - (NSDictionary<NSAttributedStringKey, id> *)_placeholderTextAttributes
 {
-  NSMutableDictionary<NSAttributedStringKey, id> *textAttributes = [_defaultTextAttributes mutableCopy] ?: [NSMutableDictionary new];
+  NSMutableDictionary<NSAttributedStringKey, id> *textAttributes =
+      [_defaultTextAttributes mutableCopy] ?: [NSMutableDictionary new];
 
   [textAttributes setValue:self.placeholderColor ?: defaultPlaceholderColor() forKey:NSForegroundColorAttributeName];
 
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h b/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
index c2a4362f028b..7187177b69d4 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
+++ b/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
@@ -16,17 +16,21 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)textInputShouldBeginEditing; // Return `NO` to disallow editing.
 - (void)textInputDidBeginEditing;
 
-- (BOOL)textInputShouldEndEditing; // Return `YES` to allow editing to stop and to resign first responder status. `NO` to disallow the editing session to end.
-- (void)textInputDidEndEditing; // May be called if forced even if `textInputShouldEndEditing` returns `NO` (e.g. view removed from window) or `[textInput endEditing:YES]` called.
+- (BOOL)textInputShouldEndEditing; // Return `YES` to allow editing to stop and to resign first responder status. `NO`
+                                   // to disallow the editing session to end.
+- (void)textInputDidEndEditing; // May be called if forced even if `textInputShouldEndEditing` returns `NO` (e.g. view
+                                // removed from window) or `[textInput endEditing:YES]` called.
 
 - (BOOL)textInputShouldReturn; // May be called right before `textInputShouldEndEditing` if "Return" button was pressed.
+                               // Dismisses keyboard if true
 - (void)textInputDidReturn;
 
+- (BOOL)textInputShouldSubmitOnReturn; // Checks whether to submit when return is pressed and emits an event if true.
+
 /*
- * Called before any change in the TextInput. The delegate has the opportunity to change the replacement string or reject the change completely.
- * To change the replacement, return the changed version of the `text`.
- * To accept the change, return `text` argument as-is.
- * To reject the change, return `nil`.
+ * Called before any change in the TextInput. The delegate has the opportunity to change the replacement string or
+ * reject the change completely. To change the replacement, return the changed version of the `text`. To accept the
+ * change, return `text` argument as-is. To reject the change, return `nil`.
  */
 - (NSString *)textInputShouldChangeText:(NSString *)text inRange:(NSRange)range;
 - (void)textInputDidChange;
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
index 1051715db38e..f1c32e6e33bb 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
+++ b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
@@ -7,8 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
-#import "RCTBackedTextInputViewProtocol.h"
 #import "RCTBackedTextInputDelegate.h"
+#import "RCTBackedTextInputViewProtocol.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
index c6c254ce5dbe..7722f831ad08 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
+++ b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
@@ -26,8 +26,12 @@ - (instancetype)initWithTextField:(UITextField<RCTBackedTextInputViewProtocol> *
     _backedTextInputView = backedTextInputView;
     backedTextInputView.delegate = self;
 
-    [_backedTextInputView addTarget:self action:@selector(textFieldDidChange) forControlEvents:UIControlEventEditingChanged];
-    [_backedTextInputView addTarget:self action:@selector(textFieldDidEndEditingOnExit) forControlEvents:UIControlEventEditingDidEndOnExit];
+    [_backedTextInputView addTarget:self
+                             action:@selector(textFieldDidChange)
+                   forControlEvents:UIControlEventEditingChanged];
+    [_backedTextInputView addTarget:self
+                             action:@selector(textFieldDidEndEditingOnExit)
+                   forControlEvents:UIControlEventEditingDidEndOnExit];
   }
 
   return self;
@@ -68,10 +72,11 @@ - (void)textFieldDidEndEditing:(__unused UITextField *)textField
   [_backedTextInputView.textInputDelegate textInputDidEndEditing];
 }
 
-- (BOOL)textField:(__unused UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
+- (BOOL)textField:(__unused UITextField *)textField
+    shouldChangeCharactersInRange:(NSRange)range
+                replacementString:(NSString *)string
 {
-  NSString *newText =
-    [_backedTextInputView.textInputDelegate textInputShouldChangeText:string inRange:range];
+  NSString *newText = [_backedTextInputView.textInputDelegate textInputShouldChangeText:string inRange:range];
 
   if (newText == nil) {
     return NO;
@@ -87,9 +92,8 @@ - (BOOL)textField:(__unused UITextField *)textField shouldChangeCharactersInRang
   [_backedTextInputView setAttributedText:[attributedString copy]];
 
   // Setting selection to the end of the replaced text.
-  UITextPosition *position =
-    [_backedTextInputView positionFromPosition:_backedTextInputView.beginningOfDocument
-                                        offset:(range.location + newText.length)];
+  UITextPosition *position = [_backedTextInputView positionFromPosition:_backedTextInputView.beginningOfDocument
+                                                                 offset:(range.location + newText.length)];
   [_backedTextInputView setSelectedTextRange:[_backedTextInputView textRangeFromPosition:position toPosition:position]
                               notifyDelegate:YES];
 
@@ -100,6 +104,8 @@ - (BOOL)textField:(__unused UITextField *)textField shouldChangeCharactersInRang
 
 - (BOOL)textFieldShouldReturn:(__unused UITextField *)textField
 {
+  // Ignore the value of whether we submitted; just make sure the submit event is called if necessary.
+  [_backedTextInputView.textInputDelegate textInputShouldSubmitOnReturn];
   return [_backedTextInputView.textInputDelegate textInputShouldReturn];
 }
 
@@ -209,15 +215,18 @@ - (BOOL)textView:(__unused UITextView *)textView shouldChangeTextInRange:(NSRang
 {
   // Custom implementation of `textInputShouldReturn` and `textInputDidReturn` pair for `UITextView`.
   if (!_backedTextInputView.textWasPasted && [text isEqualToString:@"\n"]) {
-    if ([_backedTextInputView.textInputDelegate textInputShouldReturn]) {
+    const BOOL shouldSubmit = [_backedTextInputView.textInputDelegate textInputShouldSubmitOnReturn];
+    const BOOL shouldReturn = [_backedTextInputView.textInputDelegate textInputShouldReturn];
+    if (shouldReturn) {
       [_backedTextInputView.textInputDelegate textInputDidReturn];
       [_backedTextInputView endEditing:NO];
       return NO;
+    } else if (shouldSubmit) {
+      return NO;
     }
   }
 
-  NSString *newText =
-    [_backedTextInputView.textInputDelegate textInputShouldChangeText:text inRange:range];
+  NSString *newText = [_backedTextInputView.textInputDelegate textInputShouldChangeText:text inRange:range];
 
   if (newText == nil) {
     return NO;
@@ -233,9 +242,8 @@ - (BOOL)textView:(__unused UITextView *)textView shouldChangeTextInRange:(NSRang
   [_backedTextInputView setAttributedText:[attributedString copy]];
 
   // Setting selection to the end of the replaced text.
-  UITextPosition *position =
-    [_backedTextInputView positionFromPosition:_backedTextInputView.beginningOfDocument
-                                        offset:(range.location + newText.length)];
+  UITextPosition *position = [_backedTextInputView positionFromPosition:_backedTextInputView.beginningOfDocument
+                                                                 offset:(range.location + newText.length)];
   [_backedTextInputView setSelectedTextRange:[_backedTextInputView textRangeFromPosition:position toPosition:position]
                               notifyDelegate:YES];
 
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h b/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h
index c235907d796a..686af9e3a363 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h
+++ b/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h
@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, nullable) UIView *inputView;
 @property (nonatomic, weak, nullable) id<RCTBackedTextInputDelegate> textInputDelegate;
 @property (nonatomic, readonly) CGSize contentSize;
-@property (nonatomic, strong, nullable) NSDictionary<NSAttributedStringKey,id> *defaultTextAttributes;
+@property (nonatomic, strong, nullable) NSDictionary<NSAttributedStringKey, id> *defaultTextAttributes;
 @property (nonatomic, assign) BOOL contextMenuHidden;
 @property (nonatomic, assign, getter=isEditable) BOOL editable;
 @property (nonatomic, assign) BOOL caretHidden;
@@ -35,7 +35,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign, readonly) CGPoint contentOffset;
 @property (nonatomic, assign, readonly) UIEdgeInsets contentInset;
 
-
 // This protocol disallows direct access to `selectedTextRange` property because
 // unwise usage of it can break the `delegate` behavior. So, we always have to
 // explicitly specify should `delegate` be notified about the change or not.
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
index 19d202cb3494..04d2446f86d9 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
@@ -12,11 +12,10 @@
 #import <React/RCTUIManager.h>
 #import <yoga/Yoga.h>
 
-#import "NSTextStorage+FontScaling.h"
 #import <React/RCTBaseTextInputView.h>
+#import "NSTextStorage+FontScaling.h"
 
-@implementation RCTBaseTextInputShadowView
-{
+@implementation RCTBaseTextInputShadowView {
   __weak RCTBridge *_bridge;
   NSAttributedString *_Nullable _previousAttributedText;
   BOOL _needsUpdateView;
@@ -104,11 +103,11 @@ - (void)invalidateContentSize
   _previousContentSize = contentSize;
 
   _onContentSizeChange(@{
-    @"contentSize": @{
-      @"height": @(contentSize.height),
-      @"width": @(contentSize.width),
+    @"contentSize" : @{
+      @"height" : @(contentSize.height),
+      @"width" : @(contentSize.width),
     },
-    @"target": self.reactTag,
+    @"target" : self.reactTag,
   });
 }
 
@@ -144,31 +143,28 @@ - (void)uiManagerWillPerformMounting
 
   RCTTextAttributes *textAttributes = [self.textAttributes copy];
 
-  NSMutableAttributedString *attributedText =
-    [[NSMutableAttributedString alloc] initWithAttributedString:[self attributedTextWithBaseTextAttributes:nil]];
+  NSMutableAttributedString *attributedText = [[self attributedTextWithBaseTextAttributes:nil] mutableCopy];
 
   // Removing all references to Shadow Views and tags to avoid unnecessary retaining
   // and problems with comparing the strings.
   [attributedText removeAttribute:RCTBaseTextShadowViewEmbeddedShadowViewAttributeName
                             range:NSMakeRange(0, attributedText.length)];
 
-  [attributedText removeAttribute:RCTTextAttributesTagAttributeName
-                            range:NSMakeRange(0, attributedText.length)];
+  [attributedText removeAttribute:RCTTextAttributesTagAttributeName range:NSMakeRange(0, attributedText.length)];
 
   if (self.text.length) {
     NSAttributedString *propertyAttributedText =
-      [[NSAttributedString alloc] initWithString:self.text
-                                      attributes:self.textAttributes.effectiveTextAttributes];
+        [[NSAttributedString alloc] initWithString:self.text attributes:self.textAttributes.effectiveTextAttributes];
     [attributedText insertAttributedString:propertyAttributedText atIndex:0];
   }
 
-  BOOL isAttributedTextChanged = NO;
+  NSAttributedString *newAttributedText;
   if (![_previousAttributedText isEqualToAttributedString:attributedText]) {
     // We have to follow `set prop` pattern:
     // If the value has not changed, we must not notify the view about the change,
     // otherwise we may break local (temporary) state of the text input.
-    isAttributedTextChanged = YES;
-    _previousAttributedText = [attributedText copy];
+    newAttributedText = [attributedText copy];
+    _previousAttributedText = newAttributedText;
   }
 
   NSNumber *tag = self.reactTag;
@@ -183,10 +179,11 @@ - (void)uiManagerWillPerformMounting
     baseTextInputView.reactBorderInsets = borderInsets;
     baseTextInputView.reactPaddingInsets = paddingInsets;
 
-    if (isAttributedTextChanged) {
-      // Don't set `attributedText` if length equal to zero, otherwise it would shrink when attributes contain like `lineHeight`.
-      if (attributedText.length != 0) {
-        baseTextInputView.attributedText = attributedText;
+    if (newAttributedText) {
+      // Don't set `attributedText` if length equal to zero, otherwise it would shrink when attributes contain like
+      // `lineHeight`.
+      if (newAttributedText.length != 0) {
+        baseTextInputView.attributedText = newAttributedText;
       } else {
         baseTextInputView.attributedText = nil;
       }
@@ -200,8 +197,7 @@ - (NSAttributedString *)measurableAttributedText
 {
   // Only for the very first render when we don't have `_localAttributedText`,
   // we use value directly from the property and/or nested content.
-  NSAttributedString *attributedText =
-    _localAttributedText ?: [self attributedTextWithBaseTextAttributes:nil];
+  NSAttributedString *attributedText = _localAttributedText ?: [self attributedTextWithBaseTextAttributes:nil];
 
   if (attributedText.length == 0) {
     // It's impossible to measure empty attributed string because all attributes are
@@ -213,7 +209,8 @@ - (NSAttributedString *)measurableAttributedText
       // Note: `zero-width space` is insufficient in some cases.
       text = @"I";
     }
-    attributedText = [[NSAttributedString alloc] initWithString:text attributes:self.textAttributes.effectiveTextAttributes];
+    attributedText = [[NSAttributedString alloc] initWithString:text
+                                                     attributes:self.textAttributes.effectiveTextAttributes];
   }
 
   return attributedText;
@@ -234,15 +231,13 @@ - (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximu
 
   _textContainer.size = maximumSize;
   _textContainer.maximumNumberOfLines = _maximumNumberOfLines;
-  [_textStorage replaceCharactersInRange:(NSRange){0, _textStorage.length}
-                    withAttributedString:attributedText];
+  [_textStorage replaceCharactersInRange:(NSRange){0, _textStorage.length} withAttributedString:attributedText];
   [_layoutManager ensureLayoutForTextContainer:_textContainer];
   CGSize size = [_layoutManager usedRectForTextContainer:_textContainer].size;
 
   return (CGSize){
-    MAX(minimumSize.width, MIN(RCTCeilPixelValue(size.width), maximumSize.width)),
-    MAX(minimumSize.height, MIN(RCTCeilPixelValue(size.height), maximumSize.height))
-  };
+      MAX(minimumSize.width, MIN(RCTCeilPixelValue(size.width), maximumSize.width)),
+      MAX(minimumSize.height, MIN(RCTCeilPixelValue(size.height), maximumSize.height))};
 }
 
 - (CGFloat)lastBaselineForSize:(CGSize)size
@@ -254,28 +249,28 @@ - (CGFloat)lastBaselineForSize:(CGSize)size
   [attributedText enumerateAttribute:NSFontAttributeName
                              inRange:NSMakeRange(0, attributedText.length)
                              options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
-                          usingBlock:
-    ^(UIFont *font, NSRange range, __unused BOOL *stop) {
-      if (maximumDescender > font.descender) {
-        maximumDescender = font.descender;
-      }
-    }
-  ];
+                          usingBlock:^(UIFont *font, NSRange range, __unused BOOL *stop) {
+                            if (maximumDescender > font.descender) {
+                              maximumDescender = font.descender;
+                            }
+                          }];
 
   return size.height + maximumDescender;
 }
 
-static YGSize RCTBaseTextInputShadowViewMeasure(YGNodeRef node, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode)
+static YGSize RCTBaseTextInputShadowViewMeasure(
+    YGNodeRef node,
+    float width,
+    YGMeasureMode widthMode,
+    float height,
+    YGMeasureMode heightMode)
 {
   RCTShadowView *shadowView = (__bridge RCTShadowView *)YGNodeGetContext(node);
 
   CGSize minimumSize = CGSizeMake(0, 0);
   CGSize maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
 
-  CGSize size = {
-    RCTCoreGraphicsFloatFromYogaFloat(width),
-    RCTCoreGraphicsFloatFromYogaFloat(height)
-  };
+  CGSize size = {RCTCoreGraphicsFloatFromYogaFloat(width), RCTCoreGraphicsFloatFromYogaFloat(height)};
 
   switch (widthMode) {
     case YGMeasureModeUndefined:
@@ -304,19 +299,14 @@ static YGSize RCTBaseTextInputShadowViewMeasure(YGNodeRef node, float width, YGM
   CGSize measuredSize = [shadowView sizeThatFitsMinimumSize:minimumSize maximumSize:maximumSize];
 
   return (YGSize){
-    RCTYogaFloatFromCoreGraphicsFloat(measuredSize.width),
-    RCTYogaFloatFromCoreGraphicsFloat(measuredSize.height)
-  };
+      RCTYogaFloatFromCoreGraphicsFloat(measuredSize.width), RCTYogaFloatFromCoreGraphicsFloat(measuredSize.height)};
 }
 
 static float RCTTextInputShadowViewBaseline(YGNodeRef node, const float width, const float height)
 {
   RCTBaseTextInputShadowView *shadowTextView = (__bridge RCTBaseTextInputShadowView *)YGNodeGetContext(node);
 
-  CGSize size = (CGSize){
-    RCTCoreGraphicsFloatFromYogaFloat(width),
-    RCTCoreGraphicsFloatFromYogaFloat(height)
-  };
+  CGSize size = (CGSize){RCTCoreGraphicsFloatFromYogaFloat(width), RCTCoreGraphicsFloatFromYogaFloat(height)};
 
   CGFloat lastBaseline = [shadowTextView lastBaselineForSize:size];
 
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.h b/Libraries/Text/TextInput/RCTBaseTextInputView.h
index 5c6c5cfcfa4b..209947de9b4a 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.h
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.h
@@ -42,7 +42,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) NSInteger mostRecentEventCount;
 @property (nonatomic, assign, readonly) NSInteger nativeEventCount;
 @property (nonatomic, assign) BOOL autoFocus;
-@property (nonatomic, assign) BOOL blurOnSubmit;
+@property (nonatomic, copy) NSString *submitBehavior;
 @property (nonatomic, assign) BOOL selectTextOnFocus;
 @property (nonatomic, assign) BOOL clearTextOnFocus;
 @property (nonatomic, assign) BOOL secureTextEntry;
@@ -56,8 +56,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  Sets selection intext input if both start and end are within range of the text input.
  **/
-- (void)setSelectionStart:(NSInteger)start
-             selectionEnd:(NSInteger)end;
+- (void)setSelectionStart:(NSInteger)start selectionEnd:(NSInteger)end;
 
 @end
 
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
index a4924923f190..04e5a49094ad 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -39,9 +39,9 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
-RCT_NOT_IMPLEMENTED(- (instancetype)init)
-RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)decoder)
-RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
+RCT_NOT_IMPLEMENTED(-(instancetype)init)
+RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)decoder)
+RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
 
 - (UIView<RCTBackedTextInputViewProtocol> *)backedTextInputView
 {
@@ -68,9 +68,9 @@ - (void)enforceTextAttributesIfNeeded
 {
   id<RCTBackedTextInputViewProtocol> backedTextInputView = self.backedTextInputView;
 
-  NSDictionary<NSAttributedStringKey,id> *textAttributes = [[_textAttributes effectiveTextAttributes] mutableCopy];
+  NSDictionary<NSAttributedStringKey, id> *textAttributes = [[_textAttributes effectiveTextAttributes] mutableCopy];
   if ([textAttributes valueForKey:NSForegroundColorAttributeName] == nil) {
-      [textAttributes setValue:[UIColor blackColor] forKey:NSForegroundColorAttributeName];
+    [textAttributes setValue:[UIColor blackColor] forKey:NSForegroundColorAttributeName];
   }
 
   backedTextInputView.defaultTextAttributes = textAttributes;
@@ -97,30 +97,33 @@ - (NSAttributedString *)attributedText
   return self.backedTextInputView.attributedText;
 }
 
-- (BOOL)textOf:(NSAttributedString*)newText equals:(NSAttributedString*)oldText{
+- (BOOL)textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldText
+{
   // When the dictation is running we can't update the attributed text on the backed up text view
   // because setting the attributed string will kill the dictation. This means that we can't impose
   // the settings on a dictation.
   // Similarly, when the user is in the middle of inputting some text in Japanese/Chinese, there will be styling on the
-  // text that we should disregard. See https://developer.apple.com/documentation/uikit/uitextinput/1614489-markedtextrange?language=objc
-  // for more info.
+  // text that we should disregard. See
+  // https://developer.apple.com/documentation/uikit/uitextinput/1614489-markedtextrange?language=objc for more info.
   // Also, updating the attributed text while inputting Korean language will break input mechanism.
-  // If the user added an emoji, the system adds a font attribute for the emoji and stores the original font in NSOriginalFont.
-  // Lastly, when entering a password, etc., there will be additional styling on the field as the native text view
-  // handles showing the last character for a split second.
+  // If the user added an emoji, the system adds a font attribute for the emoji and stores the original font in
+  // NSOriginalFont. Lastly, when entering a password, etc., there will be additional styling on the field as the native
+  // text view handles showing the last character for a split second.
   __block BOOL fontHasBeenUpdatedBySystem = false;
-  [oldText enumerateAttribute:@"NSOriginalFont" inRange:NSMakeRange(0, oldText.length) options:0 usingBlock:^(id value, NSRange range, BOOL *stop) {
-    if (value){
-      fontHasBeenUpdatedBySystem = true;
-    }
-  }];
+  [oldText enumerateAttribute:@"NSOriginalFont"
+                      inRange:NSMakeRange(0, oldText.length)
+                      options:0
+                   usingBlock:^(id value, NSRange range, BOOL *stop) {
+                     if (value) {
+                       fontHasBeenUpdatedBySystem = true;
+                     }
+                   }];
 
   BOOL shouldFallbackToBareTextComparison =
-    [self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"dictation"] ||
-    [self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"ko-KR"] ||
-    self.backedTextInputView.markedTextRange ||
-    self.backedTextInputView.isSecureTextEntry ||
-    fontHasBeenUpdatedBySystem;
+      [self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"dictation"] ||
+      [self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"ko-KR"] ||
+      self.backedTextInputView.markedTextRange || self.backedTextInputView.isSecureTextEntry ||
+      fontHasBeenUpdatedBySystem;
 
   if (shouldFallbackToBareTextComparison) {
     return ([newText.string isEqualToString:oldText.string]);
@@ -153,21 +156,23 @@ - (void)setAttributedText:(NSAttributedString *)attributedText
 
     if (selection.empty) {
       // Maintaining a cursor position relative to the end of the old text.
-      NSInteger offsetStart =
-      [self.backedTextInputView offsetFromPosition:self.backedTextInputView.beginningOfDocument
-                                        toPosition:selection.start];
+      NSInteger offsetStart = [self.backedTextInputView offsetFromPosition:self.backedTextInputView.beginningOfDocument
+                                                                toPosition:selection.start];
       NSInteger offsetFromEnd = oldTextLength - offsetStart;
       NSInteger newOffset = attributedText.string.length - offsetFromEnd;
       UITextPosition *position =
-      [self.backedTextInputView positionFromPosition:self.backedTextInputView.beginningOfDocument
-                                              offset:newOffset];
-      [self.backedTextInputView setSelectedTextRange:[self.backedTextInputView textRangeFromPosition:position toPosition:position]
+          [self.backedTextInputView positionFromPosition:self.backedTextInputView.beginningOfDocument offset:newOffset];
+      [self.backedTextInputView setSelectedTextRange:[self.backedTextInputView textRangeFromPosition:position
+                                                                                          toPosition:position]
                                       notifyDelegate:YES];
     }
 
     [self updateLocalData];
   } else if (eventLag > RCTTextUpdateLagWarningThreshold) {
-    RCTLog(@"Native TextInput(%@) is %lld events ahead of JS - try to make your JS faster.", self.backedTextInputView.attributedText.string, (long long)eventLag);
+    RCTLog(
+        @"Native TextInput(%@) is %lld events ahead of JS - try to make your JS faster.",
+        self.backedTextInputView.attributedText.string,
+        (long long)eventLag);
   }
 }
 
@@ -175,8 +180,11 @@ - (RCTTextSelection *)selection
 {
   id<RCTBackedTextInputViewProtocol> backedTextInputView = self.backedTextInputView;
   UITextRange *selectedTextRange = backedTextInputView.selectedTextRange;
-  return [[RCTTextSelection new] initWithStart:[backedTextInputView offsetFromPosition:backedTextInputView.beginningOfDocument toPosition:selectedTextRange.start]
-                                           end:[backedTextInputView offsetFromPosition:backedTextInputView.beginningOfDocument toPosition:selectedTextRange.end]];
+  return [[RCTTextSelection new]
+      initWithStart:[backedTextInputView offsetFromPosition:backedTextInputView.beginningOfDocument
+                                                 toPosition:selectedTextRange.start]
+                end:[backedTextInputView offsetFromPosition:backedTextInputView.beginningOfDocument
+                                                 toPosition:selectedTextRange.end]];
 }
 
 - (void)setSelection:(RCTTextSelection *)selection
@@ -188,25 +196,29 @@ - (void)setSelection:(RCTTextSelection *)selection
   id<RCTBackedTextInputViewProtocol> backedTextInputView = self.backedTextInputView;
 
   UITextRange *previousSelectedTextRange = backedTextInputView.selectedTextRange;
-  UITextPosition *start = [backedTextInputView positionFromPosition:backedTextInputView.beginningOfDocument offset:selection.start];
-  UITextPosition *end = [backedTextInputView positionFromPosition:backedTextInputView.beginningOfDocument offset:selection.end];
+  UITextPosition *start = [backedTextInputView positionFromPosition:backedTextInputView.beginningOfDocument
+                                                             offset:selection.start];
+  UITextPosition *end = [backedTextInputView positionFromPosition:backedTextInputView.beginningOfDocument
+                                                           offset:selection.end];
   UITextRange *selectedTextRange = [backedTextInputView textRangeFromPosition:start toPosition:end];
 
   NSInteger eventLag = _nativeEventCount - _mostRecentEventCount;
   if (eventLag == 0 && ![previousSelectedTextRange isEqual:selectedTextRange]) {
     [backedTextInputView setSelectedTextRange:selectedTextRange notifyDelegate:NO];
   } else if (eventLag > RCTTextUpdateLagWarningThreshold) {
-    RCTLog(@"Native TextInput(%@) is %lld events ahead of JS - try to make your JS faster.", backedTextInputView.attributedText.string, (long long)eventLag);
+    RCTLog(
+        @"Native TextInput(%@) is %lld events ahead of JS - try to make your JS faster.",
+        backedTextInputView.attributedText.string,
+        (long long)eventLag);
   }
 }
 
-- (void)setSelectionStart:(NSInteger)start
-             selectionEnd:(NSInteger)end
+- (void)setSelectionStart:(NSInteger)start selectionEnd:(NSInteger)end
 {
-  UITextPosition *startPosition = [self.backedTextInputView positionFromPosition:self.backedTextInputView.beginningOfDocument
-                                                                          offset:start];
-  UITextPosition *endPosition = [self.backedTextInputView positionFromPosition:self.backedTextInputView.beginningOfDocument
-                                                                        offset:end];
+  UITextPosition *startPosition =
+      [self.backedTextInputView positionFromPosition:self.backedTextInputView.beginningOfDocument offset:start];
+  UITextPosition *endPosition =
+      [self.backedTextInputView positionFromPosition:self.backedTextInputView.beginningOfDocument offset:end];
   if (startPosition && endPosition) {
     UITextRange *range = [self.backedTextInputView textRangeFromPosition:startPosition toPosition:endPosition];
     [self.backedTextInputView setSelectedTextRange:range notifyDelegate:NO];
@@ -215,66 +227,66 @@ - (void)setSelectionStart:(NSInteger)start
 
 - (void)setTextContentType:(NSString *)type
 {
-  #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED)
-    static dispatch_once_t onceToken;
-    static NSDictionary<NSString *, NSString *> *contentTypeMap;
-
-    dispatch_once(&onceToken, ^{
-      contentTypeMap = @{@"none": @"",
-                          @"URL": UITextContentTypeURL,
-                          @"addressCity": UITextContentTypeAddressCity,
-                          @"addressCityAndState":UITextContentTypeAddressCityAndState,
-                          @"addressState": UITextContentTypeAddressState,
-                          @"countryName": UITextContentTypeCountryName,
-                          @"creditCardNumber": UITextContentTypeCreditCardNumber,
-                          @"emailAddress": UITextContentTypeEmailAddress,
-                          @"familyName": UITextContentTypeFamilyName,
-                          @"fullStreetAddress": UITextContentTypeFullStreetAddress,
-                          @"givenName": UITextContentTypeGivenName,
-                          @"jobTitle": UITextContentTypeJobTitle,
-                          @"location": UITextContentTypeLocation,
-                          @"middleName": UITextContentTypeMiddleName,
-                          @"name": UITextContentTypeName,
-                          @"namePrefix": UITextContentTypeNamePrefix,
-                          @"nameSuffix": UITextContentTypeNameSuffix,
-                          @"nickname": UITextContentTypeNickname,
-                          @"organizationName": UITextContentTypeOrganizationName,
-                          @"postalCode": UITextContentTypePostalCode,
-                          @"streetAddressLine1": UITextContentTypeStreetAddressLine1,
-                          @"streetAddressLine2": UITextContentTypeStreetAddressLine2,
-                          @"sublocality": UITextContentTypeSublocality,
-                          @"telephoneNumber": UITextContentTypeTelephoneNumber,
-                          @"username": UITextContentTypeUsername,
-                          @"password": UITextContentTypePassword,
-                          };
-
-      #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000 /* __IPHONE_12_0 */
-        if (@available(iOS 12.0, *)) {
-          NSDictionary<NSString *, NSString *> * iOS12extras = @{@"newPassword": UITextContentTypeNewPassword,
-                                                                  @"oneTimeCode": UITextContentTypeOneTimeCode};
-
-          NSMutableDictionary<NSString *, NSString *> * iOS12baseMap = [contentTypeMap mutableCopy];
-          [iOS12baseMap addEntriesFromDictionary:iOS12extras];
-
-          contentTypeMap = [iOS12baseMap copy];
-        }
-      #endif
-    });
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED)
+  static dispatch_once_t onceToken;
+  static NSDictionary<NSString *, NSString *> *contentTypeMap;
+
+  dispatch_once(&onceToken, ^{
+    contentTypeMap = @{
+      @"none" : @"",
+      @"URL" : UITextContentTypeURL,
+      @"addressCity" : UITextContentTypeAddressCity,
+      @"addressCityAndState" : UITextContentTypeAddressCityAndState,
+      @"addressState" : UITextContentTypeAddressState,
+      @"countryName" : UITextContentTypeCountryName,
+      @"creditCardNumber" : UITextContentTypeCreditCardNumber,
+      @"emailAddress" : UITextContentTypeEmailAddress,
+      @"familyName" : UITextContentTypeFamilyName,
+      @"fullStreetAddress" : UITextContentTypeFullStreetAddress,
+      @"givenName" : UITextContentTypeGivenName,
+      @"jobTitle" : UITextContentTypeJobTitle,
+      @"location" : UITextContentTypeLocation,
+      @"middleName" : UITextContentTypeMiddleName,
+      @"name" : UITextContentTypeName,
+      @"namePrefix" : UITextContentTypeNamePrefix,
+      @"nameSuffix" : UITextContentTypeNameSuffix,
+      @"nickname" : UITextContentTypeNickname,
+      @"organizationName" : UITextContentTypeOrganizationName,
+      @"postalCode" : UITextContentTypePostalCode,
+      @"streetAddressLine1" : UITextContentTypeStreetAddressLine1,
+      @"streetAddressLine2" : UITextContentTypeStreetAddressLine2,
+      @"sublocality" : UITextContentTypeSublocality,
+      @"telephoneNumber" : UITextContentTypeTelephoneNumber,
+      @"username" : UITextContentTypeUsername,
+      @"password" : UITextContentTypePassword,
+    };
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000 /* __IPHONE_12_0 */
+    if (@available(iOS 12.0, *)) {
+      NSDictionary<NSString *, NSString *> *iOS12extras =
+          @{@"newPassword" : UITextContentTypeNewPassword, @"oneTimeCode" : UITextContentTypeOneTimeCode};
 
-    // Setting textContentType to an empty string will disable any
-    // default behaviour, like the autofill bar for password inputs
-    self.backedTextInputView.textContentType = contentTypeMap[type] ?: type;
-  #endif
-}
+      NSMutableDictionary<NSString *, NSString *> *iOS12baseMap = [contentTypeMap mutableCopy];
+      [iOS12baseMap addEntriesFromDictionary:iOS12extras];
+
+      contentTypeMap = [iOS12baseMap copy];
+    }
+#endif
+  });
 
+  // Setting textContentType to an empty string will disable any
+  // default behaviour, like the autofill bar for password inputs
+  self.backedTextInputView.textContentType = contentTypeMap[type] ?: type;
+#endif
+}
 
 - (void)setPasswordRules:(NSString *)descriptor
 {
-  #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_12_0
-    if (@available(iOS 12.0, *)) {
-      self.backedTextInputView.passwordRules = [UITextInputPasswordRules passwordRulesWithDescriptor:descriptor];
-    }
-  #endif
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_12_0
+  if (@available(iOS 12.0, *)) {
+    self.backedTextInputView.passwordRules = [UITextInputPasswordRules passwordRulesWithDescriptor:descriptor];
+  }
+#endif
 }
 
 - (UIKeyboardType)keyboardType
@@ -287,7 +299,8 @@ - (void)setKeyboardType:(UIKeyboardType)keyboardType
   UIView<RCTBackedTextInputViewProtocol> *textInputView = self.backedTextInputView;
   if (textInputView.keyboardType != keyboardType) {
     textInputView.keyboardType = keyboardType;
-    // Without the call to reloadInputViews, the keyboard will not change until the textview field (the first responder) loses and regains focus.
+    // Without the call to reloadInputViews, the keyboard will not change until the textview field (the first responder)
+    // loses and regains focus.
     if (textInputView.isFirstResponder) {
       [textInputView reloadInputViews];
     }
@@ -350,20 +363,28 @@ - (void)textInputDidEndEditing
                                eventCount:_nativeEventCount];
 }
 
-- (BOOL)textInputShouldReturn
+- (BOOL)textInputShouldSubmitOnReturn
 {
-  // We send `submit` event here, in `textInputShouldReturn`
-  // (not in `textInputDidReturn)`, because of semantic of the event:
-  // `onSubmitEditing` is called when "Submit" button
-  // (the blue key on onscreen keyboard) did pressed
-  // (no connection to any specific "submitting" process).
-  [_eventDispatcher sendTextEventWithType:RCTTextEventTypeSubmit
-                                 reactTag:self.reactTag
-                                     text:[self.backedTextInputView.attributedText.string copy]
-                                      key:nil
-                               eventCount:_nativeEventCount];
+  const BOOL shouldSubmit =
+      [_submitBehavior isEqualToString:@"blurAndSubmit"] || [_submitBehavior isEqualToString:@"submit"];
+  if (shouldSubmit) {
+    // We send `submit` event here, in `textInputShouldSubmit`
+    // (not in `textInputDidReturn)`, because of semantic of the event:
+    // `onSubmitEditing` is called when "Submit" button
+    // (the blue key on onscreen keyboard) did pressed
+    // (no connection to any specific "submitting" process).
+    [_eventDispatcher sendTextEventWithType:RCTTextEventTypeSubmit
+                                   reactTag:self.reactTag
+                                       text:[self.backedTextInputView.attributedText.string copy]
+                                        key:nil
+                                 eventCount:_nativeEventCount];
+  }
+  return shouldSubmit;
+}
 
-  return _blurOnSubmit;
+- (BOOL)textInputShouldReturn
+{
+  return [_submitBehavior isEqualToString:@"blurAndSubmit"];
 }
 
 - (void)textInputDidReturn
@@ -384,16 +405,18 @@ - (NSString *)textInputShouldChangeText:(NSString *)text inRange:(NSRange)range
   }
 
   if (_maxLength) {
-    NSInteger allowedLength = MAX(_maxLength.integerValue - (NSInteger)backedTextInputView.attributedText.string.length + (NSInteger)range.length, 0);
+    NSInteger allowedLength = MAX(
+        _maxLength.integerValue - (NSInteger)backedTextInputView.attributedText.string.length + (NSInteger)range.length,
+        0);
 
     if (text.length > allowedLength) {
       // If we typed/pasted more than one character, limit the text inputted.
       if (text.length > 1) {
         if (allowedLength > 0) {
-          //make sure unicode characters that are longer than 16 bits (such as emojis) are not cut off
-          NSRange cutOffCharacterRange = [text rangeOfComposedCharacterSequenceAtIndex: allowedLength - 1];
+          // make sure unicode characters that are longer than 16 bits (such as emojis) are not cut off
+          NSRange cutOffCharacterRange = [text rangeOfComposedCharacterSequenceAtIndex:allowedLength - 1];
           if (cutOffCharacterRange.location + cutOffCharacterRange.length > allowedLength) {
-            //the character at the length limit takes more than 16bits, truncation should end at the character before
+            // the character at the length limit takes more than 16bits, truncation should end at the character before
             allowedLength = cutOffCharacterRange.location;
           }
         }
@@ -402,7 +425,9 @@ - (NSString *)textInputShouldChangeText:(NSString *)text inRange:(NSRange)range
         NSMutableAttributedString *newAttributedText = [backedTextInputView.attributedText mutableCopy];
         // Apply text attributes if original input view doesn't have text.
         if (backedTextInputView.attributedText.length == 0) {
-          newAttributedText = [[NSMutableAttributedString alloc] initWithString:[self.textAttributes applyTextAttributesToText:limitedString] attributes:self.textAttributes.effectiveTextAttributes];
+          newAttributedText = [[NSMutableAttributedString alloc]
+              initWithString:[self.textAttributes applyTextAttributesToText:limitedString]
+                  attributes:self.textAttributes.effectiveTextAttributes];
         } else {
           [newAttributedText replaceCharactersInRange:range withString:limitedString];
         }
@@ -412,7 +437,8 @@ - (NSString *)textInputShouldChangeText:(NSString *)text inRange:(NSRange)range
         // Collapse selection at end of insert to match normal paste behavior.
         UITextPosition *insertEnd = [backedTextInputView positionFromPosition:backedTextInputView.beginningOfDocument
                                                                        offset:(range.location + allowedLength)];
-        [backedTextInputView setSelectedTextRange:[backedTextInputView textRangeFromPosition:insertEnd toPosition:insertEnd]
+        [backedTextInputView setSelectedTextRange:[backedTextInputView textRangeFromPosition:insertEnd
+                                                                                  toPosition:insertEnd]
                                    notifyDelegate:YES];
 
         [self textInputDidChange];
@@ -427,18 +453,18 @@ - (NSString *)textInputShouldChangeText:(NSString *)text inRange:(NSRange)range
   if (range.location + range.length > backedTextInputView.attributedText.string.length) {
     _predictedText = backedTextInputView.attributedText.string;
   } else {
-    _predictedText = [backedTextInputView.attributedText.string stringByReplacingCharactersInRange:range withString:text];
+    _predictedText = [backedTextInputView.attributedText.string stringByReplacingCharactersInRange:range
+                                                                                        withString:text];
   }
 
   if (_onTextInput) {
     _onTextInput(@{
-      @"text": text,
-      @"previousText": previousText,
-      @"range": @{
-        @"start": @(range.location),
-        @"end": @(range.location + range.length)
-      },
-      @"eventCount": @(_nativeEventCount),
+      // We copy the string here because if it's a mutable string it may get released before we stop using it on a
+      // different thread, causing a crash.
+      @"text" : [text copy],
+      @"previousText" : previousText,
+      @"range" : @{@"start" : @(range.location), @"end" : @(range.location + range.length)},
+      @"eventCount" : @(_nativeEventCount),
     });
   }
 
@@ -468,9 +494,9 @@ - (void)textInputDidChange
 
   if (_onChange) {
     _onChange(@{
-       @"text": [self.attributedText.string copy],
-       @"target": self.reactTag,
-       @"eventCount": @(_nativeEventCount),
+      @"text" : [self.attributedText.string copy],
+      @"target" : self.reactTag,
+      @"eventCount" : @(_nativeEventCount),
     });
   }
 }
@@ -484,9 +510,9 @@ - (void)textInputDidChangeSelection
   RCTTextSelection *selection = self.selection;
 
   _onSelectionChange(@{
-    @"selection": @{
-      @"start": @(selection.start),
-      @"end": @(selection.end),
+    @"selection" : @{
+      @"start" : @(selection.start),
+      @"end" : @(selection.end),
     },
   });
 }
@@ -495,8 +521,7 @@ - (void)updateLocalData
 {
   [self enforceTextAttributesIfNeeded];
 
-  [_bridge.uiManager setLocalData:[self.backedTextInputView.attributedText copy]
-                          forView:self];
+  [_bridge.uiManager setLocalData:[self.backedTextInputView.attributedText copy] forView:self];
 }
 
 #pragma mark - Layout (in UIKit terms, with all insets)
@@ -573,17 +598,19 @@ - (void)didSetProps:(NSArray<NSString *> *)changedProps
 - (void)setCustomInputAccessoryViewWithNativeID:(NSString *)nativeID
 {
   __weak RCTBaseTextInputView *weakSelf = self;
-  [_bridge.uiManager rootViewForReactTag:self.reactTag withCompletion:^(UIView *rootView) {
-    RCTBaseTextInputView *strongSelf = weakSelf;
-    if (rootView) {
-      UIView *accessoryView = [strongSelf->_bridge.uiManager viewForNativeID:nativeID
-                                                                 withRootTag:rootView.reactTag];
-      if (accessoryView && [accessoryView isKindOfClass:[RCTInputAccessoryView class]]) {
-        strongSelf.backedTextInputView.inputAccessoryView = ((RCTInputAccessoryView *)accessoryView).inputAccessoryView;
-        [strongSelf reloadInputViewsIfNecessary];
-      }
-    }
-  }];
+  [_bridge.uiManager rootViewForReactTag:self.reactTag
+                          withCompletion:^(UIView *rootView) {
+                            RCTBaseTextInputView *strongSelf = weakSelf;
+                            if (rootView) {
+                              UIView *accessoryView = [strongSelf->_bridge.uiManager viewForNativeID:nativeID
+                                                                                         withRootTag:rootView.reactTag];
+                              if (accessoryView && [accessoryView isKindOfClass:[RCTInputAccessoryView class]]) {
+                                strongSelf.backedTextInputView.inputAccessoryView =
+                                    ((RCTInputAccessoryView *)accessoryView).inputAccessoryView;
+                                [strongSelf reloadInputViewsIfNecessary];
+                              }
+                            }
+                          }];
 }
 
 - (void)setDefaultInputAccessoryView
@@ -594,12 +621,8 @@ - (void)setDefaultInputAccessoryView
   // These keyboard types (all are number pads) don't have a "Done" button by default,
   // so we create an `inputAccessoryView` with this button for them.
   BOOL shouldHaveInputAccesoryView =
-      (
-       keyboardType == UIKeyboardTypeNumberPad ||
-       keyboardType == UIKeyboardTypePhonePad ||
-       keyboardType == UIKeyboardTypeDecimalPad ||
-       keyboardType == UIKeyboardTypeASCIICapableNumberPad
-      ) &&
+      (keyboardType == UIKeyboardTypeNumberPad || keyboardType == UIKeyboardTypePhonePad ||
+       keyboardType == UIKeyboardTypeDecimalPad || keyboardType == UIKeyboardTypeASCIICapableNumberPad) &&
       textInputView.returnKeyType == UIReturnKeyDone;
 
   if (_hasInputAccesoryView == shouldHaveInputAccesoryView) {
@@ -612,17 +635,14 @@ - (void)setDefaultInputAccessoryView
     UIToolbar *toolbarView = [UIToolbar new];
     [toolbarView sizeToFit];
     UIBarButtonItem *flexibleSpace =
-      [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace
-                                                    target:nil
-                                                    action:nil];
+        [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil];
     UIBarButtonItem *doneButton =
-      [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone
-                                                    target:self
-                                                    action:@selector(handleInputAccessoryDoneButton)];
-    toolbarView.items = @[flexibleSpace, doneButton];
+        [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone
+                                                      target:self
+                                                      action:@selector(handleInputAccessoryDoneButton)];
+    toolbarView.items = @[ flexibleSpace, doneButton ];
     textInputView.inputAccessoryView = toolbarView;
-  }
-  else {
+  } else {
     textInputView.inputAccessoryView = nil;
   }
   [self reloadInputViewsIfNecessary];
@@ -638,6 +658,8 @@ - (void)reloadInputViewsIfNecessary
 
 - (void)handleInputAccessoryDoneButton
 {
+  // Ignore the value of whether we submitted; just make sure the submit event is called if necessary.
+  [self textInputShouldSubmitOnReturn];
   if ([self textInputShouldReturn]) {
     [self.backedTextInputView endEditing:YES];
   }
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
index b1ecf854330b..47da2cefee59 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
@@ -13,8 +13,8 @@
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTShadowView.h>
 #import <React/RCTUIManager.h>
-#import <React/RCTUIManagerUtils.h>
 #import <React/RCTUIManagerObserverCoordinator.h>
+#import <React/RCTUIManagerUtils.h>
 
 #import <React/RCTBaseTextInputShadowView.h>
 #import <React/RCTBaseTextInputView.h>
@@ -24,8 +24,7 @@ @interface RCTBaseTextInputViewManager () <RCTUIManagerObserver>
 
 @end
 
-@implementation RCTBaseTextInputViewManager
-{
+@implementation RCTBaseTextInputViewManager {
   NSHashTable<RCTBaseTextInputShadowView *> *_shadowViews;
 }
 
@@ -49,7 +48,7 @@ @implementation RCTBaseTextInputViewManager
 RCT_REMAP_VIEW_PROPERTY(scrollEnabled, backedTextInputView.scrollEnabled, BOOL)
 RCT_REMAP_VIEW_PROPERTY(secureTextEntry, backedTextInputView.secureTextEntry, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(autoFocus, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(blurOnSubmit, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(submitBehavior, NSString)
 RCT_EXPORT_VIEW_PROPERTY(clearTextOnFocus, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(keyboardType, UIKeyboardType)
 RCT_EXPORT_VIEW_PROPERTY(showSoftInputOnFocus, BOOL)
@@ -76,15 +75,16 @@ @implementation RCTBaseTextInputViewManager
 RCT_CUSTOM_VIEW_PROPERTY(multiline, BOOL, UIView)
 {
   // No op.
-  // This View Manager doesn't use this prop but it must be exposed here via ViewConfig to enable Fabric component use it.
+  // This View Manager doesn't use this prop but it must be exposed here via ViewConfig to enable Fabric component use
+  // it.
 }
 
 - (RCTShadowView *)shadowView
 {
   RCTBaseTextInputShadowView *shadowView = [[RCTBaseTextInputShadowView alloc] initWithBridge:self.bridge];
-  shadowView.textAttributes.fontSizeMultiplier = [[[self.bridge
-                                                    moduleForName:@"AccessibilityManager"
-                                                    lazilyLoadIfNecessary:YES] valueForKey:@"multiplier"] floatValue];
+  shadowView.textAttributes.fontSizeMultiplier =
+      [[[self.bridge moduleForName:@"AccessibilityManager"
+             lazilyLoadIfNecessary:YES] valueForKey:@"multiplier"] floatValue];
   [_shadowViews addObject:shadowView];
   return shadowView;
 }
@@ -101,7 +101,7 @@ - (void)setBridge:(RCTBridge *)bridge
                                            selector:@selector(handleDidUpdateMultiplierNotification)
                                                name:@"RCTAccessibilityManagerDidUpdateMultiplierNotification"
                                              object:[bridge moduleForName:@"AccessibilityManager"
-                                                    lazilyLoadIfNecessary:YES]];
+                                                        lazilyLoadIfNecessary:YES]];
 }
 
 RCT_EXPORT_METHOD(focus : (nonnull NSNumber *)viewTag)
@@ -120,11 +120,12 @@ - (void)setBridge:(RCTBridge *)bridge
   }];
 }
 
-RCT_EXPORT_METHOD(setTextAndSelection : (nonnull NSNumber *)viewTag
-                 mostRecentEventCount : (NSInteger)mostRecentEventCount
-                                value : (NSString *)value
-                                start : (NSInteger)start
-                                  end : (NSInteger)end)
+RCT_EXPORT_METHOD(setTextAndSelection
+                  : (nonnull NSNumber *)viewTag mostRecentEventCount
+                  : (NSInteger)mostRecentEventCount value
+                  : (NSString *)value start
+                  : (NSInteger)start end
+                  : (NSInteger)end)
 {
   [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
     RCTBaseTextInputView *view = (RCTBaseTextInputView *)viewRegistry[viewTag];
@@ -133,7 +134,8 @@ - (void)setBridge:(RCTBridge *)bridge
       return;
     }
     RCTExecuteOnUIManagerQueue(^{
-      RCTBaseTextInputShadowView *shadowView = (RCTBaseTextInputShadowView *)[self.bridge.uiManager shadowViewForReactTag:viewTag];
+      RCTBaseTextInputShadowView *shadowView =
+          (RCTBaseTextInputShadowView *)[self.bridge.uiManager shadowViewForReactTag:viewTag];
       if (value) {
         [shadowView setText:value];
       }
@@ -158,8 +160,8 @@ - (void)uiManagerWillPerformMounting:(__unused RCTUIManager *)uiManager
 
 - (void)handleDidUpdateMultiplierNotification
 {
-  CGFloat fontSizeMultiplier = [[[self.bridge moduleForName:@"AccessibilityManager"]
-                                 valueForKey:@"multiplier"] floatValue];
+  CGFloat fontSizeMultiplier =
+      [[[self.bridge moduleForName:@"AccessibilityManager"] valueForKey:@"multiplier"] floatValue];
 
   NSHashTable<RCTBaseTextInputShadowView *> *shadowViews = _shadowViews;
   RCTExecuteOnUIManagerQueue(^{
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m b/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m
index 8322bfc7f3e8..0bb54d3dac8a 100644
--- a/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m
+++ b/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m
@@ -14,7 +14,7 @@ @implementation RCTInputAccessoryShadowView
 - (void)insertReactSubview:(RCTShadowView *)subview atIndex:(NSInteger)atIndex
 {
   [super insertReactSubview:subview atIndex:atIndex];
-  subview.width = (YGValue) { RCTScreenSize().width, YGUnitPoint };
+  subview.width = (YGValue){RCTScreenSize().width, YGUnitPoint};
 }
 
 @end
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryView.m b/Libraries/Text/TextInput/RCTInputAccessoryView.m
index 05fbec5154e5..f41263651b75 100644
--- a/Libraries/Text/TextInput/RCTInputAccessoryView.m
+++ b/Libraries/Text/TextInput/RCTInputAccessoryView.m
@@ -13,15 +13,14 @@
 
 #import <React/RCTInputAccessoryViewContent.h>
 
-@interface RCTInputAccessoryView()
+@interface RCTInputAccessoryView ()
 
 // Overriding `inputAccessoryView` to `readwrite`.
 @property (nonatomic, readwrite, retain) UIView *inputAccessoryView;
 
 @end
 
-@implementation RCTInputAccessoryView
-{
+@implementation RCTInputAccessoryView {
   BOOL _shouldBecomeFirstResponder;
 }
 
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m
index cb846f1488d8..7fd8808c14fc 100644
--- a/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m
+++ b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m
@@ -9,8 +9,7 @@
 
 #import <React/UIView+React.h>
 
-@implementation RCTInputAccessoryViewContent
-{
+@implementation RCTInputAccessoryViewContent {
   UIView *_safeAreaContainer;
   NSLayoutConstraint *_heightConstraint;
 }
diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m
index 51feea12f866..eeb156932107 100644
--- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m
+++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m
@@ -11,16 +11,15 @@
 
 #import <React/RCTUITextField.h>
 
-@implementation RCTSinglelineTextInputView
-{
+@implementation RCTSinglelineTextInputView {
   RCTUITextField *_backedTextInputView;
 }
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
 {
   if (self = [super initWithBridge:bridge]) {
-    // `blurOnSubmit` defaults to `true` for <TextInput multiline={false}> by design.
-    self.blurOnSubmit = YES;
+    // `submitBehavior` defaults to `"blurAndSubmit"` for <TextInput multiline={false}> by design.
+    self.submitBehavior = @"blurAndSubmit";
 
     _backedTextInputView = [[RCTUITextField alloc] initWithFrame:self.bounds];
     _backedTextInputView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m
index 1fa2dc55b5ae..413ac4223878 100644
--- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m
+++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m
@@ -16,8 +16,7 @@ @implementation RCTSinglelineTextInputViewManager
 
 - (RCTShadowView *)shadowView
 {
-  RCTBaseTextInputShadowView *shadowView =
-    (RCTBaseTextInputShadowView *)[super shadowView];
+  RCTBaseTextInputShadowView *shadowView = (RCTBaseTextInputShadowView *)[super shadowView];
 
   shadowView.maximumNumberOfLines = 1;
 
diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.h b/Libraries/Text/TextInput/Singleline/RCTUITextField.h
index 358e137f1326..b26b41f8693d 100644
--- a/Libraries/Text/TextInput/Singleline/RCTUITextField.h
+++ b/Libraries/Text/TextInput/Singleline/RCTUITextField.h
@@ -7,8 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
-#import <React/RCTBackedTextInputViewProtocol.h>
 #import <React/RCTBackedTextInputDelegate.h>
+#import <React/RCTBackedTextInputViewProtocol.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.m b/Libraries/Text/TextInput/Singleline/RCTUITextField.m
index b71ef0c9613e..3d116019b89c 100644
--- a/Libraries/Text/TextInput/Singleline/RCTUITextField.m
+++ b/Libraries/Text/TextInput/Singleline/RCTUITextField.m
@@ -7,10 +7,10 @@
 
 #import <React/RCTUITextField.h>
 
-#import <React/RCTUtils.h>
-#import <React/UIView+React.h>
 #import <React/RCTBackedTextInputDelegateAdapter.h>
 #import <React/RCTTextAttributes.h>
+#import <React/RCTUtils.h>
+#import <React/UIView+React.h>
 
 @implementation RCTUITextField {
   RCTBackedTextFieldDelegateAdapter *_textInputDelegateAdapter;
@@ -43,7 +43,8 @@ - (void)setIsAccessibilityElement:(BOOL)isAccessibilityElement
 {
   // UITextField is accessible by default (some nested views are) and disabling that is not supported.
   // On iOS accessible elements cannot be nested, therefore enabling accessibility for some container view
-  // (even in a case where this view is a part of public API of TextInput on iOS) shadows some features implemented inside the component.
+  // (even in a case where this view is a part of public API of TextInput on iOS) shadows some features implemented
+  // inside the component.
 }
 
 #pragma mark - Properties
@@ -118,7 +119,8 @@ - (void)setSecureTextEntry:(BOOL)secureTextEntry
 
 - (NSDictionary<NSAttributedStringKey, id> *)_placeholderTextAttributes
 {
-  NSMutableDictionary<NSAttributedStringKey, id> *textAttributes = [_defaultTextAttributes mutableCopy] ?: [NSMutableDictionary new];
+  NSMutableDictionary<NSAttributedStringKey, id> *textAttributes =
+      [_defaultTextAttributes mutableCopy] ?: [NSMutableDictionary new];
 
   if (self.placeholderColor) {
     [textAttributes setValue:self.placeholderColor forKey:NSForegroundColorAttributeName];
@@ -188,8 +190,8 @@ - (void)setSelectedTextRange:(UITextRange *)selectedTextRange notifyDelegate:(BO
 
 - (void)paste:(id)sender
 {
-  [super paste:sender];
   _textWasPasted = YES;
+  [super paste:sender];
 }
 
 #pragma mark - Layout
diff --git a/Libraries/Text/TextNativeComponent.js b/Libraries/Text/TextNativeComponent.js
index ef680f39f43e..0d5990455b5b 100644
--- a/Libraries/Text/TextNativeComponent.js
+++ b/Libraries/Text/TextNativeComponent.js
@@ -8,13 +8,13 @@
  * @format
  */
 
-import ReactNativeViewAttributes from '../Components/View/ReactNativeViewAttributes';
+import {createViewConfig} from '../NativeComponent/ViewConfig';
 import UIManager from '../ReactNative/UIManager';
-import {type HostComponent} from '../Renderer/shims/ReactNativeTypes';
 import createReactNativeComponentClass from '../Renderer/shims/createReactNativeComponentClass';
+import {type HostComponent} from '../Renderer/shims/ReactNativeTypes';
 import {type ProcessedColorValue} from '../StyleSheet/processColor';
-import {type TextProps} from './TextProps';
 import {type PressEvent} from '../Types/CoreEventTypes';
+import {type TextProps} from './TextProps';
 
 type NativeTextProps = $ReadOnly<{
   ...TextProps,
@@ -27,47 +27,55 @@ type NativeTextProps = $ReadOnly<{
   isPressable?: ?boolean,
 }>;
 
-export const NativeText: HostComponent<NativeTextProps> =
-  (createReactNativeComponentClass('RCTText', () => ({
-    validAttributes: {
-      ...ReactNativeViewAttributes.UIView,
-      isHighlighted: true,
-      isPressable: true,
-      numberOfLines: true,
-      ellipsizeMode: true,
-      allowFontScaling: true,
-      maxFontSizeMultiplier: true,
-      disabled: true,
-      selectable: true,
-      selectionColor: true,
-      adjustsFontSizeToFit: true,
-      minimumFontScale: true,
-      textBreakStrategy: true,
-      onTextLayout: true,
-      onInlineViewLayout: true,
-      dataDetectorType: true,
-      android_hyphenationFrequency: true,
+const textViewConfig = {
+  validAttributes: {
+    isHighlighted: true,
+    isPressable: true,
+    numberOfLines: true,
+    ellipsizeMode: true,
+    allowFontScaling: true,
+    dynamicTypeRamp: true,
+    maxFontSizeMultiplier: true,
+    disabled: true,
+    selectable: true,
+    selectionColor: true,
+    adjustsFontSizeToFit: true,
+    minimumFontScale: true,
+    textBreakStrategy: true,
+    onTextLayout: true,
+    onInlineViewLayout: true,
+    dataDetectorType: true,
+    android_hyphenationFrequency: true,
+    lineBreakStrategyIOS: true,
+  },
+  directEventTypes: {
+    topTextLayout: {
+      registrationName: 'onTextLayout',
     },
-    directEventTypes: {
-      topTextLayout: {
-        registrationName: 'onTextLayout',
-      },
-      topInlineViewLayout: {
-        registrationName: 'onInlineViewLayout',
-      },
+    topInlineViewLayout: {
+      registrationName: 'onInlineViewLayout',
     },
-    uiViewClassName: 'RCTText',
-  })): any);
+  },
+  uiViewClassName: 'RCTText',
+};
+
+const virtualTextViewConfig = {
+  validAttributes: {
+    isHighlighted: true,
+    isPressable: true,
+    maxFontSizeMultiplier: true,
+  },
+  uiViewClassName: 'RCTVirtualText',
+};
+
+export const NativeText: HostComponent<NativeTextProps> =
+  (createReactNativeComponentClass('RCTText', () =>
+    createViewConfig(textViewConfig),
+  ): any);
 
 export const NativeVirtualText: HostComponent<NativeTextProps> =
   !global.RN$Bridgeless && !UIManager.hasViewManagerConfig('RCTVirtualText')
     ? NativeText
-    : (createReactNativeComponentClass('RCTVirtualText', () => ({
-        validAttributes: {
-          ...ReactNativeViewAttributes.UIView,
-          isHighlighted: true,
-          isPressable: true,
-          maxFontSizeMultiplier: true,
-        },
-        uiViewClassName: 'RCTVirtualText',
-      })): any);
+    : (createReactNativeComponentClass('RCTVirtualText', () =>
+        createViewConfig(virtualTextViewConfig),
+      ): any);
diff --git a/Libraries/Text/TextProps.js b/Libraries/Text/TextProps.js
index 84556c43b500..661571357ea4 100644
--- a/Libraries/Text/TextProps.js
+++ b/Libraries/Text/TextProps.js
@@ -10,6 +10,14 @@
 
 'use strict';
 
+import type {
+  AccessibilityActionEvent,
+  AccessibilityActionInfo,
+  AccessibilityRole,
+  AccessibilityState,
+  Role,
+} from '../Components/View/ViewAccessibility';
+import type {TextStyleProp} from '../StyleSheet/StyleSheet';
 import type {
   LayoutEvent,
   PointerEvent,
@@ -17,13 +25,6 @@ import type {
   TextLayoutEvent,
 } from '../Types/CoreEventTypes';
 import type {Node} from 'react';
-import type {TextStyleProp} from '../StyleSheet/StyleSheet';
-import type {
-  AccessibilityRole,
-  AccessibilityState,
-  AccessibilityActionInfo,
-  AccessibilityActionEvent,
-} from '../Components/View/ViewAccessibility';
 
 export type PressRetentionOffset = $ReadOnly<{|
   top: number,
@@ -57,6 +58,7 @@ export type TextProps = $ReadOnly<{|
   accessibilityLabel?: ?Stringish,
   accessibilityRole?: ?AccessibilityRole,
   accessibilityState?: ?AccessibilityState,
+  'aria-label'?: ?string,
 
   /**
    * Whether font should be scaled down automatically.
@@ -77,6 +79,25 @@ export type TextProps = $ReadOnly<{|
    *
    */
   android_hyphenationFrequency?: ?('normal' | 'none' | 'full'),
+
+  /**
+   * alias for accessibilityState
+   *
+   * see https://reactnative.dev/docs/accessibility#accessibilitystate
+   */
+  'aria-busy'?: ?boolean,
+  'aria-checked'?: ?boolean | 'mixed',
+  'aria-disabled'?: ?boolean,
+  'aria-expanded'?: ?boolean,
+  'aria-selected'?: ?boolean,
+
+  /**
+   * Reperesents the nativeID of the associated label text. When the assistive technology focuses on the component with this props, the text is read aloud.
+   *
+   * @platform android
+   */
+  'aria-labelledby'?: ?string,
+
   children?: ?Node,
 
   /**
@@ -87,6 +108,13 @@ export type TextProps = $ReadOnly<{|
    */
   ellipsizeMode?: ?('clip' | 'head' | 'middle' | 'tail'),
 
+  /**
+   * Used to locate this view from native code.
+   *
+   * See https://reactnative.dev/docs/text#nativeid
+   */
+  id?: string,
+
   /**
    * Specifies largest possible scale a font can reach when `allowFontScaling` is enabled.
    * Possible values:
@@ -149,6 +177,11 @@ export type TextProps = $ReadOnly<{|
    */
   pressRetentionOffset?: ?PressRetentionOffset,
 
+  /**
+   * Indicates to accessibility services to treat UI component like a specific role.
+   */
+  role?: ?Role,
+
   /**
    * Lets the user select text.
    *
@@ -196,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.
    *
@@ -209,4 +259,11 @@ export type TextProps = $ReadOnly<{|
    * See https://reactnative.dev/docs/text#supperhighlighting
    */
   suppressHighlighting?: ?boolean,
+
+  /**
+   * Set line break strategy on iOS.
+   *
+   * See https://reactnative.dev/docs/text.html#linebreakstrategyios
+   */
+  lineBreakStrategyIOS?: ?('none' | 'standard' | 'hangul-word' | 'push-out'),
 |}>;
diff --git a/React/Views/RCTMaskedViewManager.h b/Libraries/TurboModule/RCTExport.d.ts
similarity index 67%
rename from React/Views/RCTMaskedViewManager.h
rename to Libraries/TurboModule/RCTExport.d.ts
index 6aaf61fa281d..58006ba14759 100644
--- a/React/Views/RCTMaskedViewManager.h
+++ b/Libraries/TurboModule/RCTExport.d.ts
@@ -1,12 +1,12 @@
-/*
+/**
  * 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
  */
 
-#import <React/RCTViewManager.h>
-
-@interface RCTMaskedViewManager : RCTViewManager
-
-@end
+export interface TurboModule {
+  getConstants?(): {};
+}
diff --git a/Libraries/TurboModule/TurboModuleRegistry.d.ts b/Libraries/TurboModule/TurboModuleRegistry.d.ts
new file mode 100644
index 000000000000..dd41d56c8e8d
--- /dev/null
+++ b/Libraries/TurboModule/TurboModuleRegistry.d.ts
@@ -0,0 +1,15 @@
+/**
+ * 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
+ */
+
+import {TurboModule} from './RCTExport';
+
+export const TurboModuleRegistry: {
+  get<T extends TurboModule>(name: string): T | null;
+  getEnforcing<T extends TurboModule>(name: string): T;
+};
diff --git a/Libraries/TurboModule/TurboModuleRegistry.js b/Libraries/TurboModule/TurboModuleRegistry.js
index 250069895739..994c5ea44158 100644
--- a/Libraries/TurboModule/TurboModuleRegistry.js
+++ b/Libraries/TurboModule/TurboModuleRegistry.js
@@ -8,10 +8,12 @@
  * @format
  */
 
-const NativeModules = require('../BatchedBridge/NativeModules');
 import type {TurboModule} from './RCTExport';
+
 import invariant from 'invariant';
 
+const NativeModules = require('../BatchedBridge/NativeModules');
+
 const turboModuleProxy = global.__turboModuleProxy;
 
 function requireModule<T: TurboModule>(name: string): ?T {
diff --git a/Libraries/TurboModule/samples/NativeSampleTurboModule.js b/Libraries/TurboModule/samples/NativeSampleTurboModule.js
index 5708e9b233f9..813f2cbf5c36 100644
--- a/Libraries/TurboModule/samples/NativeSampleTurboModule.js
+++ b/Libraries/TurboModule/samples/NativeSampleTurboModule.js
@@ -10,6 +10,7 @@
 
 import type {UnsafeObject} from '../../Types/CodegenTypes';
 import type {RootTag, TurboModule} from '../RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/TypeSafety/RCTConvertHelpers.h b/Libraries/TypeSafety/RCTConvertHelpers.h
index 49a2aa7d8dcd..e7bd47bcbd26 100644
--- a/Libraries/TypeSafety/RCTConvertHelpers.h
+++ b/Libraries/TypeSafety/RCTConvertHelpers.h
@@ -15,11 +15,12 @@
 
 namespace facebook {
 namespace react {
-  template<typename T>
-  using LazyVector = FB::LazyVector<T, id>;
-}}
+template <typename T>
+using LazyVector = FB::LazyVector<T, id>;
+}
+}
 
-template<typename ContainerT>
+template <typename ContainerT>
 NSArray *RCTConvertVecToArray(const ContainerT &vec, id (^convertor)(typename ContainerT::value_type element))
 {
   NSMutableArray *array = [NSMutableArray new];
@@ -29,22 +30,31 @@ NSArray *RCTConvertVecToArray(const ContainerT &vec, id (^convertor)(typename Co
   }
   return array;
 }
-template<typename ContainerT>
+template <typename ContainerT>
 NSArray *RCTConvertVecToArray(const ContainerT &vec)
 {
-  return RCTConvertVecToArray(vec, ^id(typename ContainerT::value_type element) { return element; });
+  return RCTConvertVecToArray(vec, ^id(typename ContainerT::value_type element) {
+    return element;
+  });
 }
 
-template<typename ContainerT>
-NSArray *RCTConvertOptionalVecToArray(const std::optional<ContainerT> &vec, id (^convertor)(typename ContainerT::value_type element))
+template <typename ContainerT>
+NSArray *RCTConvertOptionalVecToArray(
+    const std::optional<ContainerT> &vec,
+    id (^convertor)(typename ContainerT::value_type element))
 {
   return vec.has_value() ? RCTConvertVecToArray(vec.value(), convertor) : nil;
 }
 
-template<typename ContainerT>
+template <typename ContainerT>
 NSArray *RCTConvertOptionalVecToArray(const std::optional<ContainerT> &vec)
 {
-  return vec.has_value() ? RCTConvertVecToArray(vec.value(), ^id(typename ContainerT::value_type element) { return element; }) : nil;
+  return vec.has_value() ? RCTConvertVecToArray(
+                               vec.value(),
+                               ^id(typename ContainerT::value_type element) {
+                                 return element;
+                               })
+                         : nil;
 }
 
 bool RCTBridgingToBool(id value);
@@ -55,7 +65,7 @@ std::optional<double> RCTBridgingToOptionalDouble(id value);
 double RCTBridgingToDouble(id value);
 NSArray *RCTBridgingToArray(id value);
 
-template<typename T>
+template <typename T>
 facebook::react::LazyVector<T> RCTBridgingToVec(id value, T (^ctor)(id element))
 {
   NSArray *array = RCTBridgingToArray(value);
@@ -64,7 +74,7 @@ facebook::react::LazyVector<T> RCTBridgingToVec(id value, T (^ctor)(id element))
   return facebook::react::LazyVector<T>::fromUnsafeRawValue(array, size, ctor);
 }
 
-template<typename T>
+template <typename T>
 std::optional<facebook::react::LazyVector<T>> RCTBridgingToOptionalVec(id value, T (^ctor)(id element))
 {
   if (value == nil || value == (id)kCFNull) {
diff --git a/Libraries/TypeSafety/RCTConvertHelpers.mm b/Libraries/TypeSafety/RCTConvertHelpers.mm
index 46690f5a4eb6..8511c9e18daa 100644
--- a/Libraries/TypeSafety/RCTConvertHelpers.mm
+++ b/Libraries/TypeSafety/RCTConvertHelpers.mm
@@ -32,7 +32,6 @@ bool RCTBridgingToBool(id value)
   return RCTBridgingToString(value);
 }
 
-
 std::optional<double> RCTBridgingToOptionalDouble(id value)
 {
   if (!RCTNilIfNull(value)) {
@@ -46,6 +45,7 @@ bool RCTBridgingToBool(id value)
   return [RCTConvert double:value];
 }
 
-NSArray *RCTBridgingToArray(id value) {
+NSArray *RCTBridgingToArray(id value)
+{
   return [RCTConvert NSArray:value];
 }
diff --git a/Libraries/TypeSafety/RCTTypedModuleConstants.h b/Libraries/TypeSafety/RCTTypedModuleConstants.h
index 2bf9037de4e8..a787b6788ebc 100644
--- a/Libraries/TypeSafety/RCTTypedModuleConstants.h
+++ b/Libraries/TypeSafety/RCTTypedModuleConstants.h
@@ -24,7 +24,7 @@
  */
 
 // Internal container for module constants. Do not use yourself directly, instead use the typedConstants helpers below.
-@interface _RCTTypedModuleConstants<StructType> : NSDictionary<NSString *, id>
+@interface _RCTTypedModuleConstants<StructType> : NSDictionary <NSString *, id>
 
 + (instancetype)newWithUnsafeDictionary:(NSDictionary<NSString *, id> *)dictionary;
 
@@ -35,13 +35,15 @@ namespace react {
 
 // Objective-C doesn't allow arbitrary types in its lightweight generics, only object and block types. We can work
 // around that by having the struct type we care about be a block-argument. The block never exists at runtime.
-template<typename T>
+template <typename T>
 using ModuleConstants = _RCTTypedModuleConstants<void (^)(T)> *;
 
-template<typename T>
-ModuleConstants<T> typedConstants(typename T::Builder::Input &&value) {
+template <typename T>
+ModuleConstants<T> typedConstants(typename T::Builder::Input &&value)
+{
   typename T::Builder builder(std::move(value));
   return [_RCTTypedModuleConstants newWithUnsafeDictionary:builder.buildUnsafeRawValue()];
 }
 
-} }
+}
+}
diff --git a/Libraries/TypeSafety/RCTTypedModuleConstants.mm b/Libraries/TypeSafety/RCTTypedModuleConstants.mm
index ad263b39f2c9..a1ff4f0cbaa9 100644
--- a/Libraries/TypeSafety/RCTTypedModuleConstants.mm
+++ b/Libraries/TypeSafety/RCTTypedModuleConstants.mm
@@ -24,11 +24,13 @@ + (instancetype)newWithUnsafeDictionary:(NSDictionary<NSString *, id> *)dictiona
 
 #pragma mark - NSDictionary subclass
 
-// See subclassing notes in https://developer.apple.com/documentation/foundation/nsdictionary#//apple_ref/occ/cl/NSDictionary
+// See subclassing notes in
+// https://developer.apple.com/documentation/foundation/nsdictionary#//apple_ref/occ/cl/NSDictionary
 
-RCT_NOT_IMPLEMENTED(- (instancetype)initWithObjects:(id  _Nonnull const [])objects
-                                            forKeys:(id<NSCopying> _Nonnull const [])keys
-                                              count:(NSUInteger)count)
+RCT_NOT_IMPLEMENTED(-(instancetype)initWithObjects
+                    : (id _Nonnull const[])objects forKeys
+                    : (id<NSCopying> _Nonnull const[])keys count
+                    : (NSUInteger)count)
 
 - (NSUInteger)count
 {
diff --git a/Libraries/Types/CoreEventTypes.d.ts b/Libraries/Types/CoreEventTypes.d.ts
new file mode 100644
index 000000000000..7aff083b07a2
--- /dev/null
+++ b/Libraries/Types/CoreEventTypes.d.ts
@@ -0,0 +1,263 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+import {NodeHandle} from '../ReactNative/RendererProxy';
+import {HostComponent} from '../../types/public/ReactNativeTypes';
+
+export interface LayoutRectangle {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
+
+// @see TextProps.onLayout
+export type LayoutChangeEvent = NativeSyntheticEvent<{layout: LayoutRectangle}>;
+
+interface TextLayoutLine {
+  ascender: number;
+  capHeight: number;
+  descender: number;
+  height: number;
+  text: string;
+  width: number;
+  x: number;
+  xHeight: number;
+  y: number;
+}
+
+/**
+ * @see TextProps.onTextLayout
+ */
+export interface TextLayoutEventData extends TargetedEvent {
+  lines: TextLayoutLine[];
+}
+
+// Similar to React.SyntheticEvent except for nativeEvent
+export interface NativeSyntheticEvent<T>
+  extends React.BaseSyntheticEvent<T, NodeHandle, NodeHandle> {}
+
+export interface NativeTouchEvent {
+  /**
+   * Array of all touch events that have changed since the last event
+   */
+  changedTouches: NativeTouchEvent[];
+
+  /**
+   * The ID of the touch
+   */
+  identifier: string;
+
+  /**
+   * The X position of the touch, relative to the element
+   */
+  locationX: number;
+
+  /**
+   * The Y position of the touch, relative to the element
+   */
+  locationY: number;
+
+  /**
+   * The X position of the touch, relative to the screen
+   */
+  pageX: number;
+
+  /**
+   * The Y position of the touch, relative to the screen
+   */
+  pageY: number;
+
+  /**
+   * The node id of the element receiving the touch event
+   */
+  target: string;
+
+  /**
+   * A time identifier for the touch, useful for velocity calculation
+   */
+  timestamp: number;
+
+  /**
+   * Array of all current touches on the screen
+   */
+  touches: NativeTouchEvent[];
+
+  /**
+   * 3D Touch reported force
+   * @platform ios
+   */
+  force?: number | undefined;
+}
+
+/**
+ * https://developer.mozilla.org/en-US/docs/Web/API/UIEvent
+ */
+export interface NativeUIEvent {
+  /**
+   * Returns a long with details about the event, depending on the event type.
+   */
+  readonly detail: number;
+}
+
+/**
+ * https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent
+ */
+export interface NativeMouseEvent extends NativeUIEvent {
+  /**
+   * The X coordinate of the mouse pointer in global (screen) coordinates.
+   */
+  readonly screenX: number;
+  /**
+   * The Y coordinate of the mouse pointer in global (screen) coordinates.
+   */
+  readonly screenY: number;
+  /**
+   * The X coordinate of the mouse pointer relative to the whole document.
+   */
+  readonly pageX: number;
+  /**
+   * The Y coordinate of the mouse pointer relative to the whole document.
+   */
+  readonly pageY: number;
+  /**
+   * The X coordinate of the mouse pointer in local (DOM content) coordinates.
+   */
+  readonly clientX: number;
+  /**
+   * The Y coordinate of the mouse pointer in local (DOM content) coordinates.
+   */
+  readonly clientY: number;
+  /**
+   * Alias for NativeMouseEvent.clientX
+   */
+  readonly x: number;
+  /**
+   * Alias for NativeMouseEvent.clientY
+   */
+  readonly y: number;
+  /**
+   * Returns true if the control key was down when the mouse event was fired.
+   */
+  readonly ctrlKey: boolean;
+  /**
+   * Returns true if the shift key was down when the mouse event was fired.
+   */
+  readonly shiftKey: boolean;
+  /**
+   * Returns true if the alt key was down when the mouse event was fired.
+   */
+  readonly altKey: boolean;
+  /**
+   * Returns true if the meta key was down when the mouse event was fired.
+   */
+  readonly metaKey: boolean;
+  /**
+   * The button number that was pressed (if applicable) when the mouse event was fired.
+   */
+  readonly button: number;
+  /**
+   * The buttons being depressed (if any) when the mouse event was fired.
+   */
+  readonly buttons: number;
+  /**
+   * The secondary target for the event, if there is one.
+   */
+  readonly relatedTarget:
+    | null
+    | number
+    | React.ElementRef<HostComponent<unknown>>;
+  // offset is proposed: https://drafts.csswg.org/cssom-view/#extensions-to-the-mouseevent-interface
+  /**
+   * The X coordinate of the mouse pointer between that event and the padding edge of the target node
+   */
+  readonly offsetX: number;
+  /**
+   * The Y coordinate of the mouse pointer between that event and the padding edge of the target node
+   */
+  readonly offsetY: number;
+}
+
+/**
+ * https://developer.mozilla.org/en-US/docs/Web/API/PointerEvent
+ */
+export interface NativePointerEvent extends NativeMouseEvent {
+  /**
+   * A unique identifier for the pointer causing the event.
+   */
+  readonly pointerId: number;
+  /**
+   * The width (magnitude on the X axis), in CSS pixels, of the contact geometry of the pointer
+   */
+  readonly width: number;
+  /**
+   * The height (magnitude on the Y axis), in CSS pixels, of the contact geometry of the pointer.
+   */
+  readonly height: number;
+  /**
+   * The normalized pressure of the pointer input in the range 0 to 1, where 0 and 1 represent
+   * the minimum and maximum pressure the hardware is capable of detecting, respectively.
+   */
+  readonly pressure: number;
+  /**
+   * The normalized tangential pressure of the pointer input (also known as barrel pressure or
+   * cylinder stress) in the range -1 to 1, where 0 is the neutral position of the control.
+   */
+  readonly tangentialPressure: number;
+  /**
+   * The plane angle (in degrees, in the range of -90 to 90) between the Y–Z plane and the plane
+   * containing both the pointer (e.g. pen stylus) axis and the Y axis.
+   */
+  readonly tiltX: number;
+  /**
+   * The plane angle (in degrees, in the range of -90 to 90) between the X–Z plane and the plane
+   * containing both the pointer (e.g. pen stylus) axis and the X axis.
+   */
+  readonly tiltY: number;
+  /**
+   * The clockwise rotation of the pointer (e.g. pen stylus) around its major axis in degrees,
+   * with a value in the range 0 to 359.
+   */
+  readonly twist: number;
+  /**
+   * Indicates the device type that caused the event (mouse, pen, touch, etc.)
+   */
+  readonly pointerType: string;
+  /**
+   * Indicates if the pointer represents the primary pointer of this pointer type.
+   */
+  readonly isPrimary: boolean;
+}
+
+export type PointerEvent = NativeSyntheticEvent<NativePointerEvent>;
+
+export interface GestureResponderEvent
+  extends NativeSyntheticEvent<NativeTouchEvent> {}
+
+export interface MouseEvent extends NativeSyntheticEvent<NativeMouseEvent> {}
+
+export interface TargetedEvent {
+  target: number;
+}
+
+export interface PointerEvents {
+  onPointerEnter?: ((event: PointerEvent) => void) | undefined;
+  onPointerEnterCapture?: ((event: PointerEvent) => void) | undefined;
+  onPointerLeave?: ((event: PointerEvent) => void) | undefined;
+  onPointerLeaveCapture?: ((event: PointerEvent) => void) | undefined;
+  onPointerMove?: ((event: PointerEvent) => void) | undefined;
+  onPointerMoveCapture?: ((event: PointerEvent) => void) | undefined;
+  onPointerCancel?: ((event: PointerEvent) => void) | undefined;
+  onPointerCancelCapture?: ((event: PointerEvent) => void) | undefined;
+  onPointerDown?: ((event: PointerEvent) => void) | undefined;
+  onPointerDownCapture?: ((event: PointerEvent) => void) | undefined;
+  onPointerUp?: ((event: PointerEvent) => void) | undefined;
+  onPointerUpCapture?: ((event: PointerEvent) => void) | undefined;
+}
diff --git a/Libraries/Types/CoreEventTypes.js b/Libraries/Types/CoreEventTypes.js
index 8664bce98ed2..a0234e95f26d 100644
--- a/Libraries/Types/CoreEventTypes.js
+++ b/Libraries/Types/CoreEventTypes.js
@@ -8,9 +8,10 @@
  * @format
  */
 
-import * as React from 'react';
 import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
 
+import * as React from 'react';
+
 export type SyntheticEvent<+T> = $ReadOnly<{|
   bubbles: ?boolean,
   cancelable: ?boolean,
diff --git a/Libraries/Utilities/AcessibilityMapping.js b/Libraries/Utilities/AcessibilityMapping.js
new file mode 100644
index 000000000000..911f3381089f
--- /dev/null
+++ b/Libraries/Utilities/AcessibilityMapping.js
@@ -0,0 +1,154 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+import type {
+  AccessibilityRole,
+  Role,
+} from '../Components/View/ViewAccessibility';
+
+// Map role values to AccessibilityRole values
+export function getAccessibilityRoleFromRole(role: Role): ?AccessibilityRole {
+  switch (role) {
+    case 'alert':
+      return 'alert';
+    case 'alertdialog':
+      return undefined;
+    case 'application':
+      return undefined;
+    case 'article':
+      return undefined;
+    case 'banner':
+      return undefined;
+    case 'button':
+      return 'button';
+    case 'cell':
+      return undefined;
+    case 'checkbox':
+      return 'checkbox';
+    case 'columnheader':
+      return undefined;
+    case 'combobox':
+      return 'combobox';
+    case 'complementary':
+      return undefined;
+    case 'contentinfo':
+      return undefined;
+    case 'definition':
+      return undefined;
+    case 'dialog':
+      return undefined;
+    case 'directory':
+      return undefined;
+    case 'document':
+      return undefined;
+    case 'feed':
+      return undefined;
+    case 'figure':
+      return undefined;
+    case 'form':
+      return undefined;
+    case 'grid':
+      return 'grid';
+    case 'group':
+      return undefined;
+    case 'heading':
+      return 'header';
+    case 'img':
+      return 'image';
+    case 'link':
+      return 'link';
+    case 'list':
+      return 'list';
+    case 'listitem':
+      return undefined;
+    case 'log':
+      return undefined;
+    case 'main':
+      return undefined;
+    case 'marquee':
+      return undefined;
+    case 'math':
+      return undefined;
+    case 'menu':
+      return 'menu';
+    case 'menubar':
+      return 'menubar';
+    case 'menuitem':
+      return 'menuitem';
+    case 'meter':
+      return undefined;
+    case 'navigation':
+      return undefined;
+    case 'none':
+      return 'none';
+    case 'note':
+      return undefined;
+    case 'option':
+      return undefined;
+    case 'presentation':
+      return 'none';
+    case 'progressbar':
+      return 'progressbar';
+    case 'radio':
+      return 'radio';
+    case 'radiogroup':
+      return 'radiogroup';
+    case 'region':
+      return undefined;
+    case 'row':
+      return undefined;
+    case 'rowgroup':
+      return undefined;
+    case 'rowheader':
+      return undefined;
+    case 'scrollbar':
+      return 'scrollbar';
+    case 'searchbox':
+      return 'search';
+    case 'separator':
+      return undefined;
+    case 'slider':
+      return 'adjustable';
+    case 'spinbutton':
+      return 'spinbutton';
+    case 'status':
+      return undefined;
+    case 'summary':
+      return 'summary';
+    case 'switch':
+      return 'switch';
+    case 'tab':
+      return 'tab';
+    case 'table':
+      return undefined;
+    case 'tablist':
+      return 'tablist';
+    case 'tabpanel':
+      return undefined;
+    case 'term':
+      return undefined;
+    case 'timer':
+      return 'timer';
+    case 'toolbar':
+      return 'toolbar';
+    case 'tooltip':
+      return undefined;
+    case 'tree':
+      return undefined;
+    case 'treegrid':
+      return undefined;
+    case 'treeitem':
+      return undefined;
+  }
+
+  return undefined;
+}
diff --git a/Libraries/Utilities/Appearance.d.ts b/Libraries/Utilities/Appearance.d.ts
new file mode 100644
index 000000000000..7d2faf69d8ce
--- /dev/null
+++ b/Libraries/Utilities/Appearance.d.ts
@@ -0,0 +1,43 @@
+/**
+ * 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
+ */
+
+import {NativeEventSubscription} from '../EventEmitter/RCTNativeAppEventEmitter';
+
+type ColorSchemeName = 'light' | 'dark' | null | undefined;
+
+export namespace Appearance {
+  type AppearancePreferences = {
+    colorScheme: ColorSchemeName;
+  };
+
+  type AppearanceListener = (preferences: AppearancePreferences) => void;
+
+  /**
+   * Note: Although color scheme is available immediately, it may change at any
+   * time. Any rendering logic or styles that depend on this should try to call
+   * this function on every render, rather than caching the value (for example,
+   * using inline styles rather than setting a value in a `StyleSheet`).
+   *
+   * Example: `const colorScheme = Appearance.getColorScheme();`
+   */
+  export function getColorScheme(): ColorSchemeName;
+
+  /**
+   * Add an event handler that is fired when appearance preferences change.
+   */
+  export function addChangeListener(
+    listener: AppearanceListener,
+  ): NativeEventSubscription;
+}
+
+/**
+ * A new useColorScheme hook is provided as the preferred way of accessing
+ * the user's preferred color scheme (e.g. Dark Mode).
+ */
+export function useColorScheme(): ColorSchemeName;
diff --git a/Libraries/Utilities/Appearance.js b/Libraries/Utilities/Appearance.js
index 04246b8fb5f6..54d03dd18200 100644
--- a/Libraries/Utilities/Appearance.js
+++ b/Libraries/Utilities/Appearance.js
@@ -8,17 +8,17 @@
  * @flow strict-local
  */
 
+import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
+import Platform from '../Utilities/Platform';
 import EventEmitter, {
   type EventSubscription,
 } from '../vendor/emitter/EventEmitter';
-import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
+import {isAsyncDebugging} from './DebugEnvironment';
 import NativeAppearance, {
   type AppearancePreferences,
   type ColorSchemeName,
 } from './NativeAppearance';
 import invariant from 'invariant';
-import {isAsyncDebugging} from './DebugEnvironment';
-import Platform from '../Utilities/Platform';
 
 type AppearanceListener = (preferences: AppearancePreferences) => void;
 const eventEmitter = new EventEmitter<{
diff --git a/Libraries/Utilities/BackHandler.android.js b/Libraries/Utilities/BackHandler.android.js
index 8162e8c7cd3e..74519f781934 100644
--- a/Libraries/Utilities/BackHandler.android.js
+++ b/Libraries/Utilities/BackHandler.android.js
@@ -97,11 +97,9 @@ const BackHandler: TBackHandler = {
     eventName: BackPressEventName,
     handler: () => ?boolean,
   ): void {
-    if (_backPressSubscriptions.indexOf(handler) !== -1) {
-      _backPressSubscriptions.splice(
-        _backPressSubscriptions.indexOf(handler),
-        1,
-      );
+    const index = _backPressSubscriptions.indexOf(handler);
+    if (index !== -1) {
+      _backPressSubscriptions.splice(index, 1);
     }
   },
 };
diff --git a/Libraries/Utilities/BackHandler.d.ts b/Libraries/Utilities/BackHandler.d.ts
new file mode 100644
index 000000000000..72400aeb1c34
--- /dev/null
+++ b/Libraries/Utilities/BackHandler.d.ts
@@ -0,0 +1,38 @@
+/**
+ * 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
+ */
+
+import {NativeEventSubscription} from '../EventEmitter/RCTNativeAppEventEmitter';
+
+export type BackPressEventName = 'hardwareBackPress';
+
+/**
+ * Detect hardware back button presses, and programmatically invoke the
+ * default back button functionality to exit the app if there are no
+ * listeners or if none of the listeners return true.
+ * The event subscriptions are called in reverse order
+ * (i.e. last registered subscription first), and if one subscription
+ * returns true then subscriptions registered earlier
+ * will not be called.
+ *
+ * @see https://reactnative.dev/docs/backhandler
+ */
+export interface BackHandlerStatic {
+  exitApp(): void;
+  addEventListener(
+    eventName: BackPressEventName,
+    handler: () => boolean | null | undefined,
+  ): NativeEventSubscription;
+  removeEventListener(
+    eventName: BackPressEventName,
+    handler: () => boolean | null | undefined,
+  ): void;
+}
+
+export const BackHandler: BackHandlerStatic;
+export type BackHandler = BackHandlerStatic;
diff --git a/Libraries/Utilities/DevSettings.d.ts b/Libraries/Utilities/DevSettings.d.ts
new file mode 100644
index 000000000000..9040ee05ad30
--- /dev/null
+++ b/Libraries/Utilities/DevSettings.d.ts
@@ -0,0 +1,32 @@
+/**
+ * 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
+ */
+
+import {NativeEventEmitter} from '../EventEmitter/NativeEventEmitter';
+
+/**
+ * The DevSettings module exposes methods for customizing settings for developers in development.
+ */
+export interface DevSettingsStatic extends NativeEventEmitter {
+  /**
+   * Adds a custom menu item to the developer menu.
+   *
+   * @param title - The title of the menu item. Is internally used as id and should therefore be unique.
+   * @param handler - The callback invoked when pressing the menu item.
+   */
+  addMenuItem(title: string, handler: () => any): void;
+
+  /**
+   * Reload the application.
+   *
+   * @param reason
+   */
+  reload(reason?: string): void;
+}
+
+export const DevSettings: DevSettingsStatic;
diff --git a/Libraries/Utilities/DevSettings.js b/Libraries/Utilities/DevSettings.js
index 4c2a85270240..af227f2582d5 100644
--- a/Libraries/Utilities/DevSettings.js
+++ b/Libraries/Utilities/DevSettings.js
@@ -8,8 +8,10 @@
  * @format
  */
 
-import NativeDevSettings from '../NativeModules/specs/NativeDevSettings';
+import type {EventSubscription} from '../vendor/emitter/EventEmitter';
+
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
+import NativeDevSettings from '../NativeModules/specs/NativeDevSettings';
 import Platform from '../Utilities/Platform';
 
 let DevSettings: {
@@ -32,7 +34,7 @@ if (__DEV__) {
     // If you want to use the native module on other platforms, please remove this condition and test its behavior
     Platform.OS !== 'ios' ? null : NativeDevSettings,
   );
-  const subscriptions = new Map();
+  const subscriptions = new Map<string, EventSubscription>();
 
   DevSettings = {
     addMenuItem(title: string, handler: () => mixed): void {
diff --git a/Libraries/Utilities/Dimensions.d.ts b/Libraries/Utilities/Dimensions.d.ts
new file mode 100644
index 000000000000..cca9d8189f53
--- /dev/null
+++ b/Libraries/Utilities/Dimensions.d.ts
@@ -0,0 +1,79 @@
+/**
+ * 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
+ */
+
+import {EmitterSubscription} from '../vendor/emitter/EventEmitter';
+
+// Used by Dimensions below
+export interface ScaledSize {
+  width: number;
+  height: number;
+  scale: number;
+  fontScale: number;
+}
+
+/**
+ * Initial dimensions are set before `runApplication` is called so they should
+ * be available before any other require's are run, but may be updated later.
+ *
+ * Note: Although dimensions are available immediately, they may change (e.g
+ * due to device rotation) so any rendering logic or styles that depend on
+ * these constants should try to call this function on every render, rather
+ * than caching the value (for example, using inline styles rather than
+ * setting a value in a `StyleSheet`).
+ *
+ * Example: `const {height, width} = Dimensions.get('window');`
+ *
+ * @param dim Name of dimension as defined when calling `set`.
+ * @returns Value for the dimension.
+ * @see https://reactnative.dev/docs/dimensions#content
+ */
+export interface Dimensions {
+  /**
+       * Initial dimensions are set before runApplication is called so they
+       * should be available before any other require's are run, but may be
+       * updated later.
+       * Note: Although dimensions are available immediately, they may
+       * change (e.g due to device rotation) so any rendering logic or
+       * styles that depend on these constants should try to call this
+       * function on every render, rather than caching the value (for
+       * example, using inline styles rather than setting a value in a
+       * StyleSheet).
+       * Example: const {height, width} = Dimensions.get('window');
+       @param dim Name of dimension as defined when calling set.
+       @returns Value for the dimension.
+       */
+  get(dim: 'window' | 'screen'): ScaledSize;
+
+  /**
+   * This should only be called from native code by sending the didUpdateDimensions event.
+   * @param dims Simple string-keyed object of dimensions to set
+   */
+  set(dims: {[key: string]: any}): void;
+
+  /**
+   * Add an event listener for dimension changes
+   *
+   * @param type the type of event to listen to
+   * @param handler the event handler
+   */
+  addEventListener(
+    type: 'change',
+    handler: ({
+      window,
+      screen,
+    }: {
+      window: ScaledSize;
+      screen: ScaledSize;
+    }) => void,
+  ): EmitterSubscription;
+}
+
+export function useWindowDimensions(): ScaledSize;
+
+export const Dimensions: Dimensions;
diff --git a/Libraries/Utilities/Dimensions.js b/Libraries/Utilities/Dimensions.js
index 6f499cc94f03..e7fe880d0dbd 100644
--- a/Libraries/Utilities/Dimensions.js
+++ b/Libraries/Utilities/Dimensions.js
@@ -8,14 +8,14 @@
  * @flow
  */
 
+import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
 import EventEmitter, {
   type EventSubscription,
 } from '../vendor/emitter/EventEmitter';
-import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
 import NativeDeviceInfo, {
+  type DimensionsPayload,
   type DisplayMetrics,
   type DisplayMetricsAndroid,
-  type DimensionsPayload,
 } from './NativeDeviceInfo';
 import invariant from 'invariant';
 
diff --git a/Libraries/Utilities/GlobalPerformanceLogger.js b/Libraries/Utilities/GlobalPerformanceLogger.js
index cba68e154d94..d119f6316c12 100644
--- a/Libraries/Utilities/GlobalPerformanceLogger.js
+++ b/Libraries/Utilities/GlobalPerformanceLogger.js
@@ -8,9 +8,10 @@
  * @format
  */
 
-import createPerformanceLogger from './createPerformanceLogger';
 import type {IPerformanceLogger} from './createPerformanceLogger';
 
+import createPerformanceLogger from './createPerformanceLogger';
+
 /**
  * This is a global shared instance of IPerformanceLogger that is created with
  * createPerformanceLogger().
diff --git a/Libraries/Utilities/HMRClient.js b/Libraries/Utilities/HMRClient.js
index 16870e570711..b37f5961d2e0 100644
--- a/Libraries/Utilities/HMRClient.js
+++ b/Libraries/Utilities/HMRClient.js
@@ -8,17 +8,18 @@
  * @flow strict-local
  */
 
+import type {ExtendedError} from '../Core/ExtendedError';
+
+import getDevServer from '../Core/Devtools/getDevServer';
+import LogBox from '../LogBox/LogBox';
+import NativeRedBox from '../NativeModules/specs/NativeRedBox';
+
 const DevSettings = require('./DevSettings');
+const Platform = require('./Platform');
 const invariant = require('invariant');
 const MetroHMRClient = require('metro-runtime/src/modules/HMRClient');
-const Platform = require('./Platform');
 const prettyFormat = require('pretty-format');
 
-import getDevServer from '../Core/Devtools/getDevServer';
-import NativeRedBox from '../NativeModules/specs/NativeRedBox';
-import LogBox from '../LogBox/LogBox';
-import type {ExtendedError} from '../Core/ExtendedError';
-
 const pendingEntryPoints = [];
 let hmrClient = null;
 let hmrUnavailableReason: string | null = null;
@@ -240,9 +241,23 @@ Error: ${e.message}`;
       }
     });
 
-    client.on('close', data => {
+    client.on('close', closeEvent => {
       LoadingView.hide();
-      setHMRUnavailableReason('Disconnected from Metro.');
+
+      // https://www.rfc-editor.org/rfc/rfc6455.html#section-7.4.1
+      // https://www.rfc-editor.org/rfc/rfc6455.html#section-7.1.5
+      const isNormalOrUnsetCloseReason =
+        closeEvent.code === 1000 ||
+        closeEvent.code === 1005 ||
+        closeEvent.code == null;
+
+      if (isNormalOrUnsetCloseReason) {
+        setHMRUnavailableReason('Disconnected from Metro.');
+      } else {
+        setHMRUnavailableReason(
+          `Disconnected from Metro (${closeEvent.code}: "${closeEvent.reason}").`,
+        );
+      }
     });
 
     if (isEnabled) {
diff --git a/Libraries/Utilities/JSDevSupportModule.js b/Libraries/Utilities/JSDevSupportModule.js
deleted file mode 100644
index c88df1f1dd3f..000000000000
--- a/Libraries/Utilities/JSDevSupportModule.js
+++ /dev/null
@@ -1,37 +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 NativeJSDevSupport from './NativeJSDevSupport';
-const ReactNative = require('../Renderer/shims/ReactNative');
-
-const JSDevSupportModule = {
-  getJSHierarchy: function (tag: number) {
-    if (NativeJSDevSupport) {
-      const constants = NativeJSDevSupport.getConstants();
-      try {
-        const {computeComponentStackForErrorReporting} =
-          ReactNative.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-        const componentStack = computeComponentStackForErrorReporting(tag);
-        if (!componentStack) {
-          NativeJSDevSupport.onFailure(
-            constants.ERROR_CODE_VIEW_NOT_FOUND,
-            "Component stack doesn't exist for tag " + tag,
-          );
-        } else {
-          NativeJSDevSupport.onSuccess(componentStack);
-        }
-      } catch (e) {
-        NativeJSDevSupport.onFailure(constants.ERROR_CODE_EXCEPTION, e.message);
-      }
-    }
-  },
-};
-
-module.exports = JSDevSupportModule;
diff --git a/Libraries/Utilities/LoadingView.ios.js b/Libraries/Utilities/LoadingView.ios.js
index 9654828cfa75..0acf7c39bc68 100644
--- a/Libraries/Utilities/LoadingView.ios.js
+++ b/Libraries/Utilities/LoadingView.ios.js
@@ -9,8 +9,8 @@
  */
 
 import processColor from '../StyleSheet/processColor';
-import NativeDevLoadingView from './NativeDevLoadingView';
 import Appearance from './Appearance';
+import NativeDevLoadingView from './NativeDevLoadingView';
 
 module.exports = {
   showMessage(message: string, type: 'load' | 'refresh') {
diff --git a/Libraries/Utilities/NativeAppearance.js b/Libraries/Utilities/NativeAppearance.js
index 3188962b6acd..cb8688f14e29 100644
--- a/Libraries/Utilities/NativeAppearance.js
+++ b/Libraries/Utilities/NativeAppearance.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export type ColorSchemeName = 'light' | 'dark';
diff --git a/Libraries/Utilities/NativeDevLoadingView.js b/Libraries/Utilities/NativeDevLoadingView.js
index 6865bd972662..2b9952fea407 100644
--- a/Libraries/Utilities/NativeDevLoadingView.js
+++ b/Libraries/Utilities/NativeDevLoadingView.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Utilities/NativeDevSplitBundleLoader.js b/Libraries/Utilities/NativeDevSplitBundleLoader.js
index 9c2563e6cfe9..8b23595b9eee 100644
--- a/Libraries/Utilities/NativeDevSplitBundleLoader.js
+++ b/Libraries/Utilities/NativeDevSplitBundleLoader.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Utilities/NativeDeviceInfo.js b/Libraries/Utilities/NativeDeviceInfo.js
index 49af514c894c..c81d3fa0d1bd 100644
--- a/Libraries/Utilities/NativeDeviceInfo.js
+++ b/Libraries/Utilities/NativeDeviceInfo.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export type DisplayMetricsAndroid = {|
diff --git a/Libraries/Utilities/NativeJSDevSupport.js b/Libraries/Utilities/NativeJSDevSupport.js
deleted file mode 100644
index 593472588883..000000000000
--- a/Libraries/Utilities/NativeJSDevSupport.js
+++ /dev/null
@@ -1,23 +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: () => {|
-    ERROR_CODE_EXCEPTION: number,
-    ERROR_CODE_VIEW_NOT_FOUND: number,
-  |};
-  +onSuccess: (data: string) => void;
-  +onFailure: (errorCode: number, error: string) => void;
-}
-
-export default (TurboModuleRegistry.get<Spec>('JSDevSupport'): ?Spec);
diff --git a/Libraries/Utilities/NativePlatformConstantsAndroid.js b/Libraries/Utilities/NativePlatformConstantsAndroid.js
index c688bae41a9b..e1329e8c5896 100644
--- a/Libraries/Utilities/NativePlatformConstantsAndroid.js
+++ b/Libraries/Utilities/NativePlatformConstantsAndroid.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Utilities/NativePlatformConstantsIOS.js b/Libraries/Utilities/NativePlatformConstantsIOS.js
index 130193087f4b..cf60d5ec9848 100644
--- a/Libraries/Utilities/NativePlatformConstantsIOS.js
+++ b/Libraries/Utilities/NativePlatformConstantsIOS.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Utilities/PerformanceLoggerContext.js b/Libraries/Utilities/PerformanceLoggerContext.js
index 391a2981b6ef..1ae7a9866c9f 100644
--- a/Libraries/Utilities/PerformanceLoggerContext.js
+++ b/Libraries/Utilities/PerformanceLoggerContext.js
@@ -8,10 +8,11 @@
  * @format
  */
 
+import type {IPerformanceLogger} from './createPerformanceLogger';
+
+import GlobalPerformanceLogger from './GlobalPerformanceLogger';
 import * as React from 'react';
 import {useContext} from 'react';
-import GlobalPerformanceLogger from './GlobalPerformanceLogger';
-import type {IPerformanceLogger} from './createPerformanceLogger';
 
 /**
  * This is a React Context that provides a scoped instance of IPerformanceLogger.
diff --git a/Libraries/Utilities/PixelRatio.d.ts b/Libraries/Utilities/PixelRatio.d.ts
new file mode 100644
index 000000000000..97d42ff6650b
--- /dev/null
+++ b/Libraries/Utilities/PixelRatio.d.ts
@@ -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.
+ *
+ * @format
+ */
+
+export interface PixelRatioStatic {
+  /*
+          Returns the device pixel density. Some examples:
+              PixelRatio.get() === 1
+              mdpi Android devices (160 dpi)
+              PixelRatio.get() === 1.5
+              hdpi Android devices (240 dpi)
+              PixelRatio.get() === 2
+              iPhone 4, 4S
+              iPhone 5, 5c, 5s
+              iPhone 6
+              xhdpi Android devices (320 dpi)
+              PixelRatio.get() === 3
+              iPhone 6 plus
+              xxhdpi Android devices (480 dpi)
+              PixelRatio.get() === 3.5
+              Nexus 6
+      */
+  get(): number;
+
+  /*
+          Returns the scaling factor for font sizes. This is the ratio that is
+          used to calculate the absolute font size, so any elements that
+          heavily depend on that should use this to do calculations.
+
+          If a font scale is not set, this returns the device pixel ratio.
+
+          Currently this is only implemented on Android and reflects the user
+          preference set in Settings > Display > Font size,
+          on iOS it will always return the default pixel ratio.
+          */
+  getFontScale(): number;
+
+  /**
+   * Converts a layout size (dp) to pixel size (px).
+   * Guaranteed to return an integer number.
+   */
+  getPixelSizeForLayoutSize(layoutSize: number): number;
+
+  /**
+   * Rounds a layout size (dp) to the nearest layout size that
+   * corresponds to an integer number of pixels. For example,
+   * on a device with a PixelRatio of 3,
+   * PixelRatio.roundToNearestPixel(8.4) = 8.33,
+   * which corresponds to exactly (8.33 * 3) = 25 pixels.
+   */
+  roundToNearestPixel(layoutSize: number): number;
+
+  /**
+   * No-op for iOS, but used on the web. Should not be documented. [sic]
+   */
+  startDetecting(): void;
+}
+
+export const PixelRatio: PixelRatioStatic;
diff --git a/Libraries/Utilities/PixelRatio.js.flow b/Libraries/Utilities/PixelRatio.js.flow
new file mode 100644
index 000000000000..b39952514b4d
--- /dev/null
+++ b/Libraries/Utilities/PixelRatio.js.flow
@@ -0,0 +1,21 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+declare class PixelRatio {
+  static get(): number;
+  static getFontScale(): number;
+  static getPixelSizeForLayoutSize(layoutSize: number): number;
+  static roundToNearestPixel(layoutSize: number): number;
+  static startDetecting(): void;
+}
+
+module.exports = PixelRatio;
diff --git a/Libraries/Utilities/Platform.android.js b/Libraries/Utilities/Platform.android.js
index 5ef0b399e5b8..29234be81a7b 100644
--- a/Libraries/Utilities/Platform.android.js
+++ b/Libraries/Utilities/Platform.android.js
@@ -10,10 +10,10 @@
 
 import NativePlatformConstantsAndroid from './NativePlatformConstantsAndroid';
 
-export type PlatformSelectSpec<A, N, D> = {
-  android?: A,
-  native?: N,
-  default?: D,
+export type PlatformSelectSpec<T> = {
+  android?: T,
+  native?: T,
+  default?: T,
   ...
 };
 
@@ -22,6 +22,7 @@ const Platform = {
   OS: 'android',
   // $FlowFixMe[unsafe-getters-setters]
   get Version(): number {
+    // $FlowFixMe[object-this-reference]
     return this.constants.Version;
   },
   // $FlowFixMe[unsafe-getters-setters]
@@ -43,23 +44,28 @@ const Platform = {
     Brand: string,
     Manufacturer: string,
   |} {
+    // $FlowFixMe[object-this-reference]
     if (this.__constants == null) {
+      // $FlowFixMe[object-this-reference]
       this.__constants = NativePlatformConstantsAndroid.getConstants();
     }
+    // $FlowFixMe[object-this-reference]
     return this.__constants;
   },
   // $FlowFixMe[unsafe-getters-setters]
   get isTesting(): boolean {
     if (__DEV__) {
+      // $FlowFixMe[object-this-reference]
       return this.constants.isTesting;
     }
     return false;
   },
   // $FlowFixMe[unsafe-getters-setters]
   get isTV(): boolean {
+    // $FlowFixMe[object-this-reference]
     return this.constants.uiMode === 'tv';
   },
-  select: <A, N, D>(spec: PlatformSelectSpec<A, N, D>): A | N | D =>
+  select: <T>(spec: PlatformSelectSpec<T>): T =>
     'android' in spec
       ? // $FlowFixMe[incompatible-return]
         spec.android
diff --git a/Libraries/Utilities/Platform.d.ts b/Libraries/Utilities/Platform.d.ts
new file mode 100644
index 000000000000..465a82b35c6d
--- /dev/null
+++ b/Libraries/Utilities/Platform.d.ts
@@ -0,0 +1,102 @@
+/**
+ * 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
+ */
+
+/**
+ * @see https://reactnative.dev/docs/platform-specific-code#content
+ */
+export type PlatformOSType =
+  | 'ios'
+  | 'android'
+  | 'macos'
+  | 'windows'
+  | 'web'
+  | 'native';
+type PlatformConstants = {
+  isTesting: boolean;
+  reactNativeVersion: {
+    major: number;
+    minor: number;
+    patch: number;
+    prerelease?: number | null | undefined;
+  };
+};
+interface PlatformStatic {
+  isTV: boolean;
+  isTesting: boolean;
+  Version: number | string;
+  constants: PlatformConstants;
+
+  /**
+   * @see https://reactnative.dev/docs/platform-specific-code#content
+   */
+  select<T>(
+    specifics:
+      | ({[platform in PlatformOSType]?: T} & {default: T})
+      | {[platform in PlatformOSType]: T},
+  ): T;
+  select<T>(specifics: {[platform in PlatformOSType]?: T}): T | undefined;
+}
+
+interface PlatformIOSStatic extends PlatformStatic {
+  constants: PlatformConstants & {
+    forceTouchAvailable: boolean;
+    interfaceIdiom: string;
+    osVersion: string;
+    systemName: string;
+  };
+  OS: 'ios';
+  isPad: boolean;
+  isTV: boolean;
+  Version: string;
+}
+
+interface PlatformAndroidStatic extends PlatformStatic {
+  constants: PlatformConstants & {
+    Version: number;
+    Release: string;
+    Serial: string;
+    Fingerprint: string;
+    Model: string;
+    Brand: string;
+    Manufacturer: string;
+    ServerHost?: string | undefined;
+    uiMode: 'car' | 'desk' | 'normal' | 'tv' | 'watch' | 'unknown';
+  };
+  OS: 'android';
+  Version: number;
+}
+
+interface PlatformMacOSStatic extends PlatformStatic {
+  OS: 'macos';
+  Version: string;
+  constants: PlatformConstants & {
+    osVersion: string;
+  };
+}
+
+interface PlatformWindowsOSStatic extends PlatformStatic {
+  OS: 'windows';
+  Version: number;
+  constants: PlatformConstants & {
+    osVersion: number;
+  };
+}
+
+interface PlatformWebStatic extends PlatformStatic {
+  OS: 'web';
+}
+
+export type Platform =
+  | PlatformIOSStatic
+  | PlatformAndroidStatic
+  | PlatformWindowsOSStatic
+  | PlatformMacOSStatic
+  | PlatformWebStatic;
+
+export const Platform: Platform;
diff --git a/Libraries/Utilities/Platform.ios.js b/Libraries/Utilities/Platform.ios.js
index fc18ed727469..4adf4201c52b 100644
--- a/Libraries/Utilities/Platform.ios.js
+++ b/Libraries/Utilities/Platform.ios.js
@@ -10,10 +10,10 @@
 
 import NativePlatformConstantsIOS from './NativePlatformConstantsIOS';
 
-export type PlatformSelectSpec<D, N, I> = {
-  default?: D,
-  native?: N,
-  ios?: I,
+export type PlatformSelectSpec<T> = {
+  default?: T,
+  native?: T,
+  ios?: T,
   ...
 };
 
@@ -22,6 +22,7 @@ const Platform = {
   OS: 'ios',
   // $FlowFixMe[unsafe-getters-setters]
   get Version(): string {
+    // $FlowFixMe[object-this-reference]
     return this.constants.osVersion;
   },
   // $FlowFixMe[unsafe-getters-setters]
@@ -38,27 +39,33 @@ const Platform = {
     |},
     systemName: string,
   |} {
+    // $FlowFixMe[object-this-reference]
     if (this.__constants == null) {
+      // $FlowFixMe[object-this-reference]
       this.__constants = NativePlatformConstantsIOS.getConstants();
     }
+    // $FlowFixMe[object-this-reference]
     return this.__constants;
   },
   // $FlowFixMe[unsafe-getters-setters]
   get isPad(): boolean {
+    // $FlowFixMe[object-this-reference]
     return this.constants.interfaceIdiom === 'pad';
   },
   // $FlowFixMe[unsafe-getters-setters]
   get isTV(): boolean {
+    // $FlowFixMe[object-this-reference]
     return this.constants.interfaceIdiom === 'tv';
   },
   // $FlowFixMe[unsafe-getters-setters]
   get isTesting(): boolean {
     if (__DEV__) {
+      // $FlowFixMe[object-this-reference]
       return this.constants.isTesting;
     }
     return false;
   },
-  select: <D, N, I>(spec: PlatformSelectSpec<D, N, I>): D | N | I =>
+  select: <T>(spec: PlatformSelectSpec<T>): T =>
     // $FlowFixMe[incompatible-return]
     'ios' in spec ? spec.ios : 'native' in spec ? spec.native : spec.default,
 };
diff --git a/Libraries/Utilities/PolyfillFunctions.js b/Libraries/Utilities/PolyfillFunctions.js
index b09def25782e..61c6d8b8d491 100644
--- a/Libraries/Utilities/PolyfillFunctions.js
+++ b/Libraries/Utilities/PolyfillFunctions.js
@@ -30,7 +30,7 @@ function polyfillObjectProperty<T>(
   name: string,
   getValue: () => T,
 ): void {
-  const descriptor = Object.getOwnPropertyDescriptor(object, name);
+  const descriptor = Object.getOwnPropertyDescriptor<$FlowFixMe>(object, name);
   if (__DEV__ && descriptor) {
     const backupName = `original${name[0].toUpperCase()}${name.substr(1)}`;
     Object.defineProperty(object, backupName, descriptor);
diff --git a/Libraries/Utilities/ReactNativeTestTools.js b/Libraries/Utilities/ReactNativeTestTools.js
index dfbb46780bc0..5dc2221528dc 100644
--- a/Libraries/Utilities/ReactNativeTestTools.js
+++ b/Libraries/Utilities/ReactNativeTestTools.js
@@ -10,22 +10,24 @@
 
 /* eslint-env jest */
 
-const React = require('react');
+import type {ReactTestRenderer as ReactTestRendererType} from 'react-test-renderer';
 
-const ReactTestRenderer = require('react-test-renderer');
+const Switch = require('../Components/Switch/Switch').default;
+const TextInput = require('../Components/TextInput/TextInput');
+const View = require('../Components/View/View');
+const VirtualizedList = require('../Lists/VirtualizedList').default;
+const Text = require('../Text/Text');
+const React = require('react');
 const ShallowRenderer = require('react-shallow-renderer');
+const ReactTestRenderer = require('react-test-renderer');
+
 /* $FlowFixMe[not-a-function] (>=0.125.1 site=react_native_fb) This comment
  * suppresses an error found when Flow v0.125.1 was deployed. To see the error,
  * delete this comment and run Flow. */
 // $FlowFixMe[invalid-constructor]
 const shallowRenderer = new ShallowRenderer();
-
-import type {ReactTestRenderer as ReactTestRendererType} from 'react-test-renderer';
-
 export type ReactTestInstance = $PropertyType<ReactTestRendererType, 'root'>;
-
 export type Predicate = (node: ReactTestInstance) => boolean;
-
 type $ReturnType<Fn> = $Call<<Ret, A>((...A) => Ret) => Ret, Fn>;
 /* $FlowFixMe[value-as-type] (>=0.125.1 site=react_native_fb) This comment
  * suppresses an error found when Flow v0.125.1 was deployed. To see the error,
@@ -36,14 +38,6 @@ export type ReactTestRendererJSON =
    * delete this comment and run Flow. */
   $ReturnType<ReactTestRenderer.create.toJSON>;
 
-const {
-  Switch,
-  Text,
-  TextInput,
-  View,
-  VirtualizedList,
-} = require('react-native');
-
 function byClickable(): Predicate {
   return withMessage(
     node =>
diff --git a/Libraries/Utilities/__tests__/DeviceInfo-test.js b/Libraries/Utilities/__tests__/DeviceInfo-test.js
index 489c2afbfc7b..07189d2cde64 100644
--- a/Libraries/Utilities/__tests__/DeviceInfo-test.js
+++ b/Libraries/Utilities/__tests__/DeviceInfo-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/__tests__/Dimensions-test.js b/Libraries/Utilities/__tests__/Dimensions-test.js
index 35a0bc7f8754..c9acae1e26dd 100644
--- a/Libraries/Utilities/__tests__/Dimensions-test.js
+++ b/Libraries/Utilities/__tests__/Dimensions-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/__tests__/MatrixMath-test.js b/Libraries/Utilities/__tests__/MatrixMath-test.js
index 5fd824a8ce12..22c2c9e19599 100644
--- a/Libraries/Utilities/__tests__/MatrixMath-test.js
+++ b/Libraries/Utilities/__tests__/MatrixMath-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/__tests__/PerformanceLogger-test.js b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
index 08940a9a8008..a7c0a5913445 100644
--- a/Libraries/Utilities/__tests__/PerformanceLogger-test.js
+++ b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
@@ -8,10 +8,11 @@
  * @flow strict-local
  */
 
-import GlobalPerformanceLogger from '../GlobalPerformanceLogger';
-import createPerformanceLogger from '../createPerformanceLogger';
 import type {IPerformanceLogger} from '../createPerformanceLogger';
 
+import createPerformanceLogger from '../createPerformanceLogger';
+import GlobalPerformanceLogger from '../GlobalPerformanceLogger';
+
 const TIMESPAN_1 = '<timespan_1>';
 const EXTRA_KEY = '<extra_key>';
 const EXTRA_VALUE = '<extra_value>';
diff --git a/Libraries/Utilities/__tests__/PixelRatio-test.js b/Libraries/Utilities/__tests__/PixelRatio-test.js
index cfac4649c601..5b8f3ebc7801 100644
--- a/Libraries/Utilities/__tests__/PixelRatio-test.js
+++ b/Libraries/Utilities/__tests__/PixelRatio-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/__tests__/Platform-test.js b/Libraries/Utilities/__tests__/Platform-test.js
index 8871ff5a9fa6..68f0b2724886 100644
--- a/Libraries/Utilities/__tests__/Platform-test.js
+++ b/Libraries/Utilities/__tests__/Platform-test.js
@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
-const PlatformIOS = require('../Platform.ios');
 const PlatformAndroid = require('../Platform.android');
+const PlatformIOS = require('../Platform.ios');
 
 describe('Platform', () => {
   describe('OS', () => {
diff --git a/Libraries/Utilities/__tests__/ReactNativeTestTools-test.js b/Libraries/Utilities/__tests__/ReactNativeTestTools-test.js
index 5c05319a34ed..05e757bbd195 100644
--- a/Libraries/Utilities/__tests__/ReactNativeTestTools-test.js
+++ b/Libraries/Utilities/__tests__/ReactNativeTestTools-test.js
@@ -6,13 +6,15 @@
  *
  * @flow
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
-import * as React from 'react';
+import TextInput from '../../Components/TextInput/TextInput';
+import TouchableWithoutFeedback from '../../Components/Touchable/TouchableWithoutFeedback';
+import View from '../../Components/View/View';
+import Text from '../../Text/Text';
 import {byTestID, byTextMatching, enter, tap} from '../ReactNativeTestTools';
-
-import {Text, TextInput, TouchableWithoutFeedback, View} from 'react-native';
+import * as React from 'react';
 
 const ReactTestRenderer = require('react-test-renderer');
 
diff --git a/Libraries/Utilities/__tests__/SceneTracker-test.js b/Libraries/Utilities/__tests__/SceneTracker-test.js
index 636a8de8f217..44a42a526811 100644
--- a/Libraries/Utilities/__tests__/SceneTracker-test.js
+++ b/Libraries/Utilities/__tests__/SceneTracker-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/__tests__/binaryToBase64-test.js b/Libraries/Utilities/__tests__/binaryToBase64-test.js
index 691f3c63b27f..a820869b4e5f 100644
--- a/Libraries/Utilities/__tests__/binaryToBase64-test.js
+++ b/Libraries/Utilities/__tests__/binaryToBase64-test.js
@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
 const base64 = require('base64-js');
-const {TextEncoder, TextDecoder} = require('util');
+const {TextDecoder, TextEncoder} = require('util');
 
 describe('binaryToBase64', () => {
   const binaryToBase64 = require('../binaryToBase64');
diff --git a/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js b/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js
index 86f55af3f2e6..2507f0f21c8f 100644
--- a/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js
+++ b/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/__tests__/clamp-test.js b/Libraries/Utilities/__tests__/clamp-test.js
index 72a4156a7a03..c98980451933 100644
--- a/Libraries/Utilities/__tests__/clamp-test.js
+++ b/Libraries/Utilities/__tests__/clamp-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/__tests__/codegenNativeComponent-test.js b/Libraries/Utilities/__tests__/codegenNativeComponent-test.js
index ae2101d7978f..4efe80cc09dc 100644
--- a/Libraries/Utilities/__tests__/codegenNativeComponent-test.js
+++ b/Libraries/Utilities/__tests__/codegenNativeComponent-test.js
@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
+const UIManager = require('../../ReactNative/UIManager');
 const codegenNativeComponent = require('../codegenNativeComponent').default;
-const {UIManager} = require('react-native');
 
 // We need to unmock requireNativeComponent since it's under test.
 // Instead, we mock the function it calls, createReactNativeComponentClass,
diff --git a/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js b/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js
index 8fb77d073981..33a0482c59f7 100644
--- a/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js
+++ b/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 const deepFreezeAndThrowOnMutationInDev = require('../deepFreezeAndThrowOnMutationInDev');
diff --git a/Libraries/Utilities/__tests__/groupByEveryN-test.js b/Libraries/Utilities/__tests__/groupByEveryN-test.js
index 5acfb42799f8..d47a372a8367 100644
--- a/Libraries/Utilities/__tests__/groupByEveryN-test.js
+++ b/Libraries/Utilities/__tests__/groupByEveryN-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/__tests__/infoLog-test.js b/Libraries/Utilities/__tests__/infoLog-test.js
index 8fe6f8fdd5cd..25952fa5ef22 100644
--- a/Libraries/Utilities/__tests__/infoLog-test.js
+++ b/Libraries/Utilities/__tests__/infoLog-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/__tests__/logError-test.js b/Libraries/Utilities/__tests__/logError-test.js
index 4ee79cec2885..01fb17f5ef34 100644
--- a/Libraries/Utilities/__tests__/logError-test.js
+++ b/Libraries/Utilities/__tests__/logError-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/__tests__/mapWithSeparator-test.js b/Libraries/Utilities/__tests__/mapWithSeparator-test.js
index 9c9022455151..8ec660d540cc 100644
--- a/Libraries/Utilities/__tests__/mapWithSeparator-test.js
+++ b/Libraries/Utilities/__tests__/mapWithSeparator-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/__tests__/mergeIntoFast-test.js b/Libraries/Utilities/__tests__/mergeIntoFast-test.js
index 8cd93030105a..c7398ef2028a 100644
--- a/Libraries/Utilities/__tests__/mergeIntoFast-test.js
+++ b/Libraries/Utilities/__tests__/mergeIntoFast-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/__tests__/setAndForwardRef-test.js b/Libraries/Utilities/__tests__/setAndForwardRef-test.js
index 51c493dad3c4..83e6acc1e680 100644
--- a/Libraries/Utilities/__tests__/setAndForwardRef-test.js
+++ b/Libraries/Utilities/__tests__/setAndForwardRef-test.js
@@ -6,27 +6,26 @@
  *
  * @flow
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
 
+const setAndForwardRef = require('../setAndForwardRef');
 const React = require('react');
 const ReactTestRenderer = require('react-test-renderer');
 
-const setAndForwardRef = require('../setAndForwardRef');
-
 describe('setAndForwardRef', () => {
   let innerFuncCalled: ?boolean = false;
   let outerFuncCalled: ?boolean = false;
 
   class ForwardedComponent extends React.Component<{||}> {
-    testFunc() {
+    testFunc(): any {
       innerFuncCalled = true;
       return true;
     }
 
-    render() {
+    render(): any {
       return null;
     }
   }
@@ -38,7 +37,7 @@ describe('setAndForwardRef', () => {
 
   class TestComponent extends React.Component<Props> {
     _nativeRef: ?React.ElementRef<typeof ForwardedComponent> = null;
-    _setNativeRef = setAndForwardRef({
+    _setNativeRef: (ref: React.ElementRef<any>) => void = setAndForwardRef({
       getForwardedRef: () => this.props.forwardedRef,
       setLocalRef: ref => {
         this._nativeRef = ref;
@@ -51,7 +50,7 @@ describe('setAndForwardRef', () => {
       }
     }
 
-    render() {
+    render(): React.Node {
       return <ForwardedComponent ref={this._setNativeRef} />;
     }
   }
@@ -111,7 +110,7 @@ describe('setAndForwardRef', () => {
         /* eslint-enable react/no-string-refs */
       }
 
-      render() {
+      render(): React.Node {
         /**
          * Can't directly pass the test component to `ReactTestRenderer.create`,
          * otherwise it will throw. See:
diff --git a/Libraries/Utilities/__tests__/stringifySafe-test.js b/Libraries/Utilities/__tests__/stringifySafe-test.js
index 9412614ac292..7f798e07343c 100644
--- a/Libraries/Utilities/__tests__/stringifySafe-test.js
+++ b/Libraries/Utilities/__tests__/stringifySafe-test.js
@@ -4,9 +4,9 @@
  * 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
- * @emails oncall+react_native
+ * @format
+ * @oncall react_native
  */
 
 import stringifySafe, {createStringifySafeWithLimits} from '../stringifySafe';
diff --git a/Libraries/Utilities/__tests__/truncate-test.js b/Libraries/Utilities/__tests__/truncate-test.js
index 0167a161cd1d..aa6908432e00 100644
--- a/Libraries/Utilities/__tests__/truncate-test.js
+++ b/Libraries/Utilities/__tests__/truncate-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/__tests__/useMergeRefs-test.js b/Libraries/Utilities/__tests__/useMergeRefs-test.js
index 06d0658cf6c3..18b201ac1c92 100644
--- a/Libraries/Utilities/__tests__/useMergeRefs-test.js
+++ b/Libraries/Utilities/__tests__/useMergeRefs-test.js
@@ -4,14 +4,17 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
+import type {ViewProps} from '../../Components/View/ViewPropTypes';
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+
+import View from '../../Components/View/View';
 import useMergeRefs from '../useMergeRefs';
 import * as React from 'react';
-import {View} from 'react-native';
 import {act, create} from 'react-test-renderer';
 
 /**
@@ -40,7 +43,7 @@ class TestViewInstance {
     return testID == null ? null : new TestViewInstance(testID);
   }
 
-  static named(name: string) {
+  static named(name: string): $FlowFixMe {
     // $FlowIssue[prop-missing] - Flow does not support type augmentation.
     return expect.testViewInstance(name);
   }
@@ -86,7 +89,12 @@ function mockRefRegistry<T>(): {
 test('accepts a callback ref', () => {
   let root;
 
-  const {mockCallbackRef, registry} = mockRefRegistry();
+  const {mockCallbackRef, registry} = mockRefRegistry<React$ElementRef<
+    React$AbstractComponent<
+      ViewProps,
+      React.ElementRef<HostComponent<ViewProps>>,
+    >,
+  > | null>();
   const refA = mockCallbackRef('refA');
 
   act(() => {
@@ -118,7 +126,12 @@ test('accepts a callback ref', () => {
 test('accepts an object ref', () => {
   let root;
 
-  const {mockObjectRef, registry} = mockRefRegistry();
+  const {mockObjectRef, registry} = mockRefRegistry<React$ElementRef<
+    React$AbstractComponent<
+      ViewProps,
+      React.ElementRef<HostComponent<ViewProps>>,
+    >,
+  > | null>();
   const refA = mockObjectRef('refA');
 
   act(() => {
@@ -150,7 +163,13 @@ test('accepts an object ref', () => {
 test('invokes refs in order', () => {
   let root;
 
-  const {mockCallbackRef, mockObjectRef, registry} = mockRefRegistry();
+  const {mockCallbackRef, mockObjectRef, registry} =
+    mockRefRegistry<React$ElementRef<
+      React$AbstractComponent<
+        ViewProps,
+        React.ElementRef<HostComponent<ViewProps>>,
+      >,
+    > | null>();
   const refA = mockCallbackRef('refA');
   const refB = mockObjectRef('refB');
   const refC = mockCallbackRef('refC');
@@ -188,7 +207,12 @@ test('invokes refs in order', () => {
 test('invokes all refs if any ref changes', () => {
   let root;
 
-  const {mockCallbackRef, registry} = mockRefRegistry();
+  const {mockCallbackRef, registry} = mockRefRegistry<React$ElementRef<
+    React$AbstractComponent<
+      ViewProps,
+      React.ElementRef<HostComponent<ViewProps>>,
+    >,
+  > | null>();
   const refA = mockCallbackRef('refA');
   const refB = mockCallbackRef('refB');
 
diff --git a/Libraries/Utilities/__tests__/useRefEffect-test.js b/Libraries/Utilities/__tests__/useRefEffect-test.js
index dc5bb882084a..ee163330d853 100644
--- a/Libraries/Utilities/__tests__/useRefEffect-test.js
+++ b/Libraries/Utilities/__tests__/useRefEffect-test.js
@@ -4,14 +4,14 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
+import View from '../../Components/View/View';
 import useRefEffect from '../useRefEffect';
 import * as React from 'react';
-import {View} from 'react-native';
 import {act, create} from 'react-test-renderer';
 
 /**
@@ -45,7 +45,7 @@ class TestEffect {
     this.name = name;
     this.key = key;
   }
-  static called(name: string, key: ?string) {
+  static called(name: string, key: ?string): $FlowFixMe {
     // $FlowIssue[prop-missing] - Flow does not support type augmentation.
     return expect.effect(name, key);
   }
@@ -61,7 +61,7 @@ class TestEffectCleanup {
     this.name = name;
     this.key = key;
   }
-  static called(name: string, key: ?string) {
+  static called(name: string, key: ?string): $FlowFixMe {
     // $FlowIssue[prop-missing] - Flow does not support type augmentation.
     return expect.effectCleanup(name, key);
   }
@@ -94,7 +94,7 @@ function mockEffectRegistry(): {
   mockEffectWithoutCleanup: string => () => void,
   registry: $ReadOnlyArray<TestEffect | TestEffectCleanup>,
 } {
-  const registry = [];
+  const registry: Array<TestEffect | TestEffectCleanup> = [];
   return {
     mockEffect(name: string): () => () => void {
       return instance => {
diff --git a/Libraries/Utilities/__tests__/verifyComponentAttributeEquivalence-test.js b/Libraries/Utilities/__tests__/verifyComponentAttributeEquivalence-test.js
index 1bef8811ac1d..b6d4b70fe5a5 100644
--- a/Libraries/Utilities/__tests__/verifyComponentAttributeEquivalence-test.js
+++ b/Libraries/Utilities/__tests__/verifyComponentAttributeEquivalence-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/__tests__/warnOnce-test.js b/Libraries/Utilities/__tests__/warnOnce-test.js
index b9bca0d7b2b3..ce0dd4656208 100644
--- a/Libraries/Utilities/__tests__/warnOnce-test.js
+++ b/Libraries/Utilities/__tests__/warnOnce-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/codegenNativeCommands.js b/Libraries/Utilities/codegenNativeCommands.js
index fe8e23944b7b..05e29cd5e6a9 100644
--- a/Libraries/Utilities/codegenNativeCommands.js
+++ b/Libraries/Utilities/codegenNativeCommands.js
@@ -8,16 +8,7 @@
  * @flow
  */
 
-let dispatchCommand;
-if (global.RN$Bridgeless) {
-  // Note: this function has the same implementation in the legacy and new renderer.
-  // However, evaluating the old renderer comes with some side effects.
-  dispatchCommand =
-    require('../../Libraries/Renderer/shims/ReactFabric').dispatchCommand;
-} else {
-  dispatchCommand =
-    require('../../Libraries/Renderer/shims/ReactNative').dispatchCommand;
-}
+const {dispatchCommand} = require('../ReactNative/RendererProxy');
 
 type Options<T = string> = $ReadOnly<{|
   supportedCommands: $ReadOnlyArray<T>,
diff --git a/Libraries/Utilities/codegenNativeComponent.js b/Libraries/Utilities/codegenNativeComponent.js
index 673544ad44e4..3f60697155e0 100644
--- a/Libraries/Utilities/codegenNativeComponent.js
+++ b/Libraries/Utilities/codegenNativeComponent.js
@@ -10,8 +10,9 @@
 
 // TODO: move this file to shims/ReactNative (requires React update and sync)
 
-import requireNativeComponent from '../../Libraries/ReactNative/requireNativeComponent';
 import type {HostComponent} from '../../Libraries/Renderer/shims/ReactNativeTypes';
+
+import requireNativeComponent from '../../Libraries/ReactNative/requireNativeComponent';
 import UIManager from '../ReactNative/UIManager';
 
 // TODO: import from CodegenSchema once workspaces are enabled
@@ -54,6 +55,7 @@ function codegenNativeComponent<Props>(
       options.paperComponentNameDeprecated != null &&
       UIManager.hasViewManagerConfig(options.paperComponentNameDeprecated)
     ) {
+      // $FlowFixMe[incompatible-type]
       componentNameInUse = options.paperComponentNameDeprecated;
     } else {
       throw new Error(
@@ -65,6 +67,7 @@ function codegenNativeComponent<Props>(
   }
 
   return (requireNativeComponent<Props>(
+    // $FlowFixMe[incompatible-call]
     componentNameInUse,
   ): HostComponent<Props>);
 }
diff --git a/Libraries/Utilities/createPerformanceLogger.d.ts b/Libraries/Utilities/createPerformanceLogger.d.ts
new file mode 100644
index 000000000000..57b590b99da4
--- /dev/null
+++ b/Libraries/Utilities/createPerformanceLogger.d.ts
@@ -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.
+ *
+ * @format
+ */
+
+export type Timespan = {
+  startTime: number;
+  endTime?: number;
+  totalTime?: number;
+  startExtras?: Extras;
+  endExtras?: Extras;
+};
+
+// Extra values should be serializable primitives
+export type ExtraValue = number | string | boolean;
+
+export type Extras = {[key: string]: ExtraValue};
+
+export interface IPerformanceLogger {
+  addTimespan(
+    key: string,
+    startTime: number,
+    endTime: number,
+    startExtras?: Extras,
+    endExtras?: Extras,
+  ): void;
+  append(logger: IPerformanceLogger): void;
+  clear(): void;
+  clearCompleted(): void;
+  close(): void;
+  currentTimestamp(): number;
+  getExtras(): {[key: string]: ExtraValue | null};
+  getPoints(): {[key: string]: number | null};
+  getPointExtras(): {[key: string]: Extras | null};
+  getTimespans(): {[key: string]: Timespan | null};
+  hasTimespan(key: string): boolean;
+  isClosed(): boolean;
+  logEverything(): void;
+  markPoint(key: string, timestamp?: number, extras?: Extras): void;
+  removeExtra(key: string): ExtraValue | null;
+  setExtra(key: string, value: ExtraValue): void;
+  startTimespan(key: string, timestamp?: number, extras?: Extras): void;
+  stopTimespan(key: string, timestamp?: number, extras?: Extras): void;
+}
diff --git a/Libraries/Utilities/createPerformanceLogger.js b/Libraries/Utilities/createPerformanceLogger.js
index 82307f47f206..6d0efb5d1fec 100644
--- a/Libraries/Utilities/createPerformanceLogger.js
+++ b/Libraries/Utilities/createPerformanceLogger.js
@@ -9,7 +9,6 @@
  */
 
 const Systrace = require('../Performance/Systrace');
-
 const infoLog = require('./infoLog');
 
 export type Timespan = {
@@ -137,31 +136,31 @@ class PerformanceLogger implements IPerformanceLogger {
     this._closed = true;
   }
 
-  currentTimestamp() {
+  currentTimestamp(): number {
     return getCurrentTimestamp();
   }
 
-  getExtras() {
+  getExtras(): {[key: string]: ?ExtraValue} {
     return this._extras;
   }
 
-  getPoints() {
+  getPoints(): {[key: string]: ?number} {
     return this._points;
   }
 
-  getPointExtras() {
+  getPointExtras(): {[key: string]: ?Extras} {
     return this._pointExtras;
   }
 
-  getTimespans() {
+  getTimespans(): {[key: string]: ?Timespan} {
     return this._timespans;
   }
 
-  hasTimespan(key: string) {
+  hasTimespan(key: string): boolean {
     return !!this._timespans[key];
   }
 
-  isClosed() {
+  isClosed(): boolean {
     return this._closed;
   }
 
diff --git a/Libraries/Utilities/differ/__tests__/deepDiffer-test.js b/Libraries/Utilities/differ/__tests__/deepDiffer-test.js
index cc6672bb13cb..0129e9d5ee1c 100644
--- a/Libraries/Utilities/differ/__tests__/deepDiffer-test.js
+++ b/Libraries/Utilities/differ/__tests__/deepDiffer-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/differ/__tests__/matricesDiffer-test.js b/Libraries/Utilities/differ/__tests__/matricesDiffer-test.js
index b145af27307f..8512db2040d7 100644
--- a/Libraries/Utilities/differ/__tests__/matricesDiffer-test.js
+++ b/Libraries/Utilities/differ/__tests__/matricesDiffer-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Utilities/differ/deepDiffer.js b/Libraries/Utilities/differ/deepDiffer.js
index c186b6c38dd4..b0af0244a654 100644
--- a/Libraries/Utilities/differ/deepDiffer.js
+++ b/Libraries/Utilities/differ/deepDiffer.js
@@ -97,5 +97,5 @@ const deepDiffer = function (
   return false;
 };
 
+deepDiffer.unstable_setLogListeners = unstable_setLogListeners;
 module.exports = deepDiffer;
-module.exports.unstable_setLogListeners = unstable_setLogListeners;
diff --git a/Libraries/Utilities/groupByEveryN.js b/Libraries/Utilities/groupByEveryN.js
index 51489ec0592e..0ef4c12d216f 100644
--- a/Libraries/Utilities/groupByEveryN.js
+++ b/Libraries/Utilities/groupByEveryN.js
@@ -28,7 +28,7 @@
 
 function groupByEveryN<T>(array: Array<T>, n: number): Array<Array<?T>> {
   const result = [];
-  let temp = [];
+  let temp: Array<?T> = [];
 
   for (let i = 0; i < array.length; ++i) {
     if (i > 0 && i % n === 0) {
diff --git a/Libraries/Utilities/stringifySafe.js b/Libraries/Utilities/stringifySafe.js
index 922ce9bd8bcb..a61716ab49a2 100644
--- a/Libraries/Utilities/stringifySafe.js
+++ b/Libraries/Utilities/stringifySafe.js
@@ -26,7 +26,9 @@ export function createStringifySafeWithLimits(limits: {|
     maxArrayLimit = Number.POSITIVE_INFINITY,
     maxObjectKeysLimit = Number.POSITIVE_INFINITY,
   } = limits;
-  const stack = [];
+  const stack: Array<
+    string | {+[string]: mixed} | {'...(truncated keys)...': number},
+  > = [];
   /* $FlowFixMe[missing-this-annot] The 'this' type annotation(s) required by
    * Flow's LTI update could not be added via codemod */
   function replacer(key: string, value: mixed): mixed {
diff --git a/Libraries/Utilities/useColorScheme.js b/Libraries/Utilities/useColorScheme.js
index b0d6eaeb2209..0c6b490a1c45 100644
--- a/Libraries/Utilities/useColorScheme.js
+++ b/Libraries/Utilities/useColorScheme.js
@@ -10,10 +10,11 @@
 
 'use strict';
 
-import {useSyncExternalStore} from 'use-sync-external-store/shim';
-import Appearance from './Appearance';
 import type {ColorSchemeName} from './NativeAppearance';
 
+import Appearance from './Appearance';
+import {useSyncExternalStore} from 'use-sync-external-store/shim';
+
 export default function useColorScheme(): ?ColorSchemeName {
   return useSyncExternalStore(
     callback => {
diff --git a/Libraries/Utilities/useRefEffect.js b/Libraries/Utilities/useRefEffect.js
index b79a644b83c0..26446cbf5360 100644
--- a/Libraries/Utilities/useRefEffect.js
+++ b/Libraries/Utilities/useRefEffect.js
@@ -31,7 +31,7 @@ export default function useRefEffect<TInstance>(
 ): CallbackRef<TInstance | null> {
   const cleanupRef = useRef<(() => void) | void>(undefined);
   return useCallback(
-    instance => {
+    (instance: null | TInstance) => {
       if (cleanupRef.current) {
         cleanupRef.current();
         cleanupRef.current = undefined;
diff --git a/Libraries/Vibration/NativeVibration.js b/Libraries/Vibration/NativeVibration.js
index d2ce739c1178..8fcc446817bd 100644
--- a/Libraries/Vibration/NativeVibration.js
+++ b/Libraries/Vibration/NativeVibration.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/Vibration/RCTVibration.mm b/Libraries/Vibration/RCTVibration.mm
index 68e4669d60c7..389dc871c4d2 100644
--- a/Libraries/Vibration/RCTVibration.mm
+++ b/Libraries/Vibration/RCTVibration.mm
@@ -13,7 +13,7 @@
 
 #import "RCTVibrationPlugins.h"
 
-@interface RCTVibration() <NativeVibrationSpec>
+@interface RCTVibration () <NativeVibrationSpec>
 @end
 
 @implementation RCTVibration
@@ -25,18 +25,18 @@ - (void)vibrate
   AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
 }
 
-RCT_EXPORT_METHOD(vibrate:(double)pattern)
+RCT_EXPORT_METHOD(vibrate : (double)pattern)
 {
   [self vibrate];
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   return std::make_shared<facebook::react::NativeVibrationSpecJSI>(params);
 }
 
-RCT_EXPORT_METHOD(vibrateByPattern:(NSArray *)pattern
-                  repeat:(double)repeat)
+RCT_EXPORT_METHOD(vibrateByPattern : (NSArray *)pattern repeat : (double)repeat)
 {
   RCTLogError(@"Vibration.vibrateByPattern does not have an iOS implementation");
 }
diff --git a/Libraries/Vibration/Vibration.d.ts b/Libraries/Vibration/Vibration.d.ts
new file mode 100644
index 000000000000..6e194b320a6e
--- /dev/null
+++ b/Libraries/Vibration/Vibration.d.ts
@@ -0,0 +1,43 @@
+/**
+ * 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
+ */
+
+/**
+ * The Vibration API is exposed at `Vibration.vibrate()`.
+ * The vibration is asynchronous so this method will return immediately.
+ *
+ * There will be no effect on devices that do not support Vibration, eg. the simulator.
+ *
+ * **Note for android**
+ * add `<uses-permission android:name="android.permission.VIBRATE"/>` to `AndroidManifest.xml`
+ *
+ * **Android Usage:**
+ *
+ * [0, 500, 200, 500]
+ * V(0.5s) --wait(0.2s)--> V(0.5s)
+ *
+ * [300, 500, 200, 500]
+ * --wait(0.3s)--> V(0.5s) --wait(0.2s)--> V(0.5s)
+ *
+ * **iOS Usage:**
+ * if first argument is 0, it will not be included in pattern array.
+ *
+ * [0, 1000, 2000, 3000]
+ * V(fixed) --wait(1s)--> V(fixed) --wait(2s)--> V(fixed) --wait(3s)--> V(fixed)
+ */
+export interface VibrationStatic {
+  vibrate(pattern?: number | number[], repeat?: boolean): void;
+
+  /**
+   * Stop vibration
+   */
+  cancel(): void;
+}
+
+export const Vibration: VibrationStatic;
+export type Vibration = VibrationStatic;
diff --git a/Libraries/Vibration/Vibration.js b/Libraries/Vibration/Vibration.js
index f862235d79ef..db124c63235c 100644
--- a/Libraries/Vibration/Vibration.js
+++ b/Libraries/Vibration/Vibration.js
@@ -10,6 +10,7 @@
  */
 
 import NativeVibration from './NativeVibration';
+
 const Platform = require('../Utilities/Platform');
 
 /**
diff --git a/Libraries/WebPerformance/NativePerformanceObserver.cpp b/Libraries/WebPerformance/NativePerformanceObserver.cpp
new file mode 100644
index 000000000000..32ab293e6cbf
--- /dev/null
+++ b/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
diff --git a/Libraries/WebPerformance/NativePerformanceObserver.h b/Libraries/WebPerformance/NativePerformanceObserver.h
new file mode 100644
index 000000000000..3a3250dcbcc6
--- /dev/null
+++ b/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
diff --git a/Libraries/WebPerformance/NativePerformanceObserver.js b/Libraries/WebPerformance/NativePerformanceObserver.js
new file mode 100644
index 000000000000..b3d6fdefc8b7
--- /dev/null
+++ b/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);
diff --git a/Libraries/WebPerformance/PerformanceObserver.js b/Libraries/WebPerformance/PerformanceObserver.js
new file mode 100644
index 000000000000..dc9a0c4aff6f
--- /dev/null
+++ b/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,
+    );
+  });
+}
diff --git a/Libraries/WebSocket/NativeWebSocketModule.js b/Libraries/WebSocket/NativeWebSocketModule.js
index 9c3f7672f5f0..7ae271cc5243 100644
--- a/Libraries/WebSocket/NativeWebSocketModule.js
+++ b/Libraries/WebSocket/NativeWebSocketModule.js
@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
diff --git a/Libraries/WebSocket/RCTReconnectingWebSocket.m b/Libraries/WebSocket/RCTReconnectingWebSocket.m
index bbd8c2273ace..d557815eb1d2 100644
--- a/Libraries/WebSocket/RCTReconnectingWebSocket.m
+++ b/Libraries/WebSocket/RCTReconnectingWebSocket.m
@@ -68,7 +68,7 @@ - (void)webSocket:(RCTSRWebSocket *)webSocket didReceiveMessage:(id)message
 - (void)reconnect
 {
   if (_stopped) {
-   return;
+    return;
   }
 
   __weak RCTSRWebSocket *socket = _socket;
@@ -95,7 +95,10 @@ - (void)webSocket:(RCTSRWebSocket *)webSocket didFailWithError:(NSError *)error
   }
 }
 
-- (void)webSocket:(RCTSRWebSocket *)webSocket didCloseWithCode:(NSInteger)code reason:(NSString *)reason wasClean:(BOOL)wasClean
+- (void)webSocket:(RCTSRWebSocket *)webSocket
+    didCloseWithCode:(NSInteger)code
+              reason:(NSString *)reason
+            wasClean:(BOOL)wasClean
 {
   [_delegate reconnectingWebSocketDidClose:self];
   [self reconnect];
diff --git a/Libraries/WebSocket/RCTSRWebSocket.h b/Libraries/WebSocket/RCTSRWebSocket.h
index 1b17cffaf47c..4480121b465f 100644
--- a/Libraries/WebSocket/RCTSRWebSocket.h
+++ b/Libraries/WebSocket/RCTSRWebSocket.h
@@ -18,23 +18,23 @@
 #import <Security/SecCertificate.h>
 
 typedef NS_ENUM(unsigned int, RCTSRReadyState) {
-    RCTSR_CONNECTING   = 0,
-    RCTSR_OPEN         = 1,
-    RCTSR_CLOSING      = 2,
-    RCTSR_CLOSED       = 3,
+  RCTSR_CONNECTING = 0,
+  RCTSR_OPEN = 1,
+  RCTSR_CLOSING = 2,
+  RCTSR_CLOSED = 3,
 };
 
 typedef NS_ENUM(NSInteger, RCTSRStatusCode) {
-    RCTSRStatusCodeNormal = 1000,
-    RCTSRStatusCodeGoingAway = 1001,
-    RCTSRStatusCodeProtocolError = 1002,
-    RCTSRStatusCodeUnhandledType = 1003,
-    // 1004 reserved.
-    RCTSRStatusNoStatusReceived = 1005,
-    // 1004-1006 reserved.
-    RCTSRStatusCodeInvalidUTF8 = 1007,
-    RCTSRStatusCodePolicyViolated = 1008,
-    RCTSRStatusCodeMessageTooBig = 1009,
+  RCTSRStatusCodeNormal = 1000,
+  RCTSRStatusCodeGoingAway = 1001,
+  RCTSRStatusCodeProtocolError = 1002,
+  RCTSRStatusCodeUnhandledType = 1003,
+  // 1004 reserved.
+  RCTSRStatusNoStatusReceived = 1005,
+  // 1004-1006 reserved.
+  RCTSRStatusCodeInvalidUTF8 = 1007,
+  RCTSRStatusCodePolicyViolated = 1008,
+  RCTSRStatusCodeMessageTooBig = 1009,
 };
 
 @class RCTSRWebSocket;
@@ -60,7 +60,8 @@ extern NSString *const RCTSRHTTPResponseErrorKey;
 @property (nonatomic, readonly, copy) NSString *protocol;
 
 // Protocols should be an array of strings that turn into Sec-WebSocket-Protocol.
-- (instancetype)initWithURLRequest:(NSURLRequest *)request protocols:(NSArray<NSString *> *)protocols NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithURLRequest:(NSURLRequest *)request
+                         protocols:(NSArray<NSString *> *)protocols NS_DESIGNATED_INITIALIZER;
 - (instancetype)initWithURLRequest:(NSURLRequest *)request;
 
 // Some helper constructors.
@@ -102,7 +103,10 @@ extern NSString *const RCTSRHTTPResponseErrorKey;
 
 - (void)webSocketDidOpen:(RCTSRWebSocket *)webSocket;
 - (void)webSocket:(RCTSRWebSocket *)webSocket didFailWithError:(NSError *)error;
-- (void)webSocket:(RCTSRWebSocket *)webSocket didCloseWithCode:(NSInteger)code reason:(NSString *)reason wasClean:(BOOL)wasClean;
+- (void)webSocket:(RCTSRWebSocket *)webSocket
+    didCloseWithCode:(NSInteger)code
+              reason:(NSString *)reason
+            wasClean:(BOOL)wasClean;
 - (void)webSocket:(RCTSRWebSocket *)webSocket didReceivePong:(NSData *)pongPayload;
 
 @end
diff --git a/Libraries/WebSocket/RCTSRWebSocket.m b/Libraries/WebSocket/RCTSRWebSocket.m
index 50983c9e3038..925596f8677f 100644
--- a/Libraries/WebSocket/RCTSRWebSocket.m
+++ b/Libraries/WebSocket/RCTSRWebSocket.m
@@ -24,7 +24,7 @@
 #import <React/RCTAssert.h>
 #import <React/RCTLog.h>
 
-typedef NS_ENUM(NSInteger, RCTSROpCode)  {
+typedef NS_ENUM(NSInteger, RCTSROpCode) {
   RCTSROpCodeTextFrame = 0x1,
   RCTSROpCodeBinaryFrame = 0x2,
   // 3-7 reserved.
@@ -50,7 +50,9 @@ typedef NS_ENUM(NSInteger, RCTSROpCode)  {
 #ifdef RCTSR_ENABLE_LOG
 #define RCTSRLog(format...) RCTLogInfo(format)
 #else
-#define RCTSRLog(...) do { } while (0)
+#define RCTSRLog(...) \
+  do {                \
+  } while (0)
 #endif
 
 // This is a hack, and probably not optimal
@@ -59,7 +61,10 @@ static inline int32_t validate_dispatch_data_partial_string(NSData *data)
   static const int maxCodepointSize = 3;
 
   for (int i = 0; i < maxCodepointSize; i++) {
-    NSString *str = [[NSString alloc] initWithBytesNoCopy:(char *)data.bytes length:data.length - i encoding:NSUTF8StringEncoding freeWhenDone:NO];
+    NSString *str = [[NSString alloc] initWithBytesNoCopy:(char *)data.bytes
+                                                   length:data.length - i
+                                                 encoding:NSUTF8StringEncoding
+                                             freeWhenDone:NO];
     if (str) {
       return (int32_t)data.length - i;
     }
@@ -74,14 +79,12 @@ @interface NSData (RCTSRWebSocket)
 
 @end
 
-
 @interface NSString (RCTSRWebSocket)
 
 @property (nonatomic, readonly, copy) NSString *stringBySHA1ThenBase64Encoding;
 
 @end
 
-
 @interface NSURL (RCTSRWebSocket)
 
 // The origin isn't really applicable for a native application.
@@ -90,14 +93,12 @@ @interface NSURL (RCTSRWebSocket)
 
 @end
 
-
 @interface _RCTSRRunLoopThread : NSThread
 
 @property (nonatomic, readonly) NSRunLoop *runLoop;
 
 @end
 
-
 static NSString *newSHA1String(const char *bytes, size_t length)
 {
   uint8_t md[CC_SHA1_DIGEST_LENGTH];
@@ -119,7 +120,6 @@ - (NSString *)stringBySHA1ThenBase64Encoding
 
 @end
 
-
 @implementation NSString (RCTSRWebSocket)
 
 - (NSString *)stringBySHA1ThenBase64Encoding
@@ -136,7 +136,7 @@ - (NSString *)stringBySHA1ThenBase64Encoding
 // Sends bytes to callback handler;
 typedef size_t (^stream_scanner)(NSData *collected_data);
 
-typedef void (^data_callback)(RCTSRWebSocket *webSocket,  NSData *data);
+typedef void (^data_callback)(RCTSRWebSocket *webSocket, NSData *data);
 
 @interface RCTSRIOConsumer : NSObject
 
@@ -153,12 +153,16 @@ @interface RCTSRIOConsumerPool : NSObject
 
 - (instancetype)initWithBufferCapacity:(NSUInteger)poolSize NS_DESIGNATED_INITIALIZER;
 
-- (RCTSRIOConsumer *)consumerWithScanner:(stream_scanner)scanner handler:(data_callback)handler bytesNeeded:(size_t)bytesNeeded readToCurrentFrame:(BOOL)readToCurrentFrame unmaskBytes:(BOOL)unmaskBytes;
+- (RCTSRIOConsumer *)consumerWithScanner:(stream_scanner)scanner
+                                 handler:(data_callback)handler
+                             bytesNeeded:(size_t)bytesNeeded
+                      readToCurrentFrame:(BOOL)readToCurrentFrame
+                             unmaskBytes:(BOOL)unmaskBytes;
 - (void)returnConsumer:(RCTSRIOConsumer *)consumer;
 
 @end
 
-@interface RCTSRWebSocket ()  <NSStreamDelegate>
+@interface RCTSRWebSocket () <NSStreamDelegate>
 
 @property (nonatomic, assign) RCTSRReadyState readyState;
 
@@ -167,8 +171,7 @@ @interface RCTSRWebSocket ()  <NSStreamDelegate>
 
 @end
 
-@implementation RCTSRWebSocket
-{
+@implementation RCTSRWebSocket {
   NSInteger _webSocketVersion;
 
   NSOperationQueue *_delegateOperationQueue;
@@ -216,7 +219,7 @@ @implementation RCTSRWebSocket
   int _closeCode;
 
   BOOL _isPumping;
-  
+
   BOOL _cleanupScheduled;
 
   NSMutableSet<NSArray *> *_scheduledRunloops;
@@ -243,7 +246,7 @@ - (instancetype)initWithURLRequest:(NSURLRequest *)request protocols:(NSArray<NS
   return self;
 }
 
-RCT_NOT_IMPLEMENTED(- (instancetype)init)
+RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (instancetype)initWithURLRequest:(NSURLRequest *)request
 {
@@ -280,7 +283,9 @@ - (instancetype)initWithURL:(NSURL *)URL protocols:(NSArray<NSString *> *)protoc
 - (void)_RCTSR_commonInit
 {
   NSString *scheme = _url.scheme.lowercaseString;
-  assert([scheme isEqualToString:@"ws"] || [scheme isEqualToString:@"http"] || [scheme isEqualToString:@"wss"] || [scheme isEqualToString:@"https"]);
+  assert(
+      [scheme isEqualToString:@"ws"] || [scheme isEqualToString:@"http"] || [scheme isEqualToString:@"wss"] ||
+      [scheme isEqualToString:@"https"]);
 
   if ([scheme isEqualToString:@"wss"] || [scheme isEqualToString:@"https"]) {
     _secure = YES;
@@ -325,7 +330,7 @@ - (void)dealloc
 
   [_inputStream close];
   [_outputStream close];
-  
+
   if (_receivedHTTPHeaders) {
     CFRelease(_receivedHTTPHeaders);
     _receivedHTTPHeaders = NULL;
@@ -372,7 +377,8 @@ - (void)setDelegateDispatchQueue:(dispatch_queue_t)queue
 
 - (BOOL)_checkHandshake:(CFHTTPMessageRef)httpMessage
 {
-  NSString *acceptHeader = CFBridgingRelease(CFHTTPMessageCopyHeaderFieldValue(httpMessage, CFSTR("Sec-WebSocket-Accept")));
+  NSString *acceptHeader =
+      CFBridgingRelease(CFHTTPMessageCopyHeaderFieldValue(httpMessage, CFSTR("Sec-WebSocket-Accept")));
 
   if (acceptHeader == nil) {
     return NO;
@@ -390,20 +396,39 @@ - (void)_HTTPHeadersDidFinish
 
   if (responseCode >= 400) {
     RCTSRLog(@"Request failed with response code %ld", responseCode);
-    [self _failWithError:[NSError errorWithDomain:RCTSRWebSocketErrorDomain code:2132 userInfo:@{NSLocalizedDescriptionKey:[NSString stringWithFormat:@"received bad response code from server %ld", (long)responseCode], RCTSRHTTPResponseErrorKey:@(responseCode)}]];
+    [self _failWithError:[NSError errorWithDomain:RCTSRWebSocketErrorDomain
+                                             code:2132
+                                         userInfo:@{
+                                           NSLocalizedDescriptionKey :
+                                               [NSString stringWithFormat:@"received bad response code from server %ld",
+                                                                          (long)responseCode],
+                                           RCTSRHTTPResponseErrorKey : @(responseCode)
+                                         }]];
     return;
   }
 
   if (![self _checkHandshake:_receivedHTTPHeaders]) {
-    [self _failWithError:[NSError errorWithDomain:RCTSRWebSocketErrorDomain code:2133 userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Invalid Sec-WebSocket-Accept response"]}]];
+    [self _failWithError:[NSError errorWithDomain:RCTSRWebSocketErrorDomain
+                                             code:2133
+                                         userInfo:@{
+                                           NSLocalizedDescriptionKey :
+                                               [NSString stringWithFormat:@"Invalid Sec-WebSocket-Accept response"]
+                                         }]];
     return;
   }
 
-  NSString *negotiatedProtocol = CFBridgingRelease(CFHTTPMessageCopyHeaderFieldValue(_receivedHTTPHeaders, CFSTR("Sec-WebSocket-Protocol")));
+  NSString *negotiatedProtocol =
+      CFBridgingRelease(CFHTTPMessageCopyHeaderFieldValue(_receivedHTTPHeaders, CFSTR("Sec-WebSocket-Protocol")));
   if (negotiatedProtocol) {
     // Make sure we requested the protocol
     if ([_requestedProtocols indexOfObject:negotiatedProtocol] == NSNotFound) {
-      [self _failWithError:[NSError errorWithDomain:RCTSRWebSocketErrorDomain code:2133 userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Server specified Sec-WebSocket-Protocol that wasn't requested"]}]];
+      [self _failWithError:
+                [NSError errorWithDomain:RCTSRWebSocketErrorDomain
+                                    code:2133
+                                userInfo:@{
+                                  NSLocalizedDescriptionKey : [NSString
+                                      stringWithFormat:@"Server specified Sec-WebSocket-Protocol that wasn't requested"]
+                                }]];
       return;
     }
 
@@ -429,11 +454,12 @@ - (void)_readHTTPHeader
     _receivedHTTPHeaders = CFHTTPMessageCreateEmpty(NULL, NO);
   }
 
-  [self _readUntilHeaderCompleteWithCallback:^(RCTSRWebSocket *socket,  NSData *data) {
+  [self _readUntilHeaderCompleteWithCallback:^(RCTSRWebSocket *socket, NSData *data) {
     CFHTTPMessageAppendBytes(self->_receivedHTTPHeaders, (const UInt8 *)data.bytes, data.length);
 
     if (CFHTTPMessageIsHeaderComplete(self->_receivedHTTPHeaders)) {
-      RCTSRLog(@"Finished reading headers %@", CFBridgingRelease(CFHTTPMessageCopyAllHeaderFields(_receivedHTTPHeaders)));
+      RCTSRLog(
+          @"Finished reading headers %@", CFBridgingRelease(CFHTTPMessageCopyAllHeaderFields(_receivedHTTPHeaders)));
       [socket _HTTPHeadersDidFinish];
     } else {
       [socket _readHTTPHeader];
@@ -447,7 +473,10 @@ - (void)didConnect
   CFHTTPMessageRef request = CFHTTPMessageCreateRequest(NULL, CFSTR("GET"), (__bridge CFURLRef)_url, kCFHTTPVersion1_1);
 
   // Set host first so it defaults
-  CFHTTPMessageSetHeaderFieldValue(request, CFSTR("Host"), (__bridge CFStringRef)(_url.port ? [NSString stringWithFormat:@"%@:%@", _url.host, _url.port] : _url.host));
+  CFHTTPMessageSetHeaderFieldValue(
+      request,
+      CFSTR("Host"),
+      (__bridge CFStringRef)(_url.port ? [NSString stringWithFormat:@"%@:%@", _url.host, _url.port] : _url.host));
 
   NSMutableData *keyBytes = [[NSMutableData alloc] initWithLength:16];
   int result __unused = SecRandomCopyBytes(kSecRandomDefault, keyBytes.length, keyBytes.mutableBytes);
@@ -458,12 +487,18 @@ - (void)didConnect
   CFHTTPMessageSetHeaderFieldValue(request, CFSTR("Upgrade"), CFSTR("websocket"));
   CFHTTPMessageSetHeaderFieldValue(request, CFSTR("Connection"), CFSTR("Upgrade"));
   CFHTTPMessageSetHeaderFieldValue(request, CFSTR("Sec-WebSocket-Key"), (__bridge CFStringRef)_secKey);
-  CFHTTPMessageSetHeaderFieldValue(request, CFSTR("Sec-WebSocket-Version"), (__bridge CFStringRef)[NSString stringWithFormat:@"%ld", (long)_webSocketVersion]);
+  CFHTTPMessageSetHeaderFieldValue(
+      request,
+      CFSTR("Sec-WebSocket-Version"),
+      (__bridge CFStringRef)[NSString stringWithFormat:@"%ld", (long)_webSocketVersion]);
 
   CFHTTPMessageSetHeaderFieldValue(request, CFSTR("Origin"), (__bridge CFStringRef)_url.RCTSR_origin);
 
   if (_requestedProtocols && _requestedProtocols.count > 0) {
-    CFHTTPMessageSetHeaderFieldValue(request, CFSTR("Sec-WebSocket-Protocol"), (__bridge CFStringRef)[_requestedProtocols componentsJoinedByString:@", "]);
+    CFHTTPMessageSetHeaderFieldValue(
+        request,
+        CFSTR("Sec-WebSocket-Protocol"),
+        (__bridge CFStringRef)[_requestedProtocols componentsJoinedByString:@", "]);
   }
 
   [_urlRequest.allHTTPHeaderFields enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
@@ -499,11 +534,11 @@ - (void)_initializeStreams
   _outputStream = CFBridgingRelease(writeStream);
   _inputStream = CFBridgingRelease(readStream);
 
-
   if (_secure) {
     NSMutableDictionary<NSString *, id> *SSLOptions = [NSMutableDictionary new];
 
-    [_outputStream setProperty:(__bridge id)kCFStreamSocketSecurityLevelNegotiatedSSL forKey:(__bridge id)kCFStreamPropertySocketSecurityLevel];
+    [_outputStream setProperty:(__bridge id)kCFStreamSocketSecurityLevelNegotiatedSSL
+                        forKey:(__bridge id)kCFStreamPropertySocketSecurityLevel];
 
     // If we're using pinned certs, don't validate the certificate chain
     if (_urlRequest.RCTSR_SSLPinnedCertificates.count) {
@@ -515,8 +550,7 @@ - (void)_initializeStreams
     RCTLogInfo(@"SocketRocket: In debug mode.  Allowing connection to any root cert");
 #endif
 
-    [_outputStream setProperty:SSLOptions
-                        forKey:(__bridge id)kCFStreamPropertySSLSettings];
+    [_outputStream setProperty:SSLOptions forKey:(__bridge id)kCFStreamPropertySSLSettings];
   }
 
   _inputStream.delegate = self;
@@ -538,7 +572,7 @@ - (void)scheduleInRunLoop:(NSRunLoop *)aRunLoop forMode:(NSString *)mode
   [_outputStream scheduleInRunLoop:aRunLoop forMode:mode];
   [_inputStream scheduleInRunLoop:aRunLoop forMode:mode];
 
-  [_scheduledRunloops addObject:@[aRunLoop, mode]];
+  [_scheduledRunloops addObject:@[ aRunLoop, mode ]];
 }
 
 - (void)unscheduleFromRunLoop:(NSRunLoop *)aRunLoop forMode:(NSString *)mode
@@ -546,7 +580,7 @@ - (void)unscheduleFromRunLoop:(NSRunLoop *)aRunLoop forMode:(NSString *)mode
   [_outputStream removeFromRunLoop:aRunLoop forMode:mode];
   [_inputStream removeFromRunLoop:aRunLoop forMode:mode];
 
-  [_scheduledRunloops removeObject:@[aRunLoop, mode]];
+  [_scheduledRunloops removeObject:@[ aRunLoop, mode ]];
 }
 
 - (void)close
@@ -584,7 +618,13 @@ - (void)closeWithCode:(NSInteger)code reason:(NSString *)reason
 
       NSUInteger usedLength = 0;
 
-      BOOL success __unused = [reason getBytes:(char *)mutablePayload.mutableBytes + sizeof(uint16_t) maxLength:payload.length - sizeof(uint16_t) usedLength:&usedLength encoding:NSUTF8StringEncoding options:NSStringEncodingConversionExternalRepresentation range:NSMakeRange(0, reason.length) remainingRange:&remainingRange];
+      BOOL success __unused = [reason getBytes:(char *)mutablePayload.mutableBytes + sizeof(uint16_t)
+                                     maxLength:payload.length - sizeof(uint16_t)
+                                    usedLength:&usedLength
+                                      encoding:NSUTF8StringEncoding
+                                       options:NSStringEncodingConversionExternalRepresentation
+                                         range:NSMakeRange(0, reason.length)
+                                remainingRange:&remainingRange];
 
       assert(success);
       assert(remainingRange.length == 0);
@@ -621,7 +661,7 @@ - (void)_failWithError:(NSError *)error
       }];
 
       self.readyState = RCTSR_CLOSED;
-      
+
       RCTSRLog(@"Failing with error %@", error.localizedDescription);
 
       [self _disconnect];
@@ -705,9 +745,7 @@ static inline BOOL closeCodeIsValid(int closeCode)
   }
 
   if (closeCode >= 1000 && closeCode <= 1011) {
-    if (closeCode == 1004 ||
-        closeCode == 1005 ||
-        closeCode == 1006) {
+    if (closeCode == 1004 || closeCode == 1005 || closeCode == 1006) {
       return NO;
     }
     return YES;
@@ -752,7 +790,8 @@ - (void)handleCloseWithData:(NSData *)data
       return;
     }
     if (dataSize > 2) {
-      _closeReason = [[NSString alloc] initWithData:[data subdataWithRange:NSMakeRange(2, dataSize - 2)] encoding:NSUTF8StringEncoding];
+      _closeReason = [[NSString alloc] initWithData:[data subdataWithRange:NSMakeRange(2, dataSize - 2)]
+                                           encoding:NSUTF8StringEncoding];
       if (!_closeReason) {
         [self _closeWithProtocolError:@"Close reason MUST be valid UTF-8"];
         return;
@@ -788,7 +827,8 @@ - (void)_handleFrameWithData:(NSData *)frameData opCode:(NSInteger)opcode
 
   // Check that the current data is valid UTF8
 
-  BOOL isControlFrame = (opcode == RCTSROpCodePing || opcode == RCTSROpCodePong || opcode == RCTSROpCodeConnectionClose);
+  BOOL isControlFrame =
+      (opcode == RCTSROpCodePing || opcode == RCTSROpCodePong || opcode == RCTSROpCodeConnectionClose);
   if (!isControlFrame) {
     [self _readFrameNew];
   } else {
@@ -838,7 +878,9 @@ - (void)_handleFrameHeader:(frame_header)frame_header curData:(NSData *)curData
     return;
   }
 
-  BOOL isControlFrame = (frame_header.opcode == RCTSROpCodePing || frame_header.opcode == RCTSROpCodePong || frame_header.opcode == RCTSROpCodeConnectionClose);
+  BOOL isControlFrame =
+      (frame_header.opcode == RCTSROpCodePing || frame_header.opcode == RCTSROpCodePong ||
+       frame_header.opcode == RCTSROpCodeConnectionClose);
 
   if (isControlFrame && !frame_header.fin) {
     [self _closeWithProtocolError:@"Fragmented control frames not allowed"];
@@ -868,19 +910,21 @@ - (void)_handleFrameHeader:(frame_header)frame_header curData:(NSData *)curData
     }
   } else {
     assert(frame_header.payload_length <= SIZE_T_MAX);
-    [self _addConsumerWithDataLength:(size_t)frame_header.payload_length callback:^(RCTSRWebSocket *socket, NSData *newData) {
-      if (isControlFrame) {
-        [socket _handleFrameWithData:newData opCode:frame_header.opcode];
-      } else {
-        if (frame_header.fin) {
-          [socket _handleFrameWithData:socket->_currentFrameData opCode:frame_header.opcode];
-        } else {
-          // TODO: add assert that opcode is not a control;
-          [socket _readFrameContinue];
-        }
-
-      }
-    } readToCurrentFrame:!isControlFrame unmaskBytes:frame_header.masked];
+    [self _addConsumerWithDataLength:(size_t)frame_header.payload_length
+                            callback:^(RCTSRWebSocket *socket, NSData *newData) {
+                              if (isControlFrame) {
+                                [socket _handleFrameWithData:newData opCode:frame_header.opcode];
+                              } else {
+                                if (frame_header.fin) {
+                                  [socket _handleFrameWithData:socket->_currentFrameData opCode:frame_header.opcode];
+                                } else {
+                                  // TODO: add assert that opcode is not a control;
+                                  [socket _readFrameContinue];
+                                }
+                              }
+                            }
+                  readToCurrentFrame:!isControlFrame
+                         unmaskBytes:frame_header.masked];
   }
 }
 
@@ -906,93 +950,110 @@ - (void)_handleFrameHeader:(frame_header)frame_header curData:(NSData *)curData
  +---------------------------------------------------------------+
  */
 
-static const uint8_t RCTSRFinMask          = 0x80;
-static const uint8_t RCTSROpCodeMask       = 0x0F;
-static const uint8_t RCTSRRsvMask          = 0x70;
-static const uint8_t RCTSRMaskMask         = 0x80;
-static const uint8_t RCTSRPayloadLenMask   = 0x7F;
+static const uint8_t RCTSRFinMask = 0x80;
+static const uint8_t RCTSROpCodeMask = 0x0F;
+static const uint8_t RCTSRRsvMask = 0x70;
+static const uint8_t RCTSRMaskMask = 0x80;
+static const uint8_t RCTSRPayloadLenMask = 0x7F;
 
 - (void)_readFrameContinue
 {
   assert((_currentFrameCount == 0 && _currentFrameOpcode == 0) || (_currentFrameCount > 0 && _currentFrameOpcode > 0));
 
-  [self _addConsumerWithDataLength:2 callback:^(RCTSRWebSocket *socket, NSData *data) {
-    __block frame_header header = {0};
-
-    const uint8_t *headerBuffer = data.bytes;
-    assert(data.length >= 2);
-
-    if (headerBuffer[0] & RCTSRRsvMask) {
-      [socket _closeWithProtocolError:@"Server used RSV bits"];
-      return;
-    }
-
-    uint8_t receivedOpcode = (RCTSROpCodeMask &headerBuffer[0]);
-
-    BOOL isControlFrame = (receivedOpcode == RCTSROpCodePing || receivedOpcode == RCTSROpCodePong || receivedOpcode == RCTSROpCodeConnectionClose);
-
-    if (!isControlFrame && receivedOpcode != 0 && socket->_currentFrameCount > 0) {
-      [socket _closeWithProtocolError:@"all data frames after the initial data frame must have opcode 0"];
-      return;
-    }
-
-    if (receivedOpcode == 0 && socket->_currentFrameCount == 0) {
-      [socket _closeWithProtocolError:@"cannot continue a message"];
-      return;
-    }
-
-    header.opcode = receivedOpcode == 0 ? socket->_currentFrameOpcode : receivedOpcode;
-
-    header.fin = !!(RCTSRFinMask &headerBuffer[0]);
-
-
-    header.masked = !!(RCTSRMaskMask &headerBuffer[1]);
-    header.payload_length = RCTSRPayloadLenMask & headerBuffer[1];
-
-    headerBuffer = NULL;
-
-    if (header.masked) {
-      [socket _closeWithProtocolError:@"Client must receive unmasked data"];
-    }
-
-    size_t extra_bytes_needed = header.masked ? sizeof(self->_currentReadMaskKey) : 0;
-
-    if (header.payload_length == 126) {
-      extra_bytes_needed += sizeof(uint16_t);
-    } else if (header.payload_length == 127) {
-      extra_bytes_needed += sizeof(uint64_t);
-    }
-
-    if (extra_bytes_needed == 0) {
-      [socket _handleFrameHeader:header curData:socket->_currentFrameData];
-    } else {
-      [socket _addConsumerWithDataLength:extra_bytes_needed callback:^(RCTSRWebSocket *_socket, NSData *_data) {
-        size_t mapped_size __unused = _data.length;
-        const void *mapped_buffer = _data.bytes;
-        size_t offset = 0;
-
-        if (header.payload_length == 126) {
-          assert(mapped_size >= sizeof(uint16_t));
-          uint16_t newLen = NSSwapBigShortToHost(*(uint16_t *)(mapped_buffer));
-          header.payload_length = newLen;
-          offset += sizeof(uint16_t);
-        } else if (header.payload_length == 127) {
-          assert(mapped_size >= sizeof(uint64_t));
-          header.payload_length = NSSwapBigLongLongToHost(*(uint64_t *)(mapped_buffer));
-          offset += sizeof(uint64_t);
-        } else {
-          assert(header.payload_length < 126 && header.payload_length >= 0);
-        }
-
-        if (header.masked) {
-          assert(mapped_size >= sizeof(self->_currentReadMaskOffset) + offset);
-          memcpy(_socket->_currentReadMaskKey, ((uint8_t *)mapped_buffer) + offset, sizeof(_socket->_currentReadMaskKey));
-        }
-
-        [_socket _handleFrameHeader:header curData:_socket->_currentFrameData];
-      } readToCurrentFrame:NO unmaskBytes:NO];
-    }
-  } readToCurrentFrame:NO unmaskBytes:NO];
+  [self
+      _addConsumerWithDataLength:2
+                        callback:^(RCTSRWebSocket *socket, NSData *data) {
+                          __block frame_header header = {0};
+
+                          const uint8_t *headerBuffer = data.bytes;
+                          assert(data.length >= 2);
+
+                          if (headerBuffer[0] & RCTSRRsvMask) {
+                            [socket _closeWithProtocolError:@"Server used RSV bits"];
+                            return;
+                          }
+
+                          uint8_t receivedOpcode = (RCTSROpCodeMask & headerBuffer[0]);
+
+                          BOOL isControlFrame =
+                              (receivedOpcode == RCTSROpCodePing || receivedOpcode == RCTSROpCodePong ||
+                               receivedOpcode == RCTSROpCodeConnectionClose);
+
+                          if (!isControlFrame && receivedOpcode != 0 && socket->_currentFrameCount > 0) {
+                            [socket _closeWithProtocolError:
+                                        @"all data frames after the initial data frame must have opcode 0"];
+                            return;
+                          }
+
+                          if (receivedOpcode == 0 && socket->_currentFrameCount == 0) {
+                            [socket _closeWithProtocolError:@"cannot continue a message"];
+                            return;
+                          }
+
+                          header.opcode = receivedOpcode == 0 ? socket->_currentFrameOpcode : receivedOpcode;
+
+                          header.fin = !!(RCTSRFinMask & headerBuffer[0]);
+
+                          header.masked = !!(RCTSRMaskMask & headerBuffer[1]);
+                          header.payload_length = RCTSRPayloadLenMask & headerBuffer[1];
+
+                          headerBuffer = NULL;
+
+                          if (header.masked) {
+                            [socket _closeWithProtocolError:@"Client must receive unmasked data"];
+                          }
+
+                          size_t extra_bytes_needed = header.masked ? sizeof(self->_currentReadMaskKey) : 0;
+
+                          if (header.payload_length == 126) {
+                            extra_bytes_needed += sizeof(uint16_t);
+                          } else if (header.payload_length == 127) {
+                            extra_bytes_needed += sizeof(uint64_t);
+                          }
+
+                          if (extra_bytes_needed == 0) {
+                            [socket _handleFrameHeader:header curData:socket->_currentFrameData];
+                          } else {
+                            [socket
+                                _addConsumerWithDataLength:extra_bytes_needed
+                                                  callback:^(RCTSRWebSocket *_socket, NSData *_data) {
+                                                    size_t mapped_size __unused = _data.length;
+                                                    const void *mapped_buffer = _data.bytes;
+                                                    size_t offset = 0;
+
+                                                    if (header.payload_length == 126) {
+                                                      assert(mapped_size >= sizeof(uint16_t));
+                                                      uint16_t newLen =
+                                                          NSSwapBigShortToHost(*(uint16_t *)(mapped_buffer));
+                                                      header.payload_length = newLen;
+                                                      offset += sizeof(uint16_t);
+                                                    } else if (header.payload_length == 127) {
+                                                      assert(mapped_size >= sizeof(uint64_t));
+                                                      header.payload_length =
+                                                          NSSwapBigLongLongToHost(*(uint64_t *)(mapped_buffer));
+                                                      offset += sizeof(uint64_t);
+                                                    } else {
+                                                      assert(header.payload_length < 126 && header.payload_length >= 0);
+                                                    }
+
+                                                    if (header.masked) {
+                                                      assert(
+                                                          mapped_size >= sizeof(self->_currentReadMaskOffset) + offset);
+                                                      memcpy(
+                                                          _socket->_currentReadMaskKey,
+                                                          ((uint8_t *)mapped_buffer) + offset,
+                                                          sizeof(_socket->_currentReadMaskKey));
+                                                    }
+
+                                                    [_socket _handleFrameHeader:header
+                                                                        curData:_socket->_currentFrameData];
+                                                  }
+                                        readToCurrentFrame:NO
+                                               unmaskBytes:NO];
+                          }
+                        }
+              readToCurrentFrame:NO
+                     unmaskBytes:NO];
 }
 
 - (void)_readFrameNew
@@ -1015,24 +1076,26 @@ - (void)_pumpWriting
 
   NSUInteger dataLength = _outputBuffer.length;
   if (dataLength - _outputBufferOffset > 0 && _outputStream.hasSpaceAvailable) {
-    NSInteger bytesWritten = [_outputStream write:_outputBuffer.bytes + _outputBufferOffset maxLength:dataLength - _outputBufferOffset];
+    NSInteger bytesWritten = [_outputStream write:_outputBuffer.bytes + _outputBufferOffset
+                                        maxLength:dataLength - _outputBufferOffset];
     if (bytesWritten == -1) {
-      [self _failWithError:[NSError errorWithDomain:RCTSRWebSocketErrorDomain code:2145 userInfo:@{NSLocalizedDescriptionKey: @"Error writing to stream"}]];
+      [self _failWithError:[NSError errorWithDomain:RCTSRWebSocketErrorDomain
+                                               code:2145
+                                           userInfo:@{NSLocalizedDescriptionKey : @"Error writing to stream"}]];
       return;
     }
 
     _outputBufferOffset += bytesWritten;
 
     if (_outputBufferOffset > 4096 && _outputBufferOffset > (_outputBuffer.length >> 1)) {
-      _outputBuffer = [[NSMutableData alloc] initWithBytes:(char *)_outputBuffer.bytes + _outputBufferOffset length:_outputBuffer.length - _outputBufferOffset];
+      _outputBuffer = [[NSMutableData alloc] initWithBytes:(char *)_outputBuffer.bytes + _outputBufferOffset
+                                                    length:_outputBuffer.length - _outputBufferOffset];
       _outputBufferOffset = 0;
     }
   }
 
-  if (_closeWhenFinishedWriting &&
-      _outputBuffer.length - _outputBufferOffset == 0 &&
-      (_inputStream.streamStatus != NSStreamStatusNotOpen &&
-       _inputStream.streamStatus != NSStreamStatusClosed) &&
+  if (_closeWhenFinishedWriting && _outputBuffer.length - _outputBufferOffset == 0 &&
+      (_inputStream.streamStatus != NSStreamStatusNotOpen && _inputStream.streamStatus != NSStreamStatusClosed) &&
       !_sentClose) {
     _sentClose = YES;
 
@@ -1054,19 +1117,30 @@ - (void)_addConsumerWithScanner:(stream_scanner)consumer callback:(data_callback
   [self _addConsumerWithScanner:consumer callback:callback dataLength:0];
 }
 
-- (void)_addConsumerWithDataLength:(size_t)dataLength callback:(data_callback)callback readToCurrentFrame:(BOOL)readToCurrentFrame unmaskBytes:(BOOL)unmaskBytes
+- (void)_addConsumerWithDataLength:(size_t)dataLength
+                          callback:(data_callback)callback
+                readToCurrentFrame:(BOOL)readToCurrentFrame
+                       unmaskBytes:(BOOL)unmaskBytes
 {
   [self assertOnWorkQueue];
   assert(dataLength);
 
-  [_consumers addObject:[_consumerPool consumerWithScanner:nil handler:callback bytesNeeded:dataLength readToCurrentFrame:readToCurrentFrame unmaskBytes:unmaskBytes]];
+  [_consumers addObject:[_consumerPool consumerWithScanner:nil
+                                                   handler:callback
+                                               bytesNeeded:dataLength
+                                        readToCurrentFrame:readToCurrentFrame
+                                               unmaskBytes:unmaskBytes]];
   [self _pumpScanner];
 }
 
 - (void)_addConsumerWithScanner:(stream_scanner)consumer callback:(data_callback)callback dataLength:(size_t)dataLength
 {
   [self assertOnWorkQueue];
-  [_consumers addObject:[_consumerPool consumerWithScanner:consumer handler:callback bytesNeeded:dataLength readToCurrentFrame:NO unmaskBytes:NO]];
+  [_consumers addObject:[_consumerPool consumerWithScanner:consumer
+                                                   handler:callback
+                                               bytesNeeded:dataLength
+                                        readToCurrentFrame:NO
+                                               unmaskBytes:NO]];
   [self _pumpScanner];
 }
 
@@ -1086,7 +1160,7 @@ - (void)_readUntilBytes:(const void *)bytes length:(size_t)length callback:(data
 
     size_t size = data.length;
     const unsigned char *buffer = data.bytes;
-    for (size_t i = 0; i < size; i++ ) {
+    for (size_t i = 0; i < size; i++) {
       if (((const unsigned char *)buffer)[i] == ((const unsigned char *)bytes)[match_count]) {
         match_count += 1;
         if (match_count == length) {
@@ -1126,7 +1200,9 @@ - (BOOL)_innerPumpScanner
 
   size_t foundSize = 0;
   if (consumer.consumer) {
-    NSData *tempView = [NSData dataWithBytesNoCopy:(char *)_readBuffer.bytes + _readBufferOffset length:_readBuffer.length - _readBufferOffset freeWhenDone:NO];
+    NSData *tempView = [NSData dataWithBytesNoCopy:(char *)_readBuffer.bytes + _readBufferOffset
+                                            length:_readBuffer.length - _readBufferOffset
+                                      freeWhenDone:NO];
     foundSize = consumer.consumer(tempView);
   } else {
     assert(consumer.bytesNeeded);
@@ -1145,7 +1221,9 @@ - (BOOL)_innerPumpScanner
     _readBufferOffset += foundSize;
 
     if (_readBufferOffset > 4096 && _readBufferOffset > (_readBuffer.length >> 1)) {
-      _readBuffer = [[NSMutableData alloc] initWithBytes:(char *)_readBuffer.bytes + _readBufferOffset length:_readBuffer.length - _readBufferOffset];            _readBufferOffset = 0;
+      _readBuffer = [[NSMutableData alloc] initWithBytes:(char *)_readBuffer.bytes + _readBufferOffset
+                                                  length:_readBuffer.length - _readBufferOffset];
+      _readBufferOffset = 0;
     }
 
     if (consumer.unmaskBytes) {
@@ -1218,7 +1296,8 @@ - (void)_pumpScanner
     return;
   }
 
-  while ([self _innerPumpScanner]) {}
+  while ([self _innerPumpScanner]) {
+  }
 
   _isPumping = NO;
 }
@@ -1299,7 +1378,8 @@ - (void)_sendFrameWithOpcode:(RCTSROpCode)opcode data:(NSData *)data
 
 - (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode
 {
-  if (_secure && !_pinnedCertFound && (eventCode == NSStreamEventHasBytesAvailable || eventCode == NSStreamEventHasSpaceAvailable)) {
+  if (_secure && !_pinnedCertFound &&
+      (eventCode == NSStreamEventHasBytesAvailable || eventCode == NSStreamEventHasSpaceAvailable)) {
     NSArray *sslCerts = _urlRequest.RCTSR_SSLPinnedCertificates;
     if (sslCerts) {
       SecTrustRef secTrust = (__bridge SecTrustRef)[aStream propertyForKey:(__bridge id)kCFStreamPropertySSLPeerTrust];
@@ -1323,13 +1403,18 @@ - (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode
 
       if (!_pinnedCertFound) {
         dispatch_async(_workQueue, ^{
-          [self _failWithError:[NSError errorWithDomain:RCTSRWebSocketErrorDomain code:23556 userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Invalid server cert"]}]];
+          [self _failWithError:[NSError errorWithDomain:RCTSRWebSocketErrorDomain
+                                                   code:23556
+                                               userInfo:@{
+                                                 NSLocalizedDescriptionKey :
+                                                     [NSString stringWithFormat:@"Invalid server cert"]
+                                               }]];
         });
         return;
       }
     }
   }
-  
+
   // _workQueue cannot be NULL
   if (!_workQueue) {
     return;
@@ -1353,7 +1438,7 @@ - (void)safeHandleEvent:(NSStreamEvent)eventCode stream:(NSStream *)aStream
         return;
       }
       assert(self->_readBuffer);
-      
+
       if (self.readyState == RCTSR_CONNECTING && aStream == self->_inputStream) {
         [self didConnect];
       }
@@ -1361,7 +1446,7 @@ - (void)safeHandleEvent:(NSStreamEvent)eventCode stream:(NSStream *)aStream
       [self _pumpScanner];
       break;
     }
-      
+
     case NSStreamEventErrorOccurred: {
       RCTSRLog(@"NSStreamEventErrorOccurred %@ %@", aStream, [aStream.streamError copy]);
       // TODO: specify error better!
@@ -1369,9 +1454,8 @@ - (void)safeHandleEvent:(NSStreamEvent)eventCode stream:(NSStream *)aStream
       self->_readBufferOffset = 0;
       self->_readBuffer.length = 0;
       break;
-      
     }
-      
+
     case NSStreamEventEndEncountered: {
       [self _pumpScanner];
       RCTSRLog(@"NSStreamEventEndEncountered %@", aStream);
@@ -1383,36 +1467,40 @@ - (void)safeHandleEvent:(NSStreamEvent)eventCode stream:(NSStream *)aStream
             self.readyState = RCTSR_CLOSED;
             [self _scheduleCleanup];
           }
-          
+
           if (!self->_sentClose && !self->_failed) {
             self->_sentClose = YES;
-            // If we get closed in this state it's probably not clean because we should be sending this when we send messages
+            // If we get closed in this state it's probably not clean because we should be sending this when we send
+            // messages
             [self _performDelegateBlock:^{
               if ([self.delegate respondsToSelector:@selector(webSocket:didCloseWithCode:reason:wasClean:)]) {
-                [self.delegate webSocket:self didCloseWithCode:RCTSRStatusCodeGoingAway reason:@"Stream end encountered" wasClean:NO];
+                [self.delegate webSocket:self
+                        didCloseWithCode:RCTSRStatusCodeGoingAway
+                                  reason:@"Stream end encountered"
+                                wasClean:NO];
               }
             }];
           }
         });
       }
-      
+
       break;
     }
-      
+
     case NSStreamEventHasBytesAvailable: {
       RCTSRLog(@"NSStreamEventHasBytesAvailable %@", aStream);
       const int bufferSize = 2048;
       uint8_t buffer[bufferSize];
-      
+
       while (self->_inputStream.hasBytesAvailable) {
         NSInteger bytes_read = [self->_inputStream read:buffer maxLength:bufferSize];
-        
+
         if (bytes_read > 0) {
           [self->_readBuffer appendBytes:buffer length:bytes_read];
         } else if (bytes_read < 0) {
           [self _failWithError:self->_inputStream.streamError];
         }
-        
+
         if (bytes_read != bufferSize) {
           break;
         }
@@ -1420,13 +1508,13 @@ - (void)safeHandleEvent:(NSStreamEvent)eventCode stream:(NSStream *)aStream
       [self _pumpScanner];
       break;
     }
-      
+
     case NSStreamEventHasSpaceAvailable: {
       RCTSRLog(@"NSStreamEventHasSpaceAvailable %@", aStream);
       [self _pumpWriting];
       break;
     }
-      
+
     default:
       RCTSRLog(@"(default)  %@", aStream);
       break;
@@ -1438,12 +1526,16 @@ - (void)_scheduleCleanup
   if (_cleanupScheduled) {
     return;
   }
-  
+
   _cleanupScheduled = YES;
-  
+
   // Cleanup NSStream's delegate in the same RunLoop used by the streams themselves:
   // This way we'll prevent race conditions between handleEvent and SRWebsocket's dealloc
-  NSTimer *timer = [NSTimer timerWithTimeInterval:(0.0f) target:self selector:@selector(_cleanupSelfReference:) userInfo:nil repeats:NO];
+  NSTimer *timer = [NSTimer timerWithTimeInterval:(0.0f)
+                                           target:self
+                                         selector:@selector(_cleanupSelfReference:)
+                                         userInfo:nil
+                                          repeats:NO];
   [[NSRunLoop RCTSR_networkRunLoop] addTimer:timer forMode:NSDefaultRunLoopMode];
 }
 
@@ -1452,16 +1544,16 @@ - (void)_cleanupSelfReference:(NSTimer *)timer
   // Remove the streams, right now, from the networkRunLoop
   [_inputStream close];
   [_outputStream close];
-  
+
   // Unschedule from RunLoop
   for (NSArray *runLoop in [_scheduledRunloops copy]) {
     [self unscheduleFromRunLoop:runLoop[0] forMode:runLoop[1]];
   }
-  
+
   // Nuke NSStream's delegate
   _inputStream.delegate = nil;
   _outputStream.delegate = nil;
-  
+
   // Cleanup selfRetain in the same GCD queue as usual
   dispatch_async(_workQueue, ^{
     self->_selfRetain = nil;
@@ -1472,7 +1564,11 @@ - (void)_cleanupSelfReference:(NSTimer *)timer
 
 @implementation RCTSRIOConsumer
 
-- (void)setupWithScanner:(stream_scanner)scanner handler:(data_callback)handler bytesNeeded:(size_t)bytesNeeded readToCurrentFrame:(BOOL)readToCurrentFrame unmaskBytes:(BOOL)unmaskBytes
+- (void)setupWithScanner:(stream_scanner)scanner
+                 handler:(data_callback)handler
+             bytesNeeded:(size_t)bytesNeeded
+      readToCurrentFrame:(BOOL)readToCurrentFrame
+             unmaskBytes:(BOOL)unmaskBytes
 {
   _consumer = [scanner copy];
   _handler = [handler copy];
@@ -1484,8 +1580,7 @@ - (void)setupWithScanner:(stream_scanner)scanner handler:(data_callback)handler
 
 @end
 
-@implementation RCTSRIOConsumerPool
-{
+@implementation RCTSRIOConsumerPool {
   NSUInteger _poolSize;
   NSMutableArray<RCTSRIOConsumer *> *_bufferedConsumers;
 }
@@ -1504,7 +1599,11 @@ - (instancetype)init
   return [self initWithBufferCapacity:8];
 }
 
-- (RCTSRIOConsumer *)consumerWithScanner:(stream_scanner)scanner handler:(data_callback)handler bytesNeeded:(size_t)bytesNeeded readToCurrentFrame:(BOOL)readToCurrentFrame unmaskBytes:(BOOL)unmaskBytes
+- (RCTSRIOConsumer *)consumerWithScanner:(stream_scanner)scanner
+                                 handler:(data_callback)handler
+                             bytesNeeded:(size_t)bytesNeeded
+                      readToCurrentFrame:(BOOL)readToCurrentFrame
+                             unmaskBytes:(BOOL)unmaskBytes
 {
   RCTSRIOConsumer *consumer = nil;
   if (_bufferedConsumers.count) {
@@ -1514,7 +1613,11 @@ - (RCTSRIOConsumer *)consumerWithScanner:(stream_scanner)scanner handler:(data_c
     consumer = [RCTSRIOConsumer new];
   }
 
-  [consumer setupWithScanner:scanner handler:handler bytesNeeded:bytesNeeded readToCurrentFrame:readToCurrentFrame unmaskBytes:unmaskBytes];
+  [consumer setupWithScanner:scanner
+                     handler:handler
+                 bytesNeeded:bytesNeeded
+          readToCurrentFrame:readToCurrentFrame
+                 unmaskBytes:unmaskBytes];
 
   return consumer;
 }
@@ -1528,7 +1631,7 @@ - (void)returnConsumer:(RCTSRIOConsumer *)consumer
 
 @end
 
-@implementation  NSURLRequest (CertificateAdditions)
+@implementation NSURLRequest (CertificateAdditions)
 
 - (NSArray *)RCTSR_SSLPinnedCertificates
 {
@@ -1537,7 +1640,7 @@ - (NSArray *)RCTSR_SSLPinnedCertificates
 
 @end
 
-@implementation  NSMutableURLRequest (CertificateAdditions)
+@implementation NSMutableURLRequest (CertificateAdditions)
 
 - (NSArray *)RCTSR_SSLPinnedCertificates
 {
@@ -1563,9 +1666,7 @@ - (NSString *)RCTSR_origin
     scheme = @"http";
   }
 
-  int defaultPort = ([scheme isEqualToString:@"https"] ? 443 :
-                     [scheme isEqualToString:@"http"] ? 80 :
-                     -1);
+  int defaultPort = ([scheme isEqualToString:@"https"] ? 443 : [scheme isEqualToString:@"http"] ? 80 : -1);
   int port = self.port.intValue;
   if (port > 0 && port != defaultPort) {
     return [NSString stringWithFormat:@"%@://%@:%d", scheme, self.host, port];
@@ -1596,8 +1697,7 @@ + (NSRunLoop *)RCTSR_networkRunLoop
 
 @end
 
-@implementation _RCTSRRunLoopThread
-{
+@implementation _RCTSRRunLoopThread {
   dispatch_group_t _waitGroup;
 }
 
@@ -1618,10 +1718,16 @@ - (void)main
     _runLoop = [NSRunLoop currentRunLoop];
     dispatch_group_leave(_waitGroup);
 
-    NSTimer *timer = [[NSTimer alloc] initWithFireDate:[NSDate distantFuture] interval:0.0 target:self selector:@selector(step) userInfo:nil repeats:NO];
+    NSTimer *timer = [[NSTimer alloc] initWithFireDate:[NSDate distantFuture]
+                                              interval:0.0
+                                                target:self
+                                              selector:@selector(step)
+                                              userInfo:nil
+                                               repeats:NO];
     [_runLoop addTimer:timer forMode:NSDefaultRunLoopMode];
 
-    while ([_runLoop runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]]) { }
+    while ([_runLoop runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]]) {
+    }
     assert(NO);
   }
 }
diff --git a/Libraries/WebSocket/WebSocket.js b/Libraries/WebSocket/WebSocket.js
index 82b3fd6a0bf5..3fdde2b3639a 100644
--- a/Libraries/WebSocket/WebSocket.js
+++ b/Libraries/WebSocket/WebSocket.js
@@ -8,13 +8,14 @@
  * @flow
  */
 
-import Blob from '../Blob/Blob';
 import type {BlobData} from '../Blob/BlobTypes';
+import type {EventSubscription} from '../vendor/emitter/EventEmitter';
+
+import Blob from '../Blob/Blob';
 import BlobManager from '../Blob/BlobManager';
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import binaryToBase64 from '../Utilities/binaryToBase64';
 import Platform from '../Utilities/Platform';
-import type {EventSubscription} from '../vendor/emitter/EventEmitter';
 import NativeWebSocketModule from './NativeWebSocketModule';
 import WebSocketEvent from './WebSocketEvent';
 import base64 from 'base64-js';
@@ -42,6 +43,10 @@ const CLOSED = 3;
 
 const CLOSE_NORMAL = 1000;
 
+// Abnormal closure where no code is provided in a control frame
+// https://www.rfc-editor.org/rfc/rfc6455.html#section-7.1.5
+const CLOSE_ABNORMAL = 1006;
+
 const WEBSOCKET_EVENTS = ['close', 'error', 'message', 'open'];
 
 let nextWebSocketId = 0;
@@ -259,6 +264,7 @@ class WebSocket extends (EventTarget(...WEBSOCKET_EVENTS): any) {
           new WebSocketEvent('close', {
             code: ev.code,
             reason: ev.reason,
+            // TODO: missing `wasClean` (exposed on iOS as `clean` but missing on Android)
           }),
         );
         this._unregisterEvents();
@@ -276,7 +282,9 @@ class WebSocket extends (EventTarget(...WEBSOCKET_EVENTS): any) {
         );
         this.dispatchEvent(
           new WebSocketEvent('close', {
-            message: ev.message,
+            code: CLOSE_ABNORMAL,
+            reason: ev.message,
+            // TODO: Expose `wasClean`
           }),
         );
         this._unregisterEvents();
diff --git a/Libraries/WebSocket/WebSocketInterceptor.js b/Libraries/WebSocket/WebSocketInterceptor.js
index f20492eb9361..43192fb5afa3 100644
--- a/Libraries/WebSocket/WebSocketInterceptor.js
+++ b/Libraries/WebSocket/WebSocketInterceptor.js
@@ -8,8 +8,8 @@
  */
 
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
-import NativeWebSocketModule from './NativeWebSocketModule';
 import Platform from '../Utilities/Platform';
+import NativeWebSocketModule from './NativeWebSocketModule';
 import base64 from 'base64-js';
 
 const originalRCTWebSocketConnect = NativeWebSocketModule.connect;
diff --git a/Libraries/WebSocket/__tests__/WebSocket-test.js b/Libraries/WebSocket/__tests__/WebSocket-test.js
index 5b98baa4191f..019bdec40ea0 100644
--- a/Libraries/WebSocket/__tests__/WebSocket-test.js
+++ b/Libraries/WebSocket/__tests__/WebSocket-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+react_native
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/Wrapper/Example/RCTWrapperExampleView.m b/Libraries/Wrapper/Example/RCTWrapperExampleView.m
index 6dcef01be09e..082c032ad0f2 100644
--- a/Libraries/Wrapper/Example/RCTWrapperExampleView.m
+++ b/Libraries/Wrapper/Example/RCTWrapperExampleView.m
@@ -20,14 +20,10 @@ - (instancetype)initWithFrame:(CGRect)frame
     self.backgroundColor = [UIColor whiteColor];
 
     _intrinsicContentSize = CGSizeMake(64, 64);
-    _timer = [NSTimer scheduledTimerWithTimeInterval:1.0
-                                              target:self
-                                            selector:@selector(tick)
-                                            userInfo:nil
-                                             repeats:YES];
-
-    UITapGestureRecognizer *gestureRecognizer =
-      [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tick)];
+    _timer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(tick) userInfo:nil repeats:YES];
+
+    UITapGestureRecognizer *gestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self
+                                                                                        action:@selector(tick)];
     [self addGestureRecognizer:gestureRecognizer];
   }
   return self;
@@ -49,10 +45,7 @@ - (CGSize)intrinsicContentSize
 
 - (CGSize)sizeThatFits:(CGSize)size
 {
-  return CGSizeMake(
-    MIN(size.width, _intrinsicContentSize.width),
-    MIN(size.height, _intrinsicContentSize.height)
-  );
+  return CGSizeMake(MIN(size.width, _intrinsicContentSize.width), MIN(size.height, _intrinsicContentSize.height));
 }
 
 @end
diff --git a/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m b/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m
index 50ccfd20b5b0..445fec614164 100644
--- a/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m
+++ b/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m
@@ -13,7 +13,8 @@
 
 @implementation RCTWrapperExampleViewController
 
-- (void)loadView {
+- (void)loadView
+{
   self.view = [RCTWrapperExampleView new];
 }
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m b/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m
index 08b6200e3a8a..522e143231a4 100644
--- a/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m
+++ b/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m
@@ -28,15 +28,14 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
 
 - (void)loadView
 {
-  RCTRootView *rootView =
-    [[RCTRootView alloc] initWithBridge:_bridge
-                             moduleName:@"WrapperExample"
-                      initialProperties:@{}];
+  RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:_bridge
+                                                   moduleName:@"WrapperExample"
+                                            initialProperties:@{}];
 
   rootView.backgroundColor = [UIColor whiteColor];
 
   UIActivityIndicatorView *progressIndicatorView =
-    [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
+      [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
   [progressIndicatorView startAnimating];
   rootView.loadingView = progressIndicatorView;
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m b/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m
index 0557aa0a7971..b50e755fef96 100644
--- a/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m
+++ b/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m
@@ -18,11 +18,10 @@ @implementation RCTWrapperReactRootViewManager
 
 - (UIView *)view
 {
-  RCTWrapperViewControllerHostingView *contentViewControllerHostingView =
-    [RCTWrapperViewControllerHostingView new];
+  RCTWrapperViewControllerHostingView *contentViewControllerHostingView = [RCTWrapperViewControllerHostingView new];
 
   contentViewControllerHostingView.contentViewController =
-    [[RCTWrapperReactRootViewController alloc] initWithBridge:self.bridge];
+      [[RCTWrapperReactRootViewController alloc] initWithBridge:self.bridge];
 
   RCTWrapperView *wrapperView = [super view];
   wrapperView.contentView = contentViewControllerHostingView;
diff --git a/Libraries/Wrapper/RCTWrapper.h b/Libraries/Wrapper/RCTWrapper.h
index 185ea3e449c4..579e73a63896 100644
--- a/Libraries/Wrapper/RCTWrapper.h
+++ b/Libraries/Wrapper/RCTWrapper.h
@@ -14,53 +14,55 @@
 // Umbrella header with macros
 
 // RCT_WRAPPER_FOR_VIEW
-#define RCT_WRAPPER_FOR_VIEW(ClassName)                                        \
-                                                                               \
-NS_ASSUME_NONNULL_BEGIN                                                        \
-                                                                               \
-@interface ClassName##Manager : RCTWrapperViewManager                          \
-                                                                               \
-@end                                                                           \
-                                                                               \
-NS_ASSUME_NONNULL_END                                                          \
-                                                                               \
-@implementation ClassName##Manager                                             \
-                                                                               \
-RCT_EXPORT_MODULE()                                                            \
-                                                                               \
-- (UIView *)view                                                               \
-{                                                                              \
-  RCTWrapperView *wrapperView = [super view];                                  \
-  wrapperView.contentView = [ClassName new];                                   \
-  return wrapperView;                                                          \
-}                                                                              \
-                                                                               \
-@end
+#define RCT_WRAPPER_FOR_VIEW(ClassName)         \
+                                                \
+  NS_ASSUME_NONNULL_BEGIN                       \
+                                                \
+  @interface ClassName                          \
+  ##Manager : RCTWrapperViewManager             \
+                                                \
+              @end                              \
+                                                \
+  NS_ASSUME_NONNULL_END                         \
+                                                \
+  @implementation ClassName                     \
+  ##Manager                                     \
+                                                \
+      RCT_EXPORT_MODULE()                       \
+                                                \
+      - (UIView *)view                          \
+  {                                             \
+    RCTWrapperView *wrapperView = [super view]; \
+    wrapperView.contentView = [ClassName new];  \
+    return wrapperView;                         \
+  }                                             \
+                                                \
+  @end
 
 // RCT_WRAPPER_FOR_VIEW_CONTROLLER
-#define RCT_WRAPPER_FOR_VIEW_CONTROLLER(ClassName)                             \
-                                                                               \
-NS_ASSUME_NONNULL_BEGIN                                                        \
-                                                                               \
-@interface ClassName##Manager : RCTWrapperViewManager                          \
-                                                                               \
-@end                                                                           \
-                                                                               \
-NS_ASSUME_NONNULL_END                                                          \
-                                                                               \
-@implementation ClassName##Manager                                             \
-                                                                               \
-RCT_EXPORT_MODULE()                                                            \
-                                                                               \
-- (UIView *)view                                                               \
-{                                                                              \
-  RCTWrapperViewControllerHostingView *contentViewControllerHostingView =      \
-    [RCTWrapperViewControllerHostingView new];                                 \
-  contentViewControllerHostingView.contentViewController =                     \
-    [[ClassName alloc] initWithNibName:nil bundle:nil];                        \
-  RCTWrapperView *wrapperView = [super view];                                  \
-  wrapperView.contentView = contentViewControllerHostingView;                  \
-  return wrapperView;                                                          \
-}                                                                              \
-                                                                               \
-@end
+#define RCT_WRAPPER_FOR_VIEW_CONTROLLER(ClassName)                                                                     \
+                                                                                                                       \
+  NS_ASSUME_NONNULL_BEGIN                                                                                              \
+                                                                                                                       \
+  @interface ClassName                                                                                                 \
+  ##Manager : RCTWrapperViewManager                                                                                    \
+                                                                                                                       \
+              @end                                                                                                     \
+                                                                                                                       \
+  NS_ASSUME_NONNULL_END                                                                                                \
+                                                                                                                       \
+  @implementation ClassName                                                                                            \
+  ##Manager                                                                                                            \
+                                                                                                                       \
+      RCT_EXPORT_MODULE()                                                                                              \
+                                                                                                                       \
+      - (UIView *)view                                                                                                 \
+  {                                                                                                                    \
+    RCTWrapperViewControllerHostingView *contentViewControllerHostingView = [RCTWrapperViewControllerHostingView new]; \
+    contentViewControllerHostingView.contentViewController = [[ClassName alloc] initWithNibName:nil bundle:nil];       \
+    RCTWrapperView *wrapperView = [super view];                                                                        \
+    wrapperView.contentView = contentViewControllerHostingView;                                                        \
+    return wrapperView;                                                                                                \
+  }                                                                                                                    \
+                                                                                                                       \
+  @end
diff --git a/Libraries/Wrapper/RCTWrapperShadowView.m b/Libraries/Wrapper/RCTWrapperShadowView.m
index cb7d4c882bc0..99b8acfd1a17 100644
--- a/Libraries/Wrapper/RCTWrapperShadowView.m
+++ b/Libraries/Wrapper/RCTWrapperShadowView.m
@@ -8,13 +8,12 @@
 #import "RCTWrapperShadowView.h"
 
 #import <React/RCTBridge.h>
-#import <React/RCTUIManager.h>
 #import <React/RCTShadowView+Layout.h>
+#import <React/RCTUIManager.h>
 
 #import "RCTWrapperView.h"
 
-@implementation RCTWrapperShadowView
-{
+@implementation RCTWrapperShadowView {
   __weak RCTBridge *_bridge;
   RCTWrapperMeasureBlock _measureBlock;
   CGSize _intrinsicContentSize;
@@ -30,7 +29,12 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
-static YGSize RCTWrapperShadowViewMeasure(YGNodeRef node, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode)
+static YGSize RCTWrapperShadowViewMeasure(
+    YGNodeRef node,
+    float width,
+    YGMeasureMode widthMode,
+    float height,
+    YGMeasureMode heightMode)
 {
   CGSize minimumSize = CGSizeMake(0, 0);
   CGSize maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
@@ -62,10 +66,7 @@ static YGSize RCTWrapperShadowViewMeasure(YGNodeRef node, float width, YGMeasure
   RCTWrapperShadowView *shadowView = (__bridge RCTWrapperShadowView *)YGNodeGetContext(node);
   CGSize size = [shadowView measureWithMinimumSize:minimumSize maximumSize:maximumSize];
 
-  return (YGSize){
-    RCTYogaFloatFromCoreGraphicsFloat(size.width),
-    RCTYogaFloatFromCoreGraphicsFloat(size.height)
-  };
+  return (YGSize){RCTYogaFloatFromCoreGraphicsFloat(size.width), RCTYogaFloatFromCoreGraphicsFloat(size.height)};
 }
 
 - (CGSize)measureWithMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
diff --git a/Libraries/Wrapper/RCTWrapperView.m b/Libraries/Wrapper/RCTWrapperView.m
index d0358a024152..a3b9ef636405 100644
--- a/Libraries/Wrapper/RCTWrapperView.m
+++ b/Libraries/Wrapper/RCTWrapperView.m
@@ -29,10 +29,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
 
       CGSize size = [strongSelf sizeThatFits:maximumSize];
 
-      return CGSizeMake(
-        MAX(size.width, minimumSize.width),
-        MAX(size.height, minimumSize.height)
-      );
+      return CGSizeMake(MAX(size.width, minimumSize.width), MAX(size.height, minimumSize.height));
     };
   }
 
diff --git a/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m b/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m
index 22a7cab0fc7e..0a433de602b4 100644
--- a/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m
+++ b/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m
@@ -42,7 +42,7 @@ - (void)attachChildViewController:(UIViewController *)childViewController toCont
 
 - (void)detachChildViewController:(UIViewController *)childViewController
 {
-  [childViewController beginAppearanceTransition:false animated: false];
+  [childViewController beginAppearanceTransition:false animated:false];
   [childViewController endAppearanceTransition];
 
   [childViewController willMoveToParentViewController:nil];
@@ -66,7 +66,6 @@ - (nullable UIViewController *)contentViewController
 
 - (void)setContentViewController:(UIViewController *)contentViewController
 {
-
   if (_contentViewController) {
     [self detachContentViewControllerIfNeeded];
   }
diff --git a/Libraries/YellowBox/YellowBoxDeprecated.d.ts b/Libraries/YellowBox/YellowBoxDeprecated.d.ts
new file mode 100644
index 000000000000..4c4e0c24c6e7
--- /dev/null
+++ b/Libraries/YellowBox/YellowBoxDeprecated.d.ts
@@ -0,0 +1,19 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+
+/**
+ * YellowBox has been replaced with LogBox.
+ * @see LogBox
+ * @deprecated
+ */
+export const YellowBox: React.ComponentClass<any, any> & {
+  ignoreWarnings: (warnings: string[]) => void;
+};
diff --git a/Libraries/YellowBox/YellowBoxDeprecated.js b/Libraries/YellowBox/YellowBoxDeprecated.js
index bec2229de46a..be97a77f0361 100644
--- a/Libraries/YellowBox/YellowBoxDeprecated.js
+++ b/Libraries/YellowBox/YellowBoxDeprecated.js
@@ -10,11 +10,10 @@
 
 'use strict';
 
-const React = require('react');
+import type {IgnorePattern} from '../LogBox/Data/LogBoxData';
 
 const LogBox = require('../LogBox/LogBox');
-
-import type {IgnorePattern} from '../LogBox/Data/LogBoxData';
+const React = require('react');
 
 type Props = $ReadOnly<{||}>;
 
diff --git a/Libraries/YellowBox/__tests__/YellowBoxDeprecated-test.js b/Libraries/YellowBox/__tests__/YellowBoxDeprecated-test.js
index 70e552464588..fe642e268e45 100644
--- a/Libraries/YellowBox/__tests__/YellowBoxDeprecated-test.js
+++ b/Libraries/YellowBox/__tests__/YellowBoxDeprecated-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
- * @format
  * @flow
+ * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/Libraries/__flowtests__/ReactNativeTypes-flowtest.js b/Libraries/__flowtests__/ReactNativeTypes-flowtest.js
index 032472bef7ac..38a6ff4dd704 100644
--- a/Libraries/__flowtests__/ReactNativeTypes-flowtest.js
+++ b/Libraries/__flowtests__/ReactNativeTypes-flowtest.js
@@ -8,9 +8,10 @@
  * @format
  */
 
-import * as React from 'react';
 import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
 
+import * as React from 'react';
+
 function takesHostComponentInstance(
   instance: React.ElementRef<HostComponent<mixed>> | null,
 ): void {}
diff --git a/Libraries/vendor/core/ErrorUtils.d.ts b/Libraries/vendor/core/ErrorUtils.d.ts
new file mode 100644
index 000000000000..f54bcbe741bd
--- /dev/null
+++ b/Libraries/vendor/core/ErrorUtils.d.ts
@@ -0,0 +1,15 @@
+/**
+ * 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
+ */
+
+type ErrorHandlerCallback = (error: any, isFatal?: boolean) => void;
+
+export interface ErrorUtils {
+  setGlobalHandler: (callback: ErrorHandlerCallback) => void;
+  getGlobalHandler: () => ErrorHandlerCallback;
+}
diff --git a/Libraries/vendor/emitter/EventEmitter.d.ts b/Libraries/vendor/emitter/EventEmitter.d.ts
new file mode 100644
index 000000000000..297b89e8a459
--- /dev/null
+++ b/Libraries/vendor/emitter/EventEmitter.d.ts
@@ -0,0 +1,164 @@
+/**
+ * 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
+ */
+
+/**
+ * EventSubscription represents a subscription to a particular event. It can
+ * remove its own subscription.
+ */
+interface EventSubscription {
+  eventType: string;
+  key: number;
+  subscriber: EventSubscriptionVendor;
+
+  /**
+   * @param subscriber the subscriber that controls
+   *   this subscription.
+   */
+  new (subscriber: EventSubscriptionVendor): EventSubscription;
+
+  /**
+   * Removes this subscription from the subscriber that controls it.
+   */
+  remove(): void;
+}
+
+/**
+ * EventSubscriptionVendor stores a set of EventSubscriptions that are
+ * subscribed to a particular event type.
+ */
+declare class EventSubscriptionVendor {
+  constructor();
+
+  /**
+   * Adds a subscription keyed by an event type.
+   *
+   */
+  addSubscription(
+    eventType: string,
+    subscription: EventSubscription,
+  ): EventSubscription;
+
+  /**
+   * Removes a bulk set of the subscriptions.
+   *
+   * @param eventType - Optional name of the event type whose
+   *   registered supscriptions to remove, if null remove all subscriptions.
+   */
+  removeAllSubscriptions(eventType?: string): void;
+
+  /**
+   * Removes a specific subscription. Instead of calling this function, call
+   * `subscription.remove()` directly.
+   *
+   */
+  removeSubscription(subscription: any): void;
+
+  /**
+   * Returns the array of subscriptions that are currently registered for the
+   * given event type.
+   *
+   * Note: This array can be potentially sparse as subscriptions are deleted
+   * from it when they are removed.
+   *
+   */
+  getSubscriptionsForType(eventType: string): EventSubscription[];
+}
+
+/**
+ * EmitterSubscription represents a subscription with listener and context data.
+ */
+interface EmitterSubscription extends EventSubscription {
+  emitter: EventEmitter;
+  listener: () => any;
+  context: any;
+
+  /**
+   * @param emitter - The event emitter that registered this
+   *   subscription
+   * @param subscriber - The subscriber that controls
+   *   this subscription
+   * @param listener - Function to invoke when the specified event is
+   *   emitted
+   * @param context - Optional context object to use when invoking the
+   *   listener
+   */
+  new (
+    emitter: EventEmitter,
+    subscriber: EventSubscriptionVendor,
+    listener: () => any,
+    context: any,
+  ): EmitterSubscription;
+
+  /**
+   * Removes this subscription from the emitter that registered it.
+   * Note: we're overriding the `remove()` method of EventSubscription here
+   * but deliberately not calling `super.remove()` as the responsibility
+   * for removing the subscription lies with the EventEmitter.
+   */
+  remove(): void;
+}
+
+export declare class EventEmitter {
+  /**
+   *
+   * @param subscriber - Optional subscriber instance
+   *   to use. If omitted, a new subscriber will be created for the emitter.
+   */
+  constructor(subscriber?: EventSubscriptionVendor | null);
+
+  /**
+   * Adds a listener to be invoked when events of the specified type are
+   * emitted. An optional calling context may be provided. The data arguments
+   * emitted will be passed to the listener function.
+   *
+   * @param eventType - Name of the event to listen to
+   * @param listener - Function to invoke when the specified event is
+   *   emitted
+   * @param context - Optional context object to use when invoking the
+   *   listener
+   */
+  addListener(
+    eventType: string,
+    listener: (...args: any[]) => any,
+    context?: any,
+  ): EmitterSubscription;
+
+  /**
+   * Removes all of the registered listeners, including those registered as
+   * listener maps.
+   *
+   * @param eventType - Optional name of the event whose registered
+   *   listeners to remove
+   */
+  removeAllListeners(eventType?: string): void;
+
+  /**
+   * Returns the number of listeners that are currently registered for the given
+   * event.
+   *
+   * @param eventType - Name of the event to query
+   */
+  listenerCount(eventType: string): number;
+
+  /**
+   * Emits an event of the given type with the given data. All handlers of that
+   * particular type will be notified.
+   *
+   * @param eventType - Name of the event to emit
+   * @param Arbitrary arguments to be passed to each registered listener
+   *
+   * @example
+   *   emitter.addListener('someEvent', function(message) {
+   *     console.log(message);
+   *   });
+   *
+   *   emitter.emit('someEvent', 'abc'); // logs 'abc'
+   */
+  emit(eventType: string, ...params: any[]): void;
+}
diff --git a/Libraries/vendor/emitter/__tests__/EventEmitter-test.js b/Libraries/vendor/emitter/__tests__/EventEmitter-test.js
index 2fdd9b138530..99288ac3e2e8 100644
--- a/Libraries/vendor/emitter/__tests__/EventEmitter-test.js
+++ b/Libraries/vendor/emitter/__tests__/EventEmitter-test.js
@@ -1,11 +1,16 @@
 /**
- * (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+ * 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.
  *
- * @emails oncall+react_native
  * @flow strict
  * @format
+ * @oncall react_native
  */
 
+import type {EventSubscription} from '../EventEmitter';
+
 import EventEmitter from '../EventEmitter';
 
 describe('listeners', () => {
@@ -306,7 +311,7 @@ describe('event emission', () => {
     const listenerA = jest.fn(() => {
       results.push('A');
     });
-    const listenerB = jest.fn(() => {
+    const listenerB: JestMockFn<Array<mixed>, void> = jest.fn(() => {
       results.push('B');
       subscriptionB.remove();
     });
@@ -314,7 +319,10 @@ describe('event emission', () => {
       results.push('C');
     });
     emitter.addListener('A', listenerA);
-    const subscriptionB = emitter.addListener('A', listenerB);
+    const subscriptionB: EventSubscription = emitter.addListener(
+      'A',
+      listenerB,
+    );
     emitter.addListener('A', listenerC);
 
     emitter.emit('A');
diff --git a/README.md b/README.md
index 405f9203e1ee..cf73b68db74d 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ React Native is developed and supported by many companies and individual core co
 
 ## 📋 Requirements
 
-React Native apps may target iOS 12.4 and Android 5.0 (API 21) or newer. You may use Windows, macOS, or Linux as your development operating system, though building and running iOS apps is limited to macOS. Tools like [Expo](https://expo.io) can be used to work around this.
+React Native apps may target iOS 12.4 and Android 5.0 (API 21) or newer. You may use Windows, macOS, or Linux as your development operating system, though building and running iOS apps is limited to macOS. Tools like [Expo](https://expo.dev) can be used to work around this.
 
 ## 🎉 Building your first React Native app
 
@@ -77,7 +77,7 @@ Follow the [Getting Started guide](https://reactnative.dev/docs/getting-started)
 - [Creating a New Application][new-app]
 - [Adding React Native to an Existing Application][existing]
 
-[hello-world]: https://snack.expo.io/@hramos/hello,-world!
+[hello-world]: https://snack.expo.dev/@hramos/hello,-world!
 [new-app]: https://reactnative.dev/docs/getting-started
 [existing]: https://reactnative.dev/docs/integration-with-existing-apps
 
diff --git a/React-Core.podspec b/React-Core.podspec
index 279e4e9c5718..7be727f36705 100644
--- a/React-Core.podspec
+++ b/React-Core.podspec
@@ -20,6 +20,8 @@ folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1
 folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
 
+use_hermes = ENV['USE_HERMES'] == '1'
+
 header_subspecs = {
   'CoreModulesHeaders'          => 'React/CoreModules/**/*.h',
   'RCTActionSheetHeaders'       => 'Libraries/ActionSheetIOS/*.h',
@@ -34,6 +36,19 @@ header_subspecs = {
   'RCTVibrationHeaders'         => 'Libraries/Vibration/*.h',
 }
 
+header_search_paths = [
+  "$(PODS_TARGET_SRCROOT)/ReactCommon",
+  "$(PODS_ROOT)/boost",
+  "$(PODS_ROOT)/DoubleConversion",
+  "$(PODS_ROOT)/RCT-Folly",
+  "${PODS_ROOT}/Headers/Public/FlipperKit",
+  "$(PODS_ROOT)/Headers/Public/ReactCommon",
+  "$(PODS_ROOT)/Headers/Public/React-RCTFabric"
+].concat(use_hermes ? [
+  "$(PODS_ROOT)/Headers/Public/React-hermes",
+  "$(PODS_ROOT)/Headers/Public/hermes-engine"
+] : []).map{|p| "\"#{p}\""}.join(" ")
+
 Pod::Spec.new do |s|
   s.name                   = "React-Core"
   s.version                = version
@@ -47,7 +62,14 @@ Pod::Spec.new do |s|
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.header_dir             = "React"
   s.framework              = "JavaScriptCore"
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\" \"${PODS_ROOT}/Headers/Public/FlipperKit\" \"$(PODS_ROOT)/Headers/Public/ReactCommon\" \"$(PODS_ROOT)/Headers/Public/React-RCTFabric\"", "DEFINES_MODULE" => "YES", "GCC_PREPROCESSOR_DEFINITIONS" => "RCT_METRO_PORT=${RCT_METRO_PORT}", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }
+  s.pod_target_xcconfig    = {
+                               "HEADER_SEARCH_PATHS" => header_search_paths,
+                               "DEFINES_MODULE" => "YES",
+                               "GCC_PREPROCESSOR_DEFINITIONS" => "RCT_METRO_PORT=${RCT_METRO_PORT}",
+                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
+                             }.merge!(use_hermes ? {
+                               "FRAMEWORK_SEARCH_PATHS" => "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-hermes\""
+                             } : {})
   s.user_target_xcconfig   = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\""}
   s.default_subspec        = "Default"
 
diff --git a/React/AppSetup/RCTAppSetupUtils.h b/React/AppSetup/RCTAppSetupUtils.h
index 954dee2a987a..06e12d7317c4 100644
--- a/React/AppSetup/RCTAppSetupUtils.h
+++ b/React/AppSetup/RCTAppSetupUtils.h
@@ -9,6 +9,8 @@
 #import <React/RCTBridge.h>
 #import <React/RCTRootView.h>
 
+#ifdef __cplusplus
+
 #if RCT_NEW_ARCH_ENABLED
 
 #ifndef RCT_USE_HERMES
@@ -28,13 +30,6 @@
 #import <ReactCommon/RCTTurboModuleManager.h>
 #endif
 
-RCT_EXTERN_C_BEGIN
-
-void RCTAppSetupPrepareApp(UIApplication *application);
-UIView *RCTAppSetupDefaultRootView(RCTBridge *bridge, NSString *moduleName, NSDictionary *initialProperties);
-
-RCT_EXTERN_C_END
-
 #if RCT_NEW_ARCH_ENABLED
 RCT_EXTERN id<RCTTurboModule> RCTAppSetupDefaultModuleFromClass(Class moduleClass);
 
@@ -42,3 +37,16 @@ std::unique_ptr<facebook::react::JSExecutorFactory> RCTAppSetupDefaultJsExecutor
     RCTBridge *bridge,
     RCTTurboModuleManager *turboModuleManager);
 #endif
+
+#endif // __cplusplus
+
+RCT_EXTERN_C_BEGIN
+
+void RCTAppSetupPrepareApp(UIApplication *application, BOOL turboModuleEnabled);
+UIView *RCTAppSetupDefaultRootView(
+    RCTBridge *bridge,
+    NSString *moduleName,
+    NSDictionary *initialProperties,
+    BOOL fabricEnabled);
+
+RCT_EXTERN_C_END
diff --git a/React/AppSetup/RCTAppSetupUtils.mm b/React/AppSetup/RCTAppSetupUtils.mm
index cc9641ca3806..4d58caebfe2e 100644
--- a/React/AppSetup/RCTAppSetupUtils.mm
+++ b/React/AppSetup/RCTAppSetupUtils.mm
@@ -44,26 +44,28 @@ static void InitializeFlipper(UIApplication *application)
 }
 #endif
 
-void RCTAppSetupPrepareApp(UIApplication *application)
+void RCTAppSetupPrepareApp(UIApplication *application, BOOL turboModuleEnabled)
 {
 #ifdef FB_SONARKIT_ENABLED
   InitializeFlipper(application);
 #endif
 
 #if RCT_NEW_ARCH_ENABLED
-  RCTEnableTurboModule(YES);
+  RCTEnableTurboModule(turboModuleEnabled);
 #endif
 }
 
-UIView *RCTAppSetupDefaultRootView(RCTBridge *bridge, NSString *moduleName, NSDictionary *initialProperties)
+UIView *
+RCTAppSetupDefaultRootView(RCTBridge *bridge, NSString *moduleName, NSDictionary *initialProperties, BOOL fabricEnabled)
 {
 #if RCT_NEW_ARCH_ENABLED
-  return [[RCTFabricSurfaceHostingProxyRootView alloc] initWithBridge:bridge
-                                                           moduleName:moduleName
-                                                    initialProperties:initialProperties];
-#else
-  return [[RCTRootView alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
+  if (fabricEnabled) {
+    return [[RCTFabricSurfaceHostingProxyRootView alloc] initWithBridge:bridge
+                                                             moduleName:moduleName
+                                                      initialProperties:initialProperties];
+  }
 #endif
+  return [[RCTRootView alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
 }
 
 #if RCT_NEW_ARCH_ENABLED
diff --git a/React/Base/RCTAssert.h b/React/Base/RCTAssert.h
index e7cb4a003bc9..e088fa9582b1 100644
--- a/React/Base/RCTAssert.h
+++ b/React/Base/RCTAssert.h
@@ -159,18 +159,18 @@ RCT_EXTERN NSString *RCTFormatStackTrace(NSArray<NSDictionary<NSString *, id> *>
  */
 #if DEBUG
 
-#define RCTAssertThread(thread, format...)                                                                            \
+#define RCTAssertThread(thread, ...)                                                                                  \
   _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") RCTAssert(       \
       [(id)thread isKindOfClass:[NSString class]]       ? [RCTCurrentThreadName() isEqualToString:(NSString *)thread] \
           : [(id)thread isKindOfClass:[NSThread class]] ? [NSThread currentThread] == (NSThread *)thread              \
                                                         : dispatch_get_current_queue() == (dispatch_queue_t)thread,   \
-      format);                                                                                                        \
+      __VA_ARGS__);                                                                                                   \
   _Pragma("clang diagnostic pop")
 
 #else
 
-#define RCTAssertThread(thread, format...) \
-  do {                                     \
+#define RCTAssertThread(thread, ...) \
+  do {                               \
   } while (0)
 
 #endif
diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h
index 0033a40579ac..1373eaae2fa9 100644
--- a/React/Base/RCTBridge.h
+++ b/React/Base/RCTBridge.h
@@ -13,117 +13,13 @@
 #import <React/RCTFrameUpdate.h>
 #import <React/RCTInvalidating.h>
 
+#import "RCTBridgeConstants.h"
+#import "RCTConstants.h"
+
 @class JSValue;
 @class RCTBridge;
 @class RCTPerformanceLogger;
 
-/**
- * This notification fires when the bridge initializes.
- */
-RCT_EXTERN NSString *const RCTJavaScriptWillStartLoadingNotification;
-
-/**
- * This notification fires when the bridge starts executing the JS bundle.
- */
-RCT_EXTERN NSString *const RCTJavaScriptWillStartExecutingNotification;
-
-/**
- * This notification fires when the bridge has finished loading the JS bundle.
- */
-RCT_EXTERN NSString *const RCTJavaScriptDidLoadNotification;
-
-/**
- * This notification fires when the bridge failed to load the JS bundle. The
- * `error` key can be used to determine the error that occurred.
- */
-RCT_EXTERN NSString *const RCTJavaScriptDidFailToLoadNotification;
-
-/**
- * This notification fires each time a native module is instantiated. The
- * `module` key will contain a reference to the newly-created module instance.
- * Note that this notification may be fired before the module is available via
- * the `[bridge moduleForClass:]` method.
- */
-RCT_EXTERN NSString *const RCTDidInitializeModuleNotification;
-
-/**
- * This notification fires each time a module is setup after it is initialized. The
- * `RCTDidSetupModuleNotificationModuleNameKey` key will contain a reference to the module name and
- * `RCTDidSetupModuleNotificationSetupTimeKey` will contain the setup time in ms.
- */
-RCT_EXTERN NSString *const RCTDidSetupModuleNotification;
-
-/**
- * Key for the module name (NSString) in the
- * RCTDidSetupModuleNotification userInfo dictionary.
- */
-RCT_EXTERN NSString *const RCTDidSetupModuleNotificationModuleNameKey;
-
-/**
- * Key for the setup time (NSNumber) in the
- * RCTDidSetupModuleNotification userInfo dictionary.
- */
-RCT_EXTERN NSString *const RCTDidSetupModuleNotificationSetupTimeKey;
-
-/**
- * DEPRECATED - Use RCTReloadCommand instead. This notification fires just before the bridge starts
- * processing a request to reload.
- */
-RCT_EXTERN NSString *const RCTBridgeWillReloadNotification;
-
-/**
- * This notification fires whenever a fast refresh happens.
- */
-RCT_EXTERN NSString *const RCTBridgeFastRefreshNotification;
-
-/**
- * This notification fires just before the bridge begins downloading a script
- * from the packager.
- */
-RCT_EXTERN NSString *const RCTBridgeWillDownloadScriptNotification;
-
-/**
- * This notification fires just after the bridge finishes downloading a script
- * from the packager.
- */
-RCT_EXTERN NSString *const RCTBridgeDidDownloadScriptNotification;
-
-/**
- * This notification fires right after the bridge is about to invalidate NativeModule
- * instances during teardown. Handle this notification to perform additional invalidation.
- */
-RCT_EXTERN NSString *const RCTBridgeWillInvalidateModulesNotification;
-
-/**
- * This notification fires right after the bridge finishes invalidating NativeModule
- * instances during teardown. Handle this notification to perform additional invalidation.
- */
-RCT_EXTERN NSString *const RCTBridgeDidInvalidateModulesNotification;
-
-/**
- * This notification fires right before the bridge starting invalidation process.
- * Handle this notification to perform additional invalidation.
- * The notification can be issued on any thread.
- */
-RCT_EXTERN NSString *const RCTBridgeWillBeInvalidatedNotification;
-
-/**
- * Key for the RCTSource object in the RCTBridgeDidDownloadScriptNotification
- * userInfo dictionary.
- */
-RCT_EXTERN NSString *const RCTBridgeDidDownloadScriptNotificationSourceKey;
-
-/**
- * Key for the reload reason in the RCTBridgeWillReloadNotification userInfo dictionary.
- */
-RCT_EXTERN NSString *const RCTBridgeDidDownloadScriptNotificationReasonKey;
-
-/**
- * Key for the bridge description (NSString_ in the
- * RCTBridgeDidDownloadScriptNotification userInfo dictionary.
- */
-RCT_EXTERN NSString *const RCTBridgeDidDownloadScriptNotificationBridgeDescriptionKey;
-
 /**
  * This block can be used to instantiate modules that require additional
  * init parameters, or additional configuration prior to being used.
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index d84b1cedc1fe..444086b38b8c 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -23,24 +23,6 @@
 #import "RCTReloadCommand.h"
 #import "RCTUtils.h"
 
-NSString *const RCTJavaScriptDidFailToLoadNotification = @"RCTJavaScriptDidFailToLoadNotification";
-NSString *const RCTJavaScriptDidLoadNotification = @"RCTJavaScriptDidLoadNotification";
-NSString *const RCTJavaScriptWillStartExecutingNotification = @"RCTJavaScriptWillStartExecutingNotification";
-NSString *const RCTJavaScriptWillStartLoadingNotification = @"RCTJavaScriptWillStartLoadingNotification";
-NSString *const RCTDidInitializeModuleNotification = @"RCTDidInitializeModuleNotification";
-NSString *const RCTDidSetupModuleNotification = @"RCTDidSetupModuleNotification";
-NSString *const RCTDidSetupModuleNotificationModuleNameKey = @"moduleName";
-NSString *const RCTDidSetupModuleNotificationSetupTimeKey = @"setupTime";
-NSString *const RCTBridgeWillReloadNotification = @"RCTBridgeWillReloadNotification";
-NSString *const RCTBridgeFastRefreshNotification = @"RCTBridgeFastRefreshNotification";
-NSString *const RCTBridgeWillDownloadScriptNotification = @"RCTBridgeWillDownloadScriptNotification";
-NSString *const RCTBridgeDidDownloadScriptNotification = @"RCTBridgeDidDownloadScriptNotification";
-NSString *const RCTBridgeWillInvalidateModulesNotification = @"RCTBridgeWillInvalidateModulesNotification";
-NSString *const RCTBridgeDidInvalidateModulesNotification = @"RCTBridgeDidInvalidateModulesNotification";
-NSString *const RCTBridgeWillBeInvalidatedNotification = @"RCTBridgeWillBeInvalidatedNotification";
-NSString *const RCTBridgeDidDownloadScriptNotificationSourceKey = @"source";
-NSString *const RCTBridgeDidDownloadScriptNotificationBridgeDescriptionKey = @"bridgeDescription";
-
 static NSMutableArray<Class> *RCTModuleClasses;
 static dispatch_queue_t RCTModuleClassesSyncQueue;
 NSArray<Class> *RCTGetModuleClasses(void)
diff --git a/React/Base/RCTBridgeConstants.h b/React/Base/RCTBridgeConstants.h
new file mode 100644
index 000000000000..13a1d0e97ef3
--- /dev/null
+++ b/React/Base/RCTBridgeConstants.h
@@ -0,0 +1,71 @@
+/*
+ * 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/RCTDefines.h>
+
+/**
+ * RCTBridgeConstants are constants that are only used in the legacy architecture.
+ * Please place constants used in the new architecture into RCTConstants.
+ */
+/**
+ * DEPRECATED - Use RCTReloadCommand instead. This notification fires just before the bridge starts
+ * processing a request to reload.
+ */
+RCT_EXTERN NSString *const RCTBridgeWillReloadNotification;
+
+/**
+ * This notification fires whenever a fast refresh happens.
+ */
+RCT_EXTERN NSString *const RCTBridgeFastRefreshNotification;
+
+/**
+ * This notification fires just before the bridge begins downloading a script
+ * from the packager.
+ */
+RCT_EXTERN NSString *const RCTBridgeWillDownloadScriptNotification;
+
+/**
+ * This notification fires just after the bridge finishes downloading a script
+ * from the packager.
+ */
+RCT_EXTERN NSString *const RCTBridgeDidDownloadScriptNotification;
+
+/**
+ * This notification fires right after the bridge is about to invalidate NativeModule
+ * instances during teardown. Handle this notification to perform additional invalidation.
+ */
+RCT_EXTERN NSString *const RCTBridgeWillInvalidateModulesNotification;
+
+/**
+ * This notification fires right after the bridge finishes invalidating NativeModule
+ * instances during teardown. Handle this notification to perform additional invalidation.
+ */
+RCT_EXTERN NSString *const RCTBridgeDidInvalidateModulesNotification;
+
+/**
+ * This notification fires right before the bridge starting invalidation process.
+ * Handle this notification to perform additional invalidation.
+ * The notification can be issued on any thread.
+ */
+RCT_EXTERN NSString *const RCTBridgeWillBeInvalidatedNotification;
+
+/**
+ * Key for the RCTSource object in the RCTBridgeDidDownloadScriptNotification
+ * userInfo dictionary.
+ */
+RCT_EXTERN NSString *const RCTBridgeDidDownloadScriptNotificationSourceKey;
+
+/**
+ * Key for the reload reason in the RCTBridgeWillReloadNotification userInfo dictionary.
+ */
+RCT_EXTERN NSString *const RCTBridgeDidDownloadScriptNotificationReasonKey;
+
+/**
+ * Key for the bridge description (NSString_ in the
+ * RCTBridgeDidDownloadScriptNotification userInfo dictionary.
+ */
+RCT_EXTERN NSString *const RCTBridgeDidDownloadScriptNotificationBridgeDescriptionKey;
diff --git a/React/Base/RCTBridgeConstants.m b/React/Base/RCTBridgeConstants.m
new file mode 100644
index 000000000000..18080e0a2042
--- /dev/null
+++ b/React/Base/RCTBridgeConstants.m
@@ -0,0 +1,18 @@
+/*
+ * 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 "RCTBridgeConstants.h"
+
+NSString *const RCTBridgeWillReloadNotification = @"RCTBridgeWillReloadNotification";
+NSString *const RCTBridgeFastRefreshNotification = @"RCTBridgeFastRefreshNotification";
+NSString *const RCTBridgeWillDownloadScriptNotification = @"RCTBridgeWillDownloadScriptNotification";
+NSString *const RCTBridgeDidDownloadScriptNotification = @"RCTBridgeDidDownloadScriptNotification";
+NSString *const RCTBridgeWillInvalidateModulesNotification = @"RCTBridgeWillInvalidateModulesNotification";
+NSString *const RCTBridgeDidInvalidateModulesNotification = @"RCTBridgeDidInvalidateModulesNotification";
+NSString *const RCTBridgeWillBeInvalidatedNotification = @"RCTBridgeWillBeInvalidatedNotification";
+NSString *const RCTBridgeDidDownloadScriptNotificationSourceKey = @"source";
+NSString *const RCTBridgeDidDownloadScriptNotificationBridgeDescriptionKey = @"bridgeDescription";
diff --git a/React/Base/RCTBridgeModule.h b/React/Base/RCTBridgeModule.h
index ae2066f16f44..cc429c410f58 100644
--- a/React/Base/RCTBridgeModule.h
+++ b/React/Base/RCTBridgeModule.h
@@ -11,11 +11,14 @@
 #import <React/RCTDefines.h>
 #import <React/RCTJSThread.h>
 
+#import "RCTBundleManager.h"
+
 @class RCTBridge;
 @protocol RCTBridgeMethod;
+@protocol RCTTurboModule;
+@protocol RCTTurboModuleRegistry;
 @class RCTModuleRegistry;
 @class RCTViewRegistry;
-@class RCTBundleManager;
 @class RCTCallableJSModules;
 
 /**
@@ -378,37 +381,6 @@ RCT_EXTERN_C_END
 
 @end
 
-/**
- * A protocol that allows TurboModules to do lookup on other TurboModules.
- * Calling these methods may cause a module to be synchronously instantiated.
- */
-@protocol RCTTurboModuleRegistry <NSObject>
-- (id)moduleForName:(const char *)moduleName;
-
-/**
- * Rationale:
- * When TurboModules lookup other modules by name, we first check the TurboModule
- * registry to see if a TurboModule exists with the respective name. In this case,
- * we don't want a RedBox to be raised if the TurboModule isn't found.
- *
- * This method is deprecated and will be deleted after the migration from
- * TurboModules to TurboModules is complete.
- */
-- (id)moduleForName:(const char *)moduleName warnOnLookupFailure:(BOOL)warnOnLookupFailure;
-- (BOOL)moduleIsInitialized:(const char *)moduleName;
-
-- (NSArray<NSString *> *)eagerInitModuleNames;
-- (NSArray<NSString *> *)eagerInitMainQueueModuleNames;
-@end
-
-/**
- * Experimental.
- * A protocol to declare that a class supports TurboModule.
- * This may be removed in the future.
- * See RCTTurboModule.h for actual signature.
- */
-@protocol RCTTurboModule;
-
 /**
  * A class that allows NativeModules and TurboModules to look up one another.
  */
@@ -420,21 +392,6 @@ RCT_EXTERN_C_END
 - (id)moduleForName:(const char *)moduleName lazilyLoadIfNecessary:(BOOL)lazilyLoad;
 @end
 
-typedef void (^RCTBridgelessBundleURLSetter)(NSURL *bundleURL);
-typedef NSURL * (^RCTBridgelessBundleURLGetter)(void);
-
-/**
- * A class that allows NativeModules/TurboModules to read/write the bundleURL, with or without the bridge.
- */
-@interface RCTBundleManager : NSObject
-- (void)setBridge:(RCTBridge *)bridge;
-- (void)setBridgelessBundleURLGetter:(RCTBridgelessBundleURLGetter)getter
-                           andSetter:(RCTBridgelessBundleURLSetter)setter
-                    andDefaultGetter:(RCTBridgelessBundleURLGetter)defaultGetter;
-- (void)resetBundleURL;
-@property NSURL *bundleURL;
-@end
-
 typedef UIView * (^RCTBridgelessComponentViewProvider)(NSNumber *);
 
 typedef void (^RCTViewRegistryUIBlock)(RCTViewRegistry *viewRegistry);
diff --git a/React/Base/RCTBundleManager.h b/React/Base/RCTBundleManager.h
new file mode 100644
index 000000000000..15ed245dbea8
--- /dev/null
+++ b/React/Base/RCTBundleManager.h
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+@class RCTBridge;
+
+typedef NSURL * (^RCTBridgelessBundleURLGetter)(void);
+typedef void (^RCTBridgelessBundleURLSetter)(NSURL *bundleURL);
+
+/**
+ * A class that allows NativeModules/TurboModules to read/write the bundleURL, with or without the bridge.
+ */
+@interface RCTBundleManager : NSObject
+- (void)setBridge:(RCTBridge *)bridge;
+- (void)setBridgelessBundleURLGetter:(RCTBridgelessBundleURLGetter)getter
+                           andSetter:(RCTBridgelessBundleURLSetter)setter
+                    andDefaultGetter:(RCTBridgelessBundleURLGetter)defaultGetter;
+- (void)resetBundleURL;
+@property NSURL *bundleURL;
+@end
diff --git a/React/Base/RCTBundleManager.m b/React/Base/RCTBundleManager.m
index 97b9400af605..8ea361fd5737 100644
--- a/React/Base/RCTBundleManager.m
+++ b/React/Base/RCTBundleManager.m
@@ -5,10 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#import "RCTBundleManager.h"
 #import "RCTAssert.h"
 #import "RCTBridge+Private.h"
 #import "RCTBridge.h"
-#import "RCTBridgeModule.h"
 
 @implementation RCTBundleManager {
   __weak RCTBridge *_bridge;
diff --git a/React/Base/RCTConstants.h b/React/Base/RCTConstants.h
index cf6e4ebf5d4b..217b7aabc21a 100644
--- a/React/Base/RCTConstants.h
+++ b/React/Base/RCTConstants.h
@@ -10,11 +10,53 @@
 RCT_EXTERN NSString *const RCTUserInterfaceStyleDidChangeNotification;
 RCT_EXTERN NSString *const RCTUserInterfaceStyleDidChangeNotificationTraitCollectionKey;
 
-/*
- * Preemptive View Allocation
+/**
+ * This notification fires when the bridge initializes.
+ */
+RCT_EXTERN NSString *const RCTJavaScriptWillStartLoadingNotification;
+
+/**
+ * This notification fires when the bridge starts executing the JS bundle.
+ */
+RCT_EXTERN NSString *const RCTJavaScriptWillStartExecutingNotification;
+
+/**
+ * This notification fires when the bridge has finished loading the JS bundle.
+ */
+RCT_EXTERN NSString *const RCTJavaScriptDidLoadNotification;
+
+/**
+ * This notification fires when the bridge failed to load the JS bundle. The
+ * `error` key can be used to determine the error that occurred.
+ */
+RCT_EXTERN NSString *const RCTJavaScriptDidFailToLoadNotification;
+
+/**
+ * This notification fires each time a native module is instantiated. The
+ * `module` key will contain a reference to the newly-created module instance.
+ * Note that this notification may be fired before the module is available via
+ * the `[bridge moduleForClass:]` method.
  */
-RCT_EXTERN BOOL RCTExperimentGetPreemptiveViewAllocationDisabled(void);
-RCT_EXTERN void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value);
+RCT_EXTERN NSString *const RCTDidInitializeModuleNotification;
+
+/**
+ * This notification fires each time a module is setup after it is initialized. The
+ * `RCTDidSetupModuleNotificationModuleNameKey` key will contain a reference to the module name and
+ * `RCTDidSetupModuleNotificationSetupTimeKey` will contain the setup time in ms.
+ */
+RCT_EXTERN NSString *const RCTDidSetupModuleNotification;
+
+/**
+ * Key for the module name (NSString) in the
+ * RCTDidSetupModuleNotification userInfo dictionary.
+ */
+RCT_EXTERN NSString *const RCTDidSetupModuleNotificationModuleNameKey;
+
+/**
+ * Key for the setup time (NSNumber) in the
+ * RCTDidSetupModuleNotification userInfo dictionary.
+ */
+RCT_EXTERN NSString *const RCTDidSetupModuleNotificationSetupTimeKey;
 
 /*
  * W3C Pointer Events
@@ -33,3 +75,9 @@ RCT_EXTERN void RCTSetValidateCanSendEventInRCTEventEmitter(BOOL value);
  */
 RCT_EXTERN BOOL RCTGetMemoryPressureUnloadLevel(void);
 RCT_EXTERN void RCTSetMemoryPressureUnloadLevel(int value);
+
+/*
+ * Parse JS stack for unhandled JS errors caught in C++
+ */
+RCT_EXTERN BOOL RCTGetParseUnhandledJSErrorStackNatively(void);
+RCT_EXTERN void RCTSetParseUnhandledJSErrorStackNatively(BOOL value);
diff --git a/React/Base/RCTConstants.m b/React/Base/RCTConstants.m
index b417b195ec83..03e5ffe984c6 100644
--- a/React/Base/RCTConstants.m
+++ b/React/Base/RCTConstants.m
@@ -10,20 +10,15 @@
 NSString *const RCTUserInterfaceStyleDidChangeNotification = @"RCTUserInterfaceStyleDidChangeNotification";
 NSString *const RCTUserInterfaceStyleDidChangeNotificationTraitCollectionKey = @"traitCollection";
 
-/*
- * Preemptive View Allocation
- */
-static BOOL RCTExperimentPreemptiveViewAllocationDisabled = NO;
-
-BOOL RCTExperimentGetPreemptiveViewAllocationDisabled()
-{
-  return RCTExperimentPreemptiveViewAllocationDisabled;
-}
+NSString *const RCTJavaScriptDidFailToLoadNotification = @"RCTJavaScriptDidFailToLoadNotification";
+NSString *const RCTJavaScriptDidLoadNotification = @"RCTJavaScriptDidLoadNotification";
+NSString *const RCTJavaScriptWillStartExecutingNotification = @"RCTJavaScriptWillStartExecutingNotification";
+NSString *const RCTJavaScriptWillStartLoadingNotification = @"RCTJavaScriptWillStartLoadingNotification";
 
-void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value)
-{
-  RCTExperimentPreemptiveViewAllocationDisabled = value;
-}
+NSString *const RCTDidInitializeModuleNotification = @"RCTDidInitializeModuleNotification";
+NSString *const RCTDidSetupModuleNotification = @"RCTDidSetupModuleNotification";
+NSString *const RCTDidSetupModuleNotificationModuleNameKey = @"moduleName";
+NSString *const RCTDidSetupModuleNotificationSetupTimeKey = @"setupTime";
 
 /*
  * W3C Pointer Events
@@ -70,3 +65,19 @@ void RCTSetMemoryPressureUnloadLevel(int value)
 {
   RCTMemoryPressureUnloadLevel = value;
 }
+
+/*
+ * In Bridge mode, parse the JS stack for unhandled JS errors, to display in RedBox.
+ * When false (previous default behavior), a native stack is displayed in the RedBox.
+ */
+static BOOL RCTParseUnhandledJSErrorStackNatively = NO;
+
+BOOL RCTGetParseUnhandledJSErrorStackNatively()
+{
+  return RCTParseUnhandledJSErrorStackNatively;
+}
+
+void RCTSetParseUnhandledJSErrorStackNatively(BOOL value)
+{
+  RCTParseUnhandledJSErrorStackNatively = value;
+}
diff --git a/React/Base/RCTConvert.h b/React/Base/RCTConvert.h
index c4913f60c7ab..7a7cc75ebdce 100644
--- a/React/Base/RCTConvert.h
+++ b/React/Base/RCTConvert.h
@@ -9,6 +9,7 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTAnimationType.h>
+#import <React/RCTBorderCurve.h>
 #import <React/RCTBorderStyle.h>
 #import <React/RCTDefines.h>
 #import <React/RCTLog.h>
@@ -64,6 +65,7 @@ typedef NSURL RCTFileURL;
 + (NSTextAlignment)NSTextAlignment:(id)json;
 + (NSUnderlineStyle)NSUnderlineStyle:(id)json;
 + (NSWritingDirection)NSWritingDirection:(id)json;
++ (NSLineBreakStrategy)NSLineBreakStrategy:(id)json;
 + (UITextAutocapitalizationType)UITextAutocapitalizationType:(id)json;
 + (UITextFieldViewMode)UITextFieldViewMode:(id)json;
 + (UIKeyboardType)UIKeyboardType:(id)json;
@@ -130,6 +132,7 @@ typedef BOOL css_backface_visibility_t;
 + (RCTPointerEvents)RCTPointerEvents:(id)json;
 + (RCTAnimationType)RCTAnimationType:(id)json;
 + (RCTBorderStyle)RCTBorderStyle:(id)json;
++ (RCTBorderCurve)RCTBorderCurve:(id)json;
 + (RCTTextDecorationLineType)RCTTextDecorationLineType:(id)json;
 
 @end
diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m
index c21ef072acd4..5e4820585b01 100644
--- a/React/Base/RCTConvert.m
+++ b/React/Base/RCTConvert.m
@@ -91,7 +91,7 @@ + (NSURL *)NSURL:(id)json
     }
 
     // Check if it has a scheme
-    if ([path rangeOfString:@":"].location != NSNotFound) {
+    if ([path rangeOfString:@"://"].location != NSNotFound) {
       NSMutableCharacterSet *urlAllowedCharacterSet = [NSMutableCharacterSet new];
       [urlAllowedCharacterSet formUnionWithCharacterSet:[NSCharacterSet URLUserAllowedCharacterSet]];
       [urlAllowedCharacterSet formUnionWithCharacterSet:[NSCharacterSet URLPasswordAllowedCharacterSet]];
@@ -345,6 +345,15 @@ + (NSLocale *)NSLocale:(id)json
     RCTBorderStyleSolid,
     integerValue)
 
+RCT_ENUM_CONVERTER(
+    RCTBorderCurve,
+    (@{
+      @"circular" : @(RCTBorderCurveCircular),
+      @"continuous" : @(RCTBorderCurveContinuous),
+    }),
+    RCTBorderCurveCircular,
+    integerValue)
+
 RCT_ENUM_CONVERTER(
     RCTTextDecorationLineType,
     (@{
@@ -366,6 +375,25 @@ + (NSLocale *)NSLocale:(id)json
     NSWritingDirectionNatural,
     integerValue)
 
++ (NSLineBreakStrategy)NSLineBreakStrategy:(id)json RCT_DYNAMIC
+{
+  if (@available(iOS 14.0, *)) {
+    static NSDictionary *mapping;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+      mapping = @{
+        @"none" : @(NSLineBreakStrategyNone),
+        @"standard" : @(NSLineBreakStrategyStandard),
+        @"hangul-word" : @(NSLineBreakStrategyHangulWordPriority),
+        @"push-out" : @(NSLineBreakStrategyPushOut)
+      };
+    });
+    return RCTConvertEnumValue("NSLineBreakStrategy", mapping, @(NSLineBreakStrategyNone), json).integerValue;
+  } else {
+    return NSLineBreakStrategyNone;
+  }
+}
+
 RCT_ENUM_CONVERTER(
     UITextAutocapitalizationType,
     (@{
diff --git a/React/Base/RCTKeyCommands.m b/React/Base/RCTKeyCommands.m
index 83385f82439f..1ceaf6ec0dce 100644
--- a/React/Base/RCTKeyCommands.m
+++ b/React/Base/RCTKeyCommands.m
@@ -128,7 +128,7 @@ - (void)handleKeyUIEventSwizzle:(UIEvent *)event
     isKeyDown = [event _isKeyDown];
   }
 
-  BOOL interactionEnabled = !UIApplication.sharedApplication.isIgnoringInteractionEvents;
+  BOOL interactionEnabled = !RCTSharedApplication().isIgnoringInteractionEvents;
   BOOL hasFirstResponder = NO;
   if (isKeyDown && modifiedInput.length > 0 && interactionEnabled) {
     UIResponder *firstResponder = nil;
diff --git a/React/Base/RCTModuleData.mm b/React/Base/RCTModuleData.mm
index 0a75719980c2..3e7fd3e7f76b 100644
--- a/React/Base/RCTModuleData.mm
+++ b/React/Base/RCTModuleData.mm
@@ -16,6 +16,7 @@
 #import "RCTBridge+Private.h"
 #import "RCTBridge.h"
 #import "RCTBridgeModuleDecorator.h"
+#import "RCTConstants.h"
 #import "RCTInitializing.h"
 #import "RCTLog.h"
 #import "RCTModuleMethod.h"
diff --git a/React/Base/RCTModuleMethod.mm b/React/Base/RCTModuleMethod.mm
index 941400a9f2de..f2d32d9aaf70 100644
--- a/React/Base/RCTModuleMethod.mm
+++ b/React/Base/RCTModuleMethod.mm
@@ -91,7 +91,7 @@ static BOOL RCTParseSelectorPart(const char **input, NSMutableString *selector)
 static BOOL RCTParseUnused(const char **input)
 {
   return RCTReadString(input, "__attribute__((unused))") || RCTReadString(input, "__attribute__((__unused__))") ||
-      RCTReadString(input, "__unused");
+      RCTReadString(input, "__unused") || RCTReadString(input, "[[maybe_unused]]");
 }
 
 static RCTNullability RCTParseNullability(const char **input)
diff --git a/React/Base/RCTModuleRegistry.m b/React/Base/RCTModuleRegistry.m
index 15ca7aa6014a..98dd082fe8ee 100644
--- a/React/Base/RCTModuleRegistry.m
+++ b/React/Base/RCTModuleRegistry.m
@@ -6,7 +6,9 @@
  */
 
 #import "RCTBridge.h"
-#import "RCTBridgeModule.h"
+#import "RCTTurboModuleRegistry.h"
+
+@class RCTBridgeModule;
 
 @implementation RCTModuleRegistry {
   __weak id<RCTTurboModuleRegistry> _turboModuleRegistry;
diff --git a/React/Base/RCTTurboModuleRegistry.h b/React/Base/RCTTurboModuleRegistry.h
new file mode 100644
index 000000000000..c0a6f52759a1
--- /dev/null
+++ b/React/Base/RCTTurboModuleRegistry.h
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+/**
+ * A protocol that allows TurboModules to do lookup on other TurboModules.
+ * Calling these methods may cause a module to be synchronously instantiated.
+ */
+@protocol RCTTurboModuleRegistry <NSObject>
+- (id)moduleForName:(const char *)moduleName;
+
+/**
+ * Rationale:
+ * When TurboModules lookup other modules by name, we first check the TurboModule
+ * registry to see if a TurboModule exists with the respective name. In this case,
+ * we don't want a RedBox to be raised if the TurboModule isn't found.
+ *
+ * This method is deprecated and will be deleted after the migration from
+ * TurboModules to TurboModules is complete.
+ */
+- (id)moduleForName:(const char *)moduleName warnOnLookupFailure:(BOOL)warnOnLookupFailure;
+- (BOOL)moduleIsInitialized:(const char *)moduleName;
+
+- (NSArray<NSString *> *)eagerInitModuleNames;
+- (NSArray<NSString *> *)eagerInitMainQueueModuleNames;
+@end
diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m
index 965c57cd19a9..1649f28d9a94 100644
--- a/React/Base/RCTVersion.m
+++ b/React/Base/RCTVersion.m
@@ -21,11 +21,11 @@
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^(void){
     __rnVersion = @{
-                    RCTVersionMajor: @(0),
-                    RCTVersionMinor: @(0),
-                    RCTVersionPatch: @(0),
-                    RCTVersionPrerelease: [NSNull null],
-                    };
+                  RCTVersionMajor: @(0),
+                  RCTVersionMinor: @(71),
+                  RCTVersionPatch: @(0),
+                  RCTVersionPrerelease: @"rc.5",
+                  };
   });
   return __rnVersion;
 }
diff --git a/React/Base/Surface/RCTSurface.mm b/React/Base/Surface/RCTSurface.mm
index 5b02f663e604..2ff9a18c3483 100644
--- a/React/Base/Surface/RCTSurface.mm
+++ b/React/Base/Surface/RCTSurface.mm
@@ -15,6 +15,7 @@
 #import "RCTAssert.h"
 #import "RCTBridge+Private.h"
 #import "RCTBridge.h"
+#import "RCTConstants.h"
 #import "RCTShadowView+Layout.h"
 #import "RCTSurfaceDelegate.h"
 #import "RCTSurfaceRootShadowView.h"
diff --git a/React/CoreModules/BUCK b/React/CoreModules/BUCK
index c5f95ab7009c..143a840eff41 100644
--- a/React/CoreModules/BUCK
+++ b/React/CoreModules/BUCK
@@ -1,5 +1,5 @@
 load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_objc_arc_preprocessor_flags", "get_preprocessor_flags_for_build_mode")
-load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "rn_apple_library", "rn_extra_build_flags")
+load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "react_native_xplat_target", "rn_apple_library", "rn_extra_build_flags")
 load(
     "@fbsource//xplat/configurations/buck/apple/plugins/sad_xplat_hosted_configurations:react_module_registration.bzl",
     "react_module_plugin_providers",
@@ -38,8 +38,9 @@ rn_apple_library(
     labels = [
         "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
         "disable_plugins_only_validation",
+        "fbios_link_group:xplat/default/public.react_native.infra",
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
+        "talkios_link_group:xplat/default/public.react_native.infra",
     ],
     link_whole = True,
     platform_preprocessor_flags = [(
@@ -77,9 +78,6 @@ rn_apple_library(
         ) + react_module_plugin_providers(
             name = "AlertManager",
             native_class_func = "RCTAlertManagerCls",
-        ) + react_module_plugin_providers(
-            name = "AsyncLocalStorage",
-            native_class_func = "RCTAsyncLocalStorageCls",
         ) + react_module_plugin_providers(
             name = "Timing",
             native_class_func = "RCTTimingCls",
@@ -129,6 +127,9 @@ rn_apple_library(
     ],
     reexport_all_header_dependencies = True,
     visibility = ["PUBLIC"],
+    deps = [
+        react_native_xplat_target("react/renderer/mapbuffer:mapbufferApple"),
+    ],
     exported_deps = [
         "//xplat/js/react-native-github:FBReactNativeSpecApple",
         "//xplat/js/react-native-github:RCTLinkingApple",
diff --git a/React/CoreModules/CoreModulesPlugins.h b/React/CoreModules/CoreModulesPlugins.h
index 55015a55c127..e2a02a4e335b 100644
--- a/React/CoreModules/CoreModulesPlugins.h
+++ b/React/CoreModules/CoreModulesPlugins.h
@@ -39,7 +39,6 @@ Class RCTI18nManagerCls(void) __attribute__((used));
 Class RCTSourceCodeCls(void) __attribute__((used));
 Class RCTActionSheetManagerCls(void) __attribute__((used));
 Class RCTAlertManagerCls(void) __attribute__((used));
-Class RCTAsyncLocalStorageCls(void) __attribute__((used));
 Class RCTTimingCls(void) __attribute__((used));
 Class RCTStatusBarManagerCls(void) __attribute__((used));
 Class RCTKeyboardObserverCls(void) __attribute__((used));
@@ -54,6 +53,7 @@ Class RCTWebSocketModuleCls(void) __attribute__((used));
 Class RCTDevLoadingViewCls(void) __attribute__((used));
 Class RCTDevSplitBundleLoaderCls(void) __attribute__((used));
 Class RCTEventDispatcherCls(void) __attribute__((used));
+Class RCTBlobManagerCls(void) __attribute__((used));
 
 #ifdef __cplusplus
 }
diff --git a/React/CoreModules/CoreModulesPlugins.mm b/React/CoreModules/CoreModulesPlugins.mm
index e74ddb8ee019..a782326e676a 100644
--- a/React/CoreModules/CoreModulesPlugins.mm
+++ b/React/CoreModules/CoreModulesPlugins.mm
@@ -29,7 +29,6 @@ Class RCTCoreModulesClassProvider(const char *name) {
     {"SourceCode", RCTSourceCodeCls},
     {"ActionSheetManager", RCTActionSheetManagerCls},
     {"AlertManager", RCTAlertManagerCls},
-    {"AsyncLocalStorage", RCTAsyncLocalStorageCls},
     {"Timing", RCTTimingCls},
     {"StatusBarManager", RCTStatusBarManagerCls},
     {"KeyboardObserver", RCTKeyboardObserverCls},
@@ -44,6 +43,7 @@ Class RCTCoreModulesClassProvider(const char *name) {
     {"DevLoadingView", RCTDevLoadingViewCls},
     {"DevSplitBundleLoader", RCTDevSplitBundleLoaderCls},
     {"EventDispatcher", RCTEventDispatcherCls},
+    {"BlobModule", RCTBlobManagerCls},
   };
 
   auto p = sCoreModuleClassMap->find(name);
diff --git a/React/CoreModules/RCTAccessibilityManager.h b/React/CoreModules/RCTAccessibilityManager.h
index 77f7388aacc5..707d5766dd4c 100644
--- a/React/CoreModules/RCTAccessibilityManager.h
+++ b/React/CoreModules/RCTAccessibilityManager.h
@@ -23,6 +23,7 @@ extern NSString *const RCTAccessibilityManagerDidUpdateMultiplierNotification; /
 @property (nonatomic, assign) BOOL isGrayscaleEnabled;
 @property (nonatomic, assign) BOOL isInvertColorsEnabled;
 @property (nonatomic, assign) BOOL isReduceMotionEnabled;
+@property (nonatomic, assign) BOOL prefersCrossFadeTransitions;
 @property (nonatomic, assign) BOOL isReduceTransparencyEnabled;
 @property (nonatomic, assign) BOOL isVoiceOverEnabled;
 
diff --git a/React/CoreModules/RCTAccessibilityManager.mm b/React/CoreModules/RCTAccessibilityManager.mm
index 33b0501f6943..99c3d2ffef11 100644
--- a/React/CoreModules/RCTAccessibilityManager.mm
+++ b/React/CoreModules/RCTAccessibilityManager.mm
@@ -358,6 +358,17 @@ static void setMultipliers(
   onSuccess(@[ @(_isReduceMotionEnabled) ]);
 }
 
+RCT_EXPORT_METHOD(getCurrentPrefersCrossFadeTransitionsState
+                  : (RCTResponseSenderBlock)onSuccess onError
+                  : (__unused RCTResponseSenderBlock)onError)
+{
+  if (@available(iOS 14.0, *)) {
+    onSuccess(@[ @(UIAccessibilityPrefersCrossFadeTransitions()) ]);
+  } else {
+    onSuccess(@[ @(false) ]);
+  }
+}
+
 RCT_EXPORT_METHOD(getCurrentReduceTransparencyState
                   : (RCTResponseSenderBlock)onSuccess onError
                   : (__unused RCTResponseSenderBlock)onError)
diff --git a/React/CoreModules/RCTAlertController.m b/React/CoreModules/RCTAlertController.m
index 6287ebf8082d..02636c3f4a7b 100644
--- a/React/CoreModules/RCTAlertController.m
+++ b/React/CoreModules/RCTAlertController.m
@@ -29,6 +29,11 @@ - (UIWindow *)alertWindow
 
 - (void)show:(BOOL)animated completion:(void (^)(void))completion
 {
+  if (@available(iOS 13.0, *)) {
+    UIUserInterfaceStyle style =
+        RCTSharedApplication().delegate.window.overrideUserInterfaceStyle ?: UIUserInterfaceStyleUnspecified;
+    self.overrideUserInterfaceStyle = style;
+  }
   [self.alertWindow makeKeyAndVisible];
   [self.alertWindow.rootViewController presentViewController:self animated:animated completion:completion];
 }
diff --git a/React/CoreModules/RCTAlertManager.mm b/React/CoreModules/RCTAlertManager.mm
index 7480580d9865..532e898faf05 100644
--- a/React/CoreModules/RCTAlertManager.mm
+++ b/React/CoreModules/RCTAlertManager.mm
@@ -94,6 +94,7 @@ - (void)invalidate
   NSString *defaultValue = [RCTConvert NSString:args.defaultValue()];
   NSString *cancelButtonKey = [RCTConvert NSString:args.cancelButtonKey()];
   NSString *destructiveButtonKey = [RCTConvert NSString:args.destructiveButtonKey()];
+  NSString *preferredButtonKey = [RCTConvert NSString:args.preferredButtonKey()];
   UIKeyboardType keyboardType = [RCTConvert UIKeyboardType:args.keyboardType()];
 
   if (!title && !message) {
@@ -175,32 +176,37 @@ - (void)invalidate
       buttonStyle = UIAlertActionStyleDestructive;
     }
     __weak RCTAlertController *weakAlertController = alertController;
-    [alertController
-        addAction:[UIAlertAction
-                      actionWithTitle:buttonTitle
-                                style:buttonStyle
-                              handler:^(__unused UIAlertAction *action) {
-                                switch (type) {
-                                  case RCTAlertViewStylePlainTextInput:
-                                  case RCTAlertViewStyleSecureTextInput:
-                                    callback(@[ buttonKey, [weakAlertController.textFields.firstObject text] ]);
-                                    [weakAlertController hide];
-                                    break;
-                                  case RCTAlertViewStyleLoginAndPasswordInput: {
-                                    NSDictionary<NSString *, NSString *> *loginCredentials = @{
-                                      @"login" : [weakAlertController.textFields.firstObject text],
-                                      @"password" : [weakAlertController.textFields.lastObject text]
-                                    };
-                                    callback(@[ buttonKey, loginCredentials ]);
-                                    [weakAlertController hide];
-                                    break;
-                                  }
-                                  case RCTAlertViewStyleDefault:
-                                    callback(@[ buttonKey ]);
-                                    [weakAlertController hide];
-                                    break;
-                                }
-                              }]];
+
+    UIAlertAction *alertAction =
+        [UIAlertAction actionWithTitle:buttonTitle
+                                 style:buttonStyle
+                               handler:^(__unused UIAlertAction *action) {
+                                 switch (type) {
+                                   case RCTAlertViewStylePlainTextInput:
+                                   case RCTAlertViewStyleSecureTextInput:
+                                     callback(@[ buttonKey, [weakAlertController.textFields.firstObject text] ]);
+                                     [weakAlertController hide];
+                                     break;
+                                   case RCTAlertViewStyleLoginAndPasswordInput: {
+                                     NSDictionary<NSString *, NSString *> *loginCredentials = @{
+                                       @"login" : [weakAlertController.textFields.firstObject text],
+                                       @"password" : [weakAlertController.textFields.lastObject text]
+                                     };
+                                     callback(@[ buttonKey, loginCredentials ]);
+                                     [weakAlertController hide];
+                                     break;
+                                   }
+                                   case RCTAlertViewStyleDefault:
+                                     callback(@[ buttonKey ]);
+                                     [weakAlertController hide];
+                                     break;
+                                 }
+                               }];
+    [alertController addAction:alertAction];
+
+    if ([buttonKey isEqualToString:preferredButtonKey]) {
+      [alertController setPreferredAction:alertAction];
+    }
   }
 
   if (!_alertControllers) {
diff --git a/React/CoreModules/RCTAsyncLocalStorage.h b/React/CoreModules/RCTAsyncLocalStorage.h
deleted file mode 100644
index 66136c871107..000000000000
--- a/React/CoreModules/RCTAsyncLocalStorage.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import <React/RCTBridgeModule.h>
-#import <React/RCTInvalidating.h>
-
-/**
- * A simple, asynchronous, persistent, key-value storage system designed as a
- * backend to the AsyncStorage JS module, which is modeled after LocalStorage.
- *
- * Current implementation stores small values in serialized dictionary and
- * larger values in separate files. Since we use a serial file queue
- * `RKFileQueue`, reading/writing from multiple threads should be perceived as
- * being atomic, unless someone bypasses the `RCTAsyncLocalStorage` API.
- *
- * Keys and values must always be strings or an error is returned.
- */
-@interface RCTAsyncLocalStorage : NSObject <RCTBridgeModule, RCTInvalidating>
-
-@property (nonatomic, assign) BOOL clearOnInvalidate;
-
-@property (nonatomic, readonly, getter=isValid) BOOL valid;
-
-// Clear the RCTAsyncLocalStorage data from native code
-- (void)clearAllData;
-
-// For clearing data when the bridge may not exist, e.g. when logging out.
-+ (void)clearAllData;
-
-// Grab data from the cache. ResponseBlock result array will have an error at position 0, and an array of arrays at
-// position 1.
-- (void)multiGet:(NSArray<NSString *> *)keys callback:(RCTResponseSenderBlock)callback;
-
-// Add multiple key value pairs to the cache.
-- (void)multiSet:(NSArray<NSArray<NSString *> *> *)kvPairs callback:(RCTResponseSenderBlock)callback;
-
-@end
diff --git a/React/CoreModules/RCTAsyncLocalStorage.mm b/React/CoreModules/RCTAsyncLocalStorage.mm
deleted file mode 100644
index 326ea78f8d69..000000000000
--- a/React/CoreModules/RCTAsyncLocalStorage.mm
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTAsyncLocalStorage.h"
-
-#import <Foundation/Foundation.h>
-
-#import <CommonCrypto/CommonCryptor.h>
-#import <CommonCrypto/CommonDigest.h>
-#import <FBReactNativeSpec/FBReactNativeSpec.h>
-
-#import <React/RCTConvert.h>
-#import <React/RCTLog.h>
-#import <React/RCTUtils.h>
-
-#import "CoreModulesPlugins.h"
-
-static NSString *const RCTStorageDirectory = @"RCTAsyncLocalStorage_V1";
-static NSString *const RCTManifestFileName = @"manifest.json";
-static const NSUInteger RCTInlineValueThreshold = 1024;
-
-#pragma mark - Static helper functions
-
-static NSDictionary *RCTErrorForKey(NSString *key)
-{
-  if (![key isKindOfClass:[NSString class]]) {
-    return RCTMakeAndLogError(@"Invalid key - must be a string.  Key: ", key, @{@"key" : key});
-  } else if (key.length < 1) {
-    return RCTMakeAndLogError(@"Invalid key - must be at least one character.  Key: ", key, @{@"key" : key});
-  } else {
-    return nil;
-  }
-}
-
-static void RCTAppendError(NSDictionary *error, NSMutableArray<NSDictionary *> **errors)
-{
-  if (error && errors) {
-    if (!*errors) {
-      *errors = [NSMutableArray new];
-    }
-    [*errors addObject:error];
-  }
-}
-
-static NSString *RCTReadFile(NSString *filePath, NSString *key, NSDictionary **errorOut)
-{
-  if ([[NSFileManager defaultManager] fileExistsAtPath:filePath]) {
-    NSError *error;
-    NSStringEncoding encoding;
-    NSString *entryString = [NSString stringWithContentsOfFile:filePath usedEncoding:&encoding error:&error];
-    NSDictionary *extraData = @{@"key" : RCTNullIfNil(key)};
-
-    if (error) {
-      if (errorOut)
-        *errorOut = RCTMakeError(@"Failed to read storage file.", error, extraData);
-      return nil;
-    }
-
-    if (encoding != NSUTF8StringEncoding) {
-      if (errorOut)
-        *errorOut = RCTMakeError(@"Incorrect encoding of storage file: ", @(encoding), extraData);
-      return nil;
-    }
-    return entryString;
-  }
-
-  return nil;
-}
-
-static NSString *RCTGetStorageDirectory()
-{
-  static NSString *storageDirectory = nil;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    storageDirectory = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject;
-    storageDirectory = [storageDirectory stringByAppendingPathComponent:RCTStorageDirectory];
-  });
-  return storageDirectory;
-}
-
-static NSString *RCTGetManifestFilePath()
-{
-  static NSString *manifestFilePath = nil;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    manifestFilePath = [RCTGetStorageDirectory() stringByAppendingPathComponent:RCTManifestFileName];
-  });
-  return manifestFilePath;
-}
-
-// Only merges objects - all other types are just clobbered (including arrays)
-static BOOL RCTMergeRecursive(NSMutableDictionary *destination, NSDictionary *source)
-{
-  BOOL modified = NO;
-  for (NSString *key in source) {
-    id sourceValue = source[key];
-    id destinationValue = destination[key];
-    if ([sourceValue isKindOfClass:[NSDictionary class]]) {
-      if ([destinationValue isKindOfClass:[NSDictionary class]]) {
-        if ([destinationValue classForCoder] != [NSMutableDictionary class]) {
-          destinationValue = [destinationValue mutableCopy];
-        }
-        if (RCTMergeRecursive(destinationValue, sourceValue)) {
-          destination[key] = destinationValue;
-          modified = YES;
-        }
-      } else {
-        destination[key] = [sourceValue copy];
-        modified = YES;
-      }
-    } else if (![source isEqual:destinationValue]) {
-      destination[key] = [sourceValue copy];
-      modified = YES;
-    }
-  }
-  return modified;
-}
-
-static dispatch_queue_t RCTGetMethodQueue()
-{
-  // We want all instances to share the same queue since they will be reading/writing the same files.
-  static dispatch_queue_t queue;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    queue = dispatch_queue_create("com.facebook.react.AsyncLocalStorageQueue", DISPATCH_QUEUE_SERIAL);
-  });
-  return queue;
-}
-
-static NSCache *RCTGetCache()
-{
-  // We want all instances to share the same cache since they will be reading/writing the same files.
-  static NSCache *cache;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    cache = [NSCache new];
-    cache.totalCostLimit = 2 * 1024 * 1024; // 2MB
-
-    // Clear cache in the event of a memory warning
-    [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidReceiveMemoryWarningNotification
-                                                      object:nil
-                                                       queue:nil
-                                                  usingBlock:^(__unused NSNotification *note) {
-                                                    [cache removeAllObjects];
-                                                  }];
-  });
-  return cache;
-}
-
-static BOOL RCTHasCreatedStorageDirectory = NO;
-static NSDictionary *RCTDeleteStorageDirectory()
-{
-  NSError *error;
-  [[NSFileManager defaultManager] removeItemAtPath:RCTGetStorageDirectory() error:&error];
-  RCTHasCreatedStorageDirectory = NO;
-  return error ? RCTMakeError(@"Failed to delete storage directory.", error, nil) : nil;
-}
-
-#pragma mark - RCTAsyncLocalStorage
-
-@interface RCTAsyncLocalStorage () <NativeAsyncLocalStorageSpec>
-@end
-
-@implementation RCTAsyncLocalStorage {
-  BOOL _haveSetup;
-  // The manifest is a dictionary of all keys with small values inlined.  Null values indicate values that are stored
-  // in separate files (as opposed to nil values which don't exist).  The manifest is read off disk at startup, and
-  // written to disk after all mutations.
-  NSMutableDictionary<NSString *, NSString *> *_manifest;
-}
-
-RCT_EXPORT_MODULE()
-
-- (dispatch_queue_t)methodQueue
-{
-  return RCTGetMethodQueue();
-}
-
-- (void)clearAllData
-{
-  dispatch_async(RCTGetMethodQueue(), ^{
-    [self->_manifest removeAllObjects];
-    [RCTGetCache() removeAllObjects];
-    RCTDeleteStorageDirectory();
-  });
-}
-
-+ (void)clearAllData
-{
-  dispatch_async(RCTGetMethodQueue(), ^{
-    [RCTGetCache() removeAllObjects];
-    RCTDeleteStorageDirectory();
-  });
-}
-
-- (void)invalidate
-{
-  if (_clearOnInvalidate) {
-    [RCTGetCache() removeAllObjects];
-    RCTDeleteStorageDirectory();
-  }
-  _clearOnInvalidate = NO;
-  [_manifest removeAllObjects];
-  _haveSetup = NO;
-}
-
-- (BOOL)isValid
-{
-  return _haveSetup;
-}
-
-- (void)dealloc
-{
-  [self invalidate];
-}
-
-- (NSString *)_filePathForKey:(NSString *)key
-{
-  NSString *safeFileName = RCTMD5Hash(key);
-  return [RCTGetStorageDirectory() stringByAppendingPathComponent:safeFileName];
-}
-
-- (NSDictionary *)_ensureSetup
-{
-  RCTAssertThread(RCTGetMethodQueue(), @"Must be executed on storage thread");
-
-  NSError *error = nil;
-  if (!RCTHasCreatedStorageDirectory) {
-    [[NSFileManager defaultManager] createDirectoryAtPath:RCTGetStorageDirectory()
-                              withIntermediateDirectories:YES
-                                               attributes:nil
-                                                    error:&error];
-    if (error) {
-      return RCTMakeError(@"Failed to create storage directory.", error, nil);
-    }
-    RCTHasCreatedStorageDirectory = YES;
-  }
-  if (!_haveSetup) {
-    NSDictionary *errorOut;
-    NSString *serialized = RCTReadFile(RCTGetManifestFilePath(), RCTManifestFileName, &errorOut);
-    _manifest = serialized ? RCTJSONParseMutable(serialized, &error) : [NSMutableDictionary new];
-    if (error) {
-      RCTLogWarn(@"Failed to parse manifest - creating new one.\n\n%@", error);
-      _manifest = [NSMutableDictionary new];
-    }
-    _haveSetup = YES;
-  }
-  return nil;
-}
-
-- (NSDictionary *)_writeManifest:(NSMutableArray<NSDictionary *> **)errors
-{
-  NSError *error;
-  NSString *serialized = RCTJSONStringify(_manifest, &error);
-  [serialized writeToFile:RCTGetManifestFilePath() atomically:YES encoding:NSUTF8StringEncoding error:&error];
-  NSDictionary *errorOut;
-  if (error) {
-    errorOut = RCTMakeError(@"Failed to write manifest file.", error, nil);
-    RCTAppendError(errorOut, errors);
-  }
-  return errorOut;
-}
-
-- (NSDictionary *)_appendItemForKey:(NSString *)key toArray:(NSMutableArray<NSArray<NSString *> *> *)result
-{
-  NSDictionary *errorOut = RCTErrorForKey(key);
-  if (errorOut) {
-    return errorOut;
-  }
-  NSString *value = [self _getValueForKey:key errorOut:&errorOut];
-  [result addObject:@[ key, RCTNullIfNil(value) ]]; // Insert null if missing or failure.
-  return errorOut;
-}
-
-- (NSString *)_getValueForKey:(NSString *)key errorOut:(NSDictionary **)errorOut
-{
-  NSString *value = _manifest[key]; // nil means missing, null means there may be a data file, else: NSString
-  if (value == (id)kCFNull) {
-    value = [RCTGetCache() objectForKey:key];
-    if (!value) {
-      NSString *filePath = [self _filePathForKey:key];
-      value = RCTReadFile(filePath, key, errorOut);
-      if (value) {
-        [RCTGetCache() setObject:value forKey:key cost:value.length];
-      } else {
-        // file does not exist after all, so remove from manifest (no need to save
-        // manifest immediately though, as cost of checking again next time is negligible)
-        [_manifest removeObjectForKey:key];
-      }
-    }
-  }
-  return value;
-}
-
-- (NSDictionary *)_writeEntry:(NSArray<NSString *> *)entry changedManifest:(BOOL *)changedManifest
-{
-  if (entry.count != 2) {
-    return RCTMakeAndLogError(@"Entries must be arrays of the form [key: string, value: string], got: ", entry, nil);
-  }
-  NSString *key = entry[0];
-  NSDictionary *errorOut = RCTErrorForKey(key);
-  if (errorOut) {
-    return errorOut;
-  }
-  if (![entry[1] isKindOfClass:[NSString class]]) {
-    return RCTMakeAndLogError(@"Invalid value for entry - must be a string. Got entry: ", entry, nil);
-  }
-  NSString *value = entry[1];
-
-  NSString *filePath = [self _filePathForKey:key];
-  NSError *error;
-  if (value.length <= RCTInlineValueThreshold) {
-    if (_manifest[key] == (id)kCFNull) {
-      // If the value already existed but wasn't inlined, remove the old file.
-      [[NSFileManager defaultManager] removeItemAtPath:filePath error:nil];
-      [RCTGetCache() removeObjectForKey:key];
-    }
-    *changedManifest = YES;
-    _manifest[key] = value;
-    return nil;
-  }
-  [value writeToFile:filePath atomically:YES encoding:NSUTF8StringEncoding error:&error];
-  [RCTGetCache() setObject:value forKey:key cost:value.length];
-  if (error) {
-    errorOut = RCTMakeError(@"Failed to write value.", error, @{@"key" : key});
-  } else if (_manifest[key] != (id)kCFNull) {
-    *changedManifest = YES;
-    _manifest[key] = (id)kCFNull;
-  }
-  return errorOut;
-}
-
-#pragma mark - Exported JS Functions
-
-RCT_EXPORT_METHOD(multiGet : (NSArray<NSString *> *)keys callback : (RCTResponseSenderBlock)callback)
-{
-  NSDictionary *errorOut = [self _ensureSetup];
-  if (errorOut) {
-    callback(@[ @[ errorOut ], (id)kCFNull ]);
-    return;
-  }
-  NSMutableArray<NSDictionary *> *errors;
-  NSMutableArray<NSArray<NSString *> *> *result = [[NSMutableArray alloc] initWithCapacity:keys.count];
-  for (NSString *key in keys) {
-    id keyError;
-    id value = [self _getValueForKey:key errorOut:&keyError];
-    [result addObject:@[ key, RCTNullIfNil(value) ]];
-    RCTAppendError(keyError, &errors);
-  }
-  callback(@[ RCTNullIfNil(errors), result ]);
-}
-
-RCT_EXPORT_METHOD(multiSet : (NSArray<NSArray<NSString *> *> *)kvPairs callback : (RCTResponseSenderBlock)callback)
-{
-  NSDictionary *errorOut = [self _ensureSetup];
-  if (errorOut) {
-    callback(@[ @[ errorOut ] ]);
-    return;
-  }
-  BOOL changedManifest = NO;
-  NSMutableArray<NSDictionary *> *errors;
-  for (NSArray<NSString *> *entry in kvPairs) {
-    NSDictionary *keyError = [self _writeEntry:entry changedManifest:&changedManifest];
-    RCTAppendError(keyError, &errors);
-  }
-  if (changedManifest) {
-    [self _writeManifest:&errors];
-  }
-  callback(@[ RCTNullIfNil(errors) ]);
-}
-
-RCT_EXPORT_METHOD(multiMerge : (NSArray<NSArray<NSString *> *> *)kvPairs callback : (RCTResponseSenderBlock)callback)
-{
-  NSDictionary *errorOut = [self _ensureSetup];
-  if (errorOut) {
-    callback(@[ @[ errorOut ] ]);
-    return;
-  }
-  BOOL changedManifest = NO;
-  NSMutableArray<NSDictionary *> *errors;
-  for (__strong NSArray<NSString *> *entry in kvPairs) {
-    NSDictionary *keyError;
-    NSString *value = [self _getValueForKey:entry[0] errorOut:&keyError];
-    if (!keyError) {
-      if (value) {
-        NSError *jsonError;
-        NSMutableDictionary *mergedVal = RCTJSONParseMutable(value, &jsonError);
-        if (RCTMergeRecursive(mergedVal, RCTJSONParse(entry[1], &jsonError))) {
-          entry = @[ entry[0], RCTNullIfNil(RCTJSONStringify(mergedVal, NULL)) ];
-        }
-        if (jsonError) {
-          keyError = RCTJSErrorFromNSError(jsonError);
-        }
-      }
-      if (!keyError) {
-        keyError = [self _writeEntry:entry changedManifest:&changedManifest];
-      }
-    }
-    RCTAppendError(keyError, &errors);
-  }
-  if (changedManifest) {
-    [self _writeManifest:&errors];
-  }
-  callback(@[ RCTNullIfNil(errors) ]);
-}
-
-RCT_EXPORT_METHOD(multiRemove : (NSArray<NSString *> *)keys callback : (RCTResponseSenderBlock)callback)
-{
-  NSDictionary *errorOut = [self _ensureSetup];
-  if (errorOut) {
-    callback(@[ @[ errorOut ] ]);
-    return;
-  }
-  NSMutableArray<NSDictionary *> *errors;
-  BOOL changedManifest = NO;
-  for (NSString *key in keys) {
-    NSDictionary *keyError = RCTErrorForKey(key);
-    if (!keyError) {
-      if (_manifest[key] == (id)kCFNull) {
-        NSString *filePath = [self _filePathForKey:key];
-        [[NSFileManager defaultManager] removeItemAtPath:filePath error:nil];
-        [RCTGetCache() removeObjectForKey:key];
-      }
-      if (_manifest[key]) {
-        changedManifest = YES;
-        [_manifest removeObjectForKey:key];
-      }
-    }
-    RCTAppendError(keyError, &errors);
-  }
-  if (changedManifest) {
-    [self _writeManifest:&errors];
-  }
-  callback(@[ RCTNullIfNil(errors) ]);
-}
-
-RCT_EXPORT_METHOD(clear : (RCTResponseSenderBlock)callback)
-{
-  [_manifest removeAllObjects];
-  [RCTGetCache() removeAllObjects];
-  NSDictionary *error = RCTDeleteStorageDirectory();
-  callback(@[ RCTNullIfNil(error) ]);
-}
-
-RCT_EXPORT_METHOD(getAllKeys : (RCTResponseSenderBlock)callback)
-{
-  NSDictionary *errorOut = [self _ensureSetup];
-  if (errorOut) {
-    callback(@[ errorOut, (id)kCFNull ]);
-  } else {
-    callback(@[ (id)kCFNull, _manifest.allKeys ]);
-  }
-}
-
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
-    (const facebook::react::ObjCTurboModule::InitParams &)params
-{
-  return std::make_shared<facebook::react::NativeAsyncLocalStorageSpecJSI>(params);
-}
-
-@end
-
-Class RCTAsyncLocalStorageCls(void)
-{
-  return RCTAsyncLocalStorage.class;
-}
diff --git a/React/CoreModules/RCTDevLoadingView.mm b/React/CoreModules/RCTDevLoadingView.mm
index 316c2489207d..f162b0f836df 100644
--- a/React/CoreModules/RCTDevLoadingView.mm
+++ b/React/CoreModules/RCTDevLoadingView.mm
@@ -12,6 +12,7 @@
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTAppearance.h>
 #import <React/RCTBridge.h>
+#import <React/RCTConstants.h>
 #import <React/RCTConvert.h>
 #import <React/RCTDefines.h>
 #import <React/RCTDevLoadingViewSetEnabled.h>
diff --git a/React/CoreModules/RCTDevSettings.mm b/React/CoreModules/RCTDevSettings.mm
index 837865b5477f..ceda9c55a37a 100644
--- a/React/CoreModules/RCTDevSettings.mm
+++ b/React/CoreModules/RCTDevSettings.mm
@@ -12,6 +12,7 @@
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridgeModule.h>
+#import <React/RCTConstants.h>
 #import <React/RCTDevMenu.h>
 #import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTLog.h>
diff --git a/React/CoreModules/RCTEventDispatcher.mm b/React/CoreModules/RCTEventDispatcher.mm
index f2cf17c947ee..3669e2e7d64b 100644
--- a/React/CoreModules/RCTEventDispatcher.mm
+++ b/React/CoreModules/RCTEventDispatcher.mm
@@ -86,7 +86,9 @@ - (void)sendTextEventWithType:(RCTTextEventType)type
   }];
 
   if (text) {
-    body[@"text"] = text;
+    // We copy the string here because if it's a mutable string it may get released before we dispatch the event on a
+    // different thread, causing a crash.
+    body[@"text"] = [text copy];
   }
 
   if (key) {
@@ -103,7 +105,9 @@ - (void)sendTextEventWithType:(RCTTextEventType)type
           break;
       }
     }
-    body[@"key"] = key;
+    // We copy the string here because if it's a mutable string it may get released before we dispatch the event on a
+    // different thread, causing a crash.
+    body[@"key"] = [key copy];
   }
 
   RCTComponentEvent *event = [[RCTComponentEvent alloc] initWithName:events[type] viewTag:reactTag body:body];
diff --git a/React/CoreModules/RCTExceptionsManager.h b/React/CoreModules/RCTExceptionsManager.h
index 76d36423d722..f23bb2153b80 100644
--- a/React/CoreModules/RCTExceptionsManager.h
+++ b/React/CoreModules/RCTExceptionsManager.h
@@ -38,7 +38,10 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)reportFatalException:(nullable NSString *)message
                        stack:(nullable NSArray<NSDictionary *> *)stack
                  exceptionId:(double)exceptionId;
-- (void)reportJsException:(NSString *)errorMap;
+- (void)reportJsException:(nullable NSString *)message
+                    stack:(nullable NSArray<NSDictionary *> *)stack
+              exceptionId:(double)exceptionId
+                  isFatal:(bool)isFatal;
 
 @property (nonatomic, weak) id<RCTExceptionsManagerDelegate> delegate;
 
diff --git a/React/CoreModules/RCTExceptionsManager.mm b/React/CoreModules/RCTExceptionsManager.mm
index 9d6aafc044be..439092ecb651 100644
--- a/React/CoreModules/RCTExceptionsManager.mm
+++ b/React/CoreModules/RCTExceptionsManager.mm
@@ -150,19 +150,11 @@ - (void)reportFatal:(NSString *)message
   }
 }
 
-- (void)reportJsException:(NSString *)errorStr
+- (void)reportJsException:(nullable NSString *)message
+                    stack:(nullable NSArray<NSDictionary *> *)stack
+              exceptionId:(double)exceptionId
+                  isFatal:(bool)isFatal
 {
-  NSData *jsonData = [errorStr dataUsingEncoding:NSUTF8StringEncoding];
-  NSError *jsonError;
-  NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:jsonData
-                                                       options:NSJSONWritingPrettyPrinted
-                                                         error:&jsonError];
-
-  NSString *message = [dict objectForKey:@"message"];
-  double exceptionId = [[dict objectForKey:@"id"] doubleValue];
-  NSArray *stack = [dict objectForKey:@"stack"];
-  BOOL isFatal = [[dict objectForKey:@"isFatal"] boolValue];
-
   if (isFatal) {
     [self reportFatalException:message stack:stack exceptionId:exceptionId];
   } else {
diff --git a/React/CoreModules/RCTRedBox.mm b/React/CoreModules/RCTRedBox.mm
index 8cb294137ca6..c349c4e2a187 100644
--- a/React/CoreModules/RCTRedBox.mm
+++ b/React/CoreModules/RCTRedBox.mm
@@ -328,7 +328,13 @@ - (UITableViewCell *)reuseCell:(UITableViewCell *)cell forErrorMessage:(NSString
     cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"msg-cell"];
     cell.textLabel.accessibilityIdentifier = @"redbox-error";
     cell.textLabel.textColor = [UIColor whiteColor];
-    cell.textLabel.font = [UIFont boldSystemFontOfSize:16];
+    if (@available(iOS 13.0, *)) {
+      // Prefer a monofont for formatting messages that were designed
+      // to be displayed in a terminal.
+      cell.textLabel.font = [UIFont monospacedSystemFontOfSize:14 weight:UIFontWeightBold];
+    } else {
+      cell.textLabel.font = [UIFont boldSystemFontOfSize:14];
+    }
     cell.textLabel.lineBreakMode = NSLineBreakByWordWrapping;
     cell.textLabel.numberOfLines = 0;
     cell.detailTextLabel.textColor = [UIColor whiteColor];
diff --git a/React/CxxBridge/JSCExecutorFactory.mm b/React/CxxBridge/JSCExecutorFactory.mm
index 4d8a1ba1b294..78584cd4e6c1 100644
--- a/React/CxxBridge/JSCExecutorFactory.mm
+++ b/React/CxxBridge/JSCExecutorFactory.mm
@@ -7,7 +7,7 @@
 
 #include "JSCExecutorFactory.h"
 
-#import <jsi/JSCRuntime.h>
+#import <jsc/JSCRuntime.h>
 
 #import <memory>
 
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index cad9d74f02b3..047a7c2c4eb4 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -29,6 +29,7 @@
 #import <React/RCTProfile.h>
 #import <React/RCTRedBox.h>
 #import <React/RCTReloadCommand.h>
+#import <React/RCTTurboModuleRegistry.h>
 #import <React/RCTUtils.h>
 #import <cxxreact/CxxNativeModule.h>
 #import <cxxreact/Instance.h>
@@ -807,7 +808,7 @@ - (void)registerExtraModules
 
   NSMutableArray<id<RCTBridgeModule>> *extraModules = [NSMutableArray new];
 
-  // Prevent TurboModules from appearing the the NativeModule system
+  // Prevent TurboModules from appearing the NativeModule system
   for (id<RCTBridgeModule> module in appExtraModules) {
     if (!(RCTTurboModuleEnabled() && [module conformsToProtocol:@protocol(RCTTurboModule)])) {
       [extraModules addObject:module];
diff --git a/React/CxxModule/RCTNativeModule.mm b/React/CxxModule/RCTNativeModule.mm
index ebc3eda4eb59..3e400a0c8870 100644
--- a/React/CxxModule/RCTNativeModule.mm
+++ b/React/CxxModule/RCTNativeModule.mm
@@ -73,6 +73,15 @@ static MethodCallResult invokeInner(
 
 void RCTNativeModule::invoke(unsigned int methodId, folly::dynamic &&params, int callId)
 {
+  id<RCTBridgeMethod> method = m_moduleData.methods[methodId];
+  if (method) {
+    RCT_PROFILE_BEGIN_EVENT(
+        RCTProfileTagAlways,
+        @"[RCTNativeModule invoke]",
+        @{@"method" : [NSString stringWithUTF8String:method.JSMethodName]});
+    RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
+  }
+
   const char *moduleName = [m_moduleData.name UTF8String];
   const char *methodName = m_moduleData.methods[methodId].JSMethodName;
 
@@ -173,6 +182,10 @@ static MethodCallResult invokeInner(
     BridgeNativeModulePerfLogger::syncMethodCallArgConversionEnd(moduleName, methodName);
   }
 
+  RCT_PROFILE_BEGIN_EVENT(
+      RCTProfileTagAlways,
+      @"[RCTNativeModule invokeInner]",
+      @{@"method" : [NSString stringWithUTF8String:method.JSMethodName]});
   @try {
     if (context == Sync) {
       BridgeNativeModulePerfLogger::syncMethodCallExecutionStart(moduleName, methodName);
@@ -214,6 +227,8 @@ static MethodCallResult invokeInner(
 #else
     RCTFatalException(exception);
 #endif
+  } @finally {
+    RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
   }
 
   return folly::none;
diff --git a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h
index a2cc0aa7567e..0cc6b210ba14 100644
--- a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h
+++ b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h
@@ -42,6 +42,7 @@ Class<RCTComponentViewProtocol> RCTTextInputCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTInputAccessoryCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTViewCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTImageCls(void) __attribute__((used));
+Class<RCTComponentViewProtocol> RCTModalHostViewCls(void) __attribute__((used));
 
 #ifdef __cplusplus
 }
diff --git a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm
index 84cbe8d55b3a..631893317013 100644
--- a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm
+++ b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm
@@ -30,6 +30,7 @@
     {"InputAccessoryView", RCTInputAccessoryCls},
     {"View", RCTViewCls},
     {"Image", RCTImageCls},
+    {"ModalHostView", RCTModalHostViewCls},
   };
 
   auto p = sFabricComponentsClassMap.find(name);
diff --git a/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm
index d91e406ab375..75456e594dc6 100644
--- a/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm
@@ -24,7 +24,6 @@ - (instancetype)initWithFrame:(CGRect)frame
   if (self = [super initWithFrame:frame]) {
     static auto const defaultProps = std::make_shared<SafeAreaViewProps const>();
     _props = defaultProps;
-    self.clipsToBounds = YES;
   }
 
   return self;
diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
index e699640940d8..2ebbb0e82ac9 100644
--- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
@@ -401,6 +401,9 @@ - (void)prepareForRecycle
   _shouldUpdateContentInsetAdjustmentBehavior = YES;
   _state.reset();
   _isUserTriggeredScrolling = NO;
+  CGRect oldFrame = self.frame;
+  self.frame = CGRectZero;
+  self.frame = oldFrame;
   [super prepareForRecycle];
 }
 
@@ -587,7 +590,6 @@ - (void)scrollTo:(double)x y:(double)y animated:(BOOL)animated
     offset = CGPointMake(localX, localY);
   }
 
-  [self _forceDispatchNextScrollEvent];
   [self scrollToOffset:offset animated:animated];
 }
 
@@ -642,12 +644,15 @@ - (CGSize)contentSize
 
 - (void)scrollToOffset:(CGPoint)offset
 {
-  [self _forceDispatchNextScrollEvent];
   [self scrollToOffset:offset animated:YES];
 }
 
 - (void)scrollToOffset:(CGPoint)offset animated:(BOOL)animated
 {
+  if (CGPointEqualToPoint(_scrollView.contentOffset, offset)) {
+    return;
+  }
+
   [self _forceDispatchNextScrollEvent];
 
   if (_layoutMetrics.layoutDirection == LayoutDirection::RightToLeft) {
diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
index 3631fb45cbc1..c7c0f1d1a793 100644
--- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
@@ -300,20 +300,25 @@ - (void)textInputDidEndEditing
   }
 }
 
-- (BOOL)textInputShouldReturn
+- (BOOL)textInputShouldSubmitOnReturn
 {
-  // We send `submit` event here, in `textInputShouldReturn`
+  const SubmitBehavior submitBehavior = [self getSubmitBehavior];
+  const BOOL shouldSubmit = submitBehavior == SubmitBehavior::Submit || submitBehavior == SubmitBehavior::BlurAndSubmit;
+  // We send `submit` event here, in `textInputShouldSubmitOnReturn`
   // (not in `textInputDidReturn)`, because of semantic of the event:
   // `onSubmitEditing` is called when "Submit" button
   // (the blue key on onscreen keyboard) did pressed
   // (no connection to any specific "submitting" process).
 
-  if (_eventEmitter) {
+  if (_eventEmitter && shouldSubmit) {
     std::static_pointer_cast<TextInputEventEmitter const>(_eventEmitter)->onSubmitEditing([self _textInputMetrics]);
   }
+  return shouldSubmit;
+}
 
-  auto const &props = *std::static_pointer_cast<TextInputProps const>(_props);
-  return props.traits.blurOnSubmit;
+- (BOOL)textInputShouldReturn
+{
+  return [self getSubmitBehavior] == SubmitBehavior::BlurAndSubmit;
 }
 
 - (void)textInputDidReturn
@@ -644,6 +649,19 @@ - (BOOL)_textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldTe
   }
 }
 
+- (SubmitBehavior)getSubmitBehavior
+{
+  auto const &props = *std::static_pointer_cast<TextInputProps const>(_props);
+  const SubmitBehavior submitBehaviorDefaultable = props.traits.submitBehavior;
+
+  // We should always have a non-default `submitBehavior`, but in case we don't, set it based on multiline.
+  if (submitBehaviorDefaultable == SubmitBehavior::Default) {
+    return props.traits.multiline ? SubmitBehavior::Newline : SubmitBehavior::BlurAndSubmit;
+  }
+
+  return submitBehaviorDefaultable;
+}
+
 @end
 
 Class<RCTComponentViewProtocol> RCTTextInputCls(void)
diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
index 06e7b5bd39ca..bf691dba2e15 100644
--- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
@@ -516,6 +516,18 @@ static void RCTReleaseRCTBorderColors(RCTBorderColors borderColors)
   CGColorRelease(borderColors.right);
 }
 
+static CALayerCornerCurve CornerCurveFromBorderCurve(BorderCurve borderCurve)
+{
+  // The constants are available only starting from iOS 13
+  // CALayerCornerCurve is a typealias on NSString *
+  switch (borderCurve) {
+    case BorderCurve::Continuous:
+      return @"continuous"; // kCACornerCurveContinuous;
+    case BorderCurve::Circular:
+      return @"circular"; // kCACornerCurveCircular;
+  }
+}
+
 static RCTBorderStyle RCTBorderStyleFromBorderStyle(BorderStyle borderStyle)
 {
   switch (borderStyle) {
@@ -580,6 +592,9 @@ - (void)invalidateLayer
     layer.borderColor = borderColor;
     CGColorRelease(borderColor);
     layer.cornerRadius = (CGFloat)borderMetrics.borderRadii.topLeft;
+    if (@available(iOS 13.0, *)) {
+      layer.cornerCurve = CornerCurveFromBorderCurve(borderMetrics.borderCurves.topLeft);
+    }
     layer.backgroundColor = _backgroundColor.CGColor;
   } else {
     if (!_borderLayer) {
diff --git a/React/Fabric/Mounting/RCTComponentViewFactory.mm b/React/Fabric/Mounting/RCTComponentViewFactory.mm
index c2ba53bf29a1..0d8e15cebc2a 100644
--- a/React/Fabric/Mounting/RCTComponentViewFactory.mm
+++ b/React/Fabric/Mounting/RCTComponentViewFactory.mm
@@ -39,6 +39,7 @@
 
 #import <objc/runtime.h>
 
+using namespace facebook;
 using namespace facebook::react;
 
 // Allow JS runtime to register native components as needed. For static view configs.
@@ -71,12 +72,7 @@ + (RCTComponentViewFactory *)currentComponentViewFactory
   dispatch_once(&onceToken, ^{
     componentViewFactory = [RCTComponentViewFactory new];
     [componentViewFactory registerComponentViewClass:[RCTRootComponentView class]];
-    [componentViewFactory registerComponentViewClass:[RCTViewComponentView class]];
     [componentViewFactory registerComponentViewClass:[RCTParagraphComponentView class]];
-    [componentViewFactory registerComponentViewClass:[RCTTextInputComponentView class]];
-
-    Class<RCTComponentViewProtocol> imageClass = RCTComponentViewClassWithName("Image");
-    [componentViewFactory registerComponentViewClass:imageClass];
 
     componentViewFactory->_providerRegistry.setComponentDescriptorProviderRequest(
         [](ComponentName requestedComponentName) {
diff --git a/React/Fabric/Mounting/RCTComponentViewRegistry.h b/React/Fabric/Mounting/RCTComponentViewRegistry.h
index bcf78a20ccd2..884424aa6a63 100644
--- a/React/Fabric/Mounting/RCTComponentViewRegistry.h
+++ b/React/Fabric/Mounting/RCTComponentViewRegistry.h
@@ -50,11 +50,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (nullable UIView<RCTComponentViewProtocol> *)findComponentViewWithTag:(facebook::react::Tag)tag;
 
-/**
- * Creates a component view with a given type and puts it to the recycle pool.
- */
-- (void)optimisticallyCreateComponentViewWithComponentHandle:(facebook::react::ComponentHandle)componentHandle;
-
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/React/Fabric/Mounting/RCTComponentViewRegistry.mm b/React/Fabric/Mounting/RCTComponentViewRegistry.mm
index afd8024939f7..b748c05f5a59 100644
--- a/React/Fabric/Mounting/RCTComponentViewRegistry.mm
+++ b/React/Fabric/Mounting/RCTComponentViewRegistry.mm
@@ -35,42 +35,11 @@ - (instancetype)init
                                              selector:@selector(handleApplicationDidReceiveMemoryWarningNotification)
                                                  name:UIApplicationDidReceiveMemoryWarningNotification
                                                object:nil];
-
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-      // Calling this a bit later, when the main thread is probably idle while JavaScript thread is busy.
-      [self preallocateViewComponents];
-    });
   }
 
   return self;
 }
 
-- (void)preallocateViewComponents
-{
-  if (RCTExperimentGetPreemptiveViewAllocationDisabled()) {
-    return;
-  }
-
-  // This data is based on empirical evidence which should represent the reality pretty well.
-  // Regular `<View>` has magnitude equals to `1` by definition.
-  std::vector<std::pair<ComponentHandle, float>> componentMagnitudes = {
-      {[RCTViewComponentView componentDescriptorProvider].handle, 1},
-      {[RCTImageComponentView componentDescriptorProvider].handle, 0.3},
-      {[RCTParagraphComponentView componentDescriptorProvider].handle, 0.3},
-  };
-
-  // `complexity` represents the complexity of a typical surface in a number of `<View>` components (with Flattening
-  // enabled).
-  float complexity = 100;
-
-  // The whole process should not take more than 10ms in the worst case, so there is no need to split it up.
-  for (const auto &componentMagnitude : componentMagnitudes) {
-    for (int i = 0; i < complexity * componentMagnitude.second; i++) {
-      [self optimisticallyCreateComponentViewWithComponentHandle:componentMagnitude.first];
-    }
-  }
-}
-
 - (RCTComponentViewDescriptor const &)dequeueComponentViewWithComponentHandle:(ComponentHandle)componentHandle
                                                                           tag:(Tag)tag
 {
@@ -100,14 +69,6 @@ - (void)enqueueComponentViewWithComponentHandle:(ComponentHandle)componentHandle
   [self _enqueueComponentViewWithComponentHandle:componentHandle componentViewDescriptor:componentViewDescriptor];
 }
 
-- (void)optimisticallyCreateComponentViewWithComponentHandle:(ComponentHandle)componentHandle
-{
-  RCTAssertMainQueue();
-  [self _enqueueComponentViewWithComponentHandle:componentHandle
-                         componentViewDescriptor:[self.componentViewFactory
-                                                     createComponentViewWithComponentHandle:componentHandle]];
-}
-
 - (RCTComponentViewDescriptor const &)componentViewDescriptorWithTag:(Tag)tag
 {
   RCTAssertMainQueue();
diff --git a/React/Fabric/Mounting/RCTMountingManager.mm b/React/Fabric/Mounting/RCTMountingManager.mm
index bfe8680d27be..7c26c83a79eb 100644
--- a/React/Fabric/Mounting/RCTMountingManager.mm
+++ b/React/Fabric/Mounting/RCTMountingManager.mm
@@ -324,10 +324,7 @@ - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag
     componentView.layer.opacity = newViewProps.opacity;
   }
 
-  auto reactNativeConfig = _contextContainer->at<std::shared_ptr<ReactNativeConfig const>>("ReactNativeConfig");
-  if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:finalize_updates_on_synchronous_update_view_ios")) {
-    [componentView finalizeUpdates:RNComponentViewUpdateMaskProps];
-  }
+  [componentView finalizeUpdates:RNComponentViewUpdateMaskProps];
 }
 
 - (void)synchronouslyDispatchCommandOnUIThread:(ReactTag)reactTag
diff --git a/React/Fabric/RCTScheduler.mm b/React/Fabric/RCTScheduler.mm
index 8ba0b3458d23..1b621d6b129b 100644
--- a/React/Fabric/RCTScheduler.mm
+++ b/React/Fabric/RCTScheduler.mm
@@ -36,15 +36,6 @@ void schedulerDidRequestPreliminaryViewAllocation(SurfaceId surfaceId, const Sha
     // This delegate method is not currently used on iOS.
   }
 
-  void schedulerDidCloneShadowNode(
-      SurfaceId surfaceId,
-      const ShadowNode &oldShadowNode,
-      const ShadowNode &newShadowNode) override
-  {
-    // Does nothing.
-    // This delegate method is not currently used on iOS.
-  }
-
   void schedulerDidDispatchCommand(
       const ShadowView &shadowView,
       const std::string &commandName,
diff --git a/React/Fabric/RCTSurfacePresenter.h b/React/Fabric/RCTSurfacePresenter.h
index 8e645be4c413..693fb51af026 100644
--- a/React/Fabric/RCTSurfacePresenter.h
+++ b/React/Fabric/RCTSurfacePresenter.h
@@ -28,7 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
 @interface RCTSurfacePresenter : NSObject
 
 - (instancetype)initWithContextContainer:(facebook::react::ContextContainer::Shared)contextContainer
-                         runtimeExecutor:(facebook::react::RuntimeExecutor)runtimeExecutor;
+                         runtimeExecutor:(facebook::react::RuntimeExecutor)runtimeExecutor
+              bridgelessBindingsExecutor:(std::optional<facebook::react::RuntimeExecutor>)bridgelessBindingsExecutor;
 
 @property (nonatomic) facebook::react::ContextContainer::Shared contextContainer;
 @property (nonatomic) facebook::react::RuntimeExecutor runtimeExecutor;
diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm
index df612c2bbada..dabc4a5afcf2 100644
--- a/React/Fabric/RCTSurfacePresenter.mm
+++ b/React/Fabric/RCTSurfacePresenter.mm
@@ -27,6 +27,8 @@
 
 #import <react/config/ReactNativeConfig.h>
 #import <react/renderer/componentregistry/ComponentDescriptorFactory.h>
+#import <react/renderer/components/text/BaseTextProps.h>
+#import <react/renderer/core/CoreFeatures.h>
 #import <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #import <react/renderer/scheduler/AsynchronousEventBeat.h>
 #import <react/renderer/scheduler/SchedulerToolbox.h>
@@ -78,6 +80,7 @@ @implementation RCTSurfacePresenter {
   RCTScheduler *_Nullable _scheduler; // Thread-safe. Pointer is protected by `_schedulerAccessMutex`.
   ContextContainer::Shared _contextContainer; // Protected by `_schedulerLifeCycleMutex`.
   RuntimeExecutor _runtimeExecutor; // Protected by `_schedulerLifeCycleMutex`.
+  std::optional<RuntimeExecutor> _bridgelessBindingsExecutor; // Only used for installing bindings.
 
   butter::shared_mutex _observerListMutex;
   std::vector<__weak id<RCTSurfacePresenterObserver>> _observers; // Protected by `_observerListMutex`.
@@ -85,10 +88,12 @@ @implementation RCTSurfacePresenter {
 
 - (instancetype)initWithContextContainer:(ContextContainer::Shared)contextContainer
                          runtimeExecutor:(RuntimeExecutor)runtimeExecutor
+              bridgelessBindingsExecutor:(std::optional<RuntimeExecutor>)bridgelessBindingsExecutor
 {
   if (self = [super init]) {
     assert(contextContainer && "RuntimeExecutor must be not null.");
     _runtimeExecutor = runtimeExecutor;
+    _bridgelessBindingsExecutor = bridgelessBindingsExecutor;
     _contextContainer = contextContainer;
 
     _surfaceRegistry = [RCTSurfaceRegistry new];
@@ -98,13 +103,10 @@ - (instancetype)initWithContextContainer:(ContextContainer::Shared)contextContai
 
     _scheduler = [self _createScheduler];
 
-    auto reactNativeConfig = _contextContainer->at<std::shared_ptr<ReactNativeConfig const>>("ReactNativeConfig");
-    if (reactNativeConfig->getBool("react_native_new_architecture:suspend_before_app_termination")) {
-      [[NSNotificationCenter defaultCenter] addObserver:self
-                                               selector:@selector(_applicationWillTerminate)
-                                                   name:UIApplicationWillTerminateNotification
-                                                 object:nil];
-    }
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(_applicationWillTerminate)
+                                                 name:UIApplicationWillTerminateNotification
+                                               object:nil];
   }
 
   return self;
@@ -265,14 +267,14 @@ - (RCTScheduler *)_createScheduler
 {
   auto reactNativeConfig = _contextContainer->at<std::shared_ptr<ReactNativeConfig const>>("ReactNativeConfig");
 
-  if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:preemptive_view_allocation_disabled_ios")) {
-    RCTExperimentSetPreemptiveViewAllocationDisabled(YES);
-  }
-
   if (reactNativeConfig && reactNativeConfig->getBool("rn_convergence:dispatch_pointer_events")) {
     RCTSetDispatchW3CPointerEvents(YES);
   }
 
+  if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:enable_cpp_props_iterator_setter_ios")) {
+    CoreFeatures::enablePropIteratorSetter = true;
+  }
+
   auto componentRegistryFactory =
       [factory = wrapManagedObject(_mountingManager.componentViewRegistry.componentViewFactory)](
           EventDispatcher::Weak const &eventDispatcher, ContextContainer::Shared const &contextContainer) {
@@ -295,13 +297,16 @@ - (RCTScheduler *)_createScheduler
   }
 
   toolbox.runtimeExecutor = runtimeExecutor;
+  toolbox.bridgelessBindingsExecutor = _bridgelessBindingsExecutor;
 
   toolbox.mainRunLoopObserverFactory = [](RunLoopObserver::Activity activities,
                                           RunLoopObserver::WeakOwner const &owner) {
     return std::make_unique<MainRunLoopObserver>(activities, owner);
   };
 
-  toolbox.backgroundExecutor = RCTGetBackgroundExecutor();
+  if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:enable_background_executor_ios")) {
+    toolbox.backgroundExecutor = RCTGetBackgroundExecutor();
+  }
 
   toolbox.synchronousEventBeatFactory =
       [runtimeExecutor, runtimeScheduler = runtimeScheduler](EventBeat::SharedOwnerBox const &ownerBox) {
diff --git a/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm b/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm
index 834022691380..b456b80a385b 100644
--- a/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm
+++ b/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm
@@ -12,6 +12,7 @@
 
 #import <React/RCTAssert.h>
 #import <React/RCTBridge+Private.h>
+#import <React/RCTConstants.h>
 #import <React/RCTImageLoader.h>
 #import <React/RCTImageLoaderWithAttributionProtocol.h>
 #import <React/RCTSurfacePresenter.h>
@@ -89,7 +90,8 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge contextContainer:(ContextCont
   if (self = [super init]) {
     contextContainer->update(*RCTContextContainerFromBridge(bridge));
     _surfacePresenter = [[RCTSurfacePresenter alloc] initWithContextContainer:contextContainer
-                                                              runtimeExecutor:RCTRuntimeExecutorFromBridge(bridge)];
+                                                              runtimeExecutor:RCTRuntimeExecutorFromBridge(bridge)
+                                                   bridgelessBindingsExecutor:std::nullopt];
 
     _bridge = bridge;
     _batchedBridge = [_bridge batchedBridge] ?: _bridge;
diff --git a/React/Fabric/RCTSurfaceTouchHandler.mm b/React/Fabric/RCTSurfaceTouchHandler.mm
index d60caf186205..c6b7fd9dcaf8 100644
--- a/React/Fabric/RCTSurfaceTouchHandler.mm
+++ b/React/Fabric/RCTSurfaceTouchHandler.mm
@@ -7,9 +7,9 @@
 
 #import "RCTSurfaceTouchHandler.h"
 
+#import <React/RCTReactTaggedView.h>
 #import <React/RCTUtils.h>
 #import <React/RCTViewComponentView.h>
-#import <UIKit/UIGestureRecognizerSubclass.h>
 
 #import "RCTConversions.h"
 #import "RCTTouchableComponentViewProtocol.h"
@@ -83,6 +83,27 @@ typedef NS_ENUM(NSInteger, RCTTouchEventType) {
    */
   UIEventButtonMask buttonMask;
 
+  /*
+   * The bit mask of modifier flags in the gesture represented by the receiver.
+   */
+  UIKeyModifierFlags modifierFlags;
+
+  /*
+   * Indicates if the active touch represents the primary pointer of this pointer type.
+   */
+  bool isPrimary;
+
+  /*
+   * The button number that was pressed (if applicable) when the event was fired.
+   */
+  int button;
+
+  /*
+   * Informs the event system that when the touch is released it should be treated as the
+   * pointer leaving the screen entirely.
+   */
+  bool shouldLeaveWhenReleased;
+
   /*
    * A component view on which the touch was begun.
    */
@@ -103,6 +124,15 @@ bool operator()(const ActiveTouch &lhs, const ActiveTouch &rhs) const
   };
 };
 
+// Mouse and Pen pointers get reserved IDs so they stay consistent no matter the order
+// at which events come in
+static int const kMousePointerId = 0;
+static int const kPencilPointerId = 1;
+
+// If a new reserved ID is added above this should be incremented to ensure touch events
+// do not conflict
+static int const kTouchIdentifierPoolOffset = 2;
+
 // Returns a CGPoint which represents the tiltX/Y values (in RADIANS)
 // Adapted from https://gist.github.com/k3a/2903719bb42b48c9198d20c2d6f73ac1
 static CGPoint SphericalToTilt(CGFloat altitudeAngleRad, CGFloat azimuthAngleRad)
@@ -140,12 +170,37 @@ static CGFloat RadsToDegrees(CGFloat rads)
 }
 
 static int ButtonMaskToButtons(UIEventButtonMask buttonMask)
+{
+  int buttonsMaskResult = 0;
+  if (@available(iOS 13.4, *)) {
+    if ((buttonMask & UIEventButtonMaskPrimary) != 0) {
+      buttonsMaskResult |= 1;
+    }
+    if ((buttonMask & UIEventButtonMaskSecondary) != 0) {
+      buttonsMaskResult |= 2;
+    }
+    // undocumented mask value which represents the "auxiliary button" (i.e. middle mouse button)
+    if ((buttonMask & 0x4) != 0) {
+      buttonsMaskResult |= 4;
+    }
+  }
+  return buttonsMaskResult;
+}
+
+static int ButtonMaskDiffToButton(UIEventButtonMask prevButtonMask, UIEventButtonMask curButtonMask)
 {
   if (@available(iOS 13.4, *)) {
-    return (((buttonMask & UIEventButtonMaskPrimary) > 0) ? 1 : 0) |
-        (((buttonMask & UIEventButtonMaskSecondary) > 0) ? 2 : 0);
+    if ((prevButtonMask & UIEventButtonMaskPrimary) != (curButtonMask & UIEventButtonMaskPrimary)) {
+      return 0;
+    }
+    if ((prevButtonMask & 0x4) != (curButtonMask & 0x4)) {
+      return 1;
+    }
+    if ((prevButtonMask & UIEventButtonMaskSecondary) != (curButtonMask & UIEventButtonMaskSecondary)) {
+      return 2;
+    }
   }
-  return 0;
+  return -1;
 }
 
 static void UpdateActiveTouchWithUITouch(
@@ -177,9 +232,17 @@ static void UpdateActiveTouchWithUITouch(
   activeTouch.altitudeAngle = uiTouch.altitudeAngle;
   activeTouch.azimuthAngle = [uiTouch azimuthAngleInView:nil];
   if (@available(iOS 13.4, *)) {
-    activeTouch.buttonMask = uiEvent.buttonMask;
+    UIEventButtonMask nextButtonMask = 0;
+    if (uiTouch.phase != UITouchPhaseEnded) {
+      nextButtonMask = uiTouch.type == UITouchTypeIndirectPointer ? uiEvent.buttonMask : 1;
+    }
+    activeTouch.button = ButtonMaskDiffToButton(activeTouch.buttonMask, nextButtonMask);
+    activeTouch.buttonMask = nextButtonMask;
+    activeTouch.modifierFlags = uiEvent.modifierFlags;
   } else {
+    activeTouch.button = 0;
     activeTouch.buttonMask = 0;
+    activeTouch.modifierFlags = 0;
   }
 }
 
@@ -200,7 +263,6 @@ static void UpdateActiveTouchWithUITouch(
     }
     componentView = componentView.superview;
   }
-
   UpdateActiveTouchWithUITouch(activeTouch, uiTouch, uiEvent, rootComponentView, rootViewOriginOffset);
   return activeTouch;
 }
@@ -216,12 +278,12 @@ static void UpdateActiveTouchWithUITouch(
   return nil;
 }
 
-static NSOrderedSet *GetTouchableViewsInPathToRoot(UIView *componentView)
+static NSOrderedSet<RCTReactTaggedView *> *GetTouchableViewsInPathToRoot(UIView *componentView)
 {
   NSMutableOrderedSet *results = [NSMutableOrderedSet orderedSet];
   do {
     if ([componentView respondsToSelector:@selector(touchEventEmitterAtPoint:)]) {
-      [results addObject:componentView];
+      [results addObject:[RCTReactTaggedView wrap:componentView]];
     }
     componentView = componentView.superview;
   } while (componentView);
@@ -248,18 +310,41 @@ static SharedTouchEventEmitter GetTouchEmitterFromView(UIView *componentView, CG
   }
 }
 
+static void UpdatePointerEventModifierFlags(PointerEvent &event, UIKeyModifierFlags flags)
+{
+  if (@available(iOS 13.4, *)) {
+    event.ctrlKey = (flags & UIKeyModifierControl) != 0;
+    event.shiftKey = (flags & UIKeyModifierShift) != 0;
+    event.altKey = (flags & UIKeyModifierAlternate) != 0;
+    event.metaKey = (flags & UIKeyModifierCommand) != 0;
+  } else {
+    event.ctrlKey = false;
+    event.shiftKey = false;
+    event.altKey = false;
+    event.metaKey = false;
+  }
+}
+
 static PointerEvent CreatePointerEventFromActiveTouch(ActiveTouch activeTouch, RCTTouchEventType eventType)
 {
   Touch touch = activeTouch.touch;
 
   PointerEvent event = {};
   event.pointerId = touch.identifier;
-  event.pressure = touch.force;
   event.pointerType = PointerTypeCStringFromUITouchType(activeTouch.touchType);
   event.clientPoint = touch.pagePoint;
   event.screenPoint = touch.screenPoint;
   event.offsetPoint = touch.offsetPoint;
 
+  event.pressure = touch.force;
+  if (@available(iOS 13.4, *)) {
+    if (activeTouch.touchType == UITouchTypeIndirectPointer) {
+      // pointer events with a mouse button pressed should report a pressure of 0.5
+      // when the touch is down and 0.0 when it is lifted regardless of how it is reported by the OS
+      event.pressure = eventType != RCTTouchEventTypeTouchEnd ? 0.5 : 0.0;
+    }
+  }
+
   CGFloat pointerSize = activeTouch.majorRadius * 2.0;
   if (@available(iOS 13.4, *)) {
     if (activeTouch.touchType == UITouchTypeIndirectPointer) {
@@ -276,31 +361,29 @@ static PointerEvent CreatePointerEventFromActiveTouch(ActiveTouch activeTouch, R
 
   event.detail = 0;
 
+  event.button = activeTouch.button;
   event.buttons = ButtonMaskToButtons(activeTouch.buttonMask);
-  // UIEvent's button mask for touch end events still marks the button as down
-  // so this ensures it's set to 0 as per the pointer event spec
-  if (eventType == RCTTouchEventTypeTouchEnd) {
-    event.buttons = 0;
-  }
+
+  UpdatePointerEventModifierFlags(event, activeTouch.modifierFlags);
 
   event.tangentialPressure = 0.0;
   event.twist = 0;
+  event.isPrimary = activeTouch.isPrimary;
 
   return event;
 }
 
 static PointerEvent CreatePointerEventFromIncompleteHoverData(
-    UIView *view,
     CGPoint clientLocation,
     CGPoint screenLocation,
     CGPoint offsetLocation,
-    NSTimeInterval timestamp)
+    UIKeyModifierFlags modifierFlags)
 {
   PointerEvent event = {};
   // "touch" events produced from a mouse cursor on iOS always have the ID 0 so
   // we can just assume that here since these sort of hover events only ever come
   // from the mouse
-  event.pointerId = 0;
+  event.pointerId = kMousePointerId;
   event.pressure = 0.0;
   event.pointerType = "mouse";
   event.clientPoint = RCTPointFromCGPoint(clientLocation);
@@ -311,9 +394,13 @@ static PointerEvent CreatePointerEventFromIncompleteHoverData(
   event.tiltX = 0;
   event.tiltY = 0;
   event.detail = 0;
+  event.button = -1;
   event.buttons = 0;
+  UpdatePointerEventModifierFlags(event, modifierFlags);
   event.tangentialPressure = 0.0;
   event.twist = 0;
+  event.isPrimary = true;
+
   return event;
 }
 
@@ -337,9 +424,10 @@ static BOOL AnyTouchesChanged(NSSet<UITouch *> *touches)
   return NO;
 }
 
-static BOOL IsViewListeningToEvent(UIView *view, ViewEvents::Offset eventType)
+static BOOL IsViewListeningToEvent(RCTReactTaggedView *taggedView, ViewEvents::Offset eventType)
 {
-  if ([view.class conformsToProtocol:@protocol(RCTComponentViewProtocol)]) {
+  UIView *view = taggedView.view;
+  if (view && [view.class conformsToProtocol:@protocol(RCTComponentViewProtocol)]) {
     auto props = ((id<RCTComponentViewProtocol>)view).props;
     if (SharedViewProps viewProps = std::dynamic_pointer_cast<ViewProps const>(props)) {
       return viewProps->events[eventType];
@@ -348,10 +436,10 @@ static BOOL IsViewListeningToEvent(UIView *view, ViewEvents::Offset eventType)
   return NO;
 }
 
-static BOOL IsAnyViewInPathListeningToEvent(NSOrderedSet<UIView *> *viewPath, ViewEvents::Offset eventType)
+static BOOL IsAnyViewInPathListeningToEvent(NSOrderedSet<RCTReactTaggedView *> *viewPath, ViewEvents::Offset eventType)
 {
-  for (UIView *view in viewPath) {
-    if (IsViewListeningToEvent(view, eventType)) {
+  for (RCTReactTaggedView *taggedView in viewPath) {
+    if (IsViewListeningToEvent(taggedView, eventType)) {
       return YES;
     }
   }
@@ -386,7 +474,9 @@ @implementation RCTSurfaceTouchHandler {
   IdentifierPool<11> _identifierPool;
 
   UIHoverGestureRecognizer *_hoverRecognizer API_AVAILABLE(ios(13.0));
-  NSOrderedSet *_currentlyHoveredViews;
+  NSMutableDictionary<NSNumber *, NSOrderedSet<RCTReactTaggedView *> *> *_currentlyHoveredViewsPerPointer;
+
+  int _primaryTouchPointerId;
 }
 
 - (instancetype)init
@@ -403,7 +493,8 @@ - (instancetype)init
     self.delegate = self;
 
     _hoverRecognizer = nil;
-    _currentlyHoveredViews = [NSOrderedSet orderedSet];
+    _currentlyHoveredViewsPerPointer = [[NSMutableDictionary alloc] init];
+    _primaryTouchPointerId = -1;
   }
 
   return self;
@@ -444,7 +535,42 @@ - (void)_registerTouches:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
 {
   for (UITouch *touch in touches) {
     auto activeTouch = CreateTouchWithUITouch(touch, event, _rootComponentView, _viewOriginOffset);
-    activeTouch.touch.identifier = _identifierPool.dequeue();
+
+    if (@available(iOS 13.4, *)) {
+      switch (touch.type) {
+        case UITouchTypeIndirectPointer:
+          activeTouch.touch.identifier = kMousePointerId;
+          activeTouch.isPrimary = true;
+          break;
+        case UITouchTypePencil:
+          activeTouch.touch.identifier = kPencilPointerId;
+          activeTouch.isPrimary = true;
+          break;
+        default:
+          // use the identifier pool offset to ensure no conflicts between the reserved IDs and the
+          // touch IDs
+          activeTouch.touch.identifier = _identifierPool.dequeue() + kTouchIdentifierPoolOffset;
+          if (_primaryTouchPointerId == -1) {
+            _primaryTouchPointerId = activeTouch.touch.identifier;
+            activeTouch.isPrimary = true;
+          }
+          break;
+      }
+    } else {
+      activeTouch.touch.identifier = _identifierPool.dequeue();
+      if (_primaryTouchPointerId == -1) {
+        _primaryTouchPointerId = activeTouch.touch.identifier;
+        activeTouch.isPrimary = true;
+      }
+    }
+
+    // If the pointer has not been marked as hovering over views before the touch started, we register
+    // that the activeTouch should not maintain its hovered state once the pointer has been lifted.
+    auto currentlyHoveredViews = [_currentlyHoveredViewsPerPointer objectForKey:@(activeTouch.touch.identifier)];
+    if (currentlyHoveredViews == nil || [currentlyHoveredViews count] == 0) {
+      activeTouch.shouldLeaveWhenReleased = YES;
+    }
+
     _activeTouches.emplace(touch, activeTouch);
   }
 }
@@ -471,7 +597,25 @@ - (void)_unregisterTouches:(NSSet<UITouch *> *)touches
       continue;
     }
     auto &activeTouch = iterator->second;
-    _identifierPool.enqueue(activeTouch.touch.identifier);
+
+    if (activeTouch.touch.identifier == _primaryTouchPointerId) {
+      _primaryTouchPointerId = -1;
+    }
+
+    if (@available(iOS 13.4, *)) {
+      // only need to enqueue if the touch type isn't one with a reserved identifier
+      switch (touch.type) {
+        case UITouchTypeIndirectPointer:
+        case UITouchTypePencil:
+          break;
+        default:
+          // since the touch's identifier has been offset we need to re-normalize it to 0-based
+          // which is what the identifier pool expects
+          _identifierPool.enqueue(activeTouch.touch.identifier - kTouchIdentifierPoolOffset);
+      }
+    } else {
+      _identifierPool.enqueue(activeTouch.touch.identifier);
+    }
     _activeTouches.erase(touch);
   }
 }
@@ -512,19 +656,38 @@ - (void)_dispatchActiveTouches:(std::vector<ActiveTouch>)activeTouches eventType
     // emit w3c pointer events
     if (RCTGetDispatchW3CPointerEvents()) {
       PointerEvent pointerEvent = CreatePointerEventFromActiveTouch(activeTouch, eventType);
-      switch (eventType) {
-        case RCTTouchEventTypeTouchStart:
-          activeTouch.eventEmitter->onPointerDown(pointerEvent);
-          break;
-        case RCTTouchEventTypeTouchMove:
-          activeTouch.eventEmitter->onPointerMove(pointerEvent);
-          break;
-        case RCTTouchEventTypeTouchEnd:
-          activeTouch.eventEmitter->onPointerUp(pointerEvent);
-          break;
-        case RCTTouchEventTypeTouchCancel:
-          activeTouch.eventEmitter->onPointerCancel(pointerEvent);
-          break;
+
+      if ((eventType == RCTTouchEventTypeTouchEnd && activeTouch.shouldLeaveWhenReleased)) {
+        activeTouch.eventEmitter->onPointerUp(pointerEvent);
+        [self handleIncomingPointerEvent:pointerEvent onView:nil];
+      } else {
+        CGPoint clientLocation = CGPointMake(pointerEvent.clientPoint.x, pointerEvent.clientPoint.y);
+        UIView *targetView = FindClosestFabricManagedTouchableView([_rootComponentView hitTest:clientLocation
+                                                                                     withEvent:nil]);
+
+        NSOrderedSet<RCTReactTaggedView *> *eventPathViews = [self handleIncomingPointerEvent:pointerEvent
+                                                                                       onView:targetView];
+
+        switch (eventType) {
+          case RCTTouchEventTypeTouchStart:
+            activeTouch.eventEmitter->onPointerDown(pointerEvent);
+            break;
+          case RCTTouchEventTypeTouchMove: {
+            bool hasMoveEventListeners =
+                IsAnyViewInPathListeningToEvent(eventPathViews, ViewEvents::Offset::PointerMove) ||
+                IsAnyViewInPathListeningToEvent(eventPathViews, ViewEvents::Offset::PointerMoveCapture);
+            if (hasMoveEventListeners) {
+              activeTouch.eventEmitter->onPointerMove(pointerEvent);
+            }
+            break;
+          }
+          case RCTTouchEventTypeTouchEnd:
+            activeTouch.eventEmitter->onPointerUp(pointerEvent);
+            break;
+          case RCTTouchEventTypeTouchCancel:
+            activeTouch.eventEmitter->onPointerCancel(pointerEvent);
+            break;
+        }
       }
     }
   }
@@ -691,77 +854,60 @@ - (void)hovering:(UIHoverGestureRecognizer *)recognizer API_AVAILABLE(ios(13.0))
 
   UIView *targetView = [listenerView hitTest:clientLocation withEvent:nil];
   targetView = FindClosestFabricManagedTouchableView(targetView);
-  UIView *prevTargetView = [_currentlyHoveredViews firstObject];
 
   CGPoint offsetLocation = [recognizer locationInView:targetView];
 
-  NSOrderedSet *eventPathViews = GetTouchableViewsInPathToRoot(targetView);
-
-  NSTimeInterval timestamp = CACurrentMediaTime();
-
-  BOOL hasMoveListenerInEventPath = NO;
-
-  // Over
-  if (prevTargetView != targetView) {
-    BOOL shouldEmitOverEvent = IsAnyViewInPathListeningToEvent(eventPathViews, ViewEvents::Offset::PointerOver);
-    SharedTouchEventEmitter eventEmitter = GetTouchEmitterFromView(targetView, [recognizer locationInView:targetView]);
-    if (shouldEmitOverEvent && eventEmitter != nil) {
-      PointerEvent event = CreatePointerEventFromIncompleteHoverData(
-          targetView, clientLocation, screenLocation, offsetLocation, timestamp);
-      eventEmitter->onPointerOver(event);
-    }
+  UIKeyModifierFlags modifierFlags;
+  if (@available(iOS 13.4, *)) {
+    modifierFlags = recognizer.modifierFlags;
+  } else {
+    modifierFlags = 0;
   }
 
-  // Entering
-
-  // We only want to emit events to JS if there is a view that is currently listening to said event
-  // so we only send those event to the JS side if the element which has been entered is itself listening,
-  // or if one of its parents is listening in case those listeners care about the capturing phase. Adding the ability
-  // for native to distingusih between capturing listeners and not could be an optimization to futher reduce the number
-  // of events we send to JS
-  BOOL hasParentEnterListener = NO;
-
-  for (UIView *componentView in [eventPathViews reverseObjectEnumerator]) {
-    BOOL shouldEmitEvent =
-        hasParentEnterListener || IsViewListeningToEvent(componentView, ViewEvents::Offset::PointerEnter);
+  PointerEvent event =
+      CreatePointerEventFromIncompleteHoverData(clientLocation, screenLocation, offsetLocation, modifierFlags);
 
-    if (shouldEmitEvent && ![_currentlyHoveredViews containsObject:componentView]) {
-      SharedTouchEventEmitter eventEmitter =
-          GetTouchEmitterFromView(componentView, [recognizer locationInView:componentView]);
-      if (eventEmitter != nil) {
-        PointerEvent event = CreatePointerEventFromIncompleteHoverData(
-            componentView, clientLocation, screenLocation, offsetLocation, timestamp);
-        eventEmitter->onPointerEnter(event);
-      }
-    }
+  NSOrderedSet<RCTReactTaggedView *> *eventPathViews = [self handleIncomingPointerEvent:event onView:targetView];
+  SharedTouchEventEmitter eventEmitter = GetTouchEmitterFromView(targetView, offsetLocation);
+  bool hasMoveEventListeners = IsAnyViewInPathListeningToEvent(eventPathViews, ViewEvents::Offset::PointerMove) ||
+      IsAnyViewInPathListeningToEvent(eventPathViews, ViewEvents::Offset::PointerMoveCapture);
+  if (eventEmitter != nil && hasMoveEventListeners) {
+    eventEmitter->onPointerMove(event);
+  }
+}
 
-    if (shouldEmitEvent && !hasParentEnterListener) {
-      hasParentEnterListener = YES;
-    }
+/**
+ * Private method which is used for tracking the location of pointer events to manage the entering/leaving events.
+ * The primary idea is that a pointer's presence & movement is dicated by a variety of underlying events such as down,
+ * move, and up — and they should all be treated the same when it comes to tracking the entering & leaving of pointers
+ * to views. This method accomplishes that by recieving the pointer event, the target view (can be null in cases when
+ * the event indicates that the pointer has left the screen entirely), and a block/callback where the underlying event
+ * should be fired.
+ */
+- (NSOrderedSet<RCTReactTaggedView *> *)handleIncomingPointerEvent:(PointerEvent)event
+                                                            onView:(nullable UIView *)targetView
+{
+  int pointerId = event.pointerId;
+  CGPoint clientLocation = CGPointMake(event.clientPoint.x, event.clientPoint.y);
 
-    if (!hasMoveListenerInEventPath && IsViewListeningToEvent(componentView, ViewEvents::Offset::PointerMove)) {
-      hasMoveListenerInEventPath = YES;
-    }
+  NSOrderedSet<RCTReactTaggedView *> *currentlyHoveredViews =
+      [_currentlyHoveredViewsPerPointer objectForKey:@(pointerId)];
+  if (currentlyHoveredViews == nil) {
+    currentlyHoveredViews = [NSOrderedSet orderedSet];
   }
 
-  // Moving
-  if (hasMoveListenerInEventPath) {
-    SharedTouchEventEmitter eventEmitter = GetTouchEmitterFromView(targetView, [recognizer locationInView:targetView]);
-    if (eventEmitter != nil) {
-      PointerEvent event = CreatePointerEventFromIncompleteHoverData(
-          targetView, clientLocation, screenLocation, offsetLocation, timestamp);
-      eventEmitter->onPointerMove(event);
-    }
-  }
+  RCTReactTaggedView *targetTaggedView = [RCTReactTaggedView wrap:targetView];
+  RCTReactTaggedView *prevTargetTaggedView = [currentlyHoveredViews firstObject];
+  UIView *prevTargetView = prevTargetTaggedView.view;
+
+  NSOrderedSet<RCTReactTaggedView *> *eventPathViews = GetTouchableViewsInPathToRoot(targetView);
 
   // Out
-  if (prevTargetView != targetView) {
-    BOOL shouldEmitOutEvent = IsAnyViewInPathListeningToEvent(_currentlyHoveredViews, ViewEvents::Offset::PointerOut);
+  if (prevTargetView != nil && prevTargetTaggedView.tag != targetTaggedView.tag) {
+    BOOL shouldEmitOutEvent = IsAnyViewInPathListeningToEvent(currentlyHoveredViews, ViewEvents::Offset::PointerOut);
     SharedTouchEventEmitter eventEmitter =
-        GetTouchEmitterFromView(prevTargetView, [recognizer locationInView:prevTargetView]);
+        GetTouchEmitterFromView(prevTargetView, [_rootComponentView convertPoint:clientLocation toView:prevTargetView]);
     if (shouldEmitOutEvent && eventEmitter != nil) {
-      PointerEvent event = CreatePointerEventFromIncompleteHoverData(
-          prevTargetView, clientLocation, screenLocation, offsetLocation, timestamp);
       eventEmitter->onPointerOut(event);
     }
   }
@@ -772,14 +918,16 @@ - (void)hovering:(UIHoverGestureRecognizer *)recognizer API_AVAILABLE(ios(13.0))
   // we also need to efficiently keep track of if a view has a parent which is listening to the leave events,
   // so we first iterate from the root to the target, collecting the views which need events fired for, of which
   // we reverse iterate (now from target to root), actually emitting the events.
-  NSMutableOrderedSet *viewsToEmitLeaveEventsTo = [NSMutableOrderedSet orderedSet];
+  NSMutableOrderedSet<UIView *> *viewsToEmitLeaveEventsTo = [NSMutableOrderedSet orderedSet];
 
   BOOL hasParentLeaveListener = NO;
-  for (UIView *componentView in [_currentlyHoveredViews reverseObjectEnumerator]) {
-    BOOL shouldEmitEvent =
-        hasParentLeaveListener || IsViewListeningToEvent(componentView, ViewEvents::Offset::PointerLeave);
+  for (RCTReactTaggedView *taggedView in [currentlyHoveredViews reverseObjectEnumerator]) {
+    UIView *componentView = taggedView.view;
+
+    BOOL shouldEmitEvent = componentView != nil &&
+        (hasParentLeaveListener || IsViewListeningToEvent(taggedView, ViewEvents::Offset::PointerLeave));
 
-    if (shouldEmitEvent && ![eventPathViews containsObject:componentView]) {
+    if (shouldEmitEvent && ![eventPathViews containsObject:taggedView]) {
       [viewsToEmitLeaveEventsTo addObject:componentView];
     }
 
@@ -790,15 +938,52 @@ - (void)hovering:(UIHoverGestureRecognizer *)recognizer API_AVAILABLE(ios(13.0))
 
   for (UIView *componentView in [viewsToEmitLeaveEventsTo reverseObjectEnumerator]) {
     SharedTouchEventEmitter eventEmitter =
-        GetTouchEmitterFromView(componentView, [recognizer locationInView:componentView]);
+        GetTouchEmitterFromView(componentView, [_rootComponentView convertPoint:clientLocation toView:componentView]);
     if (eventEmitter != nil) {
-      PointerEvent event = CreatePointerEventFromIncompleteHoverData(
-          componentView, clientLocation, screenLocation, offsetLocation, timestamp);
       eventEmitter->onPointerLeave(event);
     }
   }
 
-  _currentlyHoveredViews = eventPathViews;
+  // Over
+  if (targetView != nil && prevTargetTaggedView.tag != targetTaggedView.tag) {
+    BOOL shouldEmitOverEvent = IsAnyViewInPathListeningToEvent(eventPathViews, ViewEvents::Offset::PointerOver);
+    SharedTouchEventEmitter eventEmitter =
+        GetTouchEmitterFromView(targetView, [_rootComponentView convertPoint:clientLocation toView:targetView]);
+    if (shouldEmitOverEvent && eventEmitter != nil) {
+      eventEmitter->onPointerOver(event);
+    }
+  }
+
+  // Entering
+
+  // We only want to emit events to JS if there is a view that is currently listening to said event
+  // so we only send those event to the JS side if the element which has been entered is itself listening,
+  // or if one of its parents is listening in case those listeners care about the capturing phase. Adding the ability
+  // for native to distingusih between capturing listeners and not could be an optimization to futher reduce the number
+  // of events we send to JS
+  BOOL hasParentEnterListener = NO;
+  for (RCTReactTaggedView *taggedView in [eventPathViews reverseObjectEnumerator]) {
+    UIView *componentView = taggedView.view;
+
+    BOOL shouldEmitEvent = componentView != nil &&
+        (hasParentEnterListener || IsViewListeningToEvent(taggedView, ViewEvents::Offset::PointerEnter));
+
+    if (shouldEmitEvent && ![currentlyHoveredViews containsObject:taggedView]) {
+      SharedTouchEventEmitter eventEmitter =
+          GetTouchEmitterFromView(componentView, [_rootComponentView convertPoint:clientLocation toView:componentView]);
+      if (eventEmitter != nil) {
+        eventEmitter->onPointerEnter(event);
+      }
+    }
+
+    if (shouldEmitEvent && !hasParentEnterListener) {
+      hasParentEnterListener = YES;
+    }
+  }
+
+  [_currentlyHoveredViewsPerPointer setObject:eventPathViews forKey:@(pointerId)];
+
+  return eventPathViews;
 }
 
 @end
diff --git a/React/Fabric/Utils/RCTReactTaggedView.h b/React/Fabric/Utils/RCTReactTaggedView.h
new file mode 100644
index 000000000000..6fa543920208
--- /dev/null
+++ b/React/Fabric/Utils/RCTReactTaggedView.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * Lightweight wrapper class around a UIView with a react tag which registers a
+ * constant react tag at initialization time for a stable hash and provides the
+ * udnerlying view to a caller if that underlying view's react tag has not
+ * changed from the one provided at initalization time (i.e. recycled).
+ */
+@interface RCTReactTaggedView : NSObject {
+  UIView *_view;
+  NSInteger _tag;
+}
+
++ (RCTReactTaggedView *)wrap:(UIView *)view;
+
+- (instancetype)initWithView:(UIView *)view;
+- (nullable UIView *)view;
+- (NSInteger)tag;
+
+- (BOOL)isEqual:(id)other;
+- (NSUInteger)hash;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/React/Fabric/Utils/RCTReactTaggedView.mm b/React/Fabric/Utils/RCTReactTaggedView.mm
new file mode 100644
index 000000000000..4a4a60ff830b
--- /dev/null
+++ b/React/Fabric/Utils/RCTReactTaggedView.mm
@@ -0,0 +1,55 @@
+/*
+ * 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 "RCTReactTaggedView.h"
+
+@implementation RCTReactTaggedView
+
++ (RCTReactTaggedView *)wrap:(UIView *)view
+{
+  return [[RCTReactTaggedView alloc] initWithView:view];
+}
+
+- (instancetype)initWithView:(UIView *)view
+{
+  if (self = [super init]) {
+    _view = view;
+    _tag = view.tag;
+  }
+  return self;
+}
+
+- (nullable UIView *)view
+{
+  if (_view.tag == _tag) {
+    return _view;
+  }
+  return nil;
+}
+
+- (NSInteger)tag
+{
+  return _tag;
+}
+
+- (BOOL)isEqual:(id)other
+{
+  if (other == self) {
+    return YES;
+  }
+  if (!other || ![other isKindOfClass:[self class]]) {
+    return NO;
+  }
+  return _tag == [other tag];
+}
+
+- (NSUInteger)hash
+{
+  return _tag;
+}
+
+@end
diff --git a/React/Profiler/RCTProfile.h b/React/Profiler/RCTProfile.h
index 7341566ce86b..066e570f73ef 100644
--- a/React/Profiler/RCTProfile.h
+++ b/React/Profiler/RCTProfile.h
@@ -57,6 +57,20 @@ RCT_EXTERN void RCTProfileInit(RCTBridge *);
  */
 RCT_EXTERN void RCTProfileEnd(RCTBridge *, void (^)(NSString *));
 
+/**
+ * Route the RCT_PROFILE_BEGIN_EVENT hooks to our loom tracing.
+ */
+#ifdef WITH_LOOM_TRACE
+RCT_EXTERN BOOL _RCTLoomIsProfiling(void);
+RCT_EXTERN void
+_RCTLoomBeginEvent(NSString *name, const char *file, size_t line, NSDictionary<NSString *, NSString *> *args);
+RCT_EXTERN void _RCTLoomEndEvent();
+#else
+#define _RCTLoomIsProfiling(...) NO
+#define _RCTLoomBeginEvent(...)
+#define _RCTLoomEndEvent(...)
+#endif
+
 /**
  * Collects the initial event information for the event and returns a reference ID
  */
@@ -68,6 +82,9 @@ RCT_EXTERN void _RCTProfileBeginEvent(
     NSDictionary<NSString *, NSString *> *args);
 #define RCT_PROFILE_BEGIN_EVENT(tag, name, args)                      \
   do {                                                                \
+    if (_RCTLoomIsProfiling()) {                                      \
+      _RCTLoomBeginEvent(name, __FILE__, __LINE__, args);             \
+    }                                                                 \
     if (RCTProfileIsProfiling()) {                                    \
       NSThread *__calleeThread = [NSThread currentThread];            \
       NSTimeInterval __time = CACurrentMediaTime();                   \
@@ -89,6 +106,9 @@ RCT_EXTERN void _RCTProfileEndEvent(
 
 #define RCT_PROFILE_END_EVENT(tag, category)                                    \
   do {                                                                          \
+    if (_RCTLoomIsProfiling()) {                                                \
+      _RCTLoomEndEvent();                                                       \
+    }                                                                           \
     if (RCTProfileIsProfiling()) {                                              \
       NSThread *__calleeThread = [NSThread currentThread];                      \
       NSString *__threadName = RCTCurrentThreadName();                          \
diff --git a/React/Tests/Mounting/RCTComponentViewRegistryTests.mm b/React/Tests/Mounting/RCTComponentViewRegistryTests.mm
index 9bb5484a4c5c..4bd2b6529aad 100644
--- a/React/Tests/Mounting/RCTComponentViewRegistryTests.mm
+++ b/React/Tests/Mounting/RCTComponentViewRegistryTests.mm
@@ -22,6 +22,7 @@ - (void)setUp
 {
   [super setUp];
   _componentViewRegistry = [RCTComponentViewRegistry new];
+  [_componentViewRegistry.componentViewFactory registerComponentViewClass:[RCTViewComponentView class]];
 }
 
 - (void)testComponentViewDescriptorWithTag
diff --git a/React/Views/RCTBorderCurve.h b/React/Views/RCTBorderCurve.h
new file mode 100644
index 000000000000..96002659ed70
--- /dev/null
+++ b/React/Views/RCTBorderCurve.h
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+
+typedef NS_ENUM(NSInteger, RCTBorderCurve) {
+  RCTBorderCurveContinuous = 0,
+  RCTBorderCurveCircular,
+};
diff --git a/React/Views/RCTComponentData.m b/React/Views/RCTComponentData.m
index 768cc5c3adc8..e7cace9d91d9 100644
--- a/React/Views/RCTComponentData.m
+++ b/React/Views/RCTComponentData.m
@@ -12,6 +12,7 @@
 #import "RCTBridge.h"
 #import "RCTBridgeModule.h"
 #import "RCTComponentEvent.h"
+#import "RCTConstants.h"
 #import "RCTConvert.h"
 #import "RCTEventDispatcherProtocol.h"
 #import "RCTParserUtils.h"
diff --git a/React/Views/RCTFont.mm b/React/Views/RCTFont.mm
index 679f2cea43eb..e119657d3716 100644
--- a/React/Views/RCTFont.mm
+++ b/React/Views/RCTFont.mm
@@ -248,6 +248,86 @@ + (RCTFontVariantDescriptor *)RCTFontVariantDescriptor:(id)json
         UIFontFeatureTypeIdentifierKey : @(kNumberSpacingType),
         UIFontFeatureSelectorIdentifierKey : @(kProportionalNumbersSelector),
       },
+      @"stylistic-one" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltOneOnSelector),
+      },
+      @"stylistic-two" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltTwoOnSelector),
+      },
+      @"stylistic-three" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltThreeOnSelector),
+      },
+      @"stylistic-four" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltFourOnSelector),
+      },
+      @"stylistic-five" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltFiveOnSelector),
+      },
+      @"stylistic-six" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltSixOnSelector),
+      },
+      @"stylistic-seven" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltSevenOnSelector),
+      },
+      @"stylistic-eight" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltEightOnSelector),
+      },
+      @"stylistic-nine" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltNineOnSelector),
+      },
+      @"stylistic-ten" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltTenOnSelector),
+      },
+      @"stylistic-eleven" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltElevenOnSelector),
+      },
+      @"stylistic-twelve" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltTwelveOnSelector),
+      },
+      @"stylistic-thirteen" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltThirteenOnSelector),
+      },
+      @"stylistic-fourteen" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltFourteenOnSelector),
+      },
+      @"stylistic-fifteen" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltFifteenOnSelector),
+      },
+      @"stylistic-sixteen" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltSixteenOnSelector),
+      },
+      @"stylistic-seventeen" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltSeventeenOnSelector),
+      },
+      @"stylistic-eighteen" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltEighteenOnSelector),
+      },
+      @"stylistic-nineteen" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltNineteenOnSelector),
+      },
+      @"stylistic-twenty" : @{
+        UIFontFeatureTypeIdentifierKey : @(kStylisticAlternativesType),
+        UIFontFeatureSelectorIdentifierKey : @(kStylisticAltTwentyOnSelector),
+      }
     };
   });
   RCTFontVariantDescriptor *value = mapping[json];
diff --git a/React/Views/RCTMaskedView.m b/React/Views/RCTMaskedView.m
deleted file mode 100644
index bf9bd88edf84..000000000000
--- a/React/Views/RCTMaskedView.m
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTMaskedView.h"
-
-#import <React/UIView+React.h>
-
-@implementation RCTMaskedView
-
-- (void)didUpdateReactSubviews
-{
-  // RCTMaskedView expects that the first subview rendered is the mask.
-  UIView *maskView = [self.reactSubviews firstObject];
-  self.maskView = maskView;
-
-  // Add the other subviews to the view hierarchy
-  for (NSUInteger i = 1; i < self.reactSubviews.count; i++) {
-    UIView *subview = [self.reactSubviews objectAtIndex:i];
-    [self addSubview:subview];
-  }
-}
-
-- (void)displayLayer:(__unused CALayer *)layer
-{
-  // RCTView uses displayLayer to do border rendering.
-  // We don't need to do that in RCTMaskedView, so we
-  // stub this method and override the default implementation.
-}
-
-@end
diff --git a/React/Views/RCTMaskedViewManager.m b/React/Views/RCTMaskedViewManager.m
deleted file mode 100644
index 808f2e805fed..000000000000
--- a/React/Views/RCTMaskedViewManager.m
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTMaskedViewManager.h"
-
-#import "RCTMaskedView.h"
-#import "RCTUIManager.h"
-
-@implementation RCTMaskedViewManager
-
-RCT_EXPORT_MODULE()
-
-- (UIView *)view
-{
-  RCTNewArchitectureValidationPlaceholder(
-      RCTNotAllowedInFabricWithoutLegacy,
-      self,
-      @"This native component is still using the legacy interop layer -- please migrate it to use a Fabric specific implementation.");
-  return [RCTMaskedView new];
-}
-
-@end
diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h
index 226672fb3763..4cf8323be557 100644
--- a/React/Views/RCTShadowView.h
+++ b/React/Views/RCTShadowView.h
@@ -152,6 +152,9 @@ typedef void (^RCTApplierBlock)(NSDictionary<NSNumber *, UIView *> *viewRegistry
 
 @property (nonatomic, assign) float flex;
 @property (nonatomic, assign) float flexGrow;
+@property (nonatomic, assign) float rowGap;
+@property (nonatomic, assign) float columnGap;
+@property (nonatomic, assign) float gap;
 @property (nonatomic, assign) float flexShrink;
 @property (nonatomic, assign) YGValue flexBasis;
 
diff --git a/React/Views/RCTShadowView.m b/React/Views/RCTShadowView.m
index 016060a226c4..baca3cef65e4 100644
--- a/React/Views/RCTShadowView.m
+++ b/React/Views/RCTShadowView.m
@@ -642,6 +642,20 @@ - (YGValue)flexBasis
   return YGNodeStyleGetFlexBasis(_yogaNode);
 }
 
+#define RCT_GAP_PROPERTY(setProp, getProp, cssProp, type, gap) \
+  -(void)set##setProp : (type)value                            \
+  {                                                            \
+    YGNodeStyleSet##cssProp(_yogaNode, gap, value);            \
+  }                                                            \
+  -(type)getProp                                               \
+  {                                                            \
+    return YGNodeStyleGet##cssProp(_yogaNode, gap);            \
+  }
+
+RCT_GAP_PROPERTY(RowGap, rowGap, Gap, float, YGGutterRow);
+RCT_GAP_PROPERTY(ColumnGap, columnGap, Gap, float, YGGutterColumn);
+RCT_GAP_PROPERTY(Gap, gap, Gap, float, YGGutterAll);
+
 #define RCT_STYLE_PROPERTY(setProp, getProp, cssProp, type) \
   -(void)set##setProp : (type)value                         \
   {                                                         \
diff --git a/React/Views/RCTView.h b/React/Views/RCTView.h
index fe27daae1fb0..b3df8e80a68b 100644
--- a/React/Views/RCTView.h
+++ b/React/Views/RCTView.h
@@ -7,6 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
+#import <React/RCTBorderCurve.h>
 #import <React/RCTBorderStyle.h>
 #import <React/RCTComponent.h>
 #import <React/RCTPointerEvents.h>
@@ -93,6 +94,11 @@ extern const UIAccessibilityTraits SwitchAccessibilityTrait;
 @property (nonatomic, assign) CGFloat borderEndWidth;
 @property (nonatomic, assign) CGFloat borderWidth;
 
+/**
+ * Border curve.
+ */
+@property (nonatomic, assign) RCTBorderCurve borderCurve;
+
 /**
  * Border styles.
  */
diff --git a/React/Views/RCTView.m b/React/Views/RCTView.m
index 03dcc94d9310..7fb45443248a 100644
--- a/React/Views/RCTView.m
+++ b/React/Views/RCTView.m
@@ -10,6 +10,7 @@
 #import <React/RCTMockDef.h>
 
 #import "RCTAutoInsetsProtocol.h"
+#import "RCTBorderCurve.h"
 #import "RCTBorderDrawing.h"
 #import "RCTI18nUtil.h"
 #import "RCTLog.h"
@@ -126,6 +127,7 @@ - (instancetype)initWithFrame:(CGRect)frame
     _borderBottomRightRadius = -1;
     _borderBottomStartRadius = -1;
     _borderBottomEndRadius = -1;
+    _borderCurve = RCTBorderCurveCircular;
     _borderStyle = RCTBorderStyleSolid;
     _hitTestEdgeInsets = UIEdgeInsetsZero;
 
@@ -945,6 +947,20 @@ -(void)setBorder##side##Radius : (CGFloat)radius \
                     setBorderRadius(TopEnd) setBorderRadius(BottomLeft) setBorderRadius(BottomRight)
                         setBorderRadius(BottomStart) setBorderRadius(BottomEnd)
 
+#pragma mark - Border Curve
+
+#define setBorderCurve(side)                            \
+  -(void)setBorder##side##Curve : (RCTBorderCurve)curve \
+  {                                                     \
+    if (_border##side##Curve == curve) {                \
+      return;                                           \
+    }                                                   \
+    _border##side##Curve = curve;                       \
+    [self.layer setNeedsDisplay];                       \
+  }
+
+                            setBorderCurve()
+
 #pragma mark - Border Style
 
 #define setBorderStyle(side)                            \
@@ -957,6 +973,6 @@ -(void)setBorder##side##Style : (RCTBorderStyle)style \
     [self.layer setNeedsDisplay];                       \
   }
 
-                            setBorderStyle()
+                                setBorderStyle()
 
-                                @end
+                                    @end
diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m
index f10eea73bff7..b034ff08ac24 100644
--- a/React/Views/RCTViewManager.m
+++ b/React/Views/RCTViewManager.m
@@ -8,6 +8,7 @@
 #import "RCTViewManager.h"
 
 #import "RCTAssert.h"
+#import "RCTBorderCurve.h"
 #import "RCTBorderStyle.h"
 #import "RCTBridge.h"
 #import "RCTConvert+Transform.h"
@@ -63,6 +64,7 @@ @implementation RCTConvert (UIAccessibilityTraits)
       @"timer" : @(UIAccessibilityTraitNone),
       @"toolbar" : @(UIAccessibilityTraitNone),
       @"list" : @(UIAccessibilityTraitNone),
+      @"grid" : @(UIAccessibilityTraitNone),
     }),
     UIAccessibilityTraitNone,
     unsignedLongLongValue)
@@ -264,6 +266,19 @@ - (RCTShadowView *)shadowView
     view.removeClippedSubviews = json ? [RCTConvert BOOL:json] : defaultView.removeClippedSubviews;
   }
 }
+RCT_CUSTOM_VIEW_PROPERTY(borderCurve, RCTBorderCurve, RCTView)
+{
+  if (@available(iOS 13.0, *)) {
+    switch ([RCTConvert RCTBorderCurve:json]) {
+      case RCTBorderCurveContinuous:
+        view.layer.cornerCurve = kCACornerCurveContinuous;
+        break;
+      case RCTBorderCurveCircular:
+        view.layer.cornerCurve = kCACornerCurveCircular;
+        break;
+    }
+  }
+}
 RCT_CUSTOM_VIEW_PROPERTY(borderRadius, CGFloat, RCTView)
 {
   if ([view respondsToSelector:@selector(setBorderRadius:)]) {
@@ -412,6 +427,9 @@ - (RCTShadowView *)shadowView
 RCT_EXPORT_SHADOW_PROPERTY(alignContent, YGAlign)
 RCT_EXPORT_SHADOW_PROPERTY(position, YGPositionType)
 RCT_EXPORT_SHADOW_PROPERTY(aspectRatio, float)
+RCT_EXPORT_SHADOW_PROPERTY(rowGap, float)
+RCT_EXPORT_SHADOW_PROPERTY(columnGap, float)
+RCT_EXPORT_SHADOW_PROPERTY(gap, float)
 
 RCT_EXPORT_SHADOW_PROPERTY(overflow, YGOverflow)
 RCT_EXPORT_SHADOW_PROPERTY(display, YGDisplay)
diff --git a/React/Views/RCTViewUtils.h b/React/Views/RCTViewUtils.h
index a6204c5faa9f..ef2a335c0166 100644
--- a/React/Views/RCTViewUtils.h
+++ b/React/Views/RCTViewUtils.h
@@ -6,6 +6,7 @@
  */
 
 #import <React/RCTDefines.h>
+#import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/ReactAndroid/Android-prebuilt.mk b/ReactAndroid/Android-prebuilt.mk
index 269cf0ac0aa5..48dd794a4799 100644
--- a/ReactAndroid/Android-prebuilt.mk
+++ b/ReactAndroid/Android-prebuilt.mk
@@ -88,7 +88,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := turbomodulejsijni
 LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libturbomodulejsijni.so
 LOCAL_EXPORT_C_INCLUDES := \
-  $(REACT_ANDROID_SRC_DIR)/java/com/facebook/react/turbomodule/core/jni
+  $(REACT_ANDROID_SRC_DIR)/jni/react/turbomodule
 include $(PREBUILT_SHARED_LIBRARY)
 
 # react_render_core
@@ -164,7 +164,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := fabricjni
 LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libfabricjni.so
 LOCAL_EXPORT_C_INCLUDES := \
-  $(REACT_ANDROID_SRC_DIR)/java/com/facebook/react/fabric/jni
+  $(REACT_ANDROID_SRC_DIR)/jni/react/fabricjni
 include $(PREBUILT_SHARED_LIBRARY)
 
 # react_render_componentregistry
@@ -175,6 +175,14 @@ LOCAL_EXPORT_C_INCLUDES := \
   $(REACT_COMMON_DIR)/react/renderer/componentregistry
 include $(PREBUILT_SHARED_LIBRARY)
 
+# react_newarchdefaults
+include $(CLEAR_VARS)
+LOCAL_MODULE := react_newarchdefaults
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_newarchdefaults.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(REACT_ANDROID_SRC_DIR)/jni/react/newarchdefaults
+include $(PREBUILT_SHARED_LIBRARY)
+
 # jsi
 include $(CLEAR_VARS)
 LOCAL_MODULE := jsi
diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index 8945101d657c..037e9dc92b0a 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -5,23 +5,31 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+buildscript {
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.hasProperty("kotlinVersion") ? rootProject.ext.kotlinVersion : KOTLIN_VERSION}"
+    }
+}
+
 plugins {
     id("com.android.library")
     id("com.facebook.react")
-    id("org.jetbrains.kotlin.android") version "1.6.10"
-    id("maven-publish")
     id("de.undercouch.download")
+    id("maven-publish")
 }
 
 import com.facebook.react.tasks.internal.*
+import com.facebook.react.tasks.internal.utils.*
 
 import java.nio.file.Paths
 
+import kotlin.Pair
+
 import de.undercouch.gradle.tasks.download.Download
-import org.apache.tools.ant.taskdefs.condition.Os
-import org.apache.tools.ant.filters.ReplaceTokens
 
-def AAR_OUTPUT_URL = "file://${projectDir}/../android"
+version = VERSION_NAME
+group = "com.facebook.react"
+
 // We download various C++ open-source dependencies into downloads.
 // We then copy both the downloaded code and our custom makefiles and headers into third-party-ndk.
 // After that we build native code from src/main/jni with module path pointing at third-party-ndk.
@@ -43,8 +51,176 @@ def dependenciesPath = System.getenv("REACT_NATIVE_DEPENDENCIES")
 // and the build will use that.
 def boostPath = dependenciesPath ?: System.getenv("REACT_NATIVE_BOOST_PATH")
 
-// Setup build type for NDK, supported values: {debug, release}
-def nativeBuildType = System.getenv("NATIVE_BUILD_TYPE") ?: "release"
+// By setting REACT_NATIVE_SKIP_PREFAB we can skip prefab publishing, to
+// reduce the size of the React Native published .AAR.
+def skipPrefabPublishing = System.getenv("REACT_NATIVE_SKIP_PREFAB") != null
+def prefabHeadersDir = project.file("$buildDir/prefab-headers")
+
+final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTask) {
+    dependsOn(prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog)
+    dependsOn("generateCodegenArtifactsFromSchema")
+    // To export to a ReactNativePrefabProcessingEntities.kt once all
+    // libraries have been moved. We keep it here for now as it make easier to
+    // migrate one library at a time.
+    it.input.set(
+        [
+            new PrefabPreprocessingEntry(
+                "react_render_debug",
+                new Pair("../ReactCommon/react/renderer/debug/", "react/renderer/debug/")
+            ),
+            new PrefabPreprocessingEntry(
+                "turbomodulejsijni",
+                new Pair("src/main/jni/react/turbomodule", "")
+            ),
+            new PrefabPreprocessingEntry(
+                "runtimeexecutor",
+                new Pair("../ReactCommon/runtimeexecutor/", "")
+            ),
+            new PrefabPreprocessingEntry(
+                "react_codegen_rncore",
+                new Pair(new File(buildDir, "generated/source/codegen/jni/").absolutePath, "")
+            ),
+            new PrefabPreprocessingEntry(
+                "react_debug",
+                new Pair("../ReactCommon/react/debug/", "react/debug/")
+            ),
+            new PrefabPreprocessingEntry(
+                "react_render_componentregistry",
+                new Pair("../ReactCommon/react/renderer/componentregistry/", "react/renderer/componentregistry/")
+            ),
+            new PrefabPreprocessingEntry(
+                "react_newarchdefaults",
+                new Pair("src/main/jni/react/newarchdefaults", "")
+            ),
+            new PrefabPreprocessingEntry(
+                "react_render_animations",
+                new Pair("../ReactCommon/react/renderer/animations/", "react/renderer/animations/")
+            ),
+            new PrefabPreprocessingEntry(
+                "react_render_core",
+                new Pair("../ReactCommon/react/renderer/core/", "react/renderer/core/")
+            ),
+            new PrefabPreprocessingEntry(
+                "react_render_graphics",
+                [
+                    new Pair("../ReactCommon/react/renderer/graphics/", "react/renderer/graphics/"),
+                    new Pair("../ReactCommon/react/renderer/graphics/platform/cxx/", ""),
+                ]
+            ),
+            new PrefabPreprocessingEntry(
+                "rrc_view",
+                new Pair("../ReactCommon/react/renderer/components/view/", "react/renderer/components/view/")
+            ),
+            new PrefabPreprocessingEntry(
+                "jsi",
+                new Pair("../ReactCommon/jsi/", "")
+            ),
+            new PrefabPreprocessingEntry(
+                "glog",
+                new Pair(new File(buildDir, "third-party-ndk/glog/exported/").absolutePath, "")
+            ),
+            new PrefabPreprocessingEntry(
+                "fabricjni",
+                [
+                    new Pair("src/main/jni/react/fabric", "react/fabric/"),
+                    new Pair("src/main/jni/react/cxxcomponents", "react/cxxcomponents/")
+                ]
+            ),
+            new PrefabPreprocessingEntry(
+                "react_render_mapbuffer",
+                new Pair("../ReactCommon/react/renderer/mapbuffer/", "react/renderer/mapbuffer/")
+            ),
+            new PrefabPreprocessingEntry(
+                "yoga",
+                [
+                    new Pair("../ReactCommon/yoga/", ""),
+                    new Pair("src/main/jni/first-party/yogajni/jni", "")
+                ]
+            ),
+            new PrefabPreprocessingEntry(
+                "folly_runtime",
+                [
+                    new Pair(new File(buildDir, "third-party-ndk/folly/").absolutePath, ""),
+                    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 PrefabPreprocessingEntry(
+                "react_nativemodule_core",
+                [
+                    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/"),
+                    new Pair("../ReactCommon/react/config/", "react/config/"),
+                    new Pair("../ReactCommon/react/nativemodule/core/", ""),
+                    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/"),
+                    new Pair("../ReactCommon/react/renderer/runtimescheduler/", "react/renderer/runtimescheduler/"),
+                    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/"),
+                ]
+            ),
+            new PrefabPreprocessingEntry(
+                "react_render_imagemanager",
+                [
+                    new Pair("../ReactCommon/react/renderer/imagemanager/", "react/renderer/imagemanager/"),
+                    new Pair("../ReactCommon/react/renderer/imagemanager/platform/cxx/", ""),
+                ]
+            ),
+            new PrefabPreprocessingEntry(
+                "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/"),
+                    new Pair("../ReactCommon/cxxreact/", "cxxreact/"),
+                ]
+            ),
+        ]
+    )
+    it.outputDir.set(prefabHeadersDir)
+}
 
 // We put the publishing version from gradle.properties inside ext. so other
 // subprojects can access it as well.
@@ -79,7 +255,7 @@ task downloadDoubleConversion(dependsOn: createNativeDepsDirectories, type: Down
 task prepareDoubleConversion(dependsOn: dependenciesPath ? [] : [downloadDoubleConversion], type: Copy) {
     from(dependenciesPath ?: tarTree(downloadDoubleConversion.dest))
     from("src/main/jni/third-party/double-conversion/")
-    include("double-conversion-${DOUBLE_CONVERSION_VERSION}/src/**/*", "Android.mk", "CMakeLists.txt")
+    include("double-conversion-${DOUBLE_CONVERSION_VERSION}/src/**/*", "CMakeLists.txt")
     filesMatching("*/src/**/*", { fname -> fname.path = "double-conversion/${fname.name}" })
     includeEmptyDirs = false
     into("$thirdPartyNdkDir/double-conversion")
@@ -95,7 +271,7 @@ task downloadFolly(dependsOn: createNativeDepsDirectories, type: Download) {
 task prepareFolly(dependsOn: dependenciesPath ? [] : [downloadFolly], type: Copy) {
     from(dependenciesPath ?: tarTree(downloadFolly.dest))
     from("src/main/jni/third-party/folly/")
-    include("folly-${FOLLY_VERSION}/folly/**/*", "Android.mk", "CMakeLists.txt")
+    include("folly-${FOLLY_VERSION}/folly/**/*", "CMakeLists.txt")
     eachFile { fname -> fname.path = (fname.path - "folly-${FOLLY_VERSION}/") }
     includeEmptyDirs = false
     into("$thirdPartyNdkDir/folly")
@@ -111,7 +287,7 @@ task downloadFmt(dependsOn: createNativeDepsDirectories, type: Download) {
 task prepareFmt(dependsOn: dependenciesPath ? [] : [downloadFmt], type: Copy) {
     from(dependenciesPath ?: tarTree(downloadFmt.dest))
     from("src/main/jni/third-party/fmt/")
-    include("fmt-${FMT_VERSION}/src/**/*", "fmt-${FMT_VERSION}/include/**/*", "Android.mk", "CMakeLists.txt")
+    include("fmt-${FMT_VERSION}/src/**/*", "fmt-${FMT_VERSION}/include/**/*", "CMakeLists.txt")
     eachFile { fname -> fname.path = (fname.path - "fmt-${FMT_VERSION}/") }
     includeEmptyDirs = false
     into("$thirdPartyNdkDir/fmt")
@@ -148,7 +324,7 @@ final def prepareGlog = tasks.register("prepareGlog", PrepareGlogTask) {
     it.outputDir.set(new File(thirdPartyNdkDir, "glog"))
 }
 
-// Create Android.mk library module based on jsc from npm
+// Create Android native library module based on jsc from npm
 tasks.register('prepareJSC', PrepareJSCTask) {
     it.jscPackagePath.set(findNodeModulePath(projectDir, "jsc-android"))
     it.outputDir = project.layout.buildDirectory.dir("third-party-ndk/jsc")
@@ -216,11 +392,7 @@ def reactNativeArchitectures() {
     return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
-tasks.register("packageReactNdkLibsForBuck") {
-    dependsOn("packageReactNdkDebugLibsForBuck")
-}
-
-tasks.register("packageReactNdkDebugLibsForBuck", Copy) {
+task packageReactNdkLibsForBuck(type: Copy) {
     dependsOn("mergeDebugNativeLibs")
     // Shared libraries (.so) are copied from the merged_native_libs folder instead
     from("$buildDir/intermediates/merged_native_libs/debug/out/lib/")
@@ -229,28 +401,13 @@ tasks.register("packageReactNdkDebugLibsForBuck", Copy) {
     into("src/main/jni/prebuilt/lib")
 }
 
-tasks.register("packageReactNdkReleaseLibsForBuck", Copy) {
-    dependsOn("mergeReleaseNativeLibs")
-    // Shared libraries (.so) are copied from the merged_native_libs folder instead
-    from("$buildDir/intermediates/merged_native_libs/release/out/lib/")
-    exclude("**/libjsc.so")
-    exclude("**/libhermes.so")
-    into("src/main/jni/prebuilt/lib")
-}
-
-final def extractNativeDependencies = tasks.register('extractNativeDependencies', ExtractJniAndHeadersTask) {
-    it.extractHeadersConfiguration.setFrom(configurations.extractHeaders)
-    it.extractJniConfiguration.setFrom(configurations.extractJNI)
-    it.baseOutputDir = project.file("src/main/jni/first-party/")
-}
-
 task installArchives {
     dependsOn("publishAllPublicationsToNpmRepository")
 }
 
 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)
@@ -263,7 +420,7 @@ android {
 
     defaultConfig {
         minSdkVersion(21)
-        targetSdkVersion(31)
+        targetSdkVersion(33)
         versionCode(1)
         versionName("1.0")
 
@@ -282,41 +439,46 @@ android {
         externalNativeBuild {
             cmake {
                 arguments "-DREACT_COMMON_DIR=${reactNativeRootDir}/ReactCommon",
-                        "-DREACT_ANDROID_DIR=$projectDir",
-                        "-DREACT_BUILD_DIR=$buildDir",
-                        "-DANDROID_STL=c++_shared",
-                        "-DANDROID_TOOLCHAIN=clang",
-                        "-DANDROID_PLATFORM=android-21"
-
-                targets "reactnativejni",
-                    "jscexecutor",
-                    "jsijniprofiler",
+                    "-DREACT_ANDROID_DIR=$projectDir",
+                    "-DREACT_BUILD_DIR=$buildDir",
+                    "-DANDROID_STL=c++_shared",
+                    "-DANDROID_TOOLCHAIN=clang",
+                    "-DANDROID_PLATFORM=android-21"
+
+                targets "jsijniprofiler",
                     "reactnativeblob",
                     "reactperfloggerjni",
+                    // prefab targets
+                    "reactnativejni",
+                    "react_render_debug",
                     "turbomodulejsijni",
-                    "fabricjni"
+                    "runtimeexecutor",
+                    "react_codegen_rncore",
+                    "react_debug",
+                    "react_render_componentregistry",
+                    "react_newarchdefaults",
+                    "react_render_animations",
+                    "react_render_core",
+                    "react_render_graphics",
+                    "rrc_image",
+                    "rrc_view",
+                    "jsi",
+                    "glog",
+                    "fabricjni",
+                    "react_render_mapbuffer",
+                    "yoga",
+                    "folly_runtime",
+                    "react_nativemodule_core",
+                    "react_render_imagemanager",
+                    "react_render_uimanager",
+                    "react_render_scheduler",
+                    "react_render_mounting",
+                    "hermes_executor",
+                    "jscexecutor"
             }
         }
         ndk {
-            abiFilters (*reactNativeArchitectures())
-        }
-    }
-
-    buildTypes {
-        debug {
-            externalNativeBuild {
-                cmake {
-                    targets "hermes-executor-debug"
-                }
-            }
-        }
-
-        release {
-            externalNativeBuild {
-                cmake {
-                    targets "hermes-executor-release"
-                }
-            }
+            abiFilters(*reactNativeArchitectures())
         }
     }
 
@@ -326,11 +488,11 @@ android {
         }
     }
 
-    preBuild.dependsOn(prepareJSC, prepareBoost, prepareDoubleConversion, prepareFmt, prepareFolly, prepareGlog, prepareLibevent, extractNativeDependencies)
+    preBuild.dependsOn(prepareJSC, prepareBoost, prepareDoubleConversion, prepareFmt, prepareFolly, prepareGlog, prepareLibevent)
     preBuild.dependsOn("generateCodegenArtifactsFromSchema")
+    preBuild.dependsOn(preparePrefab)
 
     sourceSets.main {
-        jni.srcDirs = []
         res.srcDirs = ["src/main/res/devsupport", "src/main/res/shell", "src/main/res/views/modal", "src/main/res/views/uimanager"]
         java {
             srcDirs = ["src/main/java", "src/main/libraries/soloader/java", "src/main/jni/first-party/fb/jni/java"]
@@ -354,19 +516,96 @@ android {
         exclude("**/libjsc.so")
     }
 
-    configurations {
-        extractHeaders
-        extractJNI
-    }
-
     buildFeatures {
         prefab true
+        prefabPublishing !skipPrefabPublishing
+    }
+
+    prefab {
+        react_render_debug {
+            headers(new File(prefabHeadersDir, "react_render_debug").absolutePath)
+        }
+        turbomodulejsijni {
+            headers(new File(prefabHeadersDir, "turbomodulejsijni").absolutePath)
+        }
+        runtimeexecutor {
+            headers(new File(prefabHeadersDir, "runtimeexecutor").absolutePath)
+        }
+        react_codegen_rncore {
+            headers(new File(prefabHeadersDir, "react_codegen_rncore").absolutePath)
+        }
+        react_debug {
+            headers(new File(prefabHeadersDir, "react_debug").absolutePath)
+        }
+        react_render_componentregistry {
+            headers(new File(prefabHeadersDir, "react_render_componentregistry").absolutePath)
+        }
+        react_newarchdefaults {
+            headers(new File(prefabHeadersDir, "react_newarchdefaults").absolutePath)
+        }
+        react_render_animations {
+            headers(new File(prefabHeadersDir, "react_render_animations").absolutePath)
+        }
+        react_render_core {
+            headers(new File(prefabHeadersDir, "react_render_core").absolutePath)
+        }
+        react_render_graphics {
+            headers(new File(prefabHeadersDir, "react_render_graphics").absolutePath)
+        }
+        rrc_image {
+            headers(new File(prefabHeadersDir, "rrc_image").absolutePath)
+        }
+        rrc_view {
+            headers(new File(prefabHeadersDir, "rrc_view").absolutePath)
+        }
+        jsi {
+            headers(new File(prefabHeadersDir, "jsi").absolutePath)
+        }
+        glog {
+            headers(new File(prefabHeadersDir, "glog").absolutePath)
+        }
+        fabricjni {
+            headers(new File(prefabHeadersDir, "fabricjni").absolutePath)
+        }
+        react_render_mapbuffer {
+            headers(new File(prefabHeadersDir, "react_render_mapbuffer").absolutePath)
+        }
+        yoga {
+            headers(new File(prefabHeadersDir, "yoga").absolutePath)
+        }
+        folly_runtime {
+            headers(new File(prefabHeadersDir, "folly_runtime").absolutePath)
+        }
+        react_nativemodule_core {
+            headers(new File(prefabHeadersDir, "react_nativemodule_core").absolutePath)
+        }
+        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)
+        }
+        jscexecutor {
+            headers(new File(prefabHeadersDir, "jscexecutor").absolutePath)
+        }
     }
 
     publishing {
         multipleVariants {
             withSourcesJar()
-            allVariants()
+            includeBuildTypeValues('debug', 'release')
         }
     }
 }
@@ -376,8 +615,9 @@ dependencies {
     api("androidx.appcompat:appcompat:${ANDROIDX_APPCOMPAT_VERSION}")
     api("androidx.autofill:autofill:${ANDROIDX_AUTOFILL_VERSION}")
     api("androidx.swiperefreshlayout:swiperefreshlayout:${SWIPEREFRESH_LAYOUT_VERSION}")
+    api("androidx.tracing:tracing:${ANDROIDX_TRACING_VERSION}")
 
-    api("com.facebook.fbjni:fbjni-java-only:${FBJNI_VERSION}")
+    api("com.facebook.fbjni:fbjni:${FBJNI_VERSION}")
     api("com.facebook.fresco:fresco:${FRESCO_VERSION}")
     api("com.facebook.fresco:imagepipeline-okhttp3:${FRESCO_VERSION}")
     api("com.facebook.fresco:ui-common:${FRESCO_VERSION}")
@@ -391,9 +631,6 @@ dependencies {
     api("com.squareup.okio:okio:${OKIO_VERSION}")
     api("javax.inject:javax.inject:${JAVAX_INJECT_VERSION}")
 
-    extractHeaders("com.facebook.fbjni:fbjni:${FBJNI_VERSION}:headers")
-    extractJNI("com.facebook.fbjni:fbjni:${FBJNI_VERSION}")
-
     // It's up to the consumer to decide if hermes should be included or not.
     // Therefore hermes-engine is a compileOnly dependency.
     compileOnly(project(":ReactAndroid:hermes-engine"))
@@ -419,67 +656,24 @@ react {
     root = file("..")
     jsRootDir = file("../Libraries")
     reactNativeDir = file("$projectDir/..")
-    useJavaGenerator = System.getenv("USE_CODEGEN_JAVAPOET")?.toBoolean() ?: false
     // We search for the codegen in either one of the `node_modules` folder or in the
     // root packages folder (that's for when we build from source without calling `yarn install`).
     codegenDir = file(findNodeModulePath(projectDir, "react-native-codegen") ?: "../packages/react-native-codegen/")
 }
 
-afterEvaluate {
-    // Needed as some of the native sources needs to be downloaded
-    // before configureNdkBuildDebug could be executed.
-    reactNativeArchitectures().each { architecture ->
-        tasks.findByName("configureCMakeDebug[${architecture}]")?.configure { dependsOn(preBuild) }
-        tasks.findByName("configureCMakeRelWithDebInfo[${architecture}]")?.configure { dependsOn(preBuild) }
-    }
-    configureCMakeDebug.dependsOn(preBuild)
-    configureCMakeRelWithDebInfo.dependsOn(preBuild)
+apply plugin: "org.jetbrains.kotlin.android"
 
-    publishing {
-        publications {
-            release(MavenPublication) {
-                // We do a multi variant release
-                from components.default
-
-                // You can then customize attributes of the publication as shown below.
-                artifactId = POM_ARTIFACT_ID
-                groupId = GROUP
-                version = VERSION_NAME
-
-                pom {
-                    name = POM_NAME
-                    description = "A framework for building native apps with React"
-                    url = "https://github.com/facebook/react-native"
-
-                    developers {
-                        developer {
-                            id = "facebook"
-                            name = "Facebook"
-                        }
-                    }
-
-                    licenses {
-                        license {
-                            name = "MIT License"
-                            url = "https://github.com/facebook/react-native/blob/HEAD/LICENSE"
-                            distribution = "repo"
-                        }
-                    }
-
-                    scm {
-                        url = "https://github.com/facebook/react-native.git"
-                        connection = "scm:git:https://github.com/facebook/react-native.git"
-                        developerConnection = "scm:git:git@github.com:facebook/react-native.git"
-                    }
-                }
-            }
-        }
+/* Publishing Configuration */
+apply from: "./publish.gradle"
 
-        repositories {
-            maven {
-                name = "npm"
-                url = AAR_OUTPUT_URL
-            }
+// We need to override the artifact ID as this project is called `ReactAndroid` but
+// 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-android'
         }
     }
 }
diff --git a/ReactAndroid/cmake-utils/Android-prebuilt.cmake b/ReactAndroid/cmake-utils/Android-prebuilt.cmake
deleted file mode 100644
index 03be4be02aa8..000000000000
--- a/ReactAndroid/cmake-utils/Android-prebuilt.cmake
+++ /dev/null
@@ -1,231 +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.
-
-# This configuration provides access to most common React Native prebuilt .so files
-# to avoid recompiling each of the libraries outside of ReactAndroid NDK compilation.
-# Hosting app's/library's CMakeLists.txt can include this Android-prebuilt.cmake file to
-# get access to those libraries to depend on.
-# NOTES:
-# * Currently, it assumes building React Native from source.
-# * Not every .so is listed here (yet).
-# * Static libs are not covered here (yet).
-
-cmake_minimum_required(VERSION 3.13)
-set(CMAKE_VERBOSE_MAKEFILE on)
-
-# FIRST_PARTY_NDK_DIR contains vendored source code from other FB frameworks
-# like Yoga, FBJNI, etc.
-set(FIRST_PARTY_NDK_DIR ${REACT_ANDROID_DIR}/src/main/jni/first-party)
-# THIRD_PARTY_NDK_DIR is where we're downloading third-party native
-# frameworks such as libevent, boost, etc.
-set(THIRD_PARTY_NDK_DIR ${REACT_ANDROID_BUILD_DIR}/third-party-ndk)
-# REACT_ANDROID_SRC_DIR is the root of ReactAndroid source code (Java & JNI)
-set(REACT_ANDROID_SRC_DIR ${REACT_ANDROID_DIR}/src/main)
-# REACT_COMMON_DIR is the root of ReactCommon source code (C++ only)
-set(REACT_COMMON_DIR ${REACT_ANDROID_DIR}/../ReactCommon)
-# REACT_GENERATED_SRC_DIR is the folder where the codegen for rncore will output
-set(REACT_GENERATED_SRC_DIR ${REACT_ANDROID_BUILD_DIR}/generated/source)
-# REACT_NDK_EXPORT_DIR is the folder where the .so will be copied for being inported
-# in the local project by the packageReactDebugNdkLibs/packageReactReleaseNdkLibs
-set(REACT_NDK_EXPORT_DIR ${PROJECT_BUILD_DIR}/react-ndk/exported)
-
-## fb
-add_library(fb SHARED IMPORTED GLOBAL)
-set_target_properties(fb
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libfb.so)
-target_include_directories(fb
-        INTERFACE
-        ${FIRST_PARTY_NDK_DIR}/fb/include)
-
-## folly_runtime
-add_library(folly_runtime SHARED IMPORTED GLOBAL)
-set_target_properties(folly_runtime
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libfolly_runtime.so)
-target_include_directories(folly_runtime
-        INTERFACE
-        ${THIRD_PARTY_NDK_DIR}/boost/boost_1_76_0
-        ${THIRD_PARTY_NDK_DIR}/double-conversion
-        ${THIRD_PARTY_NDK_DIR}/folly)
-target_compile_options(folly_runtime
-        INTERFACE
-        -DFOLLY_NO_CONFIG=1
-        -DFOLLY_HAVE_CLOCK_GETTIME=1
-        -DFOLLY_HAVE_MEMRCHR=1
-        -DFOLLY_USE_LIBCPP=1
-        -DFOLLY_MOBILE=1
-        -DFOLLY_HAVE_XSI_STRERROR_R=1)
-
-## glog
-add_library(glog SHARED IMPORTED GLOBAL)
-set_target_properties(glog
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libglog.so)
-target_include_directories(glog INTERFACE ${THIRD_PARTY_NDK_DIR}/glog/exported)
-
-## yoga
-add_library(yoga SHARED IMPORTED GLOBAL)
-set_target_properties(yoga
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libyoga.so)
-target_include_directories(yoga
-        INTERFACE
-        ${FIRST_PARTY_NDK_DIR}/yogajni/jni
-        ${REACT_COMMON_DIR}/yoga)
-target_compile_options(yoga
-        INTERFACE
-        -fvisibility=hidden
-        -fexceptions
-        -frtti
-        -O3)
-target_link_libraries(yoga INTERFACE log android)
-
-## react_nativemodule_core
-add_library(react_nativemodule_core SHARED IMPORTED GLOBAL)
-set_target_properties(react_nativemodule_core
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_nativemodule_core.so)
-target_include_directories(react_nativemodule_core
-        INTERFACE
-        ${REACT_ANDROID_SRC_DIR}/jni
-        ${REACT_COMMON_DIR}
-        ${REACT_COMMON_DIR}/callinvoker
-        ${REACT_COMMON_DIR}/jsi
-        ${REACT_COMMON_DIR}/react/nativemodule/core
-        ${REACT_COMMON_DIR}/react/nativemodule/core/platform/android)
-target_link_libraries(react_nativemodule_core INTERFACE folly_runtime)
-
-## turbomodulejsijni
-add_library(turbomodulejsijni SHARED IMPORTED GLOBAL)
-set_target_properties(turbomodulejsijni
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libturbomodulejsijni.so)
-target_include_directories(turbomodulejsijni
-        INTERFACE
-        ${REACT_ANDROID_SRC_DIR}/java/com/facebook/react/turbomodule/core/jni)
-
-## react_render_core
-add_library(react_render_core SHARED IMPORTED GLOBAL)
-set_target_properties(react_render_core
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_core.so)
-target_include_directories(react_render_core
-        INTERFACE
-        ${REACT_COMMON_DIR}
-        ${REACT_COMMON_DIR}/react/renderer/core)
-
-## react_render_debug
-add_library(react_render_debug SHARED IMPORTED GLOBAL)
-set_target_properties(react_render_debug
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_debug.so)
-target_include_directories(react_render_debug INTERFACE ${REACT_COMMON_DIR}/react/renderer/debug)
-
-## react_debug
-add_library(react_debug SHARED IMPORTED GLOBAL)
-set_target_properties(react_debug
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_debug.so)
-target_include_directories(react_debug INTERFACE ${REACT_COMMON_DIR}/react/debug)
-target_link_libraries(react_nativemodule_core INTERFACE folly_runtime)
-
-## react_render_graphics
-add_library(react_render_graphics SHARED IMPORTED GLOBAL)
-set_target_properties(react_render_graphics
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_graphics.so)
-target_include_directories(react_render_graphics
-        INTERFACE
-        ${REACT_COMMON_DIR}/react/renderer/graphics
-        ${REACT_COMMON_DIR}/react/renderer/graphics/platform/cxx)
-
-## react_render_imagemanager
-add_library(react_render_imagemanager SHARED IMPORTED GLOBAL)
-set_target_properties(react_render_imagemanager
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_imagemanager.so)
-target_include_directories(react_render_imagemanager
-        INTERFACE
-        ${REACT_COMMON_DIR}/react/renderer/imagemanager
-        ${REACT_COMMON_DIR}/react/renderer/imagemanager/platform/cxx)
-
-## react_render_mounting
-add_library(react_render_mounting SHARED IMPORTED GLOBAL)
-set_target_properties(react_render_mounting
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_mounting.so)
-target_include_directories(react_render_mounting INTERFACE ${REACT_COMMON_DIR}/react/renderer/mounting)
-
-## react_render_mapbuffer
-add_library(react_render_mapbuffer SHARED IMPORTED GLOBAL)
-set_target_properties(react_render_mapbuffer
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_mapbuffer.so)
-target_include_directories(react_render_mapbuffer INTERFACE ${REACT_COMMON_DIR}/react/renderer/mapbuffer)
-
-## rrc_view
-add_library(rrc_view SHARED IMPORTED GLOBAL)
-set_target_properties(rrc_view
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/librrc_view.so)
-target_include_directories(rrc_view INTERFACE ${REACT_COMMON_DIR}/react/renderer/components/view)
-
-## fabricjni
-add_library(fabricjni SHARED IMPORTED GLOBAL)
-set_target_properties(fabricjni
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libfabricjni.so)
-target_include_directories(fabricjni INTERFACE ${REACT_ANDROID_SRC_DIR}/java/com/facebook/react/fabric/jni)
-
-## react_render_componentregistry
-add_library(react_render_componentregistry SHARED IMPORTED GLOBAL)
-set_target_properties(react_render_componentregistry
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_componentregistry.so)
-target_include_directories(react_render_componentregistry INTERFACE ${REACT_COMMON_DIR}/react/renderer/componentregistry)
-
-## jsi
-add_library(jsi SHARED IMPORTED GLOBAL)
-set_target_properties(jsi
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libjsi.so)
-target_include_directories(jsi INTERFACE ${REACT_COMMON_DIR}/jsi)
-
-## react_codegen_rncore
-add_library(react_codegen_rncore SHARED IMPORTED GLOBAL)
-set_target_properties(react_codegen_rncore
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_codegen_rncore.so)
-target_include_directories(react_codegen_rncore INTERFACE ${REACT_GENERATED_SRC_DIR}/codegen/jni)
-
-## runtimeexecutor
-add_library(runtimeexecutor SHARED IMPORTED GLOBAL)
-set_target_properties(runtimeexecutor
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libruntimeexecutor.so)
-target_include_directories(runtimeexecutor INTERFACE ${REACT_COMMON_DIR}/runtimeexecutor)
-
-## fbjni
-add_subdirectory(${FIRST_PARTY_NDK_DIR}/fbjni fbjni_build)
diff --git a/ReactAndroid/cmake-utils/ReactNative-application.cmake b/ReactAndroid/cmake-utils/ReactNative-application.cmake
index a002d664389f..fe3a8ca6f79a 100644
--- a/ReactAndroid/cmake-utils/ReactNative-application.cmake
+++ b/ReactAndroid/cmake-utils/ReactNative-application.cmake
@@ -12,45 +12,108 @@
 # - Include all the pre-built libraries in your build graph
 # - Link your library against those prebuilt libraries so you can access JSI, Fabric, etc.
 # - Link your library against any autolinked library.
+# - Make sure ccache is used as part of the compilation process, if you have it installed.
 
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-include(${REACT_ANDROID_DIR}/cmake-utils/Android-prebuilt.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/folly-flags.cmake)
 
-file(GLOB input_SRC CONFIGURE_DEPENDS 
+# We configured the REACT_COMMON_DIR variable as it's commonly used to reference
+# shared C++ code in other targets.
+set(REACT_COMMON_DIR ${REACT_ANDROID_DIR}/../ReactCommon)
+
+# If you have ccache installed, we're going to honor it.
+find_program(CCACHE_FOUND ccache)
+if(CCACHE_FOUND)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+endif(CCACHE_FOUND)
+
+set(BUILD_DIR ${PROJECT_BUILD_DIR})
+if(CMAKE_HOST_WIN32)
+        string(REPLACE "\\" "/" BUILD_DIR ${BUILD_DIR})
+endif()
+
+file(GLOB input_SRC CONFIGURE_DEPENDS
         *.cpp
-        ${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni/*.cpp)
+        ${BUILD_DIR}/generated/rncli/src/main/jni/*.cpp)
 
 add_library(${CMAKE_PROJECT_NAME} SHARED ${input_SRC})
 
-target_include_directories(${CMAKE_PROJECT_NAME} 
-        PUBLIC 
+target_include_directories(${CMAKE_PROJECT_NAME}
+        PUBLIC
                 ${CMAKE_CURRENT_SOURCE_DIR}
                 ${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni)
 
 target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -Wall -Werror -fexceptions -frtti -std=c++17 -DWITH_INSPECTOR=1 -DLOG_TAG=\"ReactNative\")
 
+# Prefab packages from React Native
+find_package(ReactAndroid REQUIRED CONFIG)
+add_library(react_render_debug ALIAS ReactAndroid::react_render_debug)
+add_library(turbomodulejsijni ALIAS ReactAndroid::turbomodulejsijni)
+add_library(runtimeexecutor ALIAS ReactAndroid::runtimeexecutor)
+add_library(react_codegen_rncore ALIAS ReactAndroid::react_codegen_rncore)
+add_library(react_debug ALIAS ReactAndroid::react_debug)
+add_library(react_render_componentregistry ALIAS ReactAndroid::react_render_componentregistry)
+add_library(react_newarchdefaults ALIAS ReactAndroid::react_newarchdefaults)
+add_library(react_render_core ALIAS ReactAndroid::react_render_core)
+add_library(react_render_graphics ALIAS ReactAndroid::react_render_graphics)
+add_library(rrc_view ALIAS ReactAndroid::rrc_view)
+add_library(jsi ALIAS ReactAndroid::jsi)
+add_library(glog ALIAS ReactAndroid::glog)
+add_library(fabricjni ALIAS ReactAndroid::fabricjni)
+add_library(react_render_mapbuffer ALIAS ReactAndroid::react_render_mapbuffer)
+add_library(yoga ALIAS ReactAndroid::yoga)
+add_library(folly_runtime ALIAS ReactAndroid::folly_runtime)
+add_library(react_nativemodule_core ALIAS ReactAndroid::react_nativemodule_core)
+add_library(react_render_imagemanager ALIAS ReactAndroid::react_render_imagemanager)
+add_library(rrc_image ALIAS ReactAndroid::rrc_image)
+
+find_package(fbjni REQUIRED CONFIG)
+add_library(fbjni ALIAS fbjni::fbjni)
+
 target_link_libraries(${CMAKE_PROJECT_NAME}
-        fabricjni
-        fbjni
-        folly_runtime
-        glog
-        jsi
-        react_codegen_rncore
-        react_debug
-        react_nativemodule_core
-        react_render_componentregistry
-        react_render_core
-        react_render_debug
-        react_render_graphics
-        rrc_view
-        runtimeexecutor
-        turbomodulejsijni
-        yoga)
+        fabricjni                           # prefab ready
+        fbjni                               # via 3rd party prefab
+        folly_runtime                       # prefab ready
+        glog                                # prefab ready
+        jsi                                 # prefab ready
+        react_codegen_rncore                # prefab ready
+        react_debug                         # prefab ready
+        react_nativemodule_core             # prefab ready
+        react_newarchdefaults               # prefab ready
+        react_render_componentregistry      # prefab ready
+        react_render_core                   # prefab ready
+        react_render_debug                  # prefab ready
+        react_render_graphics               # prefab ready
+        react_render_imagemanager           # prefab ready
+        react_render_mapbuffer              # prefab ready
+        rrc_image                           # prefab ready
+        rrc_view                            # prefab ready
+        runtimeexecutor                     # prefab ready
+        turbomodulejsijni                   # prefab ready
+        yoga)                               # prefab ready
+
+# We use an interface target to propagate flags to all the generated targets
+# such as the folly flags or others.
+add_library(common_flags INTERFACE)
+target_compile_options(common_flags INTERFACE ${folly_FLAGS})
+target_link_libraries(ReactAndroid::react_codegen_rncore INTERFACE common_flags)
 
 # If project is on RN CLI v9, then we can use the following lines to link against the autolinked 3rd party libraries.
 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)
+        endforeach()
+endif()
+
+# If project is running codegen at the app level, we want to link and build the generated library.
+if(EXISTS ${PROJECT_BUILD_DIR}/generated/source/codegen/jni/CMakeLists.txt)
+        add_subdirectory(${PROJECT_BUILD_DIR}/generated/source/codegen/jni/ codegen_app_build)
+        get_property(APP_CODEGEN_TARGET DIRECTORY ${PROJECT_BUILD_DIR}/generated/source/codegen/jni/ PROPERTY BUILDSYSTEM_TARGETS)
+        target_link_libraries(${CMAKE_PROJECT_NAME} ${APP_CODEGEN_TARGET})
+        target_link_libraries(${APP_CODEGEN_TARGET} common_flags)
 endif()
diff --git a/ReactAndroid/cmake-utils/default-app-setup/CMakeLists.txt b/ReactAndroid/cmake-utils/default-app-setup/CMakeLists.txt
new file mode 100644
index 000000000000..975567131ea4
--- /dev/null
+++ b/ReactAndroid/cmake-utils/default-app-setup/CMakeLists.txt
@@ -0,0 +1,31 @@
+# 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.
+
+# This CMake file is the default used by apps and is placed inside react-native
+# to encapsulate it from user space (so you won't need to touch C++/Cmake code at all on Android).
+#
+# If you wish to customize it (because you want to manually link a C++ library or pass a custom
+# compilation flag) you can:
+#
+# 1. Copy this CMake file inside the `android/app/src/main/jni` folder of your project
+# 2. Copy the OnLoad.cpp (in this same folder) file inside the same folder as above.
+# 3. Extend your `android/app/build.gradle` as follows
+#
+# android {
+#    // Other config here...
+#    externalNativeBuild {
+#        cmake {
+#            path "src/main/jni/CMakeLists.txt"
+#        }
+#    }
+# }
+
+cmake_minimum_required(VERSION 3.13)
+
+# Define the library name here.
+project(appmodules)
+
+# This file includes all the necessary to let you build your application with the New Architecture.
+include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake)
diff --git a/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp b/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp
new file mode 100644
index 000000000000..5e7df8b86bc0
--- /dev/null
+++ b/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp
@@ -0,0 +1,88 @@
+/*
+ * 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.
+ */
+
+// This C++ file is part of the default configuration used by apps and is placed
+// inside react-native to encapsulate it from user space (so you won't need to
+// touch C++/Cmake code at all on Android).
+//
+// If you wish to customize it (because you want to manually link a C++ library
+// or pass a custom compilation flag) you can:
+//
+// 1. Copy this CMake file inside the `android/app/src/main/jni` folder of your
+// project
+// 2. Copy the OnLoad.cpp (in this same folder) file inside the same folder as
+// above.
+// 3. Extend your `android/app/build.gradle` as follows
+//
+// android {
+//    // Other config here...
+//    externalNativeBuild {
+//        cmake {
+//            path "src/main/jni/CMakeLists.txt"
+//        }
+//    }
+// }
+
+#include <DefaultComponentsRegistry.h>
+#include <DefaultTurboModuleManagerDelegate.h>
+#include <fbjni/fbjni.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <rncli.h>
+
+namespace facebook {
+namespace react {
+
+void registerComponents(
+    std::shared_ptr<ComponentDescriptorProviderRegistry const> registry) {
+  // Custom Fabric Components go here. You can register custom
+  // components coming from your App or from 3rd party libraries here.
+  //
+  // providerRegistry->add(concreteComponentDescriptorProvider<
+  //        AocViewerComponentDescriptor>());
+
+  // By default we just use the components autolinked by RN CLI
+  rncli_registerProviders(registry);
+}
+
+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
+  // either your application or from external libraries. The approach to follow
+  // is similar to the following (for a library called `samplelibrary`):
+  //
+  // auto module = samplelibrary_ModuleProvider(moduleName, params);
+  // if (module != nullptr) {
+  //    return module;
+  // }
+  // return rncore_ModuleProvider(moduleName, params);
+
+  // By default we just use the module providers autolinked by RN CLI
+  return rncli_ModuleProvider(name, params);
+}
+
+} // namespace react
+} // namespace facebook
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+  return facebook::jni::initialize(vm, [] {
+    facebook::react::DefaultTurboModuleManagerDelegate::cxxModuleProvider =
+        &facebook::react::cxxModuleProvider;
+    facebook::react::DefaultTurboModuleManagerDelegate::javaModuleProvider =
+        &facebook::react::javaModuleProvider;
+    facebook::react::DefaultComponentsRegistry::
+        registerComponentDescriptorsFromEntryPoint =
+            &facebook::react::registerComponents;
+  });
+}
diff --git a/ReactAndroid/cmake-utils/folly-flags.cmake b/ReactAndroid/cmake-utils/folly-flags.cmake
new file mode 100644
index 000000000000..510196a8ce74
--- /dev/null
+++ b/ReactAndroid/cmake-utils/folly-flags.cmake
@@ -0,0 +1,22 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+# This CMake file exposes the Folly Flags that all the libraries should use when
+# compiling/linking against a dependency which requires folly.
+
+SET(folly_FLAGS
+        -DFOLLY_NO_CONFIG=1
+        -DFOLLY_HAVE_CLOCK_GETTIME=1
+        -DFOLLY_USE_LIBCPP=1
+        -DFOLLY_MOBILE=1
+        -DFOLLY_HAVE_RECVMMSG=1
+        -DFOLLY_HAVE_PTHREAD=1
+        # Once we target android-23 above, we can comment
+        # the following line. NDK uses GNU style stderror_r() after API 23.
+        -DFOLLY_HAVE_XSI_STRERROR_R=1
+        )
\ No newline at end of file
diff --git a/ReactAndroid/external-artifacts/.npmignore b/ReactAndroid/external-artifacts/.npmignore
new file mode 100644
index 000000000000..a4154094f9a9
--- /dev/null
+++ b/ReactAndroid/external-artifacts/.npmignore
@@ -0,0 +1,3 @@
+# Make sure we never publish the build and artifacts folders to npm.
+build/
+artifacts/
diff --git a/ReactAndroid/external-artifacts/build.gradle b/ReactAndroid/external-artifacts/build.gradle
new file mode 100644
index 000000000000..743ca9e22ede
--- /dev/null
+++ b/ReactAndroid/external-artifacts/build.gradle
@@ -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.
+ */
+
+plugins {
+    id("maven-publish")
+}
+
+group = "com.facebook.react"
+version = parent.publishing_version
+configurations.maybeCreate("default")
+
+// Those artifacts should be placed inside the `artifacts/hermes-ios-*.tar.gz` location.
+def hermesiOSDebugArtifactFile = layout.projectDirectory.file('artifacts/hermes-ios-debug.tar.gz')
+def hermesiOSDebugArtifact = artifacts.add('default', hermesiOSDebugArtifactFile) {
+    type 'tgz'
+    extension 'tar.gz'
+    classifier 'hermes-ios-debug'
+}
+def hermesiOSReleaseArtifactFile = layout.projectDirectory.file('artifacts/hermes-ios-release.tar.gz')
+def hermesiOSReleaseArtifact = artifacts.add('default', hermesiOSReleaseArtifactFile) {
+    type 'tgz'
+    extension 'tar.gz'
+    classifier 'hermes-ios-release'
+}
+
+
+apply from: "../publish.gradle"
+
+publishing {
+    publications {
+        getByName("release") {
+            artifactId 'react-native-artifacts'
+            artifact hermesiOSDebugArtifact
+            artifact hermesiOSReleaseArtifact
+        }
+    }
+}
diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index 1a612aec2ccc..78f371716745 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -1,28 +1,25 @@
-VERSION_NAME=1000.0.0-main
+VERSION_NAME=0.71.0-rc.5
 GROUP=com.facebook.react
 
-POM_NAME=ReactNative
-POM_ARTIFACT_ID=react-native
-POM_PACKAGING=aar
-
 # JVM Versions
-ASSERTJ_VERSION=3.21.0
-ANDROIDX_TEST_VERSION=1.1.0
 ANDROIDX_APPCOMPAT_VERSION=1.4.1
 ANDROIDX_AUTOFILL_VERSION=1.1.0
-FBJNI_VERSION=0.2.2
+ANDROIDX_TEST_VERSION=1.1.0
+ANDROIDX_TRACING_VERSION=1.1.0
+ASSERTJ_VERSION=3.21.0
+FBJNI_VERSION=0.3.0
 FRESCO_VERSION=2.5.0
 INFER_ANNOTATIONS_VERSION=0.18.0
 JAVAX_INJECT_VERSION=1
 JSR305_VERSION=3.0.2
 JUNIT_VERSION=4.12
 MOCKITO_CORE_VERSION=2.26.0
-OKIO_VERSION=2.9.0
 OKHTTP_VERSION=4.9.2
+OKIO_VERSION=2.9.0
 POWERMOCK_VERSION=2.0.2
 PROGUARD_ANNOTATIONS_VERSION=1.19.0
 ROBOLECTRIC_VERSION=4.4
-SO_LOADER_VERSION=0.10.3
+SO_LOADER_VERSION=0.10.4
 SWIPEREFRESH_LAYOUT_VERSION=1.0.0
 
 # Native Dependency Versions
@@ -33,5 +30,8 @@ FOLLY_VERSION=2021.07.22.00
 GLOG_VERSION=0.3.5
 LIBEVENT_VERSION=2.1.12
 
+# Plugins Versions
+KOTLIN_VERSION=1.6.10
+
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/ReactAndroid/hermes-engine/build.gradle b/ReactAndroid/hermes-engine/build.gradle
index ab79d88004af..760aaef0d573 100644
--- a/ReactAndroid/hermes-engine/build.gradle
+++ b/ReactAndroid/hermes-engine/build.gradle
@@ -11,6 +11,7 @@ plugins {
     id("de.undercouch.download")
     id("com.android.library")
     id("maven-publish")
+    id("signing")
 }
 
 group = "com.facebook.react"
@@ -56,10 +57,6 @@ def skipPrefabPublishing = System.getenv("REACT_NATIVE_HERMES_SKIP_PREFAB") != n
 // We inject the JSI directory used inside the Hermes build with the -DJSI_DIR config.
 def jsiDir = new File(reactNativeRootDir, "ReactCommon/jsi")
 
-// The .aar is placed inside the ./android folder at the top level.
-// There it will be placed alongside the React Android .aar
-def AAR_OUTPUT_URL = "file://${rootDir}/android"
-
 task downloadHermes(type: Download) {
     src("https://github.com/facebook/hermes/tarball/${hermesVersion}")
     onlyIfNewer(true)
@@ -86,7 +83,7 @@ task unzipHermes(dependsOn: downloadHermes, type: Copy) {
 
 task configureBuildForHermes(type: Exec) {
     workingDir(hermesDir)
-    commandLine(windowsAwareCommandLine(findCmakePath(cmakeVersion), "-S", ".", "-B", hermesBuildDir.toString(), "-DJSI_DIR=" + jsiDir.absolutePath))
+    commandLine(windowsAwareCommandLine(findCmakePath(cmakeVersion), Os.isFamily(Os.FAMILY_WINDOWS) ? "-GNMake Makefiles" : "", "-S", ".", "-B", hermesBuildDir.toString(), "-DJSI_DIR=" + jsiDir.absolutePath))
 }
 
 task buildHermes(dependsOn: configureBuildForHermes, type: Exec) {
@@ -198,8 +195,8 @@ android {
     }
 
     dependencies {
-        implementation("com.facebook.fbjni:fbjni:0.2.2")
-        implementation("com.facebook.soloader:soloader:0.10.3")
+        implementation("com.facebook.fbjni:fbjni:0.3.0")
+        implementation("com.facebook.soloader:soloader:0.10.4")
         implementation("com.facebook.yoga:proguard-annotations:1.19.0")
         implementation("androidx.annotation:annotation:1.3.0")
     }
@@ -234,27 +231,20 @@ afterEvaluate {
     }
     preBuild.dependsOn(buildHermes)
     preBuild.dependsOn(prepareHeadersForPrefab)
-    // Needed as some of the native sources needs to be downloaded
-    // before configureCMakeRelease/configureCMakeMinSizeRel could be executed.
-    reactNativeArchitectures().each { architecture ->
-        tasks.findByName("configureCMakeMinSizeRel[${architecture}]")?.configure { dependsOn(preBuild) }
-        tasks.findByName("configureCMakeRelease[${architecture}]")?.configure { dependsOn(preBuild) }
-    }
-    configureCMakeRelease.dependsOn(preBuild)
-    configureCMakeMinSizeRel.dependsOn(preBuild)
+    prepareHeadersForPrefab.dependsOn(buildHermes)
+}
 
-    publishing {
-        publications {
-            release(MavenPublication) {
-                from components.default
-                artifactId = "hermes-engine"
-            }
-        }
-        repositories {
-            maven {
-                name = "npm"
-                url = AAR_OUTPUT_URL
-            }
+/* 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'
         }
     }
 }
diff --git a/ReactAndroid/publish.gradle b/ReactAndroid/publish.gradle
new file mode 100644
index 000000000000..637a0074663b
--- /dev/null
+++ b/ReactAndroid/publish.gradle
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+def isNightly = findProperty("isNightly")?.toBoolean()
+def signingKey = findProperty("SIGNING_KEY")
+def signingPwd = findProperty("SIGNING_PWD")
+
+def reactAndroidProjectDir = project(':ReactAndroid').projectDir
+def androidOutputUrl = "file://${reactAndroidProjectDir}/../android"
+def mavenTempLocalUrl = "file:///tmp/maven-local"
+
+publishing {
+    publications {
+        release(MavenPublication) {
+            afterEvaluate {
+                // We do a multi variant release, so for Android libraries
+                // we publish `components.release`
+                if (plugins.hasPlugin("com.android.library")) {
+                    from components.default
+                }
+            }
+
+            // We populate the publishing version using the project version,
+            // appending -SNAPSHOT if on nightly.
+            if (isNightly) {
+                version = this.version + "-SNAPSHOT"
+            } else {
+                version = this.version
+            }
+
+            pom {
+                name = "react-native"
+                description = "A framework for building native apps with React"
+                url = "https://github.com/facebook/react-native"
+
+                developers {
+                    developer {
+                        id = "facebook"
+                        name = "Facebook"
+                    }
+                }
+
+                licenses {
+                    license {
+                        name = "MIT License"
+                        url = "https://github.com/facebook/react-native/blob/HEAD/LICENSE"
+                        distribution = "repo"
+                    }
+                }
+
+                scm {
+                    url = "https://github.com/facebook/react-native.git"
+                    connection = "scm:git:https://github.com/facebook/react-native.git"
+                    developerConnection = "scm:git:git@github.com:facebook/react-native.git"
+                }
+            }
+        }
+    }
+
+    repositories {
+        maven {
+            name = "npm"
+            url = androidOutputUrl
+        }
+        maven {
+            name = "mavenTempLocal"
+            url = mavenTempLocalUrl
+        }
+    }
+
+    if (signingKey && signingPwd) {
+        logger.info("PGP Key found - Signing enabled")
+        signing {
+            useInMemoryPgpKeys(signingKey, signingPwd)
+            sign(publishing.publications.release)
+        }
+    } else {
+        logger.info("Signing disabled as the PGP key was not found")
+    }
+}
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
index 6fd26eed8584..b26a35bdc136 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK
@@ -10,7 +10,6 @@ rn_android_library(
         ],
     ),
     autoglob = False,
-    is_androidx = True,
     language = "JAVA",
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
index cbfd829e308e..3823068318f1 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK
@@ -4,7 +4,6 @@ rn_android_library(
     name = "idledetection",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     language = "JAVA",
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK
index 1c47fcf935cf..5572ae6a5561 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK
index b5ee34ece706..5cd084b3b8b1 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK
@@ -11,7 +11,6 @@ rn_android_library(
     name = "rule",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     language = "JAVA",
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
index 9fddb2d16baa..5b08ffe862f6 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
@@ -4,7 +4,6 @@ rn_android_library(
     name = "tests",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     language = "JAVA",
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/IdTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/IdTestCase.java
new file mode 100644
index 000000000000..7cc93cf4ed67
--- /dev/null
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/IdTestCase.java
@@ -0,0 +1,88 @@
+/*
+ * 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.tests;
+
+import android.view.View;
+import com.facebook.react.testing.ReactAppInstrumentationTestCase;
+import com.facebook.react.uimanager.util.ReactFindViewUtil;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Tests that the 'id' property can be set on various views. The 'id' property is used to reference
+ * react managed views from native code.
+ */
+public class IdTestCase extends ReactAppInstrumentationTestCase {
+
+  @Override
+  protected String getReactApplicationKeyUnderTest() {
+    return "IdTestApp";
+  }
+
+  private final List<String> viewTags =
+      Arrays.asList(
+          "Image",
+          "Text",
+          "TouchableBounce",
+          "TouchableHighlight",
+          "TouchableOpacity",
+          "TouchableWithoutFeedback",
+          "TextInput",
+          "View");
+
+  private boolean mViewFound;
+
+  @Override
+  protected void setUp() throws Exception {
+    mViewFound = false;
+    ReactFindViewUtil.addViewListener(
+        new ReactFindViewUtil.OnViewFoundListener() {
+          @Override
+          public String getNativeId() {
+            return viewTags.get(0);
+          }
+
+          @Override
+          public void onViewFound(View view) {
+            mViewFound = true;
+          }
+        });
+    super.setUp();
+  }
+
+  public void testPropertyIsSetForViews() {
+    for (String nativeId : viewTags) {
+      View viewWithTag = ReactFindViewUtil.findView(getActivity().getRootView(), nativeId);
+      assertNotNull(
+          "View with id " + nativeId + " was not found. Check IdTestModule.js.", viewWithTag);
+    }
+  }
+
+  public void testViewListener() {
+    assertTrue("OnViewFound callback was never invoked", mViewFound);
+  }
+
+  public void testFindView() {
+    mViewFound = false;
+    ReactFindViewUtil.findView(
+        getActivity().getRootView(),
+        new ReactFindViewUtil.OnViewFoundListener() {
+          @Override
+          public String getNativeId() {
+            return viewTags.get(0);
+          }
+
+          @Override
+          public void onViewFound(View view) {
+            mViewFound = true;
+          }
+        });
+    assertTrue(
+        "OnViewFound callback should have successfully been invoked synchronously", mViewFound);
+  }
+}
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
index b4b3aaa7b4b5..f58bd22b301b 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
@@ -232,12 +232,12 @@ public void run() {
 
   private void fireEditorActionAndCheckRecording(
       final ReactEditText reactEditText, final int actionId) throws Throwable {
-    fireEditorActionAndCheckRecording(reactEditText, actionId, true);
-    fireEditorActionAndCheckRecording(reactEditText, actionId, false);
+    fireEditorActionAndCheckRecording(reactEditText, actionId, "blurAndSubmit");
+    fireEditorActionAndCheckRecording(reactEditText, actionId, "newline");
   }
 
   private void fireEditorActionAndCheckRecording(
-      final ReactEditText reactEditText, final int actionId, final boolean blurOnSubmit)
+      final ReactEditText reactEditText, final int actionId, final String submitBehavior)
       throws Throwable {
     mRecordingModule.reset();
 
@@ -246,14 +246,14 @@ private void fireEditorActionAndCheckRecording(
           @Override
           public void run() {
             reactEditText.requestFocusFromJS();
-            reactEditText.setBlurOnSubmit(blurOnSubmit);
+            reactEditText.setSubmitBehavior(submitBehavior);
             reactEditText.onEditorAction(actionId);
           }
         });
     waitForBridgeAndUIIdle();
 
     assertEquals(1, mRecordingModule.getCalls().size());
-    assertEquals(!blurOnSubmit, reactEditText.isFocused());
+    assertEquals(!submitBehavior.equals("blurAndSubmit"), reactEditText.isFocused());
   }
 
   /**
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK
index 8ad673708e44..7689d9ff3106 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK
@@ -11,7 +11,6 @@ rn_android_library(
     name = "core",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     language = "JAVA",
     deps = [
         react_native_dep("third-party/android/androidx:test-espresso-core"),
diff --git a/ReactAndroid/src/androidTest/js/BUCK b/ReactAndroid/src/androidTest/js/BUCK
index 18f3ee4411e1..c7b68b546819 100644
--- a/ReactAndroid/src/androidTest/js/BUCK
+++ b/ReactAndroid/src/androidTest/js/BUCK
@@ -18,7 +18,6 @@ rn_library(
     ),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.tests",
     ],
     skip_processors = True,
     visibility = ["PUBLIC"],
diff --git a/ReactAndroid/src/androidTest/js/IdTestModule.js b/ReactAndroid/src/androidTest/js/IdTestModule.js
new file mode 100644
index 000000000000..278670f35274
--- /dev/null
+++ b/ReactAndroid/src/androidTest/js/IdTestModule.js
@@ -0,0 +1,76 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+const React = require('react');
+const TouchableBounce = require('react-native/Libraries/Components/Touchable/TouchableBounce');
+
+const {
+  Image,
+  StyleSheet,
+  Text,
+  TextInput,
+  TouchableHighlight,
+  TouchableOpacity,
+  TouchableWithoutFeedback,
+  View,
+} = require('react-native');
+
+/**
+ * All the views implemented on Android, each with the id property set.
+ * We test that:
+ * - The app renders fine
+ * - The id property is passed to the native views via the nativeID property
+ */
+class IdTestApp extends React.Component<{...}> {
+  render(): React.Node {
+    const uri =
+      'data:image/gif;base64,' +
+      'R0lGODdhMAAwAPAAAAAAAP///ywAAAAAMAAwAAAC8IyPqcvt3wCcDkiLc7C0qwyGHhSWpjQu5yqmCYsapy' +
+      'uvUUlvONmOZtfzgFzByTB10QgxOR0TqBQejhRNzOfkVJ+5YiUqrXF5Y5lKh/DeuNcP5yLWGsEbtLiOSpa/' +
+      'TPg7JpJHxyendzWTBfX0cxOnKPjgBzi4diinWGdkF8kjdfnycQZXZeYGejmJlZeGl9i2icVqaNVailT6F5' +
+      'iJ90m6mvuTS4OK05M0vDk0Q4XUtwvKOzrcd3iq9uisF81M1OIcR7lEewwcLp7tuNNkM3uNna3F2JQFo97V' +
+      'riy/Xl4/f1cf5VWzXyym7PHhhx4dbgYKAAA7';
+    return (
+      <View>
+        <Image id="Image" source={{uri: uri}} style={styles.base} />
+        <Text id="Text">text</Text>
+        <TextInput id="TextInput" value="Text input" />
+        <TouchableBounce id="TouchableBounce">
+          <Text>TouchableBounce</Text>
+        </TouchableBounce>
+        <TouchableHighlight id="TouchableHighlight">
+          <Text>TouchableHighlight</Text>
+        </TouchableHighlight>
+        <TouchableOpacity id="TouchableOpacity">
+          <Text>TouchableOpacity</Text>
+        </TouchableOpacity>
+        <TouchableWithoutFeedback id="TouchableWithoutFeedback">
+          <View>
+            <Text>TouchableWithoutFeedback</Text>
+          </View>
+        </TouchableWithoutFeedback>
+        <View id="View" />
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  base: {
+    width: 150,
+    height: 50,
+  },
+});
+
+module.exports = {
+  IdTestApp,
+};
diff --git a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
index 50a8b3c8bfa3..4808118ed894 100644
--- a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
+++ b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
@@ -43,7 +43,7 @@ type ItemProps = $ReadOnly<{|
 type ItemState = {||};
 
 class Item extends React.Component<ItemProps, ItemState> {
-  render() {
+  render(): React.Node {
     return (
       <TouchableWithoutFeedback onPress={this.props.onPress}>
         <View style={styles.item_container}>
diff --git a/ReactAndroid/src/androidTest/js/TestApps.js b/ReactAndroid/src/androidTest/js/TestApps.js
index 4659e2c4f863..208b6cdf91eb 100644
--- a/ReactAndroid/src/androidTest/js/TestApps.js
+++ b/ReactAndroid/src/androidTest/js/TestApps.js
@@ -48,6 +48,10 @@ const apps = [
     component: () =>
       require('./ScrollViewTestModule').HorizontalScrollViewTestApp,
   },
+  {
+    appKey: 'IdTestApp',
+    component: () => require('./IdTestModule').IdTestApp,
+  },
   {
     appKey: 'ImageOverlayColorTestApp',
     component: () => require('./ImageOverlayColorTestApp'),
diff --git a/ReactAndroid/src/androidTest/js/UIManagerTestModule.js b/ReactAndroid/src/androidTest/js/UIManagerTestModule.js
index e51d10721ed8..9433f36b7865 100644
--- a/ReactAndroid/src/androidTest/js/UIManagerTestModule.js
+++ b/ReactAndroid/src/androidTest/js/UIManagerTestModule.js
@@ -10,17 +10,16 @@
 
 'use strict';
 
-const BatchedBridge = require('react-native/Libraries/BatchedBridge/BatchedBridge');
-const React = require('react');
-
-const renderApplication = require('react-native/Libraries/ReactNative/renderApplication');
-
-const {StyleSheet, Text, View} = require('react-native');
 import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes';
 
+import * as React from 'react';
+import {StyleSheet, Text, View} from 'react-native';
+import BatchedBridge from 'react-native/Libraries/BatchedBridge/BatchedBridge';
+import renderApplication from 'react-native/Libraries/ReactNative/renderApplication';
+
 type FlexTestAppProps = $ReadOnly<{||}>;
 class FlexTestApp extends React.Component<FlexTestAppProps> {
-  render() {
+  render(): React.Node {
     return (
       <View
         style={FlexTestAppStyles.container}
@@ -58,7 +57,7 @@ const FlexTestAppStyles = StyleSheet.create({
 
 type FlexWithTextProps = $ReadOnly<{||}>;
 class FlexWithText extends React.Component<FlexWithTextProps> {
-  render() {
+  render(): React.Node {
     return (
       <View
         style={FlexWithTextStyles.container}
@@ -91,7 +90,7 @@ const FlexWithTextStyles = StyleSheet.create({
 
 type AbsolutePositionTestAppProps = $ReadOnly<{||}>;
 class AbsolutePositionTestApp extends React.Component<AbsolutePositionTestAppProps> {
-  render() {
+  render(): React.Node {
     return (
       <View
         style={AbsolutePositionTestAppStyles.absolute}
@@ -114,7 +113,7 @@ const AbsolutePositionTestAppStyles = StyleSheet.create({
 
 type AbsolutePositionBottomRightTestAppProps = $ReadOnly<{||}>;
 class AbsolutePositionBottomRightTestApp extends React.Component<AbsolutePositionBottomRightTestAppProps> {
-  render() {
+  render(): React.Node {
     return (
       <View
         style={AbsolutePositionBottomRightTestAppStyles.container}
@@ -147,7 +146,7 @@ type CenteredTextViewProps = $ReadOnly<{|
   text?: ?string,
 |}>;
 class CenteredTextView extends React.Component<CenteredTextViewProps> {
-  render() {
+  render(): React.Node {
     return (
       <View collapsable={false}>
         <View style={CenteredTextViewStyles.parent} collapsable={false}>
@@ -184,7 +183,7 @@ class UpdatePositionInListTestApp extends React.Component<
   UpdatePositionInListTestAppProps,
   UpdatePositionInListTestAppState,
 > {
-  state = {
+  state: UpdatePositionInListTestAppState = {
     active: false,
   };
 
@@ -195,7 +194,7 @@ class UpdatePositionInListTestApp extends React.Component<
     flushUpdatePositionInList = () => this.setState({active: true});
   }
 
-  render() {
+  render(): React.Node {
     return (
       <View collapsable={false} testID="container">
         <View
@@ -267,4 +266,4 @@ BatchedBridge.registerCallableModule(
   UIManagerTestModule,
 );
 
-module.exports = UIManagerTestModule;
+export default UIManagerTestModule;
diff --git a/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK b/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK
index 4d169957ed77..0b84d1574011 100644
--- a/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK b/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK
index bf5b66f40937..407456dfcddf 100644
--- a/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK
index b6c37f2ccb5d..ece68a4cdd3c 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK
@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "react_native_dep", "react_native_target", "react_native_xplat_dep", "rn_android_library", "rn_xplat_cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "instrumentation",
@@ -16,7 +16,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = ["PUBLIC"],
@@ -24,33 +23,6 @@ rn_android_library(
         react_native_dep("java/com/facebook/proguard/annotations:annotations"),
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
         react_native_dep("libraries/fbjni:java"),
-        ":jni_hermes_samplingprofiler",
-    ],
-)
-
-rn_xplat_cxx_library(
-    name = "jni_hermes_samplingprofiler",
-    srcs = [
-        "HermesSamplingProfiler.cpp",
-        "OnLoad.cpp",
-    ],
-    headers = ["HermesSamplingProfiler.h"],
-    header_namespace = "",
-    compiler_flags_enable_exceptions = True,  # TODO: is this necessary?
-    compiler_flags_enable_rtti = True,  # TODO: is this necessary?
-    fbandroid_allow_jni_merging = True,
-    labels = [
-        "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
-    ],
-    platforms = ANDROID,
-    soname = "libjsijniprofiler.$(ext)",
-    visibility = [
-        react_native_dep("java/com/facebook/jsi:jsi"),
-    ],
-    deps = [
-        react_native_target("jni/react/jni:jni"),
-        FBJNI_TARGET,
-        react_native_xplat_dep("hermes/API:HermesAPI"),
+        react_native_target("jni/react/hermes/instrumentation:jni_hermes_samplingprofiler"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK
index 766186174250..2c954374c38d 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK
@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library", "rn_xplat_cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "reactexecutor",
@@ -17,7 +17,8 @@ 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"),
-        ":jni",
+        react_native_target("java/com/facebook/react/common:common"),
+        react_native_target("jni/react/hermes/reactexecutor:jni"),
         ":runtimeconfig",
     ],
 )
@@ -37,23 +38,3 @@ rn_android_library(
         react_native_target("java/com/facebook/hermes/instrumentation:instrumentation"),
     ],
 )
-
-rn_xplat_cxx_library(
-    name = "jni-interface",
-    srcs = [],
-    header_namespace = "hermes/reactexecutor",
-    exported_headers = glob(["*.h"]),
-    visibility = ["PUBLIC"],
-)
-
-rn_xplat_cxx_library(
-    name = "jni",
-    srcs = ["OnLoad.cpp"],
-    headers = [],
-    header_namespace = "",
-    compiler_flags = ["-fexceptions"],
-    soname = "libhermes-executor.$(ext)",
-    visibility = [
-        react_native_target("java/com/facebook/hermes/reactexecutor:reactexecutor"),
-    ],
-)
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutor.java b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutor.java
index a9a474510fbe..b0e4f24d10d9 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutor.java
@@ -9,6 +9,7 @@
 
 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,18 +24,21 @@ public static void loadLibrary() throws UnsatisfiedLinkError {
     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";
       }
     }
   }
 
-  HermesExecutor(@Nullable RuntimeConfig config) {
-    super(config == null ? initHybridDefaultConfig() : initHybrid(config.heapSizeMB));
+  HermesExecutor(@Nullable RuntimeConfig config, boolean enableDebugger, String debuggerName) {
+    super(
+        config == null
+            ? initHybridDefaultConfig(enableDebugger, debuggerName)
+            : initHybrid(enableDebugger, debuggerName, config.heapSizeMB));
   }
 
   @Override
@@ -51,7 +55,9 @@ public String getName() {
    */
   public static native boolean canLoadFile(String path);
 
-  private static native HybridData initHybridDefaultConfig();
+  private static native HybridData initHybridDefaultConfig(
+      boolean enableDebugger, String debuggerName);
 
-  private static native HybridData initHybrid(long heapSizeMB);
+  private static native HybridData initHybrid(
+      boolean enableDebugger, String debuggerName, long heapSizeMB);
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutorFactory.java b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutorFactory.java
index 944afe6b6456..a51d5825a268 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutorFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutorFactory.java
@@ -15,6 +15,8 @@ public class HermesExecutorFactory implements JavaScriptExecutorFactory {
   private static final String TAG = "Hermes";
 
   private final RuntimeConfig mConfig;
+  private boolean mEnableDebugger = true;
+  private String mDebuggerName = "";
 
   public HermesExecutorFactory() {
     this(null);
@@ -24,9 +26,17 @@ public HermesExecutorFactory(RuntimeConfig config) {
     mConfig = config;
   }
 
+  public void setEnableDebugger(boolean enableDebugger) {
+    mEnableDebugger = enableDebugger;
+  }
+
+  public void setDebuggerName(String debuggerName) {
+    mDebuggerName = debuggerName;
+  }
+
   @Override
   public JavaScriptExecutor create() {
-    return new HermesExecutor(mConfig);
+    return new HermesExecutor(mConfig, mEnableDebugger, mDebuggerName);
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/BUCK b/ReactAndroid/src/main/java/com/facebook/react/BUCK
index 7425996b563c..dd21088699da 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "react",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
index 700577ae4512..464346b06880 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
@@ -32,7 +32,6 @@
 import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.modules.systeminfo.AndroidInfoModule;
 import com.facebook.react.turbomodule.core.interfaces.TurboModule;
-import com.facebook.react.uimanager.UIImplementationProvider;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.uimanager.ViewManagerResolver;
@@ -70,7 +69,6 @@ public class CoreModulesPackage extends TurboReactPackage implements ReactPackag
   public CoreModulesPackage(
       ReactInstanceManager reactInstanceManager,
       DefaultHardwareBackBtnHandler hardwareBackBtnHandler,
-      @Nullable UIImplementationProvider uiImplementationProvider,
       boolean lazyViewManagersEnabled,
       int minTimeLeftInFrameForNonBatchedOperationMs) {
     mReactInstanceManager = reactInstanceManager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/JSEngineResolutionAlgorithm.java b/ReactAndroid/src/main/java/com/facebook/react/JSEngineResolutionAlgorithm.java
new file mode 100644
index 000000000000..7f33bc78c5a5
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/JSEngineResolutionAlgorithm.java
@@ -0,0 +1,18 @@
+/*
+ * 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;
+
+/**
+ * An enum that specifies the algorithm to use when loading theJS Engine. {@link #JSC} will load
+ * JavaScriptCore first and fail if it is not available. {@link #HERMES} will load Hermes first and
+ * fail if it is not available.
+ */
+public enum JSEngineResolutionAlgorithm {
+  JSC,
+  HERMES
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/JSInterpreter.java b/ReactAndroid/src/main/java/com/facebook/react/JSInterpreter.java
deleted file mode 100644
index 7e960263cc55..000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/JSInterpreter.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react;
-
-/**
- * An enum that specifies the JS Engine to be used in the app Old Logic uses the legacy code
- * JSC/HERMES loads the respective engine using the revamped logic
- */
-public enum JSInterpreter {
-  OLD_LOGIC,
-  JSC,
-  HERMES
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index 67120d27bde0..6e7a9af39bd1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -99,7 +99,6 @@
 import com.facebook.react.turbomodule.core.interfaces.TurboModuleRegistry;
 import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.ReactRoot;
-import com.facebook.react.uimanager.UIImplementationProvider;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper;
@@ -225,7 +224,6 @@ public static ReactInstanceManagerBuilder builder() {
       boolean requireActivity,
       @Nullable NotThreadSafeBridgeIdleDebugListener bridgeIdleDebugListener,
       LifecycleState initialLifecycleState,
-      @Nullable UIImplementationProvider mUIImplementationProvider,
       JSExceptionHandler jSExceptionHandler,
       @Nullable RedBoxHandler redBoxHandler,
       boolean lazyViewManagersEnabled,
@@ -282,7 +280,6 @@ public void invokeDefaultOnBackPressed() {
                   ReactInstanceManager.this.invokeDefaultOnBackPressed();
                 }
               },
-              mUIImplementationProvider,
               lazyViewManagersEnabled,
               minTimeLeftInFrameForNonBatchedOperationMs));
       if (mUseDeveloperSupport) {
@@ -964,39 +961,43 @@ public List<ViewManager> getOrCreateViewManagers(
 
   public Collection<String> getViewManagerNames() {
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstanceManager.getViewManagerNames");
-    Collection<String> viewManagerNames = mViewManagerNames;
-    if (viewManagerNames != null) {
-      return viewManagerNames;
-    }
-    ReactApplicationContext context;
-    synchronized (mReactContextLock) {
-      context = (ReactApplicationContext) getCurrentReactContext();
-      if (context == null || !context.hasActiveReactInstance()) {
-        return Collections.emptyList();
+    try {
+      Collection<String> viewManagerNames = mViewManagerNames;
+      if (viewManagerNames != null) {
+        return viewManagerNames;
+      }
+      ReactApplicationContext context;
+      synchronized (mReactContextLock) {
+        context = (ReactApplicationContext) getCurrentReactContext();
+        if (context == null || !context.hasActiveReactInstance()) {
+          FLog.w(ReactConstants.TAG, "Calling getViewManagerNames without active context");
+          return Collections.emptyList();
+        }
       }
-    }
 
-    synchronized (mPackages) {
-      if (mViewManagerNames == null) {
-        Set<String> uniqueNames = new HashSet<>();
-        for (ReactPackage reactPackage : mPackages) {
-          SystraceMessage.beginSection(
-                  TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstanceManager.getViewManagerName")
-              .arg("Package", reactPackage.getClass().getSimpleName())
-              .flush();
-          if (reactPackage instanceof ViewManagerOnDemandReactPackage) {
-            Collection<String> names =
-                ((ViewManagerOnDemandReactPackage) reactPackage).getViewManagerNames(context);
-            if (names != null) {
-              uniqueNames.addAll(names);
+      synchronized (mPackages) {
+        if (mViewManagerNames == null) {
+          Set<String> uniqueNames = new HashSet<>();
+          for (ReactPackage reactPackage : mPackages) {
+            SystraceMessage.beginSection(
+                    TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstanceManager.getViewManagerName")
+                .arg("Package", reactPackage.getClass().getSimpleName())
+                .flush();
+            if (reactPackage instanceof ViewManagerOnDemandReactPackage) {
+              Collection<String> names =
+                  ((ViewManagerOnDemandReactPackage) reactPackage).getViewManagerNames(context);
+              if (names != null) {
+                uniqueNames.addAll(names);
+              }
             }
+            Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
           }
-          SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
+          mViewManagerNames = uniqueNames;
         }
-        Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
-        mViewManagerNames = uniqueNames;
+        return mViewManagerNames;
       }
-      return mViewManagerNames;
+    } finally {
+      Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
     }
   }
 
@@ -1260,7 +1261,6 @@ private void attachRootViewToInstance(final ReactRoot reactRoot) {
                   : Arguments.fromBundle(initialProperties),
               reactRoot.getWidthMeasureSpec(),
               reactRoot.getHeightMeasureSpec());
-      reactRoot.setRootViewTag(rootTag);
       reactRoot.setShouldLogContentAppeared(true);
     } else {
       rootTag =
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
index 1ac1c2f09130..68ac1ed63451 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
@@ -14,6 +14,7 @@
 import android.app.Application;
 import android.content.Context;
 import androidx.annotation.Nullable;
+import com.facebook.common.logging.FLog;
 import com.facebook.hermes.reactexecutor.HermesExecutor;
 import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
 import com.facebook.infer.annotation.Assertions;
@@ -33,7 +34,6 @@
 import com.facebook.react.jscexecutor.JSCExecutorFactory;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.packagerconnection.RequestHandler;
-import com.facebook.react.uimanager.UIImplementationProvider;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -41,6 +41,8 @@
 /** Builder class for {@link ReactInstanceManager} */
 public class ReactInstanceManagerBuilder {
 
+  private static final String TAG = ReactInstanceManagerBuilder.class.getSimpleName();
+
   private final List<ReactPackage> mPackages = new ArrayList<>();
 
   private @Nullable String mJSBundleAssetUrl;
@@ -52,7 +54,6 @@ public class ReactInstanceManagerBuilder {
   private @Nullable DevSupportManagerFactory mDevSupportManagerFactory;
   private boolean mRequireActivity;
   private @Nullable LifecycleState mInitialLifecycleState;
-  private @Nullable UIImplementationProvider mUIImplementationProvider;
   private @Nullable JSExceptionHandler mJSExceptionHandler;
   private @Nullable Activity mCurrentActivity;
   private @Nullable DefaultHardwareBackBtnHandler mDefaultHardwareBackBtnHandler;
@@ -66,17 +67,10 @@ public class ReactInstanceManagerBuilder {
   private @Nullable Map<String, RequestHandler> mCustomPackagerCommandHandlers;
   private @Nullable ReactPackageTurboModuleManagerDelegate.Builder mTMMDelegateBuilder;
   private @Nullable SurfaceDelegateFactory mSurfaceDelegateFactory;
-  private JSInterpreter jsInterpreter = JSInterpreter.OLD_LOGIC;
+  private JSEngineResolutionAlgorithm jsEngineResolutionAlgorithm = null;
 
   /* package protected */ ReactInstanceManagerBuilder() {}
 
-  /** Sets a provider of {@link UIImplementation}. Uses default provider if null is passed. */
-  public ReactInstanceManagerBuilder setUIImplementationProvider(
-      @Nullable UIImplementationProvider uiImplementationProvider) {
-    mUIImplementationProvider = uiImplementationProvider;
-    return this;
-  }
-
   public ReactInstanceManagerBuilder setJSIModulesPackage(
       @Nullable JSIModulePackage jsiModulePackage) {
     mJSIModulesPackage = jsiModulePackage;
@@ -127,28 +121,12 @@ public ReactInstanceManagerBuilder setJSBundleLoader(JSBundleLoader jsBundleLoad
   }
 
   /**
-   * Sets the jsEngine as JSC or HERMES as per the setJsEngineAsHermes call Uses the enum {@link
-   * JSInterpreter}
-   *
-   * @param jsInterpreter
+   * Sets the JS Engine to load as either Hermes or JSC. If not set, the default is JSC with a
+   * Hermes fallback.
    */
-  private void setJSEngine(JSInterpreter jsInterpreter) {
-    this.jsInterpreter = jsInterpreter;
-  }
-
-  /**
-   * Utility setter to set the required JSEngine as HERMES or JSC Defaults to OLD_LOGIC if not
-   * called by the host app
-   *
-   * @param hermesEnabled hermesEnabled = true sets the JS Engine as HERMES and JSC otherwise
-   */
-  public ReactInstanceManagerBuilder setJsEngineAsHermes(boolean hermesEnabled) {
-    if (hermesEnabled) {
-      setJSEngine(JSInterpreter.HERMES);
-    } else {
-      setJSEngine(JSInterpreter.JSC);
-    }
-    return this;
+  private void setJSEngineResolutionAlgorithm(
+      @Nullable JSEngineResolutionAlgorithm jsEngineResolutionAlgorithm) {
+    this.jsEngineResolutionAlgorithm = jsEngineResolutionAlgorithm;
   }
 
   /**
@@ -325,11 +303,6 @@ public ReactInstanceManager build() {
         mJSMainModulePath != null || mJSBundleAssetUrl != null || mJSBundleLoader != null,
         "Either MainModulePath or JS Bundle File needs to be provided");
 
-    if (mUIImplementationProvider == null) {
-      // create default UIImplementationProvider if the provided one is null.
-      mUIImplementationProvider = new UIImplementationProvider();
-    }
-
     // We use the name of the device and the app for debugging & metrics
     //noinspection ConstantConditions
     String appName = mApplication.getPackageName();
@@ -355,7 +328,6 @@ public ReactInstanceManager build() {
         mRequireActivity,
         mBridgeIdleDebugListener,
         Assertions.assertNotNull(mInitialLifecycleState, "Initial lifecycle state was not set"),
-        mUIImplementationProvider,
         mJSExceptionHandler,
         mRedBoxHandler,
         mLazyViewManagersEnabled,
@@ -380,7 +352,11 @@ private JavaScriptExecutorFactory getDefaultJSExecutorFactory(
 
     // if nothing is specified, use old loading method
     // else load the required engine
-    if (jsInterpreter == JSInterpreter.OLD_LOGIC) {
+    if (jsEngineResolutionAlgorithm == null) {
+      FLog.w(
+          TAG,
+          "You're not setting the JS Engine Resolution Algorithm. "
+              + "We'll try to load JSC first, and if it fails we'll fallback to Hermes");
       try {
         // If JSC is included, use it as normal
         initializeSoLoaderIfNecessary(applicationContext);
@@ -393,7 +369,7 @@ private JavaScriptExecutorFactory getDefaultJSExecutorFactory(
         HermesExecutor.loadLibrary();
         return new HermesExecutorFactory();
       }
-    } else if (jsInterpreter == JSInterpreter.HERMES) {
+    } else if (jsEngineResolutionAlgorithm == JSEngineResolutionAlgorithm.HERMES) {
       HermesExecutor.loadLibrary();
       return new HermesExecutorFactory();
     } else {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
index ac27d16dc2ea..d030019b0353 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
@@ -19,7 +19,6 @@
 import com.facebook.react.common.SurfaceDelegateFactory;
 import com.facebook.react.devsupport.DevSupportManagerFactory;
 import com.facebook.react.devsupport.interfaces.RedBoxHandler;
-import com.facebook.react.uimanager.UIImplementationProvider;
 import java.util.List;
 
 /**
@@ -77,7 +76,6 @@ protected ReactInstanceManager createReactInstanceManager() {
             .setLazyViewManagersEnabled(getLazyViewManagersEnabled())
             .setRedBoxHandler(getRedBoxHandler())
             .setJavaScriptExecutorFactory(getJavaScriptExecutorFactory())
-            .setUIImplementationProvider(getUIImplementationProvider())
             .setJSIModulesPackage(getJSIModulePackage())
             .setInitialLifecycleState(LifecycleState.BEFORE_CREATE)
             .setReactPackageTurboModuleManagerDelegateBuilder(
@@ -117,16 +115,6 @@ protected final Application getApplication() {
     return mApplication;
   }
 
-  /**
-   * Get the {@link UIImplementationProvider} to use. Override this method if you want to use a
-   * custom UI implementation.
-   *
-   * <p>Note: this is very advanced functionality, in 99% of cases you don't need to override this.
-   */
-  protected UIImplementationProvider getUIImplementationProvider() {
-    return new UIImplementationProvider();
-  }
-
   protected @Nullable JSIModulePackage getJSIModulePackage() {
     return null;
   }
@@ -202,4 +190,12 @@ protected String getJSMainModuleName() {
    * default ones, you'll want to include more packages here.
    */
   protected abstract List<ReactPackage> getPackages();
+
+  /**
+   * Returns the {@link JSEngineResolutionAlgorithm} to be used when loading the JS engine. If null,
+   * will try to load JSC first and fallback to Hermes if JSC is not available.
+   */
+  protected @Nullable JSEngineResolutionAlgorithm getJSEngineResolutionAlgorithm() {
+    return null;
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
index f746f398f7ce..e0c37c31a24e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -12,6 +12,7 @@
 import static com.facebook.react.uimanager.common.UIManagerType.FABRIC;
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
 
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Point;
@@ -31,6 +32,9 @@
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.graphics.Insets;
+import androidx.core.view.WindowInsetsCompat;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.ThreadConfined;
@@ -58,6 +62,7 @@
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactClippingProhibitedView;
 import com.facebook.react.uimanager.ReactRoot;
+import com.facebook.react.uimanager.ReactRootViewTagGenerator;
 import com.facebook.react.uimanager.RootView;
 import com.facebook.react.uimanager.RootViewUtil;
 import com.facebook.react.uimanager.UIManagerHelper;
@@ -127,6 +132,7 @@ public ReactRootView(Context context, AttributeSet attrs, int defStyle) {
   }
 
   private void init() {
+    setRootViewTag(ReactRootViewTagGenerator.getNextRootViewTag());
     setClipChildren(false);
   }
 
@@ -770,7 +776,11 @@ public void runApplication() {
 
   @VisibleForTesting
   /* package */ void simulateCheckForKeyboardForTesting() {
-    getCustomGlobalLayoutListener().checkForKeyboardEvents();
+    if (Build.VERSION.SDK_INT >= 23) {
+      getCustomGlobalLayoutListener().checkForKeyboardEvents();
+    } else {
+      getCustomGlobalLayoutListener().checkForKeyboardEventsLegacy();
+    }
   }
 
   private CustomGlobalLayoutListener getCustomGlobalLayoutListener() {
@@ -879,7 +889,8 @@ private class CustomGlobalLayoutListener implements ViewTreeObserver.OnGlobalLay
     private final Rect mVisibleViewArea;
     private final int mMinKeyboardHeightDetected;
 
-    private int mKeyboardHeight = 0;
+    private boolean mKeyboardIsVisible = false;
+    private int mKeyboardHeight = 0; // Only used in checkForKeyboardEventsLegacy path
     private int mDeviceRotation = 0;
 
     /* package */ CustomGlobalLayoutListener() {
@@ -895,13 +906,62 @@ public void onGlobalLayout() {
           || mReactInstanceManager.getCurrentReactContext() == null) {
         return;
       }
-      checkForKeyboardEvents();
+
+      // WindowInsetsCompat IME measurement is reliable for API level 23+.
+      // https://developer.android.com/jetpack/androidx/releases/core#1.5.0-alpha02
+      if (Build.VERSION.SDK_INT >= 23) {
+        checkForKeyboardEvents();
+      } else {
+        checkForKeyboardEventsLegacy();
+      }
+
       checkForDeviceOrientationChanges();
       checkForDeviceDimensionsChanges();
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.M)
     private void checkForKeyboardEvents() {
       getRootView().getWindowVisibleDisplayFrame(mVisibleViewArea);
+      WindowInsets rootInsets = getRootView().getRootWindowInsets();
+      WindowInsetsCompat compatRootInsets = WindowInsetsCompat.toWindowInsetsCompat(rootInsets);
+
+      boolean keyboardIsVisible = compatRootInsets.isVisible(WindowInsetsCompat.Type.ime());
+      if (keyboardIsVisible != mKeyboardIsVisible) {
+        mKeyboardIsVisible = keyboardIsVisible;
+
+        if (keyboardIsVisible) {
+          Insets imeInsets = compatRootInsets.getInsets(WindowInsetsCompat.Type.ime());
+          Insets barInsets = compatRootInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+          int height = imeInsets.bottom - barInsets.bottom;
+
+          int softInputMode = ((Activity) getContext()).getWindow().getAttributes().softInputMode;
+          int screenY =
+              softInputMode == WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING
+                  ? mVisibleViewArea.bottom - height
+                  : mVisibleViewArea.bottom;
+
+          sendEvent(
+              "keyboardDidShow",
+              createKeyboardEventPayload(
+                  PixelUtil.toDIPFromPixel(screenY),
+                  PixelUtil.toDIPFromPixel(mVisibleViewArea.left),
+                  PixelUtil.toDIPFromPixel(mVisibleViewArea.width()),
+                  PixelUtil.toDIPFromPixel(height)));
+        } else {
+          sendEvent(
+              "keyboardDidHide",
+              createKeyboardEventPayload(
+                  PixelUtil.toDIPFromPixel(mLastHeight),
+                  0,
+                  PixelUtil.toDIPFromPixel(mVisibleViewArea.width()),
+                  0));
+        }
+      }
+    }
+
+    private void checkForKeyboardEventsLegacy() {
+      getRootView().getWindowVisibleDisplayFrame(mVisibleViewArea);
+
       int notchHeight = 0;
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
         WindowInsets insets = getRootView().getRootWindowInsets();
@@ -919,8 +979,10 @@ private void checkForKeyboardEvents() {
 
       boolean isKeyboardShowingOrKeyboardHeightChanged =
           mKeyboardHeight != heightDiff && heightDiff > mMinKeyboardHeightDetected;
+
       if (isKeyboardShowingOrKeyboardHeightChanged) {
         mKeyboardHeight = heightDiff;
+        mKeyboardIsVisible = true;
         sendEvent(
             "keyboardDidShow",
             createKeyboardEventPayload(
@@ -934,6 +996,7 @@ private void checkForKeyboardEvents() {
       boolean isKeyboardHidden = mKeyboardHeight != 0 && heightDiff <= mMinKeyboardHeightDetected;
       if (isKeyboardHidden) {
         mKeyboardHeight = 0;
+        mKeyboardIsVisible = false;
         sendEvent(
             "keyboardDidHide",
             createKeyboardEventPayload(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.java
index 0efffb9cff54..8dc8ba5471b8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.java
@@ -8,6 +8,7 @@
 package com.facebook.react;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ModuleHolder;
 import com.facebook.react.bridge.ModuleSpec;
 import com.facebook.react.bridge.NativeModule;
@@ -42,7 +43,8 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
    * @param reactContext
    * @return
    */
-  public abstract NativeModule getModule(String name, final ReactApplicationContext reactContext);
+  public abstract @Nullable NativeModule getModule(
+      String name, final ReactApplicationContext reactContext);
 
   /**
    * This is a temporary method till we implement TurboModules. Once we implement TurboModules, we
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
index dccd121b3e8a..247fccb64aae 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
@@ -6,10 +6,8 @@ rn_android_library(
         "*.java",
     ]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.java b/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.java
index fce99e38ba41..edc92c238c3b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.java
@@ -21,8 +21,13 @@
 /* package */ class EventAnimationDriver implements RCTEventEmitter {
   private List<String> mEventPath;
   /* package */ ValueAnimatedNode mValueNode;
+  /* package */ String mEventName;
+  /* package */ int mViewTag;
 
-  public EventAnimationDriver(List<String> eventPath, ValueAnimatedNode valueNode) {
+  public EventAnimationDriver(
+      String eventName, int viewTag, List<String> eventPath, ValueAnimatedNode valueNode) {
+    mEventName = eventName;
+    mViewTag = viewTag;
     mEventPath = eventPath;
     mValueNode = valueNode;
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
index f3b7e4e4040d..0f52b73c6162 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
@@ -25,7 +25,6 @@
 import com.facebook.react.bridge.UIManagerListener;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.annotations.VisibleForTesting;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
@@ -154,38 +153,21 @@ public long getBatchNumber() {
   private class ConcurrentOperationQueue {
     private final Queue<UIThreadOperation> mQueue = new ConcurrentLinkedQueue<>();
     @Nullable private UIThreadOperation mPeekedOperation = null;
-    private boolean mSynchronizedAccess = false;
 
     @AnyThread
     boolean isEmpty() {
       return mQueue.isEmpty() && mPeekedOperation == null;
     }
 
-    void setSynchronizedAccess(boolean isSynchronizedAccess) {
-      mSynchronizedAccess = isSynchronizedAccess;
-    }
-
     @AnyThread
     void add(UIThreadOperation operation) {
-      if (mSynchronizedAccess) {
-        synchronized (this) {
-          mQueue.add(operation);
-        }
-      } else {
-        mQueue.add(operation);
-      }
+      mQueue.add(operation);
     }
 
     @UiThread
     void executeBatch(long maxBatchNumber, NativeAnimatedNodesManager nodesManager) {
       List<UIThreadOperation> operations;
-      if (mSynchronizedAccess) {
-        synchronized (this) {
-          operations = drainQueueIntoList(maxBatchNumber);
-        }
-      } else {
-        operations = drainQueueIntoList(maxBatchNumber);
-      }
+      operations = drainQueueIntoList(maxBatchNumber);
       if (operations != null) {
         for (UIThreadOperation operation : operations) {
           operation.execute(nodesManager);
@@ -280,10 +262,6 @@ protected void doFrameGuarded(final long frameTimeNanos) {
             }
           }
         };
-
-    // If shipping this flag, make sure to migrate to non-concurrent queue for efficiency
-    mOperations.setSynchronizedAccess(ReactFeatureFlags.enableSynchronizationForAnimated);
-    mPreOperations.setSynchronizedAccess(ReactFeatureFlags.enableSynchronizationForAnimated);
   }
 
   @Override
@@ -871,7 +849,7 @@ public void disconnectAnimatedNodeFromView(
     if (ANIMATED_MODULE_DEBUG) {
       FLog.d(
           NAME,
-          "queue: disconnectAnimatedNodeFromView: " + animatedNodeTag + " viewTag: " + viewTag);
+          "queue disconnectAnimatedNodeFromView: " + animatedNodeTag + " viewTag: " + viewTag);
     }
 
     decrementInFlightAnimationsForViewTag(viewTag);
@@ -883,7 +861,7 @@ public void execute(NativeAnimatedNodesManager animatedNodesManager) {
             if (ANIMATED_MODULE_DEBUG) {
               FLog.d(
                   NAME,
-                  "execute: disconnectAnimatedNodeFromView: "
+                  "execute disconnectAnimatedNodeFromView: "
                       + animatedNodeTag
                       + " viewTag: "
                       + viewTag);
@@ -897,8 +875,7 @@ public void execute(NativeAnimatedNodesManager animatedNodesManager) {
   public void restoreDefaultValues(final double animatedNodeTagDouble) {
     final int animatedNodeTag = (int) animatedNodeTagDouble;
     if (ANIMATED_MODULE_DEBUG) {
-      FLog.d(
-          NAME, "queue restoreDefaultValues: disconnectAnimatedNodeFromView: " + animatedNodeTag);
+      FLog.d(NAME, "queue restoreDefaultValues: " + animatedNodeTag);
     }
 
     addPreOperation(
@@ -906,10 +883,7 @@ public void restoreDefaultValues(final double animatedNodeTagDouble) {
           @Override
           public void execute(NativeAnimatedNodesManager animatedNodesManager) {
             if (ANIMATED_MODULE_DEBUG) {
-              FLog.d(
-                  NAME,
-                  "execute restoreDefaultValues: disconnectAnimatedNodeFromView: "
-                      + animatedNodeTag);
+              FLog.d(NAME, "execute restoreDefaultValues: " + animatedNodeTag);
             }
             animatedNodesManager.restoreDefaultValues(animatedNodeTag);
           }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
index 9a6953529b4b..bb626bed0b2d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
@@ -31,11 +31,9 @@
 import com.facebook.react.uimanager.events.EventDispatcherListener;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
-import java.util.Map;
 import java.util.Queue;
 
 /**
@@ -58,9 +56,9 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
   private final SparseArray<AnimatedNode> mAnimatedNodes = new SparseArray<>();
   private final SparseArray<AnimationDriver> mActiveAnimations = new SparseArray<>();
   private final SparseArray<AnimatedNode> mUpdatedNodes = new SparseArray<>();
-  // Mapping of a view tag and an event name to a list of event animation drivers. 99% of the time
-  // there will be only one driver per mapping so all code code should be optimized around that.
-  private final Map<String, List<EventAnimationDriver>> mEventDrivers = new HashMap<>();
+  // List of event animation drivers for an event on view.
+  // There may be multiple drivers for the same event and view.
+  private final List<EventAnimationDriver> mEventDrivers = new ArrayList<>();
   private final ReactApplicationContext mReactApplicationContext;
   private int mAnimatedGraphBFSColor = 0;
   // Used to avoid allocating a new array on every frame in `runUpdates` and `onEventDispatch`.
@@ -501,7 +499,8 @@ public void restoreDefaultValues(int animatedNodeTag) {
   }
 
   @UiThread
-  public void addAnimatedEventToView(int viewTag, String eventName, ReadableMap eventMapping) {
+  public void addAnimatedEventToView(
+      int viewTag, String eventHandlerName, ReadableMap eventMapping) {
     int nodeTag = eventMapping.getInt("animatedValueTag");
     AnimatedNode node = mAnimatedNodes.get(nodeTag);
     if (node == null) {
@@ -512,8 +511,8 @@ public void addAnimatedEventToView(int viewTag, String eventName, ReadableMap ev
       throw new JSApplicationIllegalArgumentException(
           "addAnimatedEventToView: Animated node on view ["
               + viewTag
-              + "] connected to event ("
-              + eventName
+              + "] connected to event handler ("
+              + eventHandlerName
               + ") should be of type "
               + ValueAnimatedNode.class.getName());
     }
@@ -524,32 +523,27 @@ public void addAnimatedEventToView(int viewTag, String eventName, ReadableMap ev
       pathList.add(path.getString(i));
     }
 
-    EventAnimationDriver event = new EventAnimationDriver(pathList, (ValueAnimatedNode) node);
-    String key = viewTag + eventName;
-    if (mEventDrivers.containsKey(key)) {
-      mEventDrivers.get(key).add(event);
-    } else {
-      List<EventAnimationDriver> drivers = new ArrayList<>(1);
-      drivers.add(event);
-      mEventDrivers.put(key, drivers);
-    }
+    String eventName = normalizeEventName(eventHandlerName);
+
+    EventAnimationDriver eventDriver =
+        new EventAnimationDriver(eventName, viewTag, pathList, (ValueAnimatedNode) node);
+    mEventDrivers.add(eventDriver);
   }
 
   @UiThread
-  public void removeAnimatedEventFromView(int viewTag, String eventName, int animatedValueTag) {
-    String key = viewTag + eventName;
-    if (mEventDrivers.containsKey(key)) {
-      List<EventAnimationDriver> driversForKey = mEventDrivers.get(key);
-      if (driversForKey.size() == 1) {
-        mEventDrivers.remove(viewTag + eventName);
-      } else {
-        ListIterator<EventAnimationDriver> it = driversForKey.listIterator();
-        while (it.hasNext()) {
-          if (it.next().mValueNode.mTag == animatedValueTag) {
-            it.remove();
-            break;
-          }
-        }
+  public void removeAnimatedEventFromView(
+      int viewTag, String eventHandlerName, int animatedValueTag) {
+
+    String eventName = normalizeEventName(eventHandlerName);
+
+    ListIterator<EventAnimationDriver> it = mEventDrivers.listIterator();
+    while (it.hasNext()) {
+      EventAnimationDriver driver = it.next();
+      if (eventName.equals(driver.mEventName)
+          && viewTag == driver.mViewTag
+          && animatedValueTag == driver.mValueNode.mTag) {
+        it.remove();
+        break;
       }
     }
   }
@@ -585,18 +579,19 @@ private void handleEvent(Event event) {
       if (uiManager == null) {
         return;
       }
-      String eventName = uiManager.resolveCustomDirectEventName(event.getEventName());
-      if (eventName == null) {
-        eventName = "";
-      }
 
-      List<EventAnimationDriver> driversForKey = mEventDrivers.get(event.getViewTag() + eventName);
-      if (driversForKey != null) {
-        for (EventAnimationDriver driver : driversForKey) {
+      boolean foundAtLeastOneDriver = false;
+      Event.EventAnimationDriverMatchSpec matchSpec = event.getEventAnimationDriverMatchSpec();
+      for (EventAnimationDriver driver : mEventDrivers) {
+        if (matchSpec.match(driver.mViewTag, driver.mEventName)) {
+          foundAtLeastOneDriver = true;
           stopAnimationsForNode(driver.mValueNode);
           event.dispatch(driver);
           mRunUpdateNodeList.add(driver.mValueNode);
         }
+      }
+
+      if (foundAtLeastOneDriver) {
         updateNodes(mRunUpdateNodeList);
         mRunUpdateNodeList.clear();
       }
@@ -824,4 +819,14 @@ private void updateNodes(List<AnimatedNode> nodes) {
       mWarnedAboutGraphTraversal = false;
     }
   }
+
+  private String normalizeEventName(String eventHandlerName) {
+    // Fabric UIManager also makes this assumption
+    String eventName = eventHandlerName;
+    if (eventHandlerName.startsWith("on")) {
+      eventName = "top" + eventHandlerName.substring(2);
+    }
+
+    return eventName;
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
index 2e19dc700b11..b5dcea616336 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
@@ -21,10 +21,8 @@ rn_android_library(
         exclude = INTERFACES,
     ),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     proguard_config = "reactnative.pro",
@@ -71,10 +69,8 @@ rn_android_library(
     name = "interfaces",
     srcs = glob(INTERFACES),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     proguard_config = "reactnative.pro",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
index 50aedd434212..ad5fb6985f9d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
@@ -108,8 +108,7 @@ public String toString() {
   // C++ parts
   private final HybridData mHybridData;
 
-  private static native HybridData initHybrid(
-      boolean enableRuntimeScheduler, boolean enableRuntimeSchedulerInTurboModule);
+  private static native HybridData initHybrid();
 
   public native CallInvokerHolderImpl getJSCallInvokerHolder();
 
@@ -124,15 +123,7 @@ private CatalystInstanceImpl(
     FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge.");
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "createCatalystInstanceImpl");
 
-    if (ReactFeatureFlags.enableRuntimeSchedulerInTurboModule
-        && !ReactFeatureFlags.enableRuntimeScheduler) {
-      Assertions.assertUnreachable();
-    }
-
-    mHybridData =
-        initHybrid(
-            ReactFeatureFlags.enableRuntimeScheduler,
-            ReactFeatureFlags.enableRuntimeSchedulerInTurboModule);
+    mHybridData = initHybrid();
 
     mReactQueueConfiguration =
         ReactQueueConfigurationImpl.create(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCxxErrorHandler.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCxxErrorHandler.java
index a2646ebf74c4..484f18896f59 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCxxErrorHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCxxErrorHandler.java
@@ -32,7 +32,7 @@ private static void handleError(final String message) {
         parameters[0] = new Exception(message);
         mHandleErrorFunc.invoke(mObject, parameters);
       } catch (Exception e) {
-        FLog.e("ReactCxxErrorHandler", "Failed to invole error hanlder function", e);
+        FLog.e("ReactCxxErrorHandler", "Failed to invoke error handler function", e);
       }
     }
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK
index a654b44e727b..77d911b93b42 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK
@@ -12,10 +12,8 @@ rn_android_library(
         exclude = SUB_PROJECTS,
     ),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK
index daa264d3ba55..21e704ce9605 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK
@@ -7,10 +7,8 @@ rn_android_library(
         "*.kt",
     ]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "KOTLIN",
     provided_deps = [],
@@ -22,7 +20,7 @@ rn_android_library(
     deps = [
         FBJNI_TARGET,
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
-        react_native_target("java/com/facebook/react/common/mapbuffer/jni:jni"),
+        react_native_target("jni/react/mapbuffer:jni"),
         react_native_dep("libraries/fbjni:java"),
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/MapBuffer.kt b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/MapBuffer.kt
index db6f49de94d7..481dd409798f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/MapBuffer.kt
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/MapBuffer.kt
@@ -126,6 +126,16 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
    */
   fun getMapBuffer(key: Int): MapBuffer
 
+  /**
+   * Provides parsed [List<MapBuffer>] value if the entry for given key exists with [DataType.MAP]
+   * type
+   * @param key key to lookup [List<MapBuffer>] value for
+   * @return value associated with the requested key
+   * @throws IllegalArgumentException if the key doesn't exist
+   * @throws IllegalStateException if the data type doesn't match
+   */
+  fun getMapBufferList(key: Int): List<MapBuffer>
+
   /** Iterable entry representing parsed MapBuffer values */
   interface Entry {
     /**
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt
index c3143431d7aa..744a9ee15a55 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt
@@ -17,7 +17,7 @@ import javax.annotation.concurrent.NotThreadSafe
 
 /**
  * Read-only implementation of the [MapBuffer], imported from C++ environment. Use
- * `<react/common/mapbuffer/jni/JReadableMapBuffer.h> to create it.
+ * `<react/common/mapbuffer/JReadableMapBuffer.h> to create it.
  *
  * See [MapBuffer] documentation for more details
  */
@@ -137,6 +137,24 @@ class ReadableMapBuffer : MapBuffer {
     return ReadableMapBuffer(ByteBuffer.wrap(newBuffer))
   }
 
+  private fun readMapBufferListValue(position: Int): List<ReadableMapBuffer> {
+    val readMapBufferList = arrayListOf<ReadableMapBuffer>()
+    var offset = offsetForDynamicData + buffer.getInt(position)
+    val sizeMapBufferList = buffer.getInt(offset)
+    offset += Int.SIZE_BYTES
+    var curLen = 0
+    while (curLen < sizeMapBufferList) {
+      val sizeMapBuffer = buffer.getInt(offset + curLen)
+      val newMapBuffer = ByteArray(sizeMapBuffer)
+      curLen = curLen + Int.SIZE_BYTES
+      buffer.position(offset + curLen)
+      buffer[newMapBuffer, 0, sizeMapBuffer]
+      readMapBufferList.add(ReadableMapBuffer(ByteBuffer.wrap(newMapBuffer)))
+      curLen = curLen + sizeMapBuffer
+    }
+    return readMapBufferList
+  }
+
   private fun getKeyOffsetForBucketIndex(bucketIndex: Int): Int {
     return HEADER_SIZE + BUCKET_SIZE * bucketIndex
   }
@@ -172,6 +190,9 @@ class ReadableMapBuffer : MapBuffer {
   override fun getMapBuffer(key: Int): ReadableMapBuffer =
       readMapBufferValue(getTypedValueOffsetForKey(key, MapBuffer.DataType.MAP))
 
+  override fun getMapBufferList(key: Int): List<ReadableMapBuffer> =
+      readMapBufferListValue(getTypedValueOffsetForKey(key, MapBuffer.DataType.MAP))
+
   override fun hashCode(): Int {
     buffer.rewind()
     return buffer.hashCode()
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/WritableMapBuffer.kt b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/WritableMapBuffer.kt
index 7cc67f9e070c..bb27c26c1ef0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/WritableMapBuffer.kt
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/WritableMapBuffer.kt
@@ -106,6 +106,8 @@ class WritableMapBuffer : MapBuffer {
 
   override fun getMapBuffer(key: Int): MapBuffer = verifyValue(key, values.get(key))
 
+  override fun getMapBufferList(key: Int): List<MapBuffer> = verifyValue(key, values.get(key))
+
   /** Generalizes verification of the value types based on the requested type. */
   private inline fun <reified T> verifyValue(key: Int, value: Any?): T {
     require(value != null) { "Key not found: $key" }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK
index 6a5b37045b07..102eae06fefb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/BUCK b/ReactAndroid/src/main/java/com/facebook/react/config/BUCK
index 39a460931a7d..959e44f7c856 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/config/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/config/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
index a8a5264042ba..a4cf989ca750 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
@@ -37,6 +37,11 @@ public class ReactFeatureFlags {
    */
   public static boolean enableBridgelessArchitecture = false;
 
+  /**
+   * Does the bridgeless architecture log soft exceptions. Could be useful for tracking down issues.
+   */
+  public static volatile boolean enableBridgelessArchitectureSoftExceptions = false;
+
   /**
    * After TurboModules and Fabric are enabled, we need to ensure that the legacy NativeModule isn't
    * isn't used. So, turn this flag on to trigger warnings whenever the legacy NativeModule system
@@ -70,51 +75,23 @@ public class ReactFeatureFlags {
   /** This feature flag enables logs for Fabric */
   public static boolean enableFabricLogs = false;
 
-  public static boolean enableRuntimeScheduler = false;
-
-  public static boolean enableRuntimeSchedulerInTurboModule = false;
-
   /** Feature flag to configure eager attachment of the root view/initialisation of the JS code */
   public static boolean enableEagerRootViewAttachment = false;
 
-  /** Feature flag to configure synchronized queue access for Animated module */
-  public static boolean enableSynchronizationForAnimated = false;
+  /* Enables or disables MapBuffer use in Props infrastructure. */
+  public static boolean useMapBufferProps = false;
 
-  /** Enables or disables MapBuffer Serialization */
-  public static boolean mapBufferSerializationEnabled = false;
+  /** Enables or disables calculation of Transformed Frames */
+  public static boolean calculateTransformedFramesEnabled = false;
 
   /** Feature Flag to use overflowInset values provided by Yoga */
   public static boolean useOverflowInset = false;
 
-  public static boolean enableLockFreeEventDispatcher = false;
-
-  public static boolean enableAggressiveEventEmitterCleanup = false;
-
-  public static boolean insertZReorderBarriersOnViewGroupChildren = true;
-
-  /** Feature Flag for mitigatin concurrent root crashes */
-  public static boolean enableDelayedViewStateDeletion = false;
-
-  public static boolean disablePreallocationOnClone = false;
-
-  public static boolean shouldRememberAllocatedViews = false;
-  /**
-   * Feature Flag to control the size of the cache used by TextLayoutManager in Fabric. Used from
-   * JNI.
-   */
-  public static boolean enableLargeTextMeasureCache = true;
-
-  /** TODO: T113245006 Delete this flag. Enables caching of spannables for text */
-  public static boolean enableSpannableCache = false;
-
   public static boolean dispatchPointerEvents = false;
 
   /** Feature Flag to enable the pending event queue in fabric before mounting views */
   public static boolean enableFabricPendingEventQueue = false;
 
-  /** Feature Flag to control RN Android scrollEventThrottle prop. */
-  public static boolean enableScrollEventThrottle = false;
-
   /**
    * Feature flag that controls how turbo modules are exposed to JS
    *
@@ -143,4 +120,7 @@ public class ReactFeatureFlags {
 
   /** Temporary flag to allow execution of mount items up to 15ms earlier than normal. */
   public static boolean enableEarlyScheduledMountItemExecution = false;
+
+  // TODO (T136375139): Remove this once finish testing
+  public static boolean enableAtomicRegisterSegment = false;
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultComponentsRegistry.kt b/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultComponentsRegistry.kt
new file mode 100644
index 000000000000..131804140ee9
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultComponentsRegistry.kt
@@ -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.
+ */
+
+package com.facebook.react.defaults
+
+import com.facebook.jni.HybridData
+import com.facebook.proguard.annotations.DoNotStrip
+import com.facebook.react.fabric.ComponentFactory
+
+/**
+ * A utility class that provides users a ComponentRegistry they can customize with a C++
+ * implementation of its native methods.
+ *
+ * This class works together with the [DefaultNewArchitectureEntryPoint] and it's C++ implementation
+ * is hosted inside the React Native framework
+ */
+@DoNotStrip
+class DefaultComponentsRegistry
+@DoNotStrip
+private constructor(componentFactory: ComponentFactory) {
+
+  @DoNotStrip private val hybridData: HybridData = initHybrid(componentFactory)
+
+  @DoNotStrip private external fun initHybrid(componentFactory: ComponentFactory): HybridData
+
+  companion object {
+    @JvmStatic
+    @DoNotStrip
+    fun register(componentFactory: ComponentFactory) = DefaultComponentsRegistry(componentFactory)
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultJSIModulePackage.kt b/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultJSIModulePackage.kt
new file mode 100644
index 000000000000..de55e4bd0507
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultJSIModulePackage.kt
@@ -0,0 +1,58 @@
+/*
+ * 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.defaults
+
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.bridge.JSIModulePackage
+import com.facebook.react.bridge.JSIModuleProvider
+import com.facebook.react.bridge.JSIModuleSpec
+import com.facebook.react.bridge.JSIModuleType
+import com.facebook.react.bridge.JavaScriptContextHolder
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.UIManager
+import com.facebook.react.fabric.ComponentFactory
+import com.facebook.react.fabric.FabricJSIModuleProvider
+import com.facebook.react.fabric.ReactNativeConfig
+import com.facebook.react.uimanager.ViewManagerRegistry
+
+/**
+ * A utility class that allows users to create a JSIModulePackage to use Fabric. This essentially
+ * allows users to just provide C++ implementation for the methods of `DefaultComponentsRegistry`
+ * without providing all the extra machinery for the New Architecture.
+ *
+ * `ReactNativeHost` is required to create Fabric's ViewManagers.
+ */
+class DefaultJSIModulePackage(private val reactNativeHost: ReactNativeHost) : JSIModulePackage {
+
+  override fun getJSIModules(
+      reactApplicationContext: ReactApplicationContext,
+      jsContext: JavaScriptContextHolder
+  ): List<JSIModuleSpec<UIManager>> =
+      listOf<JSIModuleSpec<UIManager>>(JSIModuleForFabric(reactApplicationContext, reactNativeHost))
+
+  private inner class JSIModuleForFabric(
+      private val reactApplicationContext: ReactApplicationContext,
+      private val reactNativeHost: ReactNativeHost
+  ) : JSIModuleSpec<UIManager> {
+    override fun getJSIModuleType(): JSIModuleType = JSIModuleType.UIManager
+    override fun getJSIModuleProvider(): JSIModuleProvider<UIManager> {
+      val componentFactory = ComponentFactory()
+
+      DefaultComponentsRegistry.register(componentFactory)
+
+      val viewManagers =
+          reactNativeHost.reactInstanceManager.getOrCreateViewManagers(reactApplicationContext)
+      val viewManagerRegistry = ViewManagerRegistry(viewManagers)
+      return FabricJSIModuleProvider(
+          reactApplicationContext,
+          componentFactory,
+          ReactNativeConfig.DEFAULT_CONFIG,
+          viewManagerRegistry)
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt b/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt
new file mode 100644
index 000000000000..28ee848dd75f
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt
@@ -0,0 +1,49 @@
+/*
+ * 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.defaults
+
+import com.facebook.react.config.ReactFeatureFlags
+import com.facebook.soloader.SoLoader
+
+/**
+ * A utility class that serves as an entry point for users setup the New Architecture.
+ *
+ * This class needs to be invoked as `DefaultNewArchitectureEntryPoint.load(...)` by passing a
+ * series of optional parameters.
+ *
+ * By default it loads a library called `appmodules`. `appmodules` is a convention used to refer to
+ * the application dynamic library. If changed here should be updated also inside the template.
+ *
+ * By default it also enables both TurboModules, Fabric and Concurrent React (aka React 18)
+ */
+object DefaultNewArchitectureEntryPoint {
+  @JvmStatic
+  @JvmOverloads
+  fun load(
+      turboModulesEnabled: Boolean = true,
+      fabricEnabled: Boolean = true,
+      concurrentReactEnabled: Boolean = true,
+      dynamicLibraryName: String = "appmodules",
+  ) {
+    ReactFeatureFlags.useTurboModules = turboModulesEnabled
+    ReactFeatureFlags.enableFabricRenderer = fabricEnabled
+
+    this.fabricEnabled = fabricEnabled
+    this.turboModulesEnabled = turboModulesEnabled
+    this.concurrentReactEnabled = concurrentReactEnabled
+
+    SoLoader.loadLibrary("react_newarchdefaults")
+    SoLoader.loadLibrary(dynamicLibraryName)
+  }
+
+  @JvmStatic var fabricEnabled: Boolean = false
+
+  @JvmStatic var turboModulesEnabled: Boolean = false
+
+  @JvmStatic var concurrentReactEnabled: Boolean = false
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactActivityDelegate.kt b/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactActivityDelegate.kt
new file mode 100644
index 000000000000..7189aa6fb49c
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactActivityDelegate.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.defaults
+
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.ReactRootView
+
+/**
+ * A utility class that allows you to simplify the setup of a [ReactActivityDelegate] for new apps
+ * in Open Source.
+ *
+ * Specifically, with this class you can simply control if Fabric and Concurrent Root are enabled
+ * for an Activity using the boolean flags in the constructor.
+ *
+ * @param fabricEnabled Whether Fabric should be enabled for the RootView of this Activity.
+ * @param concurrentRootEnabled Whether ConcurrentRoot (aka React 18) should be enabled for the
+ * RootView of this Activity.
+ */
+open class DefaultReactActivityDelegate(
+    activity: ReactActivity,
+    mainComponentName: String,
+    private val fabricEnabled: Boolean = false,
+    private val concurrentRootEnabled: Boolean = false
+) : ReactActivityDelegate(activity, mainComponentName) {
+
+  /**
+   * Override this method to enable Concurrent Root on the surface for this Activity. See:
+   * https://reactjs.org/blog/2022/03/29/react-v18.html
+   *
+   * This requires to be rendering on Fabric (i.e. on the New Architecture).
+   *
+   * @return Whether you want to enable Concurrent Root for this surface or not.
+   */
+  override fun isConcurrentRootEnabled(): Boolean {
+    return concurrentRootEnabled
+  }
+
+  override fun createRootView(): ReactRootView =
+      ReactRootView(context).apply { setIsFabric(fabricEnabled) }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactNativeHost.kt b/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactNativeHost.kt
new file mode 100644
index 000000000000..23c0bada20a2
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactNativeHost.kt
@@ -0,0 +1,71 @@
+/*
+ * 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.defaults
+
+import android.app.Application
+import com.facebook.react.JSEngineResolutionAlgorithm
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate
+import com.facebook.react.bridge.JSIModulePackage
+
+/**
+ * A utility class that allows you to simplify the setup of a [ReactNativeHost] for new apps in Open
+ * Source.
+ *
+ * Specifically, for apps that are using the New Architecture, this Default class takes care of
+ * providing the default TurboModuleManagerDelegateBuilder and the default JSIModulePackage,
+ * provided the name of the dynamic library to load.
+ */
+abstract class DefaultReactNativeHost
+protected constructor(
+    application: Application,
+) : ReactNativeHost(application) {
+
+  override fun getReactPackageTurboModuleManagerDelegateBuilder():
+      ReactPackageTurboModuleManagerDelegate.Builder? =
+      if (isNewArchEnabled) {
+        DefaultTurboModuleManagerDelegate.Builder()
+      } else {
+        null
+      }
+
+  override fun getJSIModulePackage(): JSIModulePackage? =
+      if (isNewArchEnabled) {
+        DefaultJSIModulePackage(this)
+      } else {
+        null
+      }
+
+  override fun getJSEngineResolutionAlgorithm(): JSEngineResolutionAlgorithm? =
+      when (isHermesEnabled) {
+        true -> JSEngineResolutionAlgorithm.HERMES
+        false -> JSEngineResolutionAlgorithm.JSC
+        null -> null
+      }
+
+  /**
+   * Returns whether the user wants to use the New Architecture or not.
+   *
+   * If true, we will load the default JSI Module Package and TurboModuleManagerDelegate needed to
+   * enable the New Architecture
+   *
+   * If false, the app will not attempt to load the New Architecture modules.
+   */
+  protected open val isNewArchEnabled: Boolean
+    get() = false
+
+  /**
+   * Returns whether the user wants to use Hermes.
+   *
+   * If true, the app will load the Hermes engine, and fail if not found. If false, the app will
+   * load the JSC engine, and fail if not found. If null, the app will attempt to load JSC first and
+   * fallback to Hermes if not found.
+   */
+  protected open val isHermesEnabled: Boolean?
+    get() = null
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt b/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt
new file mode 100644
index 000000000000..ac1fd1a4c7d9
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt
@@ -0,0 +1,33 @@
+/*
+ * 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.defaults
+
+import com.facebook.jni.HybridData
+import com.facebook.proguard.annotations.DoNotStrip
+import com.facebook.react.ReactPackage
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate
+import com.facebook.react.bridge.ReactApplicationContext
+
+/**
+ * A utility class that allows you to simplify the setup of a
+ * [ReactPackageTurboModuleManagerDelegate] for new apps in Open Source.
+ *
+ * This class works together with the [DefaultNewArchitectureEntryPoint] and it's C++ implementation
+ * is hosted inside the React Native framework
+ */
+class DefaultTurboModuleManagerDelegate
+private constructor(context: ReactApplicationContext, packages: List<ReactPackage>) :
+    ReactPackageTurboModuleManagerDelegate(context, packages) {
+
+  @DoNotStrip external override fun initHybrid(): HybridData?
+
+  class Builder : ReactPackageTurboModuleManagerDelegate.Builder() {
+    override fun build(context: ReactApplicationContext, packages: List<ReactPackage>) =
+        DefaultTurboModuleManagerDelegate(context, packages)
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
index 5dd56e4c3b99..a00fc846a719 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "devsupport",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     manifest = "AndroidManifest.xml",
@@ -52,10 +50,8 @@ rn_android_library(
     name = "interfaces",
     srcs = glob(["interfaces/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java
index db8ef299fc67..fa1554bda002 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java
@@ -69,9 +69,9 @@ public void showForUrl(String url) {
       return;
     }
 
+    int port = parsedURL.getPort() != -1 ? parsedURL.getPort() : parsedURL.getDefaultPort();
     showMessage(
-        context.getString(
-            R.string.catalyst_loading_from_url, parsedURL.getHost() + ":" + parsedURL.getPort()));
+        context.getString(R.string.catalyst_loading_from_url, parsedURL.getHost() + ":" + port));
   }
 
   public void showForRemoteJSEnabled() {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
index 76977bfb4626..0141e70c3eb6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
@@ -703,7 +703,7 @@ private void resetCurrentContext(@Nullable ReactContext reactContext) {
         URL sourceUrl = new URL(getSourceUrl());
         String path = sourceUrl.getPath().substring(1); // strip initial slash in path
         String host = sourceUrl.getHost();
-        int port = sourceUrl.getPort();
+        int port = sourceUrl.getPort() != -1 ? sourceUrl.getPort() : sourceUrl.getDefaultPort();
         mCurrentContext
             .getJSModule(HMRClient.class)
             .setup("android", path, host, port, mDevSettings.isHotModuleReplacementEnabled());
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDevSupport.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDevSupport.java
deleted file mode 100644
index 4ea6a82c7c98..000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDevSupport.java
+++ /dev/null
@@ -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.
- */
-
-package com.facebook.react.devsupport;
-
-import android.util.Pair;
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.fbreact.specs.NativeJSDevSupportSpec;
-import com.facebook.react.bridge.JavaScriptModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.module.annotations.ReactModule;
-import java.util.HashMap;
-import java.util.Map;
-
-@ReactModule(name = JSDevSupport.MODULE_NAME)
-public class JSDevSupport extends NativeJSDevSupportSpec {
-  public static final String MODULE_NAME = "JSDevSupport";
-
-  public static final int ERROR_CODE_EXCEPTION = 0;
-  public static final int ERROR_CODE_VIEW_NOT_FOUND = 1;
-
-  @Nullable private volatile DevSupportCallback mCurrentCallback = null;
-
-  public interface JSDevSupportModule extends JavaScriptModule {
-    void getJSHierarchy(int reactTag);
-  }
-
-  public JSDevSupport(ReactApplicationContext reactContext) {
-    super(reactContext);
-  }
-
-  public interface DevSupportCallback {
-
-    void onSuccess(String data);
-
-    void onFailure(int errorCode, Exception error);
-  }
-
-  /**
-   * Notifies the callback with either the JS hierarchy of the deepest leaf from the given root view
-   * or with an error.
-   */
-  public synchronized void computeDeepestJSHierarchy(View root, DevSupportCallback callback) {
-    final Pair<View, Integer> deepestPairView = ViewHierarchyUtil.getDeepestLeaf(root);
-    View deepestView = deepestPairView.first;
-    Integer tagId = deepestView.getId();
-    getJSHierarchy(tagId, callback);
-  }
-
-  public synchronized void getJSHierarchy(int reactTag, DevSupportCallback callback) {
-    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-
-    JSDevSupportModule jsDevSupportModule = null;
-    if (reactApplicationContext != null) {
-      jsDevSupportModule = reactApplicationContext.getJSModule(JSDevSupportModule.class);
-    }
-
-    if (jsDevSupportModule == null) {
-      callback.onFailure(
-          ERROR_CODE_EXCEPTION,
-          new JSCHeapCapture.CaptureException(MODULE_NAME + " module not registered."));
-      return;
-    }
-    mCurrentCallback = callback;
-    jsDevSupportModule.getJSHierarchy(reactTag);
-  }
-
-  @SuppressWarnings("unused")
-  @Override
-  public synchronized void onSuccess(String data) {
-    if (mCurrentCallback != null) {
-      mCurrentCallback.onSuccess(data);
-    }
-  }
-
-  @SuppressWarnings("unused")
-  @Override
-  public synchronized void onFailure(double errorCodeDouble, String error) {
-    int errorCode = (int) errorCodeDouble;
-
-    if (mCurrentCallback != null) {
-      mCurrentCallback.onFailure(errorCode, new RuntimeException(error));
-    }
-  }
-
-  @Override
-  public Map<String, Object> getTypedExportedConstants() {
-    HashMap<String, Object> constants = new HashMap<>();
-    constants.put("ERROR_CODE_EXCEPTION", ERROR_CODE_EXCEPTION);
-    constants.put("ERROR_CODE_VIEW_NOT_FOUND", ERROR_CODE_VIEW_NOT_FOUND);
-    return constants;
-  }
-
-  @Override
-  public String getName() {
-    return MODULE_NAME;
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
index f6cb63b14df4..a311acbbcadf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
@@ -12,10 +12,8 @@ rn_android_library(
         "mounting/**/*.java",
     ]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "KOTLIN",
     provided_deps = [
@@ -42,7 +40,6 @@ rn_android_library(
         react_native_target("java/com/facebook/debug/holder:holder"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/config:config"),
-        react_native_target("java/com/facebook/react/fabric/jni:jni"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/modules/i18nmanager:i18nmanager"),
@@ -52,5 +49,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/views/view:view"),
         react_native_target("java/com/facebook/react/views/text:text"),
         react_native_target("java/com/facebook/react/touch:touch"),
+        react_native_target("jni/react/fabric:jni"),
     ] + KOTLIN_STDLIB_DEPS,
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java
index a46b65c27ce4..1565f57e6335 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java
@@ -16,6 +16,7 @@
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.RuntimeExecutor;
 import com.facebook.react.bridge.RuntimeScheduler;
+import com.facebook.react.common.mapbuffer.MapBufferSoLoader;
 import com.facebook.react.fabric.events.EventBeatManager;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.uimanager.PixelUtil;
@@ -26,6 +27,7 @@ public class Binding {
 
   static {
     FabricSoLoader.staticInit();
+    MapBufferSoLoader.staticInit();
   }
 
   @DoNotStrip private final HybridData mHybridData;
@@ -42,7 +44,8 @@ private native void installFabricUIManager(
       Object uiManager,
       EventBeatManager eventBeatManager,
       ComponentFactory componentsRegistry,
-      Object reactNativeConfig);
+      Object reactNativeConfig,
+      CppComponentRegistry cppComponentRegistry);
 
   public native void startSurface(
       int surfaceId, @NonNull String moduleName, @NonNull NativeMap initialProps);
@@ -89,6 +92,24 @@ public void register(
       @NonNull EventBeatManager eventBeatManager,
       @NonNull ComponentFactory componentFactory,
       @NonNull ReactNativeConfig reactNativeConfig) {
+    register(
+        runtimeExecutor,
+        runtimeScheduler,
+        fabricUIManager,
+        eventBeatManager,
+        componentFactory,
+        reactNativeConfig,
+        null);
+  }
+
+  public void register(
+      @NonNull RuntimeExecutor runtimeExecutor,
+      @Nullable RuntimeScheduler runtimeScheduler,
+      @NonNull FabricUIManager fabricUIManager,
+      @NonNull EventBeatManager eventBeatManager,
+      @NonNull ComponentFactory componentFactory,
+      @NonNull ReactNativeConfig reactNativeConfig,
+      @Nullable CppComponentRegistry cppComponentRegistry) {
     fabricUIManager.setBinding(this);
     installFabricUIManager(
         runtimeExecutor,
@@ -96,7 +117,8 @@ public void register(
         fabricUIManager,
         eventBeatManager,
         componentFactory,
-        reactNativeConfig);
+        reactNativeConfig,
+        cppComponentRegistry);
 
     setPixelDensity(PixelUtil.getDisplayMetricDensity());
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/CoreComponentsRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/CoreComponentsRegistry.java
index 2fa95f0a89b6..797106872d6c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/CoreComponentsRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/CoreComponentsRegistry.java
@@ -9,12 +9,11 @@
 
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.soloader.SoLoader;
 
 @DoNotStrip
 public class CoreComponentsRegistry {
   static {
-    SoLoader.loadLibrary("fabricjni");
+    FabricSoLoader.staticInit();
   }
 
   @DoNotStrip private final HybridData mHybridData;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/CppComponentRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/CppComponentRegistry.java
new file mode 100644
index 000000000000..0a14322c6497
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/CppComponentRegistry.java
@@ -0,0 +1,28 @@
+/*
+ * 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.fabric;
+
+import androidx.annotation.NonNull;
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class CppComponentRegistry {
+
+  static {
+    FabricSoLoader.staticInit();
+  }
+
+  @NonNull private final HybridData mHybridData;
+
+  private static native HybridData initHybrid();
+
+  private CppComponentRegistry(HybridData hybridData) {
+    mHybridData = hybridData;
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/CppViewMutationsWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/CppViewMutationsWrapper.java
new file mode 100644
index 000000000000..2df36efac126
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/CppViewMutationsWrapper.java
@@ -0,0 +1,47 @@
+/*
+ * 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.fabric;
+
+import android.annotation.SuppressLint;
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+/**
+ * This class holds reference to the C++ CppViewMutations object. Instances of this class are
+ * created on the Bindings.cpp, where the pointer to the cppViewMutations is set.
+ */
+@SuppressLint("MissingNativeLoadLibrary")
+public class CppViewMutationsWrapper {
+
+  static {
+    FabricSoLoader.staticInit();
+  }
+
+  @DoNotStrip private final HybridData mHybridData;
+
+  private static native HybridData initHybrid();
+
+  private CppViewMutationsWrapper() {
+    mHybridData = initHybrid();
+  }
+
+  public native void runCppViewMutations();
+
+  public synchronized void destroy() {
+    if (mHybridData != null) {
+      mHybridData.resetNative();
+    }
+  }
+
+  private boolean isValid() {
+    if (mHybridData != null) {
+      return mHybridData.isValid();
+    }
+    return false;
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java
index bbb76d993b25..84690939fe5a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java
@@ -8,11 +8,10 @@
 package com.facebook.react.fabric;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.JSIModuleProvider;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.UIManager;
-import com.facebook.react.common.mapbuffer.MapBufferSoLoader;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.fabric.events.EventBeatManager;
 import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.systrace.Systrace;
@@ -23,16 +22,27 @@ public class FabricJSIModuleProvider implements JSIModuleProvider<UIManager> {
   @NonNull private final ComponentFactory mComponentFactory;
   @NonNull private final ReactNativeConfig mConfig;
   @NonNull private final ViewManagerRegistry mViewManagerRegistry;
+  @Nullable private final CppComponentRegistry mCppComponentRegistry;
 
   public FabricJSIModuleProvider(
       @NonNull ReactApplicationContext reactApplicationContext,
       @NonNull ComponentFactory componentFactory,
       @NonNull ReactNativeConfig config,
       @NonNull ViewManagerRegistry viewManagerRegistry) {
+    this(reactApplicationContext, componentFactory, config, viewManagerRegistry, null);
+  }
+
+  public FabricJSIModuleProvider(
+      @NonNull ReactApplicationContext reactApplicationContext,
+      @NonNull ComponentFactory componentFactory,
+      @NonNull ReactNativeConfig config,
+      @NonNull ViewManagerRegistry viewManagerRegistry,
+      @Nullable CppComponentRegistry cppComponentRegistry) {
     mReactApplicationContext = reactApplicationContext;
     mComponentFactory = componentFactory;
     mConfig = config;
     mViewManagerRegistry = viewManagerRegistry;
+    mCppComponentRegistry = cppComponentRegistry;
   }
 
   @Override
@@ -45,17 +55,14 @@ public UIManager get() {
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.registerBinding");
     final Binding binding = new Binding();
 
-    if (ReactFeatureFlags.mapBufferSerializationEnabled) {
-      MapBufferSoLoader.staticInit();
-    }
-
     binding.register(
         mReactApplicationContext.getCatalystInstance().getRuntimeExecutor(),
         mReactApplicationContext.getCatalystInstance().getRuntimeScheduler(),
         uiManager,
         eventBeatManager,
         mComponentFactory,
-        mConfig);
+        mConfig,
+        mCppComponentRegistry);
 
     Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
     Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
index 96d624e0d2cb..e0947264fd95 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -81,7 +81,6 @@
 import com.facebook.react.uimanager.events.EventCategoryDef;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.EventDispatcherImpl;
-import com.facebook.react.uimanager.events.LockFreeEventDispatcherImpl;
 import com.facebook.react.views.text.TextLayoutManager;
 import com.facebook.react.views.text.TextLayoutManagerMapBuffer;
 import java.util.HashMap;
@@ -241,10 +240,7 @@ public FabricUIManager(
     mMountingManager = new MountingManager(viewManagerRegistry, mMountItemExecutor);
     mMountItemDispatcher =
         new MountItemDispatcher(mMountingManager, new MountItemDispatchListener());
-    mEventDispatcher =
-        ReactFeatureFlags.enableLockFreeEventDispatcher
-            ? new LockFreeEventDispatcherImpl(reactContext)
-            : new EventDispatcherImpl(reactContext);
+    mEventDispatcher = new EventDispatcherImpl(reactContext);
     mShouldDeallocateEventDispatcher = true;
     mEventBeatManager = eventBeatManager;
     mReactApplicationContext.addLifecycleEventListener(this);
@@ -265,8 +261,8 @@ public <T extends View> int addRootView(
         new IllegalViewOperationException(
             "Do not call addRootView in Fabric; it is unsupported. Call startSurface instead."));
 
-    final int rootTag = ReactRootViewTagGenerator.getNextRootViewTag();
     ReactRoot reactRootView = (ReactRoot) rootView;
+    final int rootTag = reactRootView.getRootViewTag();
 
     ThemedReactContext reactContext =
         new ThemedReactContext(
@@ -294,7 +290,7 @@ public <T extends View> int addRootView(
    * @return a {@link ReadableMap} that contains metadata associated to the React Component that
    *     rendered the Android View received as a parameter. For more details about the keys stored
    *     in the {@link ReadableMap} refer to the "getInspectorDataForInstance" method from
-   *     com/facebook/react/fabric/jni/Binding.cpp file.
+   *     jni/react/fabric/Binding.cpp file.
    */
   @UiThread
   @ThreadConfined(UI)
@@ -322,7 +318,7 @@ public <T extends View> int startSurface(
       final WritableMap initialProps,
       int widthMeasureSpec,
       int heightMeasureSpec) {
-    final int rootTag = ReactRootViewTagGenerator.getNextRootViewTag();
+    final int rootTag = ((ReactRoot) rootView).getRootViewTag();
     Context context = rootView.getContext();
     ThemedReactContext reactContext =
         new ThemedReactContext(mReactApplicationContext, context, moduleName, rootTag);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/viewPropConversions.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/viewPropConversions.h
deleted file mode 100644
index 91e90813d1bc..000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/viewPropConversions.h
+++ /dev/null
@@ -1,540 +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.
- */
-
-#pragma once
-
-#include <react/renderer/components/view/ViewProps.h>
-#include <react/renderer/components/view/conversions.h>
-#include <react/renderer/graphics/conversions.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
-
-#include <optional>
-
-namespace facebook {
-namespace react {
-
-namespace {
-// ViewProps values
-constexpr MapBuffer::Key VP_ACCESSIBILITY_ACTIONS = 0;
-constexpr MapBuffer::Key VP_ACCESSIBILITY_HINT = 1;
-constexpr MapBuffer::Key VP_ACCESSIBILITY_LABEL = 2;
-constexpr MapBuffer::Key VP_ACCESSIBILITY_LABELLED_BY = 3;
-constexpr MapBuffer::Key VP_ACCESSIBILITY_LIVE_REGION = 4;
-constexpr MapBuffer::Key VP_ACCESSIBILITY_ROLE = 5;
-constexpr MapBuffer::Key VP_ACCESSIBILITY_STATE = 6;
-constexpr MapBuffer::Key VP_ACCESSIBILITY_VALUE = 7;
-constexpr MapBuffer::Key VP_ACCESSIBLE = 8;
-constexpr MapBuffer::Key VP_BACKFACE_VISIBILITY = 9;
-constexpr MapBuffer::Key VP_BG_COLOR = 10;
-constexpr MapBuffer::Key VP_BORDER_COLOR = 11;
-constexpr MapBuffer::Key VP_BORDER_RADII = 12;
-constexpr MapBuffer::Key VP_BORDER_STYLE = 13;
-constexpr MapBuffer::Key VP_COLLAPSABLE = 14;
-constexpr MapBuffer::Key VP_ELEVATION = 15;
-constexpr MapBuffer::Key VP_FOCUSABLE = 16;
-constexpr MapBuffer::Key VP_HAS_TV_FOCUS = 17;
-constexpr MapBuffer::Key VP_HIT_SLOP = 18;
-constexpr MapBuffer::Key VP_IMPORTANT_FOR_ACCESSIBILITY = 19;
-constexpr MapBuffer::Key VP_NATIVE_BACKGROUND = 20;
-constexpr MapBuffer::Key VP_NATIVE_FOREGROUND = 21;
-constexpr MapBuffer::Key VP_NATIVE_ID = 22;
-constexpr MapBuffer::Key VP_OFFSCREEN_ALPHA_COMPOSITING = 23;
-constexpr MapBuffer::Key VP_OPACITY = 24;
-constexpr MapBuffer::Key VP_POINTER_EVENTS = 25;
-constexpr MapBuffer::Key VP_POINTER_ENTER = 26;
-constexpr MapBuffer::Key VP_POINTER_LEAVE = 27;
-constexpr MapBuffer::Key VP_POINTER_MOVE = 28;
-constexpr MapBuffer::Key VP_REMOVE_CLIPPED_SUBVIEW = 29;
-constexpr MapBuffer::Key VP_RENDER_TO_HARDWARE_TEXTURE = 30;
-constexpr MapBuffer::Key VP_SHADOW_COLOR = 31;
-constexpr MapBuffer::Key VP_TEST_ID = 32;
-constexpr MapBuffer::Key VP_TRANSFORM = 33;
-constexpr MapBuffer::Key VP_ZINDEX = 34;
-constexpr MapBuffer::Key VP_POINTER_ENTER_CAPTURE = 38;
-constexpr MapBuffer::Key VP_POINTER_LEAVE_CAPTURE = 39;
-constexpr MapBuffer::Key VP_POINTER_MOVE_CAPTURE = 40;
-
-// Yoga values
-constexpr MapBuffer::Key YG_BORDER_WIDTH = 100;
-constexpr MapBuffer::Key YG_OVERFLOW = 101;
-
-// AccessibilityAction values
-constexpr MapBuffer::Key ACCESSIBILITY_ACTION_NAME = 0;
-constexpr MapBuffer::Key ACCESSIBILITY_ACTION_LABEL = 1;
-
-static MapBuffer convertAccessibilityActions(
-    std::vector<AccessibilityAction> const &actions) {
-  MapBufferBuilder builder(actions.size());
-  for (auto i = 0; i < actions.size(); i++) {
-    auto const &action = actions[i];
-    MapBufferBuilder actionsBuilder(2);
-    actionsBuilder.putString(ACCESSIBILITY_ACTION_NAME, action.name);
-    if (action.label.has_value()) {
-      actionsBuilder.putString(
-          ACCESSIBILITY_ACTION_LABEL, action.label.value());
-    }
-    builder.putMapBuffer(i, actionsBuilder.build());
-  }
-  return builder.build();
-}
-
-static MapBuffer convertAccessibilityLabelledBy(
-    AccessibilityLabelledBy const &labelledBy) {
-  MapBufferBuilder builder(labelledBy.value.size());
-  for (auto i = 0; i < labelledBy.value.size(); i++) {
-    builder.putString(i, labelledBy.value[i]);
-  }
-  return builder.build();
-}
-
-// AccessibilityState values
-constexpr MapBuffer::Key ACCESSIBILITY_STATE_BUSY = 0;
-constexpr MapBuffer::Key ACCESSIBILITY_STATE_DISABLED = 1;
-constexpr MapBuffer::Key ACCESSIBILITY_STATE_EXPANDED = 2;
-constexpr MapBuffer::Key ACCESSIBILITY_STATE_SELECTED = 3;
-constexpr MapBuffer::Key ACCESSIBILITY_STATE_CHECKED = 4;
-
-MapBuffer convertAccessibilityState(AccessibilityState const &state) {
-  MapBufferBuilder builder(5);
-  builder.putBool(ACCESSIBILITY_STATE_BUSY, state.busy);
-  builder.putBool(ACCESSIBILITY_STATE_DISABLED, state.disabled);
-  builder.putBool(ACCESSIBILITY_STATE_EXPANDED, state.expanded);
-  builder.putBool(ACCESSIBILITY_STATE_SELECTED, state.selected);
-  int checked;
-  switch (state.checked) {
-    case AccessibilityState::Unchecked:
-      checked = 0;
-      break;
-    case AccessibilityState::Checked:
-      checked = 1;
-      break;
-    case AccessibilityState::Mixed:
-      checked = 2;
-      break;
-    case AccessibilityState::None:
-      checked = 3;
-      break;
-  }
-  builder.putInt(ACCESSIBILITY_STATE_CHECKED, checked);
-  return builder.build();
-}
-
-inline void putOptionalColor(
-    MapBufferBuilder &builder,
-    MapBuffer::Key key,
-    std::optional<SharedColor> const &color) {
-  builder.putInt(key, color.has_value() ? toAndroidRepr(color.value()) : -1);
-}
-
-constexpr MapBuffer::Key EDGE_TOP = 0;
-constexpr MapBuffer::Key EDGE_LEFT = 1;
-constexpr MapBuffer::Key EDGE_RIGHT = 2;
-constexpr MapBuffer::Key EDGE_BOTTOM = 3;
-constexpr MapBuffer::Key EDGE_START = 4;
-constexpr MapBuffer::Key EDGE_END = 5;
-constexpr MapBuffer::Key EDGE_ALL = 6;
-
-MapBuffer convertBorderColors(CascadedBorderColors const &colors) {
-  MapBufferBuilder builder(7);
-  putOptionalColor(builder, EDGE_TOP, colors.top);
-  putOptionalColor(builder, EDGE_RIGHT, colors.right);
-  putOptionalColor(builder, EDGE_BOTTOM, colors.bottom);
-  putOptionalColor(builder, EDGE_LEFT, colors.left);
-  putOptionalColor(builder, EDGE_START, colors.start);
-  putOptionalColor(builder, EDGE_END, colors.end);
-  putOptionalColor(builder, EDGE_ALL, colors.all);
-  return builder.build();
-}
-
-constexpr MapBuffer::Key CORNER_TOP_LEFT = 0;
-constexpr MapBuffer::Key CORNER_TOP_RIGHT = 1;
-constexpr MapBuffer::Key CORNER_BOTTOM_RIGHT = 2;
-constexpr MapBuffer::Key CORNER_BOTTOM_LEFT = 3;
-constexpr MapBuffer::Key CORNER_TOP_START = 4;
-constexpr MapBuffer::Key CORNER_TOP_END = 5;
-constexpr MapBuffer::Key CORNER_BOTTOM_END = 6;
-constexpr MapBuffer::Key CORNER_BOTTOM_START = 7;
-constexpr MapBuffer::Key CORNER_ALL = 8;
-
-inline void putOptionalFloat(
-    MapBufferBuilder &builder,
-    MapBuffer::Key key,
-    std::optional<Float> const &value) {
-  builder.putDouble(key, value.value_or(NAN));
-}
-
-MapBuffer convertBorderRadii(CascadedBorderRadii const &radii) {
-  MapBufferBuilder builder(9);
-  putOptionalFloat(builder, CORNER_TOP_LEFT, radii.topLeft);
-  putOptionalFloat(builder, CORNER_TOP_RIGHT, radii.topRight);
-  putOptionalFloat(builder, CORNER_BOTTOM_RIGHT, radii.bottomRight);
-  putOptionalFloat(builder, CORNER_BOTTOM_LEFT, radii.bottomLeft);
-  putOptionalFloat(builder, CORNER_TOP_START, radii.topStart);
-  putOptionalFloat(builder, CORNER_TOP_END, radii.topEnd);
-  putOptionalFloat(builder, CORNER_BOTTOM_END, radii.bottomEnd);
-  putOptionalFloat(builder, CORNER_BOTTOM_START, radii.bottomStart);
-  putOptionalFloat(builder, CORNER_ALL, radii.all);
-  return builder.build();
-}
-
-MapBuffer convertBorderWidths(YGStyle::Edges const &border) {
-  MapBufferBuilder builder(7);
-  putOptionalFloat(
-      builder, EDGE_TOP, optionalFloatFromYogaValue(border[YGEdgeTop]));
-  putOptionalFloat(
-      builder, EDGE_RIGHT, optionalFloatFromYogaValue(border[YGEdgeRight]));
-  putOptionalFloat(
-      builder, EDGE_BOTTOM, optionalFloatFromYogaValue(border[YGEdgeBottom]));
-  putOptionalFloat(
-      builder, EDGE_LEFT, optionalFloatFromYogaValue(border[YGEdgeLeft]));
-  putOptionalFloat(
-      builder, EDGE_START, optionalFloatFromYogaValue(border[YGEdgeStart]));
-  putOptionalFloat(
-      builder, EDGE_END, optionalFloatFromYogaValue(border[YGEdgeEnd]));
-  putOptionalFloat(
-      builder, EDGE_ALL, optionalFloatFromYogaValue(border[YGEdgeAll]));
-  return builder.build();
-}
-
-MapBuffer convertEdgeInsets(EdgeInsets const &insets) {
-  MapBufferBuilder builder(4);
-  builder.putDouble(EDGE_TOP, insets.top);
-  builder.putDouble(EDGE_RIGHT, insets.right);
-  builder.putDouble(EDGE_BOTTOM, insets.bottom);
-  builder.putDouble(EDGE_LEFT, insets.left);
-  return builder.build();
-}
-
-#ifdef ANDROID
-
-constexpr MapBuffer::Key NATIVE_DRAWABLE_KIND = 0;
-constexpr MapBuffer::Key NATIVE_DRAWABLE_ATTRIBUTE = 1;
-constexpr MapBuffer::Key NATIVE_DRAWABLE_COLOR = 2;
-constexpr MapBuffer::Key NATIVE_DRAWABLE_BORDERLESS = 3;
-constexpr MapBuffer::Key NATIVE_DRAWABLE_RIPPLE_RADIUS = 4;
-
-MapBuffer convertNativeBackground(std::optional<NativeDrawable> const &value) {
-  if (!value.has_value()) {
-    return MapBufferBuilder::EMPTY();
-  }
-
-  auto const &drawable = value.value();
-  MapBufferBuilder builder(4);
-  switch (drawable.kind) {
-    case NativeDrawable::Kind::ThemeAttr:
-      builder.putInt(NATIVE_DRAWABLE_KIND, 0);
-      builder.putString(NATIVE_DRAWABLE_ATTRIBUTE, drawable.themeAttr);
-      break;
-    case NativeDrawable::Kind::Ripple:
-      builder.putInt(NATIVE_DRAWABLE_KIND, 1);
-      if (drawable.ripple.color.has_value()) {
-        builder.putInt(NATIVE_DRAWABLE_COLOR, drawable.ripple.color.value());
-      }
-
-      builder.putBool(NATIVE_DRAWABLE_BORDERLESS, drawable.ripple.borderless);
-      if (drawable.ripple.rippleRadius.has_value()) {
-        builder.putDouble(
-            NATIVE_DRAWABLE_RIPPLE_RADIUS,
-            drawable.ripple.rippleRadius.value());
-      }
-      break;
-  }
-  return builder.build();
-}
-
-#endif
-
-MapBuffer convertTransform(Transform const &transform) {
-  MapBufferBuilder builder(16);
-  for (int32_t i = 0; i < transform.matrix.size(); i++) {
-    builder.putDouble(i, transform.matrix[i]);
-  }
-  return builder.build();
-}
-} // namespace
-
-/**
- * Diffs two sets of ViewProps into MapBuffer.
- * TODO: Currently unsupported: nextFocusForward/Left/Up/Right/Down
- */
-static inline MapBuffer viewPropsDiff(
-    ViewProps const &oldProps,
-    ViewProps const &newProps) {
-  MapBufferBuilder builder;
-  if (oldProps.accessibilityActions != newProps.accessibilityActions) {
-    builder.putMapBuffer(
-        VP_ACCESSIBILITY_ACTIONS,
-        convertAccessibilityActions(newProps.accessibilityActions));
-  }
-
-  if (oldProps.accessibilityHint != newProps.accessibilityHint) {
-    builder.putString(VP_ACCESSIBILITY_HINT, newProps.accessibilityHint);
-  }
-
-  if (oldProps.accessibilityLabel != newProps.accessibilityLabel) {
-    builder.putString(VP_ACCESSIBILITY_LABEL, newProps.accessibilityLabel);
-  }
-
-  if (oldProps.accessibilityLabelledBy != newProps.accessibilityLabelledBy) {
-    builder.putMapBuffer(
-        VP_ACCESSIBILITY_LABELLED_BY,
-        convertAccessibilityLabelledBy(newProps.accessibilityLabelledBy));
-  }
-
-  if (oldProps.accessibilityLiveRegion != newProps.accessibilityLiveRegion) {
-    int value;
-    switch (newProps.accessibilityLiveRegion) {
-      case AccessibilityLiveRegion::None:
-        value = 0;
-        break;
-      case AccessibilityLiveRegion::Polite:
-        value = 1;
-        break;
-      case AccessibilityLiveRegion::Assertive:
-        value = 2;
-        break;
-    }
-    builder.putInt(VP_ACCESSIBILITY_LIVE_REGION, value);
-  }
-
-  if (oldProps.accessibilityRole != newProps.accessibilityRole) {
-    builder.putString(VP_ACCESSIBILITY_ROLE, newProps.accessibilityRole);
-  }
-
-  if (oldProps.accessibilityState != newProps.accessibilityState) {
-    builder.putMapBuffer(
-        VP_ACCESSIBILITY_STATE,
-        convertAccessibilityState(newProps.accessibilityState));
-  }
-
-  if (oldProps.accessibilityValue != newProps.accessibilityValue) {
-    builder.putString(
-        VP_ACCESSIBILITY_VALUE, newProps.accessibilityValue.text.value_or(""));
-  }
-
-  if (oldProps.accessible != newProps.accessible) {
-    builder.putBool(VP_ACCESSIBLE, newProps.accessible);
-  }
-
-  if (oldProps.backfaceVisibility != newProps.backfaceVisibility) {
-    int value;
-    switch (newProps.backfaceVisibility) {
-      case BackfaceVisibility::Auto:
-        value = 0;
-        break;
-      case BackfaceVisibility::Visible:
-        value = 1;
-        break;
-      case BackfaceVisibility::Hidden:
-        value = 2;
-        break;
-    }
-    builder.putInt(VP_BACKFACE_VISIBILITY, value);
-  }
-
-  if (oldProps.backgroundColor != newProps.backgroundColor) {
-    builder.putInt(VP_BG_COLOR, toAndroidRepr(newProps.backgroundColor));
-  }
-
-  if (oldProps.borderColors != newProps.borderColors) {
-    builder.putMapBuffer(
-        VP_BORDER_COLOR, convertBorderColors(newProps.borderColors));
-  }
-
-  if (oldProps.borderRadii != newProps.borderRadii) {
-    builder.putMapBuffer(
-        VP_BORDER_RADII, convertBorderRadii(newProps.borderRadii));
-  }
-
-  if (oldProps.borderStyles != newProps.borderStyles) {
-    int value = -1;
-    if (newProps.borderStyles.all.has_value()) {
-      switch (newProps.borderStyles.all.value()) {
-        case BorderStyle::Solid:
-          value = 0;
-          break;
-        case BorderStyle::Dotted:
-          value = 1;
-          break;
-        case BorderStyle::Dashed:
-          value = 2;
-          break;
-      }
-    }
-    builder.putInt(VP_BORDER_STYLE, value);
-  }
-
-  if (oldProps.elevation != newProps.elevation) {
-    builder.putDouble(VP_ELEVATION, newProps.elevation);
-  }
-
-#ifdef ANDROID
-  if (oldProps.focusable != newProps.focusable) {
-    builder.putBool(VP_FOCUSABLE, newProps.focusable);
-  }
-
-  if (oldProps.hasTVPreferredFocus != newProps.hasTVPreferredFocus) {
-    builder.putBool(VP_HAS_TV_FOCUS, newProps.hasTVPreferredFocus);
-  }
-#endif
-
-  if (oldProps.hitSlop != newProps.hitSlop) {
-    builder.putMapBuffer(VP_HIT_SLOP, convertEdgeInsets(newProps.hitSlop));
-  }
-
-  if (oldProps.importantForAccessibility !=
-      newProps.importantForAccessibility) {
-    int value;
-    switch (newProps.importantForAccessibility) {
-      case ImportantForAccessibility::Auto:
-        value = 0;
-        break;
-      case ImportantForAccessibility::Yes:
-        value = 1;
-        break;
-      case ImportantForAccessibility::No:
-        value = 2;
-        break;
-      case ImportantForAccessibility::NoHideDescendants:
-        value = 3;
-        break;
-    }
-    builder.putInt(VP_IMPORTANT_FOR_ACCESSIBILITY, value);
-  }
-
-#ifdef ANDROID
-  if (oldProps.nativeBackground != newProps.nativeBackground) {
-    builder.putMapBuffer(
-        VP_NATIVE_BACKGROUND,
-        convertNativeBackground(newProps.nativeBackground));
-  }
-
-  if (oldProps.nativeForeground != newProps.nativeForeground) {
-    builder.putMapBuffer(
-        VP_NATIVE_FOREGROUND,
-        convertNativeBackground(newProps.nativeForeground));
-  }
-#endif
-
-  if (oldProps.nativeId != newProps.nativeId) {
-    builder.putString(VP_NATIVE_ID, newProps.nativeId);
-  }
-
-#ifdef ANDROID
-  if (oldProps.needsOffscreenAlphaCompositing !=
-      newProps.needsOffscreenAlphaCompositing) {
-    builder.putBool(
-        VP_OFFSCREEN_ALPHA_COMPOSITING,
-        newProps.needsOffscreenAlphaCompositing);
-  }
-#endif
-
-  if (oldProps.opacity != newProps.opacity) {
-    builder.putDouble(VP_OPACITY, newProps.opacity);
-  }
-
-  if (oldProps.pointerEvents != newProps.pointerEvents) {
-    int value;
-    switch (newProps.pointerEvents) {
-      case PointerEventsMode::Auto:
-        value = 0;
-        break;
-      case PointerEventsMode::None:
-        value = 1;
-        break;
-      case PointerEventsMode::BoxNone:
-        value = 2;
-        break;
-      case PointerEventsMode::BoxOnly:
-        value = 3;
-        break;
-    }
-
-    builder.putInt(VP_POINTER_EVENTS, value);
-  }
-
-  if (oldProps.events != newProps.events) {
-    builder.putBool(
-        VP_POINTER_ENTER, newProps.events[ViewEvents::Offset::PointerEnter]);
-    builder.putBool(
-        VP_POINTER_LEAVE, newProps.events[ViewEvents::Offset::PointerLeave]);
-    builder.putBool(
-        VP_POINTER_MOVE, newProps.events[ViewEvents::Offset::PointerMove]);
-
-    builder.putBool(
-        VP_POINTER_ENTER_CAPTURE,
-        newProps.events[ViewEvents::Offset::PointerEnterCapture]);
-    builder.putBool(
-        VP_POINTER_LEAVE_CAPTURE,
-        newProps.events[ViewEvents::Offset::PointerLeaveCapture]);
-    builder.putBool(
-        VP_POINTER_MOVE_CAPTURE,
-        newProps.events[ViewEvents::Offset::PointerMoveCapture]);
-  }
-
-  if (oldProps.removeClippedSubviews != newProps.removeClippedSubviews) {
-    builder.putBool(VP_REMOVE_CLIPPED_SUBVIEW, newProps.removeClippedSubviews);
-  }
-
-#ifdef ANDROID
-  if (oldProps.renderToHardwareTextureAndroid !=
-      newProps.renderToHardwareTextureAndroid) {
-    builder.putBool(
-        VP_RENDER_TO_HARDWARE_TEXTURE, newProps.renderToHardwareTextureAndroid);
-  }
-#endif
-
-  if (oldProps.shadowColor != newProps.shadowColor) {
-    builder.putInt(VP_SHADOW_COLOR, toAndroidRepr(newProps.shadowColor));
-  }
-
-  if (oldProps.testId != newProps.testId) {
-    builder.putString(VP_TEST_ID, newProps.testId);
-  }
-
-  // TODO: seems like transform covers rotation/translate/scale/skew?
-
-  if (oldProps.transform != newProps.transform) {
-    builder.putMapBuffer(VP_TRANSFORM, convertTransform(newProps.transform));
-  }
-
-  if (oldProps.zIndex != newProps.zIndex) {
-    builder.putInt(VP_ZINDEX, newProps.zIndex.value_or(0));
-  }
-
-  if (oldProps.yogaStyle != newProps.yogaStyle) {
-    auto const &oldStyle = oldProps.yogaStyle;
-    auto const &newStyle = newProps.yogaStyle;
-
-    if (!(oldStyle.border() == newStyle.border())) {
-      builder.putMapBuffer(
-          YG_BORDER_WIDTH, convertBorderWidths(newStyle.border()));
-    }
-
-    if (oldStyle.overflow() != newStyle.overflow()) {
-      int value;
-      switch (newStyle.overflow()) {
-        case YGOverflowVisible:
-          value = 0;
-          break;
-        case YGOverflowHidden:
-          value = 1;
-          break;
-        case YGOverflowScroll:
-          value = 2;
-          break;
-      }
-      builder.putInt(YG_OVERFLOW, value);
-    }
-  }
-
-  return builder.build();
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java
index 3d8f8efdd478..804a77ade78c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java
@@ -93,14 +93,6 @@ public class SurfaceMountingManager {
   // This is null *until* StopSurface is called.
   private Set<Integer> mTagSetForStoppedSurface;
 
-  // C++ layer checks for prop revision and doesn't
-  // dispatch createView mount item if view pre-allocation mount item was dispatched.
-  // This leads to missing createView and pre-mature deletion of ViewState.
-  // To work around this issue, ViewState deletion is delayed until subsequent commit.
-  // If the subsequent commit accesses ViewState, it won't be deleted.
-  private Set<Integer> mSoftDeletedViewStateTags;
-  private Set<Integer> mScheduledForDeletionViewStateTags;
-
   private final int mSurfaceId;
 
   public SurfaceMountingManager(
@@ -117,11 +109,6 @@ public SurfaceMountingManager(
     mRootViewManager = rootViewManager;
     mMountItemExecutor = mountItemExecutor;
     mThemedReactContext = reactContext;
-
-    if (ReactFeatureFlags.enableDelayedViewStateDeletion) {
-      mSoftDeletedViewStateTags = new HashSet();
-      mScheduledForDeletionViewStateTags = new HashSet();
-    }
   }
 
   public boolean isStopped() {
@@ -296,11 +283,9 @@ public void stopSurface() {
         viewState.mStateWrapper.destroyState();
         viewState.mStateWrapper = null;
       }
-      if (ReactFeatureFlags.enableAggressiveEventEmitterCleanup) {
-        if (viewState.mEventEmitter != null) {
-          viewState.mEventEmitter.destroy();
-          viewState.mEventEmitter = null;
-        }
+      if (viewState.mEventEmitter != null) {
+        viewState.mEventEmitter.destroy();
+        viewState.mEventEmitter = null;
       }
     }
 
@@ -967,7 +952,8 @@ public void sendAccessibilityEvent(int reactTag, int eventType) {
   }
 
   @UiThread
-  public void updateLayout(int reactTag, int x, int y, int width, int height, int displayType) {
+  public void updateLayout(
+      int reactTag, int parentTag, int x, int y, int width, int height, int displayType) {
     if (isStopped()) {
       return;
     }
@@ -992,9 +978,14 @@ public void updateLayout(int reactTag, int x, int y, int width, int height, int
       parent.requestLayout();
     }
 
-    // TODO: T31905686 Check if the parent of the view has to layout the view, or the child has
-    // to lay itself out. see NativeViewHierarchyManager.updateLayout
-    viewToUpdate.layout(x, y, x + width, y + height);
+    ViewState parentViewState = getViewState(parentTag);
+    ViewGroupManager<?> parentViewManager = null;
+    if (parentViewState.mViewManager != null) {
+      parentViewManager = parentViewState.mViewManager.getViewGroupManager();
+    }
+    if (parentViewManager == null || !parentViewManager.needsCustomLayoutForChildren()) {
+      viewToUpdate.layout(x, y, x + width, y + height);
+    }
 
     // displayType: 0 represents display: 'none'
     int visibility = displayType == 0 ? View.INVISIBLE : View.VISIBLE;
@@ -1182,23 +1173,6 @@ private void onViewStateDeleted(ViewState viewState) {
     }
   }
 
-  @UiThread
-  public void didUpdateViews() {
-    if (ReactFeatureFlags.enableDelayedViewStateDeletion) {
-      for (Integer reactTag : mScheduledForDeletionViewStateTags) {
-        // To delete we simply remove the tag from the registry.
-        // We want to rely on the correct set of MountInstructions being sent to the platform,
-        // or StopSurface being called, so we do not handle deleting descendents of the View.
-        ViewState viewState = mTagToViewState.remove(reactTag);
-        if (viewState != null) {
-          onViewStateDeleted(viewState);
-        }
-      }
-      mScheduledForDeletionViewStateTags = mSoftDeletedViewStateTags;
-      mSoftDeletedViewStateTags = new HashSet();
-    }
-  }
-
   @UiThread
   public void deleteView(int reactTag) {
     UiThreadUtil.assertOnUiThread();
@@ -1216,16 +1190,12 @@ public void deleteView(int reactTag) {
       return;
     }
 
-    if (ReactFeatureFlags.enableDelayedViewStateDeletion) {
-      mSoftDeletedViewStateTags.add(reactTag);
-    } else {
-      // To delete we simply remove the tag from the registry.
-      // We want to rely on the correct set of MountInstructions being sent to the platform,
-      // or StopSurface being called, so we do not handle deleting descendents of the View.
-      mTagToViewState.remove(reactTag);
+    // To delete we simply remove the tag from the registry.
+    // We want to rely on the correct set of MountInstructions being sent to the platform,
+    // or StopSurface being called, so we do not handle deleting descendents of the View.
+    mTagToViewState.remove(reactTag);
 
-      onViewStateDeleted(viewState);
-    }
+    onViewStateDeleted(viewState);
   }
 
   @UiThread
@@ -1275,9 +1245,6 @@ public View getView(int reactTag) {
       throw new RetryableMountingLayerException(
           "Unable to find viewState for tag " + tag + ". Surface stopped: " + isStopped());
     }
-    if (ReactFeatureFlags.enableDelayedViewStateDeletion) {
-      mScheduledForDeletionViewStateTags.remove(tag);
-    }
     return viewState;
   }
 
@@ -1286,9 +1253,6 @@ public View getView(int reactTag) {
     if (viewStates == null) {
       return null;
     }
-    if (ReactFeatureFlags.enableDelayedViewStateDeletion) {
-      mScheduledForDeletionViewStateTags.remove(tag);
-    }
     return viewStates.get(tag);
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java
index 693f889651eb..f5bc56dd52ea 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java
@@ -16,6 +16,7 @@
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
+import com.facebook.react.fabric.CppViewMutationsWrapper;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.fabric.mounting.MountingManager;
 import com.facebook.react.fabric.mounting.SurfaceMountingManager;
@@ -50,6 +51,7 @@ public class IntBufferBatchMountItem implements MountItem {
   static final int INSTRUCTION_UPDATE_PADDING = 512;
   static final int INSTRUCTION_UPDATE_OVERFLOW_INSET = 1024;
   static final int INSTRUCTION_REMOVE_DELETE_TREE = 2048;
+  static final int INSTRUCTION_RUN_CPP_VIEWS = 4096;
 
   private final int mSurfaceId;
   private final int mCommitNumber;
@@ -97,6 +99,10 @@ private static EventEmitterWrapper castToEventEmitter(Object obj) {
     return obj != null ? (EventEmitterWrapper) obj : null;
   }
 
+  private static CppViewMutationsWrapper castToCppViewMutationWrapper(Object obj) {
+    return obj != null ? (CppViewMutationsWrapper) obj : null;
+  }
+
   @Override
   public void execute(@NonNull MountingManager mountingManager) {
     SurfaceMountingManager surfaceMountingManager = mountingManager.getSurfaceManager(mSurfaceId);
@@ -149,13 +155,15 @@ public void execute(@NonNull MountingManager mountingManager) {
           surfaceMountingManager.updateState(mIntBuffer[i++], castToState(mObjBuffer[j++]));
         } else if (type == INSTRUCTION_UPDATE_LAYOUT) {
           int reactTag = mIntBuffer[i++];
+          int parentTag = mIntBuffer[i++];
           int x = mIntBuffer[i++];
           int y = mIntBuffer[i++];
           int width = mIntBuffer[i++];
           int height = mIntBuffer[i++];
           int displayType = mIntBuffer[i++];
 
-          surfaceMountingManager.updateLayout(reactTag, x, y, width, height, displayType);
+          surfaceMountingManager.updateLayout(
+              reactTag, parentTag, x, y, width, height, displayType);
 
         } else if (type == INSTRUCTION_UPDATE_PADDING) {
           surfaceMountingManager.updatePadding(
@@ -176,6 +184,8 @@ public void execute(@NonNull MountingManager mountingManager) {
         } else if (type == INSTRUCTION_UPDATE_EVENT_EMITTER) {
           surfaceMountingManager.updateEventEmitter(
               mIntBuffer[i++], castToEventEmitter(mObjBuffer[j++]));
+        } else if (type == INSTRUCTION_RUN_CPP_VIEWS) {
+          castToCppViewMutationWrapper(mObjBuffer[j++]).runCppViewMutations();
         } else {
           throw new IllegalArgumentException(
               "Invalid type argument to IntBufferBatchMountItem: " + type + " at index: " + i);
@@ -183,8 +193,6 @@ public void execute(@NonNull MountingManager mountingManager) {
       }
     }
 
-    surfaceMountingManager.didUpdateViews();
-
     endMarkers();
   }
 
@@ -245,10 +253,13 @@ public String toString() {
                     : "<hidden>";
             s.append(String.format("UPDATE STATE [%d]: %s\n", mIntBuffer[i++], stateString));
           } else if (type == INSTRUCTION_UPDATE_LAYOUT) {
+            int reactTag = mIntBuffer[i++];
+            int parentTag = mIntBuffer[i++];
             s.append(
                 String.format(
-                    "UPDATE LAYOUT [%d]: x:%d y:%d w:%d h:%d displayType:%d\n",
-                    mIntBuffer[i++],
+                    "UPDATE LAYOUT [%d]->[%d]: x:%d y:%d w:%d h:%d displayType:%d\n",
+                    parentTag,
+                    reactTag,
                     mIntBuffer[i++],
                     mIntBuffer[i++],
                     mIntBuffer[i++],
@@ -275,6 +286,9 @@ public String toString() {
           } else if (type == INSTRUCTION_UPDATE_EVENT_EMITTER) {
             j += 1;
             s.append(String.format("UPDATE EVENTEMITTER [%d]\n", mIntBuffer[i++]));
+          } else if (type == INSTRUCTION_RUN_CPP_VIEWS) {
+            j += 1;
+            s.append(String.format("RUN CPP_VIEWS [%d]\n", mIntBuffer[i++]));
           } else {
             FLog.e(TAG, "String so far: " + s.toString());
             throw new IllegalArgumentException(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK
index 45d863567cd9..bae4c2c5df0b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/BUCK
@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "react_native_dep", "react_native_target", "react_native_xplat_target", "rn_android_library", "rn_xplat_cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "jscexecutor",
@@ -6,37 +6,14 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
         "PUBLIC",
     ],
     deps = [
-        ":jni",
+        react_native_target("jni/react/jscexecutor:jni"),
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
     ],
 )
-
-rn_xplat_cxx_library(
-    name = "jni",
-    srcs = glob(["*.cpp"]),
-    headers = glob(["*.h"]),
-    header_namespace = "",
-    compiler_flags_enable_exceptions = True,  # TODO: is this necessary?
-    compiler_flags_enable_rtti = True,  # TODO: is this necessary?
-    fbandroid_allow_jni_merging = True,
-    platforms = ANDROID,
-    soname = "libjscexecutor.$(ext)",
-    visibility = [
-        react_native_target("java/com/facebook/react/jscexecutor:jscexecutor"),
-    ],
-    deps = [
-        "//xplat/folly:molly",
-        FBJNI_TARGET,
-        react_native_target("jni/react/jni:jni"),
-        react_native_xplat_target("jsi:JSCRuntime"),
-        react_native_xplat_target("jsiexecutor:jsiexecutor"),
-    ],
-)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK b/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK
index 3d7df06430ac..953751ea32f1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK
index 13c1c2a7da6b..a2320c0e9746 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     required_for_source_only_abi = True,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK
index 2a3552e4c6dd..263a790af224 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK
index e578bc87e9e6..486997e369d2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK
@@ -17,7 +17,6 @@ rn_java_library(
     srcs = glob(["*.java"]),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     source = "8",
     target = "8",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK
index 6b1d56805eff..6d272ba2cd6a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "accessibilityinfo",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK
index 8b52d631c613..4cb4e0819467 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "appearance",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/BUCK
index 66e480e329d1..194cad5d24da 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK
index 91c4be204abb..3b32ccead299 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK
index 77a681228e35..ead9c5351070 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "blob",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
@@ -31,7 +29,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
-        react_native_target("java/com/facebook/react/modules/blob/jni:jni"),
+        react_native_target("jni/react/reactnativeblob:jni"),
         react_native_target("java/com/facebook/react/modules/network:network"),
         react_native_target("java/com/facebook/react/modules/websocket:websocket"),
     ],
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK
index 90789e450a34..6e0fc1d216b0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "bundleloader",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK
index b16798bf487f..6489f72dd6d0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "camera",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK
index af97f435b79c..232b7b914af1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK
index 66aff2013c45..c7f0867606b8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
index f92e3e18f8e5..adfb5a46fc15 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "core",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK
index 0eee8c6c07b6..a0f564e9d97e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "debug",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
@@ -38,7 +36,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
index 67398a892f61..cd88a53d2713 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "deviceinfo",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK
index 17f1ff6e2609..926bd99ad3dc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "dialog",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK
index 2c3797463d50..6366cd9f500b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK
index edef8dc8e326..e274463a9507 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "fresco",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK
index c574ef4317a0..f10162658bdf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "i18nmanager",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK
index e3fd907c5a1b..b396cabccea9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "image",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK
index c09e21e5b796..a72f21ee4461 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "intent",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
index 4b7d7e2b950d..c4bb1d902ba0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "network",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.java
index def2f4e3957e..304c3a18915a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.java
@@ -138,25 +138,18 @@ protected void doInBackgroundGuarded(Void... params) {
         // https://bugs.chromium.org/p/chromium/issues/detail?id=559720
         return null;
       } catch (Exception exception) {
-        String message = exception.getMessage();
-        // We cannot catch MissingWebViewPackageException as it is in a private / system API
-        // class. This validates the exception's message to ensure we are only handling this
-        // specific exception.
-        // The exception class doesn't always contain the correct name as it depends on the OEM
-        // and OS version. It is better to check the message for clues regarding the exception
-        // as that is somewhat consistent across OEMs.
-        // For instance, the Exception thrown on OxygenOS 11 is a RuntimeException but the message
-        // contains the required strings.
-        // https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/webkit/WebViewFactory.java#348
-        if (exception.getClass().getCanonicalName().contains("MissingWebViewPackageException")
-            || (message != null
-                && (message.contains("WebView provider")
-                    || message.contains("No WebView installed")
-                    || message.contains("Cannot load WebView")))) {
-          return null;
-        } else {
-          throw exception;
-        }
+        // Ideally we would like to catch a `MissingWebViewPackageException` here.
+        // That API is private so we can't access it.
+        // Historically we used string matching on the error message to understand
+        // if the exception was a Missing Webview One.
+        // OEMs have been customizing that message making really hard to catch it.
+        // Therefore we result to returning null as a default instead of rethrowing
+        // the exception as it will result in a app crash at runtime.
+        // a) We will return null for all the other unhandled conditions when a webview provider is
+        // not found.
+        // b) We already have null checks in place for `getCookieManager()` calls.
+        // c) We have annotated the method as @Nullable to notify future devs about our return type.
+        return null;
       }
     }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK
index 537fdd9ff1d6..6f0db9877bd6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK
index 6503b2dca3a3..0bcc6be310e0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK
index 0351a135f761..68266a144f1d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "sound",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
index 89c9b6991f79..bdba39328924 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "statusbar",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncLocalStorageUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncLocalStorageUtil.java
deleted file mode 100644
index d3e8fb9b3591..000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncLocalStorageUtil.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.modules.storage;
-
-import static com.facebook.react.modules.storage.ReactDatabaseSupplier.KEY_COLUMN;
-import static com.facebook.react.modules.storage.ReactDatabaseSupplier.TABLE_CATALYST;
-import static com.facebook.react.modules.storage.ReactDatabaseSupplier.VALUE_COLUMN;
-
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.text.TextUtils;
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReadableArray;
-import java.util.Arrays;
-import java.util.Iterator;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/** Helper for database operations. */
-public class AsyncLocalStorageUtil {
-
-  /**
-   * Build the String required for an SQL select statement: WHERE key IN (?, ?, ..., ?) without
-   * 'WHERE' and with selectionCount '?'
-   */
-  /* package */ static String buildKeySelection(int selectionCount) {
-    String[] list = new String[selectionCount];
-    Arrays.fill(list, "?");
-    return KEY_COLUMN + " IN (" + TextUtils.join(", ", list) + ")";
-  }
-
-  /**
-   * Build the String[] arguments needed for an SQL selection, i.e.: {a, b, c} to be used in the SQL
-   * select statement: WHERE key in (?, ?, ?)
-   */
-  /* package */ static String[] buildKeySelectionArgs(ReadableArray keys, int start, int count) {
-    String[] selectionArgs = new String[count];
-    for (int keyIndex = 0; keyIndex < count; keyIndex++) {
-      selectionArgs[keyIndex] = keys.getString(start + keyIndex);
-    }
-    return selectionArgs;
-  }
-
-  /** Returns the value of the given key, or null if not found. */
-  public static @Nullable String getItemImpl(SQLiteDatabase db, String key) {
-    String[] columns = {VALUE_COLUMN};
-    String[] selectionArgs = {key};
-
-    Cursor cursor =
-        db.query(TABLE_CATALYST, columns, KEY_COLUMN + "=?", selectionArgs, null, null, null);
-
-    try {
-      if (!cursor.moveToFirst()) {
-        return null;
-      } else {
-        return cursor.getString(0);
-      }
-    } finally {
-      cursor.close();
-    }
-  }
-
-  /** Sets the value for the key given, returns true if successful, false otherwise. */
-  /* package */ static boolean setItemImpl(SQLiteDatabase db, String key, String value) {
-    ContentValues contentValues = new ContentValues();
-    contentValues.put(KEY_COLUMN, key);
-    contentValues.put(VALUE_COLUMN, value);
-
-    long inserted =
-        db.insertWithOnConflict(
-            TABLE_CATALYST, null, contentValues, SQLiteDatabase.CONFLICT_REPLACE);
-
-    return (-1 != inserted);
-  }
-
-  /**
-   * Does the actual merge of the (key, value) pair with the value stored in the database. NB: This
-   * assumes that a database lock is already in effect!
-   *
-   * @return the errorCode of the operation
-   */
-  /* package */ static boolean mergeImpl(SQLiteDatabase db, String key, String value)
-      throws JSONException {
-    String oldValue = getItemImpl(db, key);
-    String newValue;
-
-    if (oldValue == null) {
-      newValue = value;
-    } else {
-      JSONObject oldJSON = new JSONObject(oldValue);
-      JSONObject newJSON = new JSONObject(value);
-      deepMergeInto(oldJSON, newJSON);
-      newValue = oldJSON.toString();
-    }
-
-    return setItemImpl(db, key, newValue);
-  }
-
-  /**
-   * Merges two {@link JSONObject}s. The newJSON object will be merged with the oldJSON object by
-   * either overriding its values, or merging them (if the values of the same key in both objects
-   * are of type {@link JSONObject}). oldJSON will contain the result of this merge.
-   */
-  private static void deepMergeInto(JSONObject oldJSON, JSONObject newJSON) throws JSONException {
-    Iterator<?> keys = newJSON.keys();
-    while (keys.hasNext()) {
-      String key = (String) keys.next();
-
-      JSONObject newJSONObject = newJSON.optJSONObject(key);
-      JSONObject oldJSONObject = oldJSON.optJSONObject(key);
-      if (newJSONObject != null && oldJSONObject != null) {
-        deepMergeInto(oldJSONObject, newJSONObject);
-        oldJSON.put(key, oldJSONObject);
-      } else {
-        oldJSON.put(key, newJSON.get(key));
-      }
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageErrorUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageErrorUtil.java
deleted file mode 100644
index eaa59f4c2d05..000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageErrorUtil.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.modules.storage;
-
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-
-/** Helper class for database errors. */
-public class AsyncStorageErrorUtil {
-
-  /** Create Error object to be passed back to the JS callback. */
-  /* package */ static WritableMap getError(@Nullable String key, String errorMessage) {
-    WritableMap errorMap = Arguments.createMap();
-    errorMap.putString("message", errorMessage);
-    if (key != null) {
-      errorMap.putString("key", key);
-    }
-    return errorMap;
-  }
-
-  /* package */ static WritableMap getInvalidKeyError(@Nullable String key) {
-    return getError(key, "Invalid key");
-  }
-
-  /* package */ static WritableMap getInvalidValueError(@Nullable String key) {
-    return getError(key, "Invalid Value");
-  }
-
-  /* package */ static WritableMap getDBError(@Nullable String key) {
-    return getError(key, "Database Error");
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java
deleted file mode 100644
index 1b33b4b83d7d..000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.modules.storage;
-
-import static com.facebook.react.modules.storage.ReactDatabaseSupplier.KEY_COLUMN;
-import static com.facebook.react.modules.storage.ReactDatabaseSupplier.TABLE_CATALYST;
-import static com.facebook.react.modules.storage.ReactDatabaseSupplier.VALUE_COLUMN;
-
-import android.database.Cursor;
-import android.database.sqlite.SQLiteStatement;
-import android.os.AsyncTask;
-import com.facebook.common.logging.FLog;
-import com.facebook.fbreact.specs.NativeAsyncSQLiteDBStorageSpec;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.GuardedAsyncTask;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.common.ReactConstants;
-import com.facebook.react.common.annotations.VisibleForTesting;
-import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.modules.common.ModuleDataCleaner;
-import java.util.ArrayDeque;
-import java.util.HashSet;
-import java.util.concurrent.Executor;
-
-@ReactModule(name = AsyncStorageModule.NAME)
-public final class AsyncStorageModule extends NativeAsyncSQLiteDBStorageSpec
-    implements ModuleDataCleaner.Cleanable {
-
-  public static final String NAME = "AsyncSQLiteDBStorage";
-
-  // SQL variable number limit, defined by SQLITE_LIMIT_VARIABLE_NUMBER:
-  // https://raw.githubusercontent.com/android/platform_external_sqlite/master/dist/sqlite3.c
-  private static final int MAX_SQL_KEYS = 999;
-
-  private ReactDatabaseSupplier mReactDatabaseSupplier;
-  private boolean mShuttingDown = false;
-
-  // Adapted from
-  // https://android.googlesource.com/platform/frameworks/base.git/+/1488a3a19d4681a41fb45570c15e14d99db1cb66/core/java/android/os/AsyncTask.java#237
-  private class SerialExecutor implements Executor {
-    private final ArrayDeque<Runnable> mTasks = new ArrayDeque<Runnable>();
-    private Runnable mActive;
-    private final Executor executor;
-
-    SerialExecutor(Executor executor) {
-      this.executor = executor;
-    }
-
-    public synchronized void execute(final Runnable r) {
-      mTasks.offer(
-          new Runnable() {
-            public void run() {
-              try {
-                r.run();
-              } finally {
-                scheduleNext();
-              }
-            }
-          });
-      if (mActive == null) {
-        scheduleNext();
-      }
-    }
-
-    synchronized void scheduleNext() {
-      if ((mActive = mTasks.poll()) != null) {
-        executor.execute(mActive);
-      }
-    }
-  }
-
-  private final SerialExecutor executor;
-
-  public AsyncStorageModule(ReactApplicationContext reactContext) {
-    this(reactContext, AsyncTask.THREAD_POOL_EXECUTOR);
-  }
-
-  @VisibleForTesting
-  AsyncStorageModule(ReactApplicationContext reactContext, Executor executor) {
-    super(reactContext);
-    this.executor = new SerialExecutor(executor);
-    mReactDatabaseSupplier = ReactDatabaseSupplier.getInstance(reactContext);
-  }
-
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
-  @Override
-  public void initialize() {
-    super.initialize();
-    mShuttingDown = false;
-  }
-
-  @Override
-  public void invalidate() {
-    mShuttingDown = true;
-  }
-
-  @Override
-  public void clearSensitiveData() {
-    // Clear local storage. If fails, crash, since the app is potentially in a bad state and could
-    // cause a privacy violation. We're still not recovering from this well, but at least the error
-    // will be reported to the server.
-    mReactDatabaseSupplier.clearAndCloseDatabase();
-  }
-
-  /**
-   * Given an array of keys, this returns a map of (key, value) pairs for the keys found, and (key,
-   * null) for the keys that haven't been found.
-   */
-  @Override
-  public void multiGet(final ReadableArray keys, final Callback callback) {
-    if (keys == null) {
-      callback.invoke(AsyncStorageErrorUtil.getInvalidKeyError(null), null);
-      return;
-    }
-
-    new GuardedAsyncTask<Void, Void>(getReactApplicationContext()) {
-      @Override
-      protected void doInBackgroundGuarded(Void... params) {
-        if (!ensureDatabase()) {
-          callback.invoke(AsyncStorageErrorUtil.getDBError(null), null);
-          return;
-        }
-
-        String[] columns = {KEY_COLUMN, VALUE_COLUMN};
-        HashSet<String> keysRemaining = new HashSet<>();
-        WritableArray data = Arguments.createArray();
-        for (int keyStart = 0; keyStart < keys.size(); keyStart += MAX_SQL_KEYS) {
-          int keyCount = Math.min(keys.size() - keyStart, MAX_SQL_KEYS);
-          Cursor cursor =
-              mReactDatabaseSupplier
-                  .get()
-                  .query(
-                      TABLE_CATALYST,
-                      columns,
-                      AsyncLocalStorageUtil.buildKeySelection(keyCount),
-                      AsyncLocalStorageUtil.buildKeySelectionArgs(keys, keyStart, keyCount),
-                      null,
-                      null,
-                      null);
-          keysRemaining.clear();
-          try {
-            if (cursor.getCount() != keys.size()) {
-              // some keys have not been found - insert them with null into the final array
-              for (int keyIndex = keyStart; keyIndex < keyStart + keyCount; keyIndex++) {
-                keysRemaining.add(keys.getString(keyIndex));
-              }
-            }
-
-            if (cursor.moveToFirst()) {
-              do {
-                WritableArray row = Arguments.createArray();
-                row.pushString(cursor.getString(0));
-                row.pushString(cursor.getString(1));
-                data.pushArray(row);
-                keysRemaining.remove(cursor.getString(0));
-              } while (cursor.moveToNext());
-            }
-          } catch (Exception e) {
-            FLog.w(ReactConstants.TAG, e.getMessage(), e);
-            callback.invoke(AsyncStorageErrorUtil.getError(null, e.getMessage()), null);
-            return;
-          } finally {
-            cursor.close();
-          }
-
-          for (String key : keysRemaining) {
-            WritableArray row = Arguments.createArray();
-            row.pushString(key);
-            row.pushNull();
-            data.pushArray(row);
-          }
-          keysRemaining.clear();
-        }
-
-        callback.invoke(null, data);
-      }
-    }.executeOnExecutor(executor);
-  }
-
-  /**
-   * Inserts multiple (key, value) pairs. If one or more of the pairs cannot be inserted, this will
-   * return AsyncLocalStorageFailure, but all other pairs will have been inserted. The insertion
-   * will replace conflicting (key, value) pairs.
-   */
-  @Override
-  public void multiSet(final ReadableArray keyValueArray, final Callback callback) {
-    if (keyValueArray.size() == 0) {
-      callback.invoke(AsyncStorageErrorUtil.getInvalidKeyError(null));
-      return;
-    }
-
-    new GuardedAsyncTask<Void, Void>(getReactApplicationContext()) {
-      @Override
-      protected void doInBackgroundGuarded(Void... params) {
-        if (!ensureDatabase()) {
-          callback.invoke(AsyncStorageErrorUtil.getDBError(null));
-          return;
-        }
-
-        String sql = "INSERT OR REPLACE INTO " + TABLE_CATALYST + " VALUES (?, ?);";
-        SQLiteStatement statement = mReactDatabaseSupplier.get().compileStatement(sql);
-        WritableMap error = null;
-        try {
-          mReactDatabaseSupplier.get().beginTransaction();
-          for (int idx = 0; idx < keyValueArray.size(); idx++) {
-            if (keyValueArray.getArray(idx).size() != 2) {
-              error = AsyncStorageErrorUtil.getInvalidValueError(null);
-              return;
-            }
-            if (keyValueArray.getArray(idx).getString(0) == null) {
-              error = AsyncStorageErrorUtil.getInvalidKeyError(null);
-              return;
-            }
-            if (keyValueArray.getArray(idx).getString(1) == null) {
-              error = AsyncStorageErrorUtil.getInvalidValueError(null);
-              return;
-            }
-
-            statement.clearBindings();
-            statement.bindString(1, keyValueArray.getArray(idx).getString(0));
-            statement.bindString(2, keyValueArray.getArray(idx).getString(1));
-            statement.execute();
-          }
-          mReactDatabaseSupplier.get().setTransactionSuccessful();
-        } catch (Exception e) {
-          FLog.w(ReactConstants.TAG, e.getMessage(), e);
-          error = AsyncStorageErrorUtil.getError(null, e.getMessage());
-        } finally {
-          try {
-            mReactDatabaseSupplier.get().endTransaction();
-          } catch (Exception e) {
-            FLog.w(ReactConstants.TAG, e.getMessage(), e);
-            if (error == null) {
-              error = AsyncStorageErrorUtil.getError(null, e.getMessage());
-            }
-          }
-        }
-        if (error != null) {
-          callback.invoke(error);
-        } else {
-          callback.invoke();
-        }
-      }
-    }.executeOnExecutor(executor);
-  }
-
-  /** Removes all rows of the keys given. */
-  @Override
-  public void multiRemove(final ReadableArray keys, final Callback callback) {
-    if (keys.size() == 0) {
-      callback.invoke(AsyncStorageErrorUtil.getInvalidKeyError(null));
-      return;
-    }
-
-    new GuardedAsyncTask<Void, Void>(getReactApplicationContext()) {
-      @Override
-      protected void doInBackgroundGuarded(Void... params) {
-        if (!ensureDatabase()) {
-          callback.invoke(AsyncStorageErrorUtil.getDBError(null));
-          return;
-        }
-
-        WritableMap error = null;
-        try {
-          mReactDatabaseSupplier.get().beginTransaction();
-          for (int keyStart = 0; keyStart < keys.size(); keyStart += MAX_SQL_KEYS) {
-            int keyCount = Math.min(keys.size() - keyStart, MAX_SQL_KEYS);
-            mReactDatabaseSupplier
-                .get()
-                .delete(
-                    TABLE_CATALYST,
-                    AsyncLocalStorageUtil.buildKeySelection(keyCount),
-                    AsyncLocalStorageUtil.buildKeySelectionArgs(keys, keyStart, keyCount));
-          }
-          mReactDatabaseSupplier.get().setTransactionSuccessful();
-        } catch (Exception e) {
-          FLog.w(ReactConstants.TAG, e.getMessage(), e);
-          error = AsyncStorageErrorUtil.getError(null, e.getMessage());
-        } finally {
-          try {
-            mReactDatabaseSupplier.get().endTransaction();
-          } catch (Exception e) {
-            FLog.w(ReactConstants.TAG, e.getMessage(), e);
-            if (error == null) {
-              error = AsyncStorageErrorUtil.getError(null, e.getMessage());
-            }
-          }
-        }
-        if (error != null) {
-          callback.invoke(error);
-        } else {
-          callback.invoke();
-        }
-      }
-    }.executeOnExecutor(executor);
-  }
-
-  /**
-   * Given an array of (key, value) pairs, this will merge the given values with the stored values
-   * of the given keys, if they exist.
-   */
-  @Override
-  public void multiMerge(final ReadableArray keyValueArray, final Callback callback) {
-    new GuardedAsyncTask<Void, Void>(getReactApplicationContext()) {
-      @Override
-      protected void doInBackgroundGuarded(Void... params) {
-        if (!ensureDatabase()) {
-          callback.invoke(AsyncStorageErrorUtil.getDBError(null));
-          return;
-        }
-        WritableMap error = null;
-        try {
-          mReactDatabaseSupplier.get().beginTransaction();
-          for (int idx = 0; idx < keyValueArray.size(); idx++) {
-            if (keyValueArray.getArray(idx).size() != 2) {
-              error = AsyncStorageErrorUtil.getInvalidValueError(null);
-              return;
-            }
-
-            if (keyValueArray.getArray(idx).getString(0) == null) {
-              error = AsyncStorageErrorUtil.getInvalidKeyError(null);
-              return;
-            }
-
-            if (keyValueArray.getArray(idx).getString(1) == null) {
-              error = AsyncStorageErrorUtil.getInvalidValueError(null);
-              return;
-            }
-
-            if (!AsyncLocalStorageUtil.mergeImpl(
-                mReactDatabaseSupplier.get(),
-                keyValueArray.getArray(idx).getString(0),
-                keyValueArray.getArray(idx).getString(1))) {
-              error = AsyncStorageErrorUtil.getDBError(null);
-              return;
-            }
-          }
-          mReactDatabaseSupplier.get().setTransactionSuccessful();
-        } catch (Exception e) {
-          FLog.w(ReactConstants.TAG, e.getMessage(), e);
-          error = AsyncStorageErrorUtil.getError(null, e.getMessage());
-        } finally {
-          try {
-            mReactDatabaseSupplier.get().endTransaction();
-          } catch (Exception e) {
-            FLog.w(ReactConstants.TAG, e.getMessage(), e);
-            if (error == null) {
-              error = AsyncStorageErrorUtil.getError(null, e.getMessage());
-            }
-          }
-        }
-        if (error != null) {
-          callback.invoke(error);
-        } else {
-          callback.invoke();
-        }
-      }
-    }.executeOnExecutor(executor);
-  }
-
-  /** Clears the database. */
-  @Override
-  public void clear(final Callback callback) {
-    new GuardedAsyncTask<Void, Void>(getReactApplicationContext()) {
-      @Override
-      protected void doInBackgroundGuarded(Void... params) {
-        if (!mReactDatabaseSupplier.ensureDatabase()) {
-          callback.invoke(AsyncStorageErrorUtil.getDBError(null));
-          return;
-        }
-        try {
-          mReactDatabaseSupplier.clear();
-          callback.invoke();
-        } catch (Exception e) {
-          FLog.w(ReactConstants.TAG, e.getMessage(), e);
-          callback.invoke(AsyncStorageErrorUtil.getError(null, e.getMessage()));
-        }
-      }
-    }.executeOnExecutor(executor);
-  }
-
-  /** Returns an array with all keys from the database. */
-  @Override
-  public void getAllKeys(final Callback callback) {
-    new GuardedAsyncTask<Void, Void>(getReactApplicationContext()) {
-      @Override
-      protected void doInBackgroundGuarded(Void... params) {
-        if (!ensureDatabase()) {
-          callback.invoke(AsyncStorageErrorUtil.getDBError(null), null);
-          return;
-        }
-        WritableArray data = Arguments.createArray();
-        String[] columns = {KEY_COLUMN};
-        Cursor cursor =
-            mReactDatabaseSupplier
-                .get()
-                .query(TABLE_CATALYST, columns, null, null, null, null, null);
-        try {
-          if (cursor.moveToFirst()) {
-            do {
-              data.pushString(cursor.getString(0));
-            } while (cursor.moveToNext());
-          }
-        } catch (Exception e) {
-          FLog.w(ReactConstants.TAG, e.getMessage(), e);
-          callback.invoke(AsyncStorageErrorUtil.getError(null, e.getMessage()), null);
-          return;
-        } finally {
-          cursor.close();
-        }
-        callback.invoke(null, data);
-      }
-    }.executeOnExecutor(executor);
-  }
-
-  /** Verify the database is open for reads and writes. */
-  private boolean ensureDatabase() {
-    return !mShuttingDown && mReactDatabaseSupplier.ensureDatabase();
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK
deleted file mode 100644
index 73632c65b44c..000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK
+++ /dev/null
@@ -1,27 +0,0 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_root_target", "react_native_target", "rn_android_library")
-
-rn_android_library(
-    name = "storage",
-    srcs = glob(["**/*.java"]),
-    autoglob = False,
-    is_androidx = True,
-    labels = [
-        "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
-    ],
-    language = "JAVA",
-    visibility = [
-        "PUBLIC",
-    ],
-    deps = [
-        react_native_dep("third-party/android/androidx:annotation"),
-        react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
-        react_native_dep("third-party/java/infer-annotations:infer-annotations"),
-        react_native_dep("third-party/java/jsr-305:jsr-305"),
-        react_native_target("java/com/facebook/react/bridge:bridge"),
-        react_native_target("java/com/facebook/react/common:common"),
-        react_native_target("java/com/facebook/react/module/annotations:annotations"),
-        react_native_target("java/com/facebook/react/modules/common:common"),
-    ],
-    exported_deps = [react_native_root_target(":FBReactNativeSpec")],
-)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/ReactDatabaseSupplier.java b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/ReactDatabaseSupplier.java
deleted file mode 100644
index ccf9fb9fe2aa..000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/ReactDatabaseSupplier.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.modules.storage;
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-import android.database.sqlite.SQLiteOpenHelper;
-import androidx.annotation.Nullable;
-import com.facebook.common.logging.FLog;
-import com.facebook.react.common.ReactConstants;
-
-/**
- * Database supplier of the database used by react native. This creates, opens and deletes the
- * database as necessary.
- */
-public class ReactDatabaseSupplier extends SQLiteOpenHelper {
-
-  // VisibleForTesting
-  public static final String DATABASE_NAME = "RKStorage";
-
-  private static final int DATABASE_VERSION = 1;
-  private static final int SLEEP_TIME_MS = 30;
-
-  static final String TABLE_CATALYST = "catalystLocalStorage";
-  static final String KEY_COLUMN = "key";
-  static final String VALUE_COLUMN = "value";
-
-  static final String VERSION_TABLE_CREATE =
-      "CREATE TABLE "
-          + TABLE_CATALYST
-          + " ("
-          + KEY_COLUMN
-          + " TEXT PRIMARY KEY, "
-          + VALUE_COLUMN
-          + " TEXT NOT NULL"
-          + ")";
-
-  private static @Nullable ReactDatabaseSupplier sReactDatabaseSupplierInstance;
-
-  private Context mContext;
-  private @Nullable SQLiteDatabase mDb;
-  private long mMaximumDatabaseSize = 6L * 1024L * 1024L; // 6 MB in bytes
-
-  private ReactDatabaseSupplier(Context context) {
-    super(context, DATABASE_NAME, null, DATABASE_VERSION);
-    mContext = context;
-  }
-
-  public static ReactDatabaseSupplier getInstance(Context context) {
-    if (sReactDatabaseSupplierInstance == null) {
-      sReactDatabaseSupplierInstance = new ReactDatabaseSupplier(context.getApplicationContext());
-    }
-    return sReactDatabaseSupplierInstance;
-  }
-
-  @Override
-  public void onCreate(SQLiteDatabase db) {
-    db.execSQL(VERSION_TABLE_CREATE);
-  }
-
-  @Override
-  public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-    if (oldVersion != newVersion) {
-      deleteDatabase();
-      onCreate(db);
-    }
-  }
-
-  /** Verify the database exists and is open. */
-  /* package */ synchronized boolean ensureDatabase() {
-    if (mDb != null && mDb.isOpen()) {
-      return true;
-    }
-    // Sometimes retrieving the database fails. We do 2 retries: first without database deletion
-    // and then with deletion.
-    SQLiteException lastSQLiteException = null;
-    for (int tries = 0; tries < 2; tries++) {
-      try {
-        if (tries > 0) {
-          deleteDatabase();
-        }
-        mDb = getWritableDatabase();
-        break;
-      } catch (SQLiteException e) {
-        lastSQLiteException = e;
-      }
-      // Wait before retrying.
-      try {
-        Thread.sleep(SLEEP_TIME_MS);
-      } catch (InterruptedException ie) {
-        Thread.currentThread().interrupt();
-      }
-    }
-    if (mDb == null) {
-      throw lastSQLiteException;
-    }
-    // This is a sane limit to protect the user from the app storing too much data in the database.
-    // This also protects the database from filling up the disk cache and becoming malformed
-    // (endTransaction() calls will throw an exception, not rollback, and leave the db malformed).
-    mDb.setMaximumSize(mMaximumDatabaseSize);
-    return true;
-  }
-
-  /** Create and/or open the database. */
-  public synchronized SQLiteDatabase get() {
-    ensureDatabase();
-    return mDb;
-  }
-
-  public synchronized void clearAndCloseDatabase() throws RuntimeException {
-    try {
-      clear();
-      closeDatabase();
-      FLog.d(ReactConstants.TAG, "Cleaned " + DATABASE_NAME);
-    } catch (Exception e) {
-      // Clearing the database has failed, delete it instead.
-      if (deleteDatabase()) {
-        FLog.d(ReactConstants.TAG, "Deleted Local Database " + DATABASE_NAME);
-        return;
-      }
-      // Everything failed, throw
-      throw new RuntimeException("Clearing and deleting database " + DATABASE_NAME + " failed");
-    }
-  }
-
-  /* package */ synchronized void clear() {
-    get().delete(TABLE_CATALYST, null, null);
-  }
-
-  /**
-   * Sets the maximum size the database will grow to. The maximum size cannot be set below the
-   * current size.
-   */
-  public synchronized void setMaximumSize(long size) {
-    mMaximumDatabaseSize = size;
-    if (mDb != null) {
-      mDb.setMaximumSize(mMaximumDatabaseSize);
-    }
-  }
-
-  private synchronized boolean deleteDatabase() {
-    closeDatabase();
-    return mContext.deleteDatabase(DATABASE_NAME);
-  }
-
-  private synchronized void closeDatabase() {
-    if (mDb != null && mDb.isOpen()) {
-      mDb.close();
-      mDb = null;
-    }
-  }
-
-  // For testing purposes only!
-  public static void deleteInstance() {
-    sReactDatabaseSupplierInstance = null;
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java
index 5bc5192dee27..c03aab436f5f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java
@@ -50,6 +50,8 @@ private String uiMode() {
         return "desk";
       case Configuration.UI_MODE_TYPE_WATCH:
         return "watch";
+      case Configuration.UI_MODE_TYPE_VR_HEADSET:
+        return "vrheadset";
       case Configuration.UI_MODE_TYPE_NORMAL:
         return "normal";
       default:
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
index 1fcefc767c99..e35b947dbc09 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
@@ -7,10 +7,8 @@ rn_android_library(
         "ReactNativeVersion.java",
     ],
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
@@ -37,10 +35,8 @@ rn_android_library(
         "AndroidInfoHelpers.java",
     ],
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
index d42743752bb9..e4a4c0345665 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
@@ -16,7 +16,7 @@
 public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
-      "minor", 0,
+      "minor", 71,
       "patch", 0,
-      "prerelease", null);
+      "prerelease", "rc.5");
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK
index 97ee0d8a8cbf..d1660ab7f20d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK
index 94dcc95c7994..f584ea54ef8b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK
index 4a94227ae282..cd32f6785935 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "websocket",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java
index 92e5b9143b3f..50e6f9d84c3c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java
@@ -58,10 +58,18 @@ public WebSocketModule(ReactApplicationContext context) {
     mCookieHandler = new ForwardingCookieHandler(context);
   }
 
-  private void sendEvent(String eventName, WritableMap params) {
-    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
+  @Override
+  public void invalidate() {
+    for (WebSocket socket : mWebSocketConnections.values()) {
+      socket.close(1001 /* endpoint is going away */, null);
+    }
+    mWebSocketConnections.clear();
+    mContentHandlers.clear();
+  }
 
-    if (reactApplicationContext != null) {
+  private void sendEvent(String eventName, WritableMap params) {
+    ReactApplicationContext reactApplicationContext = getReactApplicationContext();
+    if (reactApplicationContext.hasActiveReactInstance()) {
       reactApplicationContext
           .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
           .emit(eventName, params);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK
index a0a16974d46e..53f9c5277302 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/BUCK
@@ -6,10 +6,8 @@ rn_android_library(
         ["**/*.java"],
     ),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK b/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK
index 08d0367f5a5d..07c545a4a9ca 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK
@@ -17,7 +17,6 @@ rn_java_library(
     srcs = glob(["*.java"]),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     source = "7",
     target = "7",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/BUCK b/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/BUCK
index 194149d9ee8b..af677fa38cc4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/BUCK
@@ -10,7 +10,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     required_for_source_only_abi = True,
@@ -20,6 +19,6 @@ rn_android_library(
     deps = [
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
         react_native_dep("libraries/fbjni:java"),
-        react_native_target("java/com/facebook/react/reactperflogger/jni:jni"),
+        react_native_target("jni/react/reactperflogger:jni"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK b/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK
index 65bf1513c1c7..f6d575f9aff6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "shell",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
@@ -48,7 +46,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/permissions:permissions"),
         react_native_target("java/com/facebook/react/modules/share:share"),
         react_native_target("java/com/facebook/react/modules/statusbar:statusbar"),
-        react_native_target("java/com/facebook/react/modules/storage:storage"),
         react_native_target("java/com/facebook/react/modules/sound:sound"),
         react_native_target("java/com/facebook/react/modules/toast:toast"),
         react_native_target("java/com/facebook/react/modules/vibration:vibration"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java
index 6fc4a536e2b1..f845a46118cf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java
@@ -33,7 +33,6 @@
 import com.facebook.react.modules.share.ShareModule;
 import com.facebook.react.modules.sound.SoundManagerModule;
 import com.facebook.react.modules.statusbar.StatusBarModule;
-import com.facebook.react.modules.storage.AsyncStorageModule;
 import com.facebook.react.modules.toast.ToastModule;
 import com.facebook.react.modules.vibration.VibrationModule;
 import com.facebook.react.modules.websocket.WebSocketModule;
@@ -69,7 +68,6 @@
       AppStateModule.class,
       BlobModule.class,
       FileReaderModule.class,
-      AsyncStorageModule.class,
       ClipboardModule.class,
       DialogModule.class,
       FrescoModule.class,
@@ -111,8 +109,6 @@ public MainReactPackage(MainPackageConfig config) {
         return new BlobModule(context);
       case FileReaderModule.NAME:
         return new FileReaderModule(context);
-      case AsyncStorageModule.NAME:
-        return new AsyncStorageModule(context);
       case ClipboardModule.NAME:
         return new ClipboardModule(context);
       case DialogModule.NAME:
@@ -193,7 +189,6 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {
             AppStateModule.class,
             BlobModule.class,
             FileReaderModule.class,
-            AsyncStorageModule.class,
             ClipboardModule.class,
             DialogModule.class,
             FrescoModule.class,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK b/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK
index 5dd4efa696a0..fbf785ccfce0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "surface",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK b/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK
index a9771388ede9..e8949030a881 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/touch/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "touch",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/BUCK b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/BUCK
index 308b2ba6e955..6fd897c5e747 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/BUCK
@@ -11,7 +11,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     required_for_source_only_abi = True,
@@ -28,12 +27,12 @@ rn_android_library(
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/reactperflogger:reactperflogger"),
-        react_native_target("java/com/facebook/react/turbomodule/core/jni:jni"),
         react_native_target("java/com/facebook/debug/holder:holder"),
         react_native_target("java/com/facebook/react/bridge:interfaces"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/config:config"),
         react_native_target("java/com/facebook/react/module/model:model"),
+        react_native_target("jni/react/turbomodule:jni"),
         ":callinvokerholder",
     ],
     exported_deps = [
@@ -47,7 +46,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     required_for_source_only_abi = True,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/BUCK b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/BUCK
index dac3cd10b04a..1a1285b36245 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/interfaces/BUCK
@@ -6,10 +6,8 @@ rn_android_library(
         ["*.java"],
     ),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     required_for_source_only_abi = True,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
index 87ee60ed353f..021331bddff1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
@@ -13,10 +13,8 @@ rn_android_library(
     name = "interfaces",
     srcs = glob(INTERFACES_FILES),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
@@ -50,10 +48,8 @@ rn_android_library(
     exported_provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
     ],
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
@@ -76,7 +72,6 @@ rn_android_library(
         react_native_target("java/com/facebook/debug/tags:tags"),
         react_native_target("java/com/facebook/debug/holder:holder"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
-        react_native_target("java/com/facebook/react/uimanager/jni:jni"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/common/mapbuffer:mapbuffer"),
         react_native_target("java/com/facebook/react/config:config"),
@@ -86,6 +81,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/touch:touch"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager/util:util"),
+        react_native_target("jni/react/uimanager:jni"),
         react_native_target("res:uimanager"),
     ],
     exported_deps = [
@@ -102,10 +98,8 @@ rn_android_library(
         "DisplayMetricsHolder.java",
     ],
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
index 16b6b3abb26a..f32bc44be2d5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
@@ -27,6 +27,7 @@
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.uimanager.events.PointerEventHelper;
 import com.facebook.react.uimanager.util.ReactFindViewUtil;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -67,9 +68,8 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
   @Override
   protected T prepareToRecycleView(@NonNull ThemedReactContext reactContext, T view) {
     // Reset tags
-    view.setTag(R.id.pointer_enter, null);
-    view.setTag(R.id.pointer_leave, null);
-    view.setTag(R.id.pointer_move, null);
+    view.setTag(null);
+    view.setTag(R.id.pointer_events, null);
     view.setTag(R.id.react_test_id, null);
     view.setTag(R.id.view_tag_native_id, null);
     view.setTag(R.id.labelled_by, null);
@@ -92,8 +92,7 @@ protected T prepareToRecycleView(@NonNull ThemedReactContext reactContext, T vie
     setTransform(view, null);
 
     // RenderNode params not covered by setTransform above
-    view.setPivotX(0);
-    view.setPivotY(0);
+    view.resetPivot();
     view.setTop(0);
     view.setBottom(0);
     view.setLeft(0);
@@ -287,7 +286,9 @@ public void setViewState(@NonNull T view, @Nullable ReadableMap accessibilitySta
       view.setSelected(false);
     }
     view.setTag(R.id.accessibility_state, accessibilityState);
-    view.setEnabled(true);
+    if (accessibilityState.hasKey("disabled") && !accessibilityState.getBoolean("disabled")) {
+      view.setEnabled(true);
+    }
 
     // For states which don't have corresponding methods in
     // AccessibilityNodeInfo, update the view's content description
@@ -316,7 +317,6 @@ public void setViewState(@NonNull T view, @Nullable ReadableMap accessibilitySta
   private void updateViewContentDescription(@NonNull T view) {
     final String accessibilityLabel = (String) view.getTag(R.id.accessibility_label);
     final ReadableMap accessibilityState = (ReadableMap) view.getTag(R.id.accessibility_state);
-    final String accessibilityHint = (String) view.getTag(R.id.accessibility_hint);
     final List<String> contentDescription = new ArrayList<>();
     final ReadableMap accessibilityValue = (ReadableMap) view.getTag(R.id.accessibility_value);
     if (accessibilityLabel != null) {
@@ -351,9 +351,6 @@ private void updateViewContentDescription(@NonNull T view) {
         contentDescription.add(text.asString());
       }
     }
-    if (accessibilityHint != null) {
-      contentDescription.add(accessibilityHint);
-    }
     if (contentDescription.size() > 0) {
       view.setContentDescription(TextUtils.join(", ", contentDescription));
     }
@@ -583,6 +580,16 @@ protected void onAfterUpdateTransaction(@NonNull T view) {
                 MapBuilder.of(
                     "phasedRegistrationNames",
                     MapBuilder.of("bubbled", "onPointerUp", "captured", "onPointerUpCapture")))
+            .put(
+                "topPointerOut",
+                MapBuilder.of(
+                    "phasedRegistrationNames",
+                    MapBuilder.of("bubbled", "onPointerOut", "captured", "onPointerOutCapture")))
+            .put(
+                "topPointerOver",
+                MapBuilder.of(
+                    "phasedRegistrationNames",
+                    MapBuilder.of("bubbled", "onPointerOver", "captured", "onPointerOverCapture")))
             .build());
     return eventTypeConstants;
   }
@@ -631,35 +638,63 @@ private void logUnsupportedPropertyWarning(String propName) {
     FLog.w(ReactConstants.TAG, "%s doesn't support property '%s'", getName(), propName);
   }
 
+  private static void setPointerEventsFlag(
+      @NonNull View view, PointerEventHelper.EVENT event, boolean isListening) {
+    Integer tag = (Integer) view.getTag(R.id.pointer_events);
+    int currentValue = tag != null ? tag.intValue() : 0;
+    int flag = 1 << event.ordinal();
+    view.setTag(R.id.pointer_events, isListening ? (currentValue | flag) : (currentValue & ~flag));
+  }
+
   /* Experimental W3C Pointer events start */
   @ReactProp(name = "onPointerEnter")
   public void setPointerEnter(@NonNull T view, boolean value) {
-    view.setTag(R.id.pointer_enter, value);
+    setPointerEventsFlag(view, PointerEventHelper.EVENT.ENTER, value);
   }
 
   @ReactProp(name = "onPointerEnterCapture")
   public void setPointerEnterCapture(@NonNull T view, boolean value) {
-    view.setTag(R.id.pointer_enter_capture, value);
+    setPointerEventsFlag(view, PointerEventHelper.EVENT.ENTER_CAPTURE, value);
+  }
+
+  @ReactProp(name = "onPointerOver")
+  public void setPointerOver(@NonNull T view, boolean value) {
+    setPointerEventsFlag(view, PointerEventHelper.EVENT.OVER, value);
+  }
+
+  @ReactProp(name = "onPointerOverCapture")
+  public void setPointerOverCapture(@NonNull T view, boolean value) {
+    setPointerEventsFlag(view, PointerEventHelper.EVENT.OVER_CAPTURE, value);
+  }
+
+  @ReactProp(name = "onPointerOut")
+  public void setPointerOut(@NonNull T view, boolean value) {
+    setPointerEventsFlag(view, PointerEventHelper.EVENT.OUT, value);
+  }
+
+  @ReactProp(name = "onPointerOutCapture")
+  public void setPointerOutCapture(@NonNull T view, boolean value) {
+    setPointerEventsFlag(view, PointerEventHelper.EVENT.OUT_CAPTURE, value);
   }
 
   @ReactProp(name = "onPointerLeave")
   public void setPointerLeave(@NonNull T view, boolean value) {
-    view.setTag(R.id.pointer_leave, value);
+    setPointerEventsFlag(view, PointerEventHelper.EVENT.LEAVE, value);
   }
 
   @ReactProp(name = "onPointerLeaveCapture")
   public void setPointerLeaveCapture(@NonNull T view, boolean value) {
-    view.setTag(R.id.pointer_leave_capture, value);
+    setPointerEventsFlag(view, PointerEventHelper.EVENT.LEAVE_CAPTURE, value);
   }
 
   @ReactProp(name = "onPointerMove")
   public void setPointerMove(@NonNull T view, boolean value) {
-    view.setTag(R.id.pointer_move, value);
+    setPointerEventsFlag(view, PointerEventHelper.EVENT.MOVE, value);
   }
 
   @ReactProp(name = "onPointerMoveCapture")
   public void setPointerMoveCapture(@NonNull T view, boolean value) {
-    view.setTag(R.id.pointer_move_capture, value);
+    setPointerEventsFlag(view, PointerEventHelper.EVENT.MOVE_CAPTURE, value);
   }
 
   /* Experimental W3C Pointer events end */
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.java
index 5c2ca1b828f0..bb809381494e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.java
@@ -11,6 +11,7 @@
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.bridge.DynamicFromObject;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.yoga.YogaConstants;
@@ -92,7 +93,8 @@ public void setProperty(T view, String propName, @Nullable Object value) {
         mViewManager.setNativeId(view, (String) value);
         break;
       case ViewProps.ACCESSIBILITY_LABELLED_BY:
-        mViewManager.setAccessibilityLabelledBy(view, (Dynamic) value);
+        Dynamic dynamicFromObject = new DynamicFromObject(value);
+        mViewManager.setAccessibilityLabelledBy(view, dynamicFromObject);
         break;
       case ViewProps.OPACITY:
         mViewManager.setOpacity(view, value == null ? 1.0f : ((Double) value).floatValue());
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java
index c3a2c630563f..2d9d1def01c9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java
@@ -18,21 +18,13 @@
 
 /**
  * Holds an instance of the current DisplayMetrics so we don't have to thread it through all the
- * classes that need it. Note: windowDisplayMetrics are deprecated in favor of ScreenDisplayMetrics:
- * window metrics are supposed to return the drawable area but there's no guarantee that they
- * correspond to the actual size of the {@link ReactRootView}. Moreover, they are not consistent
- * with what iOS returns. Screen metrics returns the metrics of the entire screen, is consistent
- * with iOS and should be used instead.
+ * classes that need it.
  */
 public class DisplayMetricsHolder {
 
   private static @Nullable DisplayMetrics sWindowDisplayMetrics;
   private static @Nullable DisplayMetrics sScreenDisplayMetrics;
 
-  /**
-   * @deprecated Use {@link #setScreenDisplayMetrics(DisplayMetrics)} instead. See comment above as
-   *     to why this is not correct to use.
-   */
   public static void setWindowDisplayMetrics(DisplayMetrics displayMetrics) {
     sWindowDisplayMetrics = displayMetrics;
   }
@@ -63,11 +55,7 @@ public static void initDisplayMetrics(Context context) {
     DisplayMetricsHolder.setScreenDisplayMetrics(screenDisplayMetrics);
   }
 
-  /**
-   * @deprecated Use {@link #getScreenDisplayMetrics()} instead. See comment above as to why this is
-   *     not correct to use.
-   */
-  @Deprecated
+  /** Returns the metrics of the window associated to the Context used to initialize ReactNative */
   public static DisplayMetrics getWindowDisplayMetrics() {
     return sWindowDisplayMetrics;
   }
@@ -76,6 +64,7 @@ public static void setScreenDisplayMetrics(DisplayMetrics screenDisplayMetrics)
     sScreenDisplayMetrics = screenDisplayMetrics;
   }
 
+  /** Screen metrics returns the metrics of the default screen on the device. */
   public static DisplayMetrics getScreenDisplayMetrics() {
     return sScreenDisplayMetrics;
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSPointerDispatcher.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSPointerDispatcher.java
index 434ebe0fe191..88ab9e9efc0a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSPointerDispatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSPointerDispatcher.java
@@ -16,13 +16,14 @@
 import com.facebook.react.uimanager.TouchTargetHelper.ViewTarget;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.PointerEvent;
+import com.facebook.react.uimanager.events.PointerEvent.PointerEventState;
 import com.facebook.react.uimanager.events.PointerEventHelper;
 import com.facebook.react.uimanager.events.PointerEventHelper.EVENT;
-import com.facebook.react.uimanager.events.TouchEvent;
-import com.facebook.react.uimanager.events.TouchEventCoalescingKeyHelper;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * JSPointerDispatcher handles dispatching pointer events to JS from RootViews. If you implement
@@ -31,20 +32,20 @@
  * and also dispatch the appropriate event to JS
  */
 public class JSPointerDispatcher {
+  private static final int UNSET_POINTER_ID = -1;
+  private static final float ONMOVE_EPSILON = 0.1f;
+  private static final String TAG = "POINTER EVENTS";
+
+  private Map<Integer, List<ViewTarget>> mLastHitPathByPointerId;
+  private Map<Integer, float[]> mLastEventCoordinatesByPointerId;
 
-  private final float[] mTargetCoordinates = new float[2];
   private int mChildHandlingNativeGesture = -1;
-  private long mDownStartTime = TouchEvent.UNSET;
+  private int mPrimaryPointerId = UNSET_POINTER_ID;
+  private int mCoalescingKey = 0;
+  private int mLastButtonState = 0;
   private final ViewGroup mRootViewGroup;
-  private final TouchEventCoalescingKeyHelper mTouchEventCoalescingKeyHelper =
-      new TouchEventCoalescingKeyHelper();
-
-  private static final float ONMOVE_EPSILON = 0.1f;
 
   // Set globally for hover interactions, referenced for coalescing hover events
-  private long mHoverInteractionKey = TouchEvent.UNSET;
-  private List<ViewTarget> mLastHitPath = Collections.emptyList();
-  private final float[] mLastEventCoordinates = new float[2];
 
   public JSPointerDispatcher(ViewGroup viewGroup) {
     mRootViewGroup = viewGroup;
@@ -59,10 +60,7 @@ public void onChildStartedNativeGesture(
       return;
     }
 
-    List<ViewTarget> hitPath =
-        TouchTargetHelper.findTargetPathAndCoordinatesForTouch(
-            motionEvent.getX(), motionEvent.getY(), mRootViewGroup, mTargetCoordinates);
-    dispatchCancelEvent(hitPath, motionEvent, eventDispatcher);
+    dispatchCancelEvent(motionEvent, eventDispatcher);
     mChildHandlingNativeGesture = childView.getId();
   }
 
@@ -71,183 +69,197 @@ public void onChildEndedNativeGesture() {
     mChildHandlingNativeGesture = -1;
   }
 
-  public void handleMotionEvent(MotionEvent motionEvent, EventDispatcher eventDispatcher) {
-    boolean supportsHover = PointerEventHelper.supportsHover(motionEvent);
+  private void onUp(
+      int activeTargetTag,
+      PointerEventState eventState,
+      MotionEvent motionEvent,
+      EventDispatcher eventDispatcher) {
 
-    int surfaceId = UIManagerHelper.getSurfaceId(mRootViewGroup);
-    int action = motionEvent.getActionMasked();
-    List<ViewTarget> hitPath =
-        TouchTargetHelper.findTargetPathAndCoordinatesForTouch(
-            motionEvent.getX(), motionEvent.getY(), mRootViewGroup, mTargetCoordinates);
+    List<ViewTarget> activeHitPath =
+        eventState.getHitPathByPointerId().get(eventState.getActivePointerId());
 
-    if (hitPath.isEmpty()) {
-      return;
+    boolean supportsHover = PointerEventHelper.supportsHover(motionEvent);
+    boolean listeningForUp =
+        isAnyoneListeningForBubblingEvent(activeHitPath, EVENT.UP, EVENT.UP_CAPTURE);
+    if (listeningForUp) {
+      eventDispatcher.dispatchEvent(
+          PointerEvent.obtain(
+              PointerEventHelper.POINTER_UP, activeTargetTag, eventState, motionEvent));
     }
 
-    TouchTargetHelper.ViewTarget activeViewTarget = hitPath.get(0);
-    int activeTargetTag = activeViewTarget.getViewId();
-
-    if (supportsHover) {
-      if (action == MotionEvent.ACTION_HOVER_MOVE) {
-        handleHoverEvent(motionEvent, eventDispatcher, surfaceId, hitPath);
-        return;
+    if (!supportsHover) {
+      boolean listeningForOut =
+          isAnyoneListeningForBubblingEvent(activeHitPath, EVENT.OUT, EVENT.OUT_CAPTURE);
+      if (listeningForOut) {
+        eventDispatcher.dispatchEvent(
+            PointerEvent.obtain(
+                PointerEventHelper.POINTER_OUT, activeTargetTag, eventState, motionEvent));
       }
 
-      // Ignore hover enter/exit because it's handled in `handleHoverEvent`
-      if (action == MotionEvent.ACTION_HOVER_EXIT || action == MotionEvent.ACTION_HOVER_ENTER) {
-        return;
-      }
+      List<ViewTarget> leaveViewTargets =
+          filterByShouldDispatch(activeHitPath, EVENT.LEAVE, EVENT.LEAVE_CAPTURE, false);
+
+      // target -> root
+      dispatchEventForViewTargets(
+          PointerEventHelper.POINTER_LEAVE,
+          eventState,
+          motionEvent,
+          leaveViewTargets,
+          eventDispatcher);
     }
 
-    // First down pointer
-    if (action == MotionEvent.ACTION_DOWN) {
+    if (motionEvent.getActionMasked() == MotionEvent.ACTION_UP) {
+      mPrimaryPointerId = UNSET_POINTER_ID;
+    }
+  }
 
-      // Reset mChildHandlingNativeGesture like JSTouchDispatcher does
-      mChildHandlingNativeGesture = -1;
+  private void incrementCoalescingKey() {
+    mCoalescingKey = (mCoalescingKey + 1) % Integer.MAX_VALUE;
+  }
 
-      // Start a "down" coalescing key
-      mDownStartTime = motionEvent.getEventTime();
-      mTouchEventCoalescingKeyHelper.addCoalescingKey(mDownStartTime);
+  private short getCoalescingKey() {
+    return ((short) (0xffff & mCoalescingKey));
+  }
 
-      if (!supportsHover) {
-        List<ViewTarget> enterViewTargets =
-            filterByShouldDispatch(hitPath, EVENT.ENTER, EVENT.ENTER_CAPTURE, false);
+  private void onDown(
+      int activeTargetTag,
+      PointerEventState eventState,
+      MotionEvent motionEvent,
+      EventDispatcher eventDispatcher) {
 
-        // Dispatch root -> target, we need to reverse order of enterViewTargets
-        Collections.reverse(enterViewTargets);
-        dispatchEventForViewTargets(
-            PointerEventHelper.POINTER_ENTER,
-            enterViewTargets,
-            eventDispatcher,
-            surfaceId,
-            motionEvent);
-      }
+    List<ViewTarget> activeHitPath =
+        eventState.getHitPathByPointerId().get(eventState.getActivePointerId());
 
-      boolean listeningForDown =
-          isAnyoneListeningForBubblingEvent(hitPath, EVENT.DOWN, EVENT.DOWN_CAPTURE);
-      if (listeningForDown) {
+    incrementCoalescingKey();
+    boolean supportsHover = PointerEventHelper.supportsHover(motionEvent);
+    if (!supportsHover) {
+      // Indirect OVER event dispatches before ENTER
+      boolean listeningForOver =
+          isAnyoneListeningForBubblingEvent(activeHitPath, EVENT.OVER, EVENT.OVER_CAPTURE);
+      if (listeningForOver) {
         eventDispatcher.dispatchEvent(
             PointerEvent.obtain(
-                PointerEventHelper.POINTER_DOWN,
-                surfaceId,
-                activeTargetTag,
-                motionEvent,
-                mTargetCoordinates));
+                PointerEventHelper.POINTER_OVER, activeTargetTag, eventState, motionEvent));
       }
 
-      return;
-    }
+      List<ViewTarget> enterViewTargets =
+          filterByShouldDispatch(activeHitPath, EVENT.ENTER, EVENT.ENTER_CAPTURE, false);
 
-    // If the touch was intercepted by a child, we've already sent a cancel event to JS for this
-    // gesture, so we shouldn't send any more pointer events related to it.
-    if (mChildHandlingNativeGesture != -1) {
-      return;
+      // Dispatch root -> target, we need to reverse order of enterViewTargets
+      Collections.reverse(enterViewTargets);
+      dispatchEventForViewTargets(
+          PointerEventHelper.POINTER_ENTER,
+          eventState,
+          motionEvent,
+          enterViewTargets,
+          eventDispatcher);
     }
 
-    // New pointer goes down, this can only happen after ACTION_DOWN is sent for the first pointer
-    if (action == MotionEvent.ACTION_POINTER_DOWN) {
-      mTouchEventCoalescingKeyHelper.incrementCoalescingKey(mDownStartTime);
-
-      boolean listeningForDown =
-          isAnyoneListeningForBubblingEvent(hitPath, EVENT.DOWN, EVENT.DOWN_CAPTURE);
-      if (listeningForDown) {
-        eventDispatcher.dispatchEvent(
-            PointerEvent.obtain(
-                PointerEventHelper.POINTER_DOWN,
-                surfaceId,
-                activeTargetTag,
-                motionEvent,
-                mTargetCoordinates));
-      }
-
-      return;
+    boolean listeningForDown =
+        isAnyoneListeningForBubblingEvent(activeHitPath, EVENT.DOWN, EVENT.DOWN_CAPTURE);
+    if (listeningForDown) {
+      eventDispatcher.dispatchEvent(
+          PointerEvent.obtain(
+              PointerEventHelper.POINTER_DOWN, activeTargetTag, eventState, motionEvent));
     }
+  }
 
-    if (action == MotionEvent.ACTION_MOVE) {
-      int coalescingKey = mTouchEventCoalescingKeyHelper.getCoalescingKey(mDownStartTime);
-
-      boolean listeningForMove =
-          isAnyoneListeningForBubblingEvent(hitPath, EVENT.MOVE, EVENT.MOVE_CAPTURE);
-      if (listeningForMove) {
-        eventDispatcher.dispatchEvent(
-            PointerEvent.obtain(
-                PointerEventHelper.POINTER_MOVE,
-                surfaceId,
-                activeTargetTag,
-                motionEvent,
-                mTargetCoordinates,
-                coalescingKey));
-      }
-
-      return;
+  private PointerEventState createEventState(MotionEvent motionEvent) {
+    int activeIndex = motionEvent.getActionIndex();
+
+    Map<Integer, float[]> offsetByPointerId = new HashMap<Integer, float[]>();
+    Map<Integer, List<ViewTarget>> hitPathByPointerId = new HashMap<Integer, List<ViewTarget>>();
+    Map<Integer, float[]> eventCoordinatesByPointerId = new HashMap<Integer, float[]>();
+    for (int index = 0; index < motionEvent.getPointerCount(); index++) {
+      float[] offsetCoordinates = new float[2];
+      float[] eventCoordinates = new float[] {motionEvent.getX(index), motionEvent.getY(index)};
+      List<ViewTarget> hitPath =
+          TouchTargetHelper.findTargetPathAndCoordinatesForTouch(
+              eventCoordinates[0], eventCoordinates[1], mRootViewGroup, offsetCoordinates);
+
+      int pointerId = motionEvent.getPointerId(index);
+      offsetByPointerId.put(pointerId, offsetCoordinates);
+      hitPathByPointerId.put(pointerId, hitPath);
+      eventCoordinatesByPointerId.put(pointerId, eventCoordinates);
     }
 
-    // Exactly one of the pointers goes up, not the last one
-    if (action == MotionEvent.ACTION_POINTER_UP) {
-      mTouchEventCoalescingKeyHelper.incrementCoalescingKey(mDownStartTime);
+    int activePointerId = motionEvent.getPointerId(activeIndex);
+    int surfaceId = UIManagerHelper.getSurfaceId(mRootViewGroup);
 
-      boolean listeningForUp =
-          isAnyoneListeningForBubblingEvent(hitPath, EVENT.UP, EVENT.UP_CAPTURE);
-      if (listeningForUp) {
-        eventDispatcher.dispatchEvent(
-            PointerEvent.obtain(
-                PointerEventHelper.POINTER_UP,
-                surfaceId,
-                activeTargetTag,
-                motionEvent,
-                mTargetCoordinates));
-      }
+    return new PointerEventState(
+        mPrimaryPointerId,
+        activePointerId,
+        mLastButtonState,
+        surfaceId,
+        offsetByPointerId,
+        hitPathByPointerId,
+        eventCoordinatesByPointerId);
+  }
 
+  public void handleMotionEvent(MotionEvent motionEvent, EventDispatcher eventDispatcher) {
+    // Don't fire any pointer events if child view is handling native gesture
+    if (mChildHandlingNativeGesture != -1) {
       return;
     }
 
-    // Last pointer comes up
-    if (action == MotionEvent.ACTION_UP) {
-
-      // End of a "down" coalescing key
-      mTouchEventCoalescingKeyHelper.removeCoalescingKey(mDownStartTime);
-      mDownStartTime = TouchEvent.UNSET;
-
-      boolean listeningForUp =
-          isAnyoneListeningForBubblingEvent(hitPath, EVENT.UP, EVENT.UP_CAPTURE);
-      if (listeningForUp) {
-        eventDispatcher.dispatchEvent(
-            PointerEvent.obtain(
-                PointerEventHelper.POINTER_UP,
-                surfaceId,
-                activeTargetTag,
-                motionEvent,
-                mTargetCoordinates));
-      }
+    int action = motionEvent.getActionMasked();
+    if (action == MotionEvent.ACTION_DOWN) {
+      mPrimaryPointerId = motionEvent.getPointerId(0);
+    }
 
-      if (!supportsHover) {
-        List<ViewTarget> leaveViewTargets =
-            filterByShouldDispatch(hitPath, EVENT.LEAVE, EVENT.LEAVE_CAPTURE, false);
+    PointerEventState eventState = createEventState(motionEvent);
+    List<ViewTarget> activeHitPath =
+        eventState.getHitPathByPointerId().get(eventState.getActivePointerId());
 
-        // target -> root
-        dispatchEventForViewTargets(
-            PointerEventHelper.POINTER_LEAVE,
-            leaveViewTargets,
-            eventDispatcher,
-            surfaceId,
-            motionEvent);
-      }
+    if (activeHitPath == null || activeHitPath.isEmpty()) {
       return;
     }
 
-    if (action == MotionEvent.ACTION_CANCEL) {
-      dispatchCancelEvent(hitPath, motionEvent, eventDispatcher);
-      return;
+    TouchTargetHelper.ViewTarget activeViewTarget = activeHitPath.get(0);
+    int activeTargetTag = activeViewTarget.getViewId();
+
+    switch (action) {
+      case MotionEvent.ACTION_DOWN:
+      case MotionEvent.ACTION_POINTER_DOWN:
+        onDown(activeTargetTag, eventState, motionEvent, eventDispatcher);
+        break;
+      case MotionEvent.ACTION_HOVER_MOVE:
+        // TODO(luwe) - converge this with ACTION_MOVE
+        // HOVER_MOVE may occur before DOWN. Add its downTime as a coalescing key
+        onMove(activeTargetTag, eventState, motionEvent, eventDispatcher);
+        break;
+      case MotionEvent.ACTION_MOVE:
+        // TODO(luwe) - converge this with ACTION_HOVER_MOVE
+        boolean listeningForMove =
+            isAnyoneListeningForBubblingEvent(activeHitPath, EVENT.MOVE, EVENT.MOVE_CAPTURE);
+        if (listeningForMove) {
+          eventDispatcher.dispatchEvent(
+              PointerEvent.obtain(
+                  PointerEventHelper.POINTER_MOVE,
+                  activeTargetTag,
+                  eventState,
+                  motionEvent,
+                  getCoalescingKey()));
+        }
+        break;
+      case MotionEvent.ACTION_UP:
+      case MotionEvent.ACTION_POINTER_UP:
+        incrementCoalescingKey();
+        onUp(activeTargetTag, eventState, motionEvent, eventDispatcher);
+        break;
+      case MotionEvent.ACTION_CANCEL:
+        dispatchCancelEvent(eventState, motionEvent, eventDispatcher);
+        break;
+      default:
+        FLog.w(
+            ReactConstants.TAG,
+            "Warning : Motion Event was ignored. Action=" + action + " Target=" + activeTargetTag);
+        return;
     }
 
-    FLog.w(
-        ReactConstants.TAG,
-        "Warning : Motion Event was ignored. Action="
-            + action
-            + " Target="
-            + activeTargetTag
-            + " Supports Hover="
-            + supportsHover);
+    mLastHitPathByPointerId = eventState.getHitPathByPointerId();
+    mLastEventCoordinatesByPointerId = eventState.getEventCoordinatesByPointerId();
+    mLastButtonState = motionEvent.getButtonState();
   }
 
   private static boolean isAnyoneListeningForBubblingEvent(
@@ -298,80 +310,62 @@ private static List<ViewTarget> filterByShouldDispatch(
 
   private void dispatchEventForViewTargets(
       String eventName,
+      PointerEventState eventState,
+      MotionEvent motionEvent,
       List<ViewTarget> viewTargets,
-      EventDispatcher dispatcher,
-      int surfaceId,
-      MotionEvent motionEvent) {
+      EventDispatcher dispatcher) {
 
     for (ViewTarget viewTarget : viewTargets) {
       int viewId = viewTarget.getViewId();
-      dispatcher.dispatchEvent(
-          PointerEvent.obtain(eventName, surfaceId, viewId, motionEvent, mTargetCoordinates));
+      dispatcher.dispatchEvent(PointerEvent.obtain(eventName, viewId, eventState, motionEvent));
     }
   }
 
   // called on hover_move motion events only
-  private void handleHoverEvent(
+  private void onMove(
+      int targetTag,
+      PointerEventState eventState,
       MotionEvent motionEvent,
-      EventDispatcher eventDispatcher,
-      int surfaceId,
-      List<ViewTarget> hitPath) {
+      EventDispatcher eventDispatcher) {
 
-    int action = motionEvent.getActionMasked();
-    if (action != MotionEvent.ACTION_HOVER_MOVE) {
-      return;
-    }
+    int activePointerId = eventState.getActivePointerId();
+    float[] eventCoordinates = eventState.getEventCoordinatesByPointerId().get(activePointerId);
+    List<ViewTarget> activeHitPath = eventState.getHitPathByPointerId().get(activePointerId);
+
+    List<ViewTarget> lastHitPath =
+        mLastHitPathByPointerId != null && mLastHitPathByPointerId.containsKey(activePointerId)
+            ? mLastHitPathByPointerId.get(activePointerId)
+            : new ArrayList<ViewTarget>();
 
-    float x = motionEvent.getX();
-    float y = motionEvent.getY();
+    float[] lastEventCoordinates =
+        mLastEventCoordinatesByPointerId != null
+                && mLastEventCoordinatesByPointerId.containsKey(activePointerId)
+            ? mLastEventCoordinatesByPointerId.get(activePointerId)
+            : new float[] {0, 0};
 
     boolean qualifiedMove =
-        (Math.abs(mLastEventCoordinates[0] - x) > ONMOVE_EPSILON
-            || Math.abs(mLastEventCoordinates[1] - y) > ONMOVE_EPSILON);
+        (Math.abs(lastEventCoordinates[0] - eventCoordinates[0]) > ONMOVE_EPSILON
+            || Math.abs(lastEventCoordinates[1] - eventCoordinates[1]) > ONMOVE_EPSILON);
 
-    // Early exit
+    // Early exit if active pointer has not moved enough
     if (!qualifiedMove) {
       return;
     }
 
-    // Set the interaction key if unset, to be used as a coalescing key for hover interactions
-    if (mHoverInteractionKey < 0) {
-      mHoverInteractionKey = motionEvent.getEventTime();
-      mTouchEventCoalescingKeyHelper.addCoalescingKey(mHoverInteractionKey);
-    }
-
-    // If child is handling, eliminate target tags under handling child
-    if (mChildHandlingNativeGesture > 0) {
-      int index = 0;
-      for (ViewTarget viewTarget : hitPath) {
-        if (viewTarget.getViewId() == mChildHandlingNativeGesture) {
-          hitPath.subList(0, index).clear();
-          break;
-        }
-        index++;
-      }
-    }
-
-    int targetTag = hitPath.isEmpty() ? -1 : hitPath.get(0).getViewId();
-    // If targetTag is empty, we should bail?
-    if (targetTag == -1) {
-      return;
-    }
-
     // hitState is list ordered from inner child -> parent tag
-    // Traverse hitState back-to-front to find the first divergence with mLastHitState
+    // Traverse hitState back-to-front to find the first divergence with lastHitPath
     // FIXME: this may generate incorrect events when view collapsing changes the hierarchy
     boolean nonDivergentListeningToEnter = false;
     boolean nonDivergentListeningToLeave = false;
     int firstDivergentIndexFromBack = 0;
-    while (firstDivergentIndexFromBack < Math.min(hitPath.size(), mLastHitPath.size())
-        && hitPath
-            .get(hitPath.size() - 1 - firstDivergentIndexFromBack)
-            .equals(mLastHitPath.get(mLastHitPath.size() - 1 - firstDivergentIndexFromBack))) {
+    while (firstDivergentIndexFromBack < Math.min(activeHitPath.size(), lastHitPath.size())
+        && activeHitPath
+            .get(activeHitPath.size() - 1 - firstDivergentIndexFromBack)
+            .equals(lastHitPath.get(lastHitPath.size() - 1 - firstDivergentIndexFromBack))) {
 
       // Track if any non-diverging views are listening to enter/leave
       View nonDivergentViewTargetView =
-          hitPath.get(hitPath.size() - 1 - firstDivergentIndexFromBack).getView();
+          activeHitPath.get(activeHitPath.size() - 1 - firstDivergentIndexFromBack).getView();
       if (!nonDivergentListeningToEnter
           && PointerEventHelper.isListening(nonDivergentViewTargetView, EVENT.ENTER_CAPTURE)) {
         nonDivergentListeningToEnter = true;
@@ -385,16 +379,53 @@ private void handleHoverEvent(
     }
 
     boolean hasDiverged =
-        firstDivergentIndexFromBack < Math.max(hitPath.size(), mLastHitPath.size());
+        firstDivergentIndexFromBack < Math.max(activeHitPath.size(), lastHitPath.size());
 
     if (hasDiverged) {
       // If something has changed in either enter/exit, let's start a new coalescing key
-      mTouchEventCoalescingKeyHelper.incrementCoalescingKey(mHoverInteractionKey);
+      incrementCoalescingKey();
+
+      // Out, Leave events
+      if (lastHitPath.size() > 0) {
+        int lastTargetTag = lastHitPath.get(0).getViewId();
+        boolean listeningForOut =
+            isAnyoneListeningForBubblingEvent(lastHitPath, EVENT.OUT, EVENT.OUT_CAPTURE);
+        if (listeningForOut) {
+          eventDispatcher.dispatchEvent(
+              PointerEvent.obtain(
+                  PointerEventHelper.POINTER_OUT, lastTargetTag, eventState, motionEvent));
+        }
+
+        // target -> root
+        List<ViewTarget> leaveViewTargets =
+            filterByShouldDispatch(
+                lastHitPath.subList(0, lastHitPath.size() - firstDivergentIndexFromBack),
+                EVENT.LEAVE,
+                EVENT.LEAVE_CAPTURE,
+                nonDivergentListeningToLeave);
+        if (leaveViewTargets.size() > 0) {
+          // We want to dispatch from target -> root, so no need to reverse
+          dispatchEventForViewTargets(
+              PointerEventHelper.POINTER_LEAVE,
+              eventState,
+              motionEvent,
+              leaveViewTargets,
+              eventDispatcher);
+        }
+      }
+
+      boolean listeningForOver =
+          isAnyoneListeningForBubblingEvent(activeHitPath, EVENT.OVER, EVENT.OVER_CAPTURE);
+      if (listeningForOver) {
+        eventDispatcher.dispatchEvent(
+            PointerEvent.obtain(
+                PointerEventHelper.POINTER_OVER, targetTag, eventState, motionEvent));
+      }
 
       // target -> root
       List<ViewTarget> enterViewTargets =
           filterByShouldDispatch(
-              hitPath.subList(0, hitPath.size() - firstDivergentIndexFromBack),
+              activeHitPath.subList(0, activeHitPath.size() - firstDivergentIndexFromBack),
               EVENT.ENTER,
               EVENT.ENTER_CAPTURE,
               nonDivergentListeningToEnter);
@@ -404,88 +435,82 @@ private void handleHoverEvent(
         Collections.reverse(enterViewTargets);
         dispatchEventForViewTargets(
             PointerEventHelper.POINTER_ENTER,
+            eventState,
+            motionEvent,
             enterViewTargets,
-            eventDispatcher,
-            surfaceId,
-            motionEvent);
-      }
-
-      // target -> root
-      List<ViewTarget> leaveViewTargets =
-          filterByShouldDispatch(
-              mLastHitPath.subList(0, mLastHitPath.size() - firstDivergentIndexFromBack),
-              EVENT.LEAVE,
-              EVENT.LEAVE_CAPTURE,
-              nonDivergentListeningToLeave);
-      if (leaveViewTargets.size() > 0) {
-        // We want to dispatch from target -> root, so no need to reverse
-        dispatchEventForViewTargets(
-            PointerEventHelper.POINTER_LEAVE,
-            leaveViewTargets,
-            eventDispatcher,
-            surfaceId,
-            motionEvent);
+            eventDispatcher);
       }
     }
 
-    int coalescingKey = mTouchEventCoalescingKeyHelper.getCoalescingKey(mHoverInteractionKey);
     boolean listeningToMove =
-        isAnyoneListeningForBubblingEvent(hitPath, EVENT.MOVE, EVENT.MOVE_CAPTURE);
+        isAnyoneListeningForBubblingEvent(activeHitPath, EVENT.MOVE, EVENT.MOVE_CAPTURE);
     if (listeningToMove) {
       eventDispatcher.dispatchEvent(
           PointerEvent.obtain(
               PointerEventHelper.POINTER_MOVE,
-              surfaceId,
               targetTag,
+              eventState,
               motionEvent,
-              mTargetCoordinates,
-              coalescingKey));
+              getCoalescingKey()));
     }
+  }
+
+  private void dispatchCancelEvent(MotionEvent motionEvent, EventDispatcher eventDispatcher) {
+    Assertions.assertCondition(
+        mChildHandlingNativeGesture == -1,
+        "Expected to not have already sent a cancel for this gesture");
 
-    mLastHitPath = hitPath;
-    mLastEventCoordinates[0] = x;
-    mLastEventCoordinates[1] = y;
+    PointerEventState eventState = createEventState(motionEvent);
+    dispatchCancelEvent(eventState, motionEvent, eventDispatcher);
   }
 
   private void dispatchCancelEvent(
-      List<ViewTarget> hitPath, MotionEvent motionEvent, EventDispatcher eventDispatcher) {
+      PointerEventState eventState, MotionEvent motionEvent, EventDispatcher eventDispatcher) {
     // This means the gesture has already ended, via some other CANCEL or UP event. This is not
     // expected to happen very often as it would mean some child View has decided to intercept the
     // touch stream and start a native gesture only upon receiving the UP/CANCEL event.
-
     Assertions.assertCondition(
         mChildHandlingNativeGesture == -1,
         "Expected to not have already sent a cancel for this gesture");
-    int surfaceId = UIManagerHelper.getSurfaceId(mRootViewGroup);
 
-    if (!hitPath.isEmpty()) {
+    List<ViewTarget> activeHitPath =
+        eventState.getHitPathByPointerId().get(eventState.getActivePointerId());
+
+    if (!activeHitPath.isEmpty()) {
       boolean listeningForCancel =
-          isAnyoneListeningForBubblingEvent(hitPath, EVENT.CANCEL, EVENT.CANCEL_CAPTURE);
+          isAnyoneListeningForBubblingEvent(activeHitPath, EVENT.CANCEL, EVENT.CANCEL_CAPTURE);
       if (listeningForCancel) {
-        int targetTag = hitPath.get(0).getViewId();
+        int targetTag = activeHitPath.get(0).getViewId();
         Assertions.assertNotNull(eventDispatcher)
             .dispatchEvent(
                 PointerEvent.obtain(
-                    PointerEventHelper.POINTER_CANCEL,
-                    surfaceId,
-                    targetTag,
-                    motionEvent,
-                    mTargetCoordinates));
+                    PointerEventHelper.POINTER_CANCEL, targetTag, eventState, motionEvent));
       }
 
+      // TODO(luwe) - Need to fire pointer out here as well:
+      // https://w3c.github.io/pointerevents/#dfn-suppress-a-pointer-event-stream
       List<ViewTarget> leaveViewTargets =
-          filterByShouldDispatch(hitPath, EVENT.LEAVE, EVENT.LEAVE_CAPTURE, false);
+          filterByShouldDispatch(activeHitPath, EVENT.LEAVE, EVENT.LEAVE_CAPTURE, false);
 
       // dispatch from target -> root
       dispatchEventForViewTargets(
           PointerEventHelper.POINTER_LEAVE,
+          eventState,
+          motionEvent,
           leaveViewTargets,
-          eventDispatcher,
-          surfaceId,
-          motionEvent);
+          eventDispatcher);
 
-      mTouchEventCoalescingKeyHelper.removeCoalescingKey(mDownStartTime);
-      mDownStartTime = TouchEvent.UNSET;
+      incrementCoalescingKey();
+      mPrimaryPointerId = UNSET_POINTER_ID;
     }
   }
+
+  private void debugPrintHitPath(List<ViewTarget> hitPath) {
+    StringBuilder builder = new StringBuilder("hitPath: ");
+    for (ViewTarget viewTarget : hitPath) {
+      builder.append(String.format("%d, ", viewTarget.getViewId()));
+    }
+
+    FLog.d(TAG, builder.toString());
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
index f5a7d8a9ca60..bfcf2be62e53 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
@@ -224,6 +224,30 @@ public void setFlexGrow(float flexGrow) {
     super.setFlexGrow(flexGrow);
   }
 
+  @ReactProp(name = ViewProps.ROW_GAP, defaultFloat = YogaConstants.UNDEFINED)
+  public void setRowGap(float rowGap) {
+    if (isVirtual()) {
+      return;
+    }
+    super.setRowGap(PixelUtil.toPixelFromDIP(rowGap));
+  }
+
+  @ReactProp(name = ViewProps.COLUMN_GAP, defaultFloat = YogaConstants.UNDEFINED)
+  public void setColumnGap(float columnGap) {
+    if (isVirtual()) {
+      return;
+    }
+    super.setColumnGap(PixelUtil.toPixelFromDIP(columnGap));
+  }
+
+  @ReactProp(name = ViewProps.GAP, defaultFloat = YogaConstants.UNDEFINED)
+  public void setGap(float gap) {
+    if (isVirtual()) {
+      return;
+    }
+    super.setGap(PixelUtil.toPixelFromDIP(gap));
+  }
+
   @ReactProp(name = ViewProps.FLEX_SHRINK, defaultFloat = 0f)
   public void setFlexShrink(float flexShrink) {
     if (isVirtual()) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java
index 3e6d1b36b084..0f5f1671c8ff 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java
@@ -225,10 +225,15 @@ public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCo
     super.onInitializeAccessibilityNodeInfo(host, info);
     final AccessibilityRole accessibilityRole =
         (AccessibilityRole) host.getTag(R.id.accessibility_role);
+    final String accessibilityHint = (String) host.getTag(R.id.accessibility_hint);
     if (accessibilityRole != null) {
       setRole(info, accessibilityRole, host.getContext());
     }
 
+    if (accessibilityHint != null) {
+      info.setTooltipText(accessibilityHint);
+    }
+
     final Object accessibilityLabelledBy = host.getTag(R.id.labelled_by);
     if (accessibilityLabelledBy != null) {
       mAccessibilityLabelledBy =
@@ -443,9 +448,7 @@ public static void setRole(
     } else if (role.equals(AccessibilityRole.SUMMARY)) {
       nodeInfo.setRoleDescription(context.getString(R.string.summary_description));
     } else if (role.equals(AccessibilityRole.HEADER)) {
-      final AccessibilityNodeInfoCompat.CollectionItemInfoCompat itemInfo =
-          AccessibilityNodeInfoCompat.CollectionItemInfoCompat.obtain(0, 1, 0, 1, true);
-      nodeInfo.setCollectionItemInfo(itemInfo);
+      nodeInfo.setHeading(true);
     } else if (role.equals(AccessibilityRole.ALERT)) {
       nodeInfo.setRoleDescription(context.getString(R.string.alert_description));
     } else if (role.equals(AccessibilityRole.COMBOBOX)) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
index 18da96c97c84..db10bf379e46 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
@@ -308,6 +308,12 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
 
   void setFlexGrow(float flexGrow);
 
+  void setRowGap(float rowGap);
+
+  void setColumnGap(float columnGap);
+
+  void setGap(float gap);
+
   void setFlexShrink(float flexShrink);
 
   void setFlexBasis(float flexBasis);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index ad64a3a120a1..f62e6085ae45 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -18,6 +18,7 @@
 import com.facebook.yoga.YogaDisplay;
 import com.facebook.yoga.YogaEdge;
 import com.facebook.yoga.YogaFlexDirection;
+import com.facebook.yoga.YogaGutter;
 import com.facebook.yoga.YogaJustify;
 import com.facebook.yoga.YogaMeasureFunction;
 import com.facebook.yoga.YogaNode;
@@ -794,6 +795,21 @@ public void setFlexGrow(float flexGrow) {
     mYogaNode.setFlexGrow(flexGrow);
   }
 
+  @Override
+  public void setRowGap(float rowGap) {
+    mYogaNode.setGap(YogaGutter.ROW, rowGap);
+  }
+
+  @Override
+  public void setColumnGap(float columnGap) {
+    mYogaNode.setGap(YogaGutter.COLUMN, columnGap);
+  }
+
+  @Override
+  public void setGap(float gap) {
+    mYogaNode.setGap(YogaGutter.ALL, gap);
+  }
+
   @Override
   public void setFlexShrink(float flexShrink) {
     mYogaNode.setFlexShrink(flexShrink);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
index 9e3ee72e62f7..55939a9679dd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
@@ -30,7 +30,6 @@
 import com.facebook.yoga.YogaConstants;
 import com.facebook.yoga.YogaDirection;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -65,30 +64,6 @@ public interface LayoutUpdateListener {
     void onLayoutUpdated(ReactShadowNode root);
   }
 
-  public UIImplementation(
-      ReactApplicationContext reactContext,
-      ViewManagerResolver viewManagerResolver,
-      EventDispatcher eventDispatcher,
-      int minTimeLeftInFrameForNonBatchedOperationMs) {
-    this(
-        reactContext,
-        new ViewManagerRegistry(viewManagerResolver),
-        eventDispatcher,
-        minTimeLeftInFrameForNonBatchedOperationMs);
-  }
-
-  public UIImplementation(
-      ReactApplicationContext reactContext,
-      List<ViewManager> viewManagers,
-      EventDispatcher eventDispatcher,
-      int minTimeLeftInFrameForNonBatchedOperationMs) {
-    this(
-        reactContext,
-        new ViewManagerRegistry(viewManagers),
-        eventDispatcher,
-        minTimeLeftInFrameForNonBatchedOperationMs);
-  }
-
   UIImplementation(
       ReactApplicationContext reactContext,
       ViewManagerRegistry viewManagers,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementationProvider.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementationProvider.java
deleted file mode 100644
index 65b85ed22da2..000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementationProvider.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.uimanager;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.events.EventDispatcher;
-import com.facebook.systrace.Systrace;
-import java.util.List;
-
-/** Provides UIImplementation to use in {@link UIManagerModule}. */
-@Deprecated
-public class UIImplementationProvider {
-
-  public UIImplementation createUIImplementation(
-      ReactApplicationContext reactContext,
-      ViewManagerResolver viewManagerResolver,
-      EventDispatcher eventDispatcher,
-      int minTimeLeftInFrameForNonBatchedOperationMs) {
-    Systrace.beginSection(
-        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "UIImplementationProvider.createUIImplementation[1]");
-    try {
-      return new UIImplementation(
-          reactContext,
-          viewManagerResolver,
-          eventDispatcher,
-          minTimeLeftInFrameForNonBatchedOperationMs);
-    } finally {
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-  }
-
-  public UIImplementation createUIImplementation(
-      ReactApplicationContext reactContext,
-      List<ViewManager> viewManagerList,
-      EventDispatcher eventDispatcher,
-      int minTimeLeftInFrameForNonBatchedOperationMs) {
-    Systrace.beginSection(
-        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "UIImplementationProvider.createUIImplementation[2]");
-    try {
-      return new UIImplementation(
-          reactContext,
-          viewManagerList,
-          eventDispatcher,
-          minTimeLeftInFrameForNonBatchedOperationMs);
-    } finally {
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-  }
-
-  UIImplementation createUIImplementation(
-      ReactApplicationContext reactContext,
-      ViewManagerRegistry viewManagerRegistry,
-      EventDispatcher eventDispatcher,
-      int minTimeLeftInFrameForNonBatchedOperationMs) {
-    Systrace.beginSection(
-        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "UIImplementationProvider.createUIImplementation[3]");
-    try {
-      return new UIImplementation(
-          reactContext,
-          viewManagerRegistry,
-          eventDispatcher,
-          minTimeLeftInFrameForNonBatchedOperationMs);
-    } finally {
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
index 2c21f9064ed5..752586990b6d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
@@ -115,36 +115,10 @@ public interface CustomEventNamesResolver {
   private int mBatchId = 0;
   private int mNumRootViews = 0;
 
-  @SuppressWarnings("deprecated")
   public UIManagerModule(
       ReactApplicationContext reactContext,
       ViewManagerResolver viewManagerResolver,
       int minTimeLeftInFrameForNonBatchedOperationMs) {
-    this(
-        reactContext,
-        viewManagerResolver,
-        new UIImplementationProvider(),
-        minTimeLeftInFrameForNonBatchedOperationMs);
-  }
-
-  @SuppressWarnings("deprecated")
-  public UIManagerModule(
-      ReactApplicationContext reactContext,
-      List<ViewManager> viewManagersList,
-      int minTimeLeftInFrameForNonBatchedOperationMs) {
-    this(
-        reactContext,
-        viewManagersList,
-        new UIImplementationProvider(),
-        minTimeLeftInFrameForNonBatchedOperationMs);
-  }
-
-  @Deprecated
-  public UIManagerModule(
-      ReactApplicationContext reactContext,
-      ViewManagerResolver viewManagerResolver,
-      UIImplementationProvider uiImplementationProvider,
-      int minTimeLeftInFrameForNonBatchedOperationMs) {
     super(reactContext);
     DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext);
     mEventDispatcher = new EventDispatcherImpl(reactContext);
@@ -152,7 +126,7 @@ public UIManagerModule(
     mCustomDirectEvents = UIManagerModuleConstants.getDirectEventTypeConstants();
     mViewManagerRegistry = new ViewManagerRegistry(viewManagerResolver);
     mUIImplementation =
-        uiImplementationProvider.createUIImplementation(
+        new UIImplementation(
             reactContext,
             mViewManagerRegistry,
             mEventDispatcher,
@@ -161,11 +135,9 @@ public UIManagerModule(
     reactContext.addLifecycleEventListener(this);
   }
 
-  @Deprecated
   public UIManagerModule(
       ReactApplicationContext reactContext,
       List<ViewManager> viewManagersList,
-      UIImplementationProvider uiImplementationProvider,
       int minTimeLeftInFrameForNonBatchedOperationMs) {
     super(reactContext);
     DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext);
@@ -174,7 +146,7 @@ public UIManagerModule(
     mModuleConstants = createConstants(viewManagersList, null, mCustomDirectEvents);
     mViewManagerRegistry = new ViewManagerRegistry(viewManagersList);
     mUIImplementation =
-        uiImplementationProvider.createUIImplementation(
+        new UIImplementation(
             reactContext,
             mViewManagerRegistry,
             mEventDispatcher,
@@ -927,7 +899,7 @@ public void runGuarded() {
   }
 
   /** Listener that drops the CSSNode pool on low memory when the app is backgrounded. */
-  private class MemoryTrimCallback implements ComponentCallbacks2 {
+  private static class MemoryTrimCallback implements ComponentCallbacks2 {
 
     @Override
     public void onTrimMemory(int level) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
index d78d1f7e5a8e..462fd25ee289 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
@@ -32,6 +32,9 @@ public class ViewProps {
   public static final String FLEX_BASIS = "flexBasis";
   public static final String FLEX_DIRECTION = "flexDirection";
   public static final String FLEX_WRAP = "flexWrap";
+  public static final String ROW_GAP = "rowGap";
+  public static final String COLUMN_GAP = "columnGap";
+  public static final String GAP = "gap";
   public static final String HEIGHT = "height";
   public static final String JUSTIFY_CONTENT = "justifyContent";
   public static final String LEFT = "left";
@@ -203,6 +206,9 @@ public class ViewProps {
               FLEX_BASIS,
               FLEX_DIRECTION,
               FLEX_GROW,
+              ROW_GAP,
+              COLUMN_GAP,
+              GAP,
               FLEX_SHRINK,
               FLEX_WRAP,
               JUSTIFY_CONTENT,
@@ -278,14 +284,16 @@ public static boolean isLayoutOnly(ReadableMap map, String prop) {
         }
         return true;
       case BORDER_LEFT_COLOR:
-        return !map.isNull(BORDER_LEFT_COLOR) && map.getInt(BORDER_LEFT_COLOR) == Color.TRANSPARENT;
+        return map.getType(BORDER_LEFT_COLOR) == ReadableType.Number
+            && map.getInt(BORDER_LEFT_COLOR) == Color.TRANSPARENT;
       case BORDER_RIGHT_COLOR:
-        return !map.isNull(BORDER_RIGHT_COLOR)
+        return map.getType(BORDER_RIGHT_COLOR) == ReadableType.Number
             && map.getInt(BORDER_RIGHT_COLOR) == Color.TRANSPARENT;
       case BORDER_TOP_COLOR:
-        return !map.isNull(BORDER_TOP_COLOR) && map.getInt(BORDER_TOP_COLOR) == Color.TRANSPARENT;
+        return map.getType(BORDER_TOP_COLOR) == ReadableType.Number
+            && map.getInt(BORDER_TOP_COLOR) == Color.TRANSPARENT;
       case BORDER_BOTTOM_COLOR:
-        return !map.isNull(BORDER_BOTTOM_COLOR)
+        return map.getType(BORDER_BOTTOM_COLOR) == ReadableType.Number
             && map.getInt(BORDER_BOTTOM_COLOR) == Color.TRANSPARENT;
       case BORDER_WIDTH:
         return map.isNull(BORDER_WIDTH) || map.getDouble(BORDER_WIDTH) == 0d;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK
index 7b5fdff30d98..74f9d9913297 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "annotations",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     required_for_source_only_abi = True,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
index f76e8c71b0e1..8820a30d24ae 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "common",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java
index 0b6a1140c8ed..01b355def8b8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java
@@ -40,6 +40,7 @@ public abstract class Event<T extends Event> {
   private int mViewTag;
   private long mTimestampMs;
   private int mUniqueID = sUniqueID++;
+  private @Nullable EventAnimationDriverMatchSpec mEventAnimationDriverMatchSpec;
 
   protected Event() {}
 
@@ -165,6 +166,19 @@ public void onDispose() {}
   /** @return the name of this event as registered in JS */
   public abstract String getEventName();
 
+  public EventAnimationDriverMatchSpec getEventAnimationDriverMatchSpec() {
+    if (mEventAnimationDriverMatchSpec == null) {
+      mEventAnimationDriverMatchSpec =
+          new EventAnimationDriverMatchSpec() {
+            @Override
+            public boolean match(int viewTag, String eventName) {
+              return viewTag == getViewTag() && eventName.equals(getEventName());
+            };
+          };
+    }
+    return mEventAnimationDriverMatchSpec;
+  }
+
   /**
    * Dispatch this event to JS using the given event emitter. Compatible with old and new renderer.
    * Instead of using this or dispatchModern, it is recommended that you simply override
@@ -225,4 +239,8 @@ public void dispatchModern(RCTModernEventEmitter rctEventEmitter) {
     }
     dispatch(rctEventEmitter);
   }
+
+  public interface EventAnimationDriverMatchSpec {
+    boolean match(int viewTag, String eventName);
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/LockFreeEventDispatcherImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/LockFreeEventDispatcherImpl.java
deleted file mode 100644
index 4c62d7aeca73..000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/LockFreeEventDispatcherImpl.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.uimanager.events;
-
-import com.facebook.common.logging.FLog;
-import com.facebook.infer.annotation.Assertions;
-import com.facebook.react.bridge.LifecycleEventListener;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.UiThreadUtil;
-import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.modules.core.ChoreographerCompat;
-import com.facebook.react.modules.core.ReactChoreographer;
-import com.facebook.react.uimanager.common.UIManagerType;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * Class responsible for dispatching UI events to JS. The main purpose of this class is to act as an
- * intermediary between UI code generating events and JS, making sure we don't send more events than
- * JS can process.
- *
- * <p>To use it, create a subclass of {@link Event} and call {@link #dispatchEvent(Event)} whenever
- * there's a UI event to dispatch.
- *
- * <p>This class works by installing a Choreographer frame callback on the main thread. This
- * callback then enqueues a runnable on the JS thread (if one is not already pending) that is
- * responsible for actually dispatch events to JS. This implementation depends on the properties
- * that 1) FrameCallbacks run after UI events have been processed in Choreographer.java 2) when we
- * enqueue a runnable on the JS queue thread, it won't be called until after any previously enqueued
- * JS jobs have finished processing
- *
- * <p>If JS is taking a long time processing events, then the UI events generated on the UI thread
- * can be coalesced into fewer events so that when the runnable runs, we don't overload JS with a
- * ton of events and make it get even farther behind.
- *
- * <p>Ideally, we don't need this and JS is fast enough to process all the events each frame, but
- * bad things happen, including load on CPUs from the system, and we should handle this case well.
- *
- * <p>== Event Cookies ==
- *
- * <p>An event cookie is made up of the event type id, view tag, and a custom coalescing key. Only
- * Events that have the same cookie can be coalesced.
- *
- * <p>Event Cookie Composition: VIEW_TAG_MASK = 0x00000000ffffffff EVENT_TYPE_ID_MASK =
- * 0x0000ffff00000000 COALESCING_KEY_MASK = 0xffff000000000000
- *
- * <p>This is a copy of EventDispatcherImpl, meant only to remove locking and synchronization.
- */
-public class LockFreeEventDispatcherImpl implements EventDispatcher, LifecycleEventListener {
-
-  private final boolean DEBUG_MODE = ReactBuildConfig.DEBUG;
-  private final String TAG = LockFreeEventDispatcherImpl.class.getSimpleName();
-
-  private final ReactApplicationContext mReactContext;
-  private final CopyOnWriteArrayList<EventDispatcherListener> mListeners =
-      new CopyOnWriteArrayList<>();
-  private final CopyOnWriteArrayList<BatchEventDispatchedListener> mPostEventDispatchListeners =
-      new CopyOnWriteArrayList<>();
-  private final LockFreeEventDispatcherImpl.ScheduleDispatchFrameCallback mCurrentFrameCallback =
-      new LockFreeEventDispatcherImpl.ScheduleDispatchFrameCallback();
-
-  private volatile ReactEventEmitter mReactEventEmitter;
-
-  public LockFreeEventDispatcherImpl(ReactApplicationContext reactContext) {
-    mReactContext = reactContext;
-    mReactContext.addLifecycleEventListener(this);
-    mReactEventEmitter = new ReactEventEmitter(mReactContext);
-  }
-
-  /** Sends the given Event to C++, where it will be flushed to JS ASAP. */
-  public void dispatchEvent(Event event) {
-    Assertions.assertCondition(event.isInitialized(), "Dispatched event hasn't been initialized");
-    Assertions.assertNotNull(mReactEventEmitter);
-
-    if (DEBUG_MODE) {
-      FLog.v(TAG, "dispatchEvent: " + event.toString());
-    }
-
-    for (EventDispatcherListener listener : mListeners) {
-      listener.onEventDispatch(event);
-    }
-
-    event.dispatchModern(mReactEventEmitter);
-    event.dispose();
-  }
-
-  public void dispatchAllEvents() {
-    maybePostFrameCallbackFromNonUI();
-  }
-
-  private void maybePostFrameCallbackFromNonUI() {
-    if (mReactEventEmitter != null) {
-      // If the host activity is paused, the frame callback may not be currently
-      // posted. Ensure that it is so that this event gets delivered promptly.
-      mCurrentFrameCallback.maybePostFromNonUI();
-    } else {
-      // No JS application has started yet, or resumed. This can happen when a ReactRootView is
-      // added to view hierarchy, but ReactContext creation has not completed yet. In this case, any
-      // touch event dispatch will hit this codepath, and we simply queue them so that they
-      // are dispatched once ReactContext creation completes and JS app is running.
-    }
-  }
-
-  /** Add a listener to this EventDispatcher. */
-  public void addListener(EventDispatcherListener listener) {
-    mListeners.add(listener);
-  }
-
-  /** Remove a listener from this EventDispatcher. */
-  public void removeListener(EventDispatcherListener listener) {
-    mListeners.remove(listener);
-  }
-
-  public void addBatchEventDispatchedListener(BatchEventDispatchedListener listener) {
-    mPostEventDispatchListeners.add(listener);
-  }
-
-  public void removeBatchEventDispatchedListener(BatchEventDispatchedListener listener) {
-    mPostEventDispatchListeners.remove(listener);
-  }
-
-  @Override
-  public void onHostResume() {
-    UiThreadUtil.assertOnUiThread();
-    mCurrentFrameCallback.resume();
-  }
-
-  @Override
-  public void onHostPause() {
-    stopFrameCallback();
-  }
-
-  @Override
-  public void onHostDestroy() {
-    stopFrameCallback();
-  }
-
-  public void onCatalystInstanceDestroyed() {
-    UiThreadUtil.runOnUiThread(
-        new Runnable() {
-          @Override
-          public void run() {
-            stopFrameCallback();
-          }
-        });
-  }
-
-  private void stopFrameCallback() {
-    UiThreadUtil.assertOnUiThread();
-    mCurrentFrameCallback.stop();
-  }
-
-  public void registerEventEmitter(@UIManagerType int uiManagerType, RCTEventEmitter eventEmitter) {
-    mReactEventEmitter.register(uiManagerType, eventEmitter);
-  }
-
-  public void registerEventEmitter(
-      @UIManagerType int uiManagerType, RCTModernEventEmitter eventEmitter) {
-    mReactEventEmitter.register(uiManagerType, eventEmitter);
-  }
-
-  public void unregisterEventEmitter(@UIManagerType int uiManagerType) {
-    mReactEventEmitter.unregister(uiManagerType);
-  }
-
-  private class ScheduleDispatchFrameCallback extends ChoreographerCompat.FrameCallback {
-    private volatile boolean mIsPosted = false;
-    private boolean mShouldStop = false;
-
-    @Override
-    public void doFrame(long frameTimeNanos) {
-      UiThreadUtil.assertOnUiThread();
-
-      if (mShouldStop) {
-        mIsPosted = false;
-      } else {
-        post();
-      }
-
-      driveEventBeats();
-    }
-
-    public void resume() {
-      mShouldStop = false;
-      maybePost();
-    }
-
-    public void stop() {
-      mShouldStop = true;
-    }
-
-    public void maybePost() {
-      if (!mIsPosted) {
-        mIsPosted = true;
-        post();
-      }
-    }
-
-    private void post() {
-      ReactChoreographer.getInstance()
-          .postFrameCallback(ReactChoreographer.CallbackType.TIMERS_EVENTS, mCurrentFrameCallback);
-    }
-
-    public void maybePostFromNonUI() {
-      if (mIsPosted) {
-        return;
-      }
-
-      // We should only hit this slow path when we receive events while the host activity is paused.
-      if (mReactContext.isOnUiQueueThread()) {
-        maybePost();
-      } else {
-        mReactContext.runOnUiQueueThread(
-            new Runnable() {
-              @Override
-              public void run() {
-                maybePost();
-              }
-            });
-      }
-    }
-  }
-
-  /**
-   * Is this a misnomer? It's called "driveEventBeats" but then is just calls
-   * `onBatchEventDispatched` listeners? Practically, all that `onBatchEventDispatched` is used for
-   * in Fabric is to drive AsyncEventBeats.
-   *
-   * <p>If this class ships for Fabric, we should remove `driveEventBeats` from here entirely,
-   * because it no longer needs to be connected to this event dispatcher. We should/probably can
-   * also delete `onRequestEventBeat` entirely.
-   */
-  private void driveEventBeats() {
-    for (BatchEventDispatchedListener listener : mPostEventDispatchListeners) {
-      listener.onBatchEventDispatched();
-    }
-  }
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEvent.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEvent.java
index e5ca07139b92..ed7004a1fc90 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEvent.java
@@ -15,79 +15,71 @@
 import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.PixelUtil;
+import com.facebook.react.uimanager.TouchTargetHelper;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 public class PointerEvent extends Event<PointerEvent> {
   private static final String TAG = PointerEvent.class.getSimpleName();
   private static final int POINTER_EVENTS_POOL_SIZE = 6;
   private static final Pools.SynchronizedPool<PointerEvent> EVENTS_POOL =
       new Pools.SynchronizedPool<>(POINTER_EVENTS_POOL_SIZE);
-  private static final int UNSET_COALESCING_KEY = -1;
+  private static final short UNSET_COALESCING_KEY = -1;
 
   public static PointerEvent obtain(
       String eventName,
-      int surfaceId,
-      int viewTag,
-      MotionEvent motionEventToCopy,
-      float[] offsetCoords) {
+      int targetTag,
+      PointerEventState eventState,
+      MotionEvent motionEventToCopy) {
     PointerEvent event = EVENTS_POOL.acquire();
     if (event == null) {
       event = new PointerEvent();
     }
     event.init(
-        eventName,
-        surfaceId,
-        viewTag,
-        Assertions.assertNotNull(motionEventToCopy),
-        offsetCoords,
-        0);
+        eventName, targetTag, eventState, Assertions.assertNotNull(motionEventToCopy), (short) 0);
     return event;
   }
 
   public static PointerEvent obtain(
       String eventName,
-      int surfaceId,
-      int viewTag,
+      int targetTag,
+      PointerEventState eventState,
       MotionEvent motionEventToCopy,
-      float[] offsetCoords,
-      int coalescingKey) {
+      short coalescingKey) {
     PointerEvent event = EVENTS_POOL.acquire();
     if (event == null) {
       event = new PointerEvent();
     }
     event.init(
         eventName,
-        surfaceId,
-        viewTag,
+        targetTag,
+        eventState,
         Assertions.assertNotNull(motionEventToCopy),
-        offsetCoords,
         coalescingKey);
     return event;
   }
 
   private @Nullable MotionEvent mMotionEvent;
   private @Nullable String mEventName;
-  private int mCoalescingKey = UNSET_COALESCING_KEY;
-  private float mOffsetX;
-  private float mOffsetY;
+  private short mCoalescingKey = UNSET_COALESCING_KEY;
   private @Nullable List<WritableMap> mPointersEventData;
+  private PointerEventState mEventState;
+  private @Nullable Event.EventAnimationDriverMatchSpec mEventAnimationDriverMatchSpec;
 
   private void init(
       String eventName,
-      int surfaceId,
-      int viewTag,
+      int targetTag,
+      PointerEventState eventState,
       MotionEvent motionEventToCopy,
-      float[] offsetCoords,
-      int coalescingKey) {
+      short coalescingKey) {
 
-    super.init(surfaceId, viewTag, motionEventToCopy.getEventTime());
+    super.init(eventState.getSurfaceId(), targetTag, motionEventToCopy.getEventTime());
     mEventName = eventName;
     mMotionEvent = MotionEvent.obtain(motionEventToCopy);
     mCoalescingKey = coalescingKey;
-    mOffsetX = offsetCoords[0];
-    mOffsetY = offsetCoords[1];
+    mEventState = eventState;
   }
 
   private PointerEvent() {}
@@ -123,6 +115,31 @@ public void dispatch(RCTEventEmitter rctEventEmitter) {
     return;
   }
 
+  @Override
+  public Event.EventAnimationDriverMatchSpec getEventAnimationDriverMatchSpec() {
+    if (mEventAnimationDriverMatchSpec == null) {
+      mEventAnimationDriverMatchSpec =
+          new EventAnimationDriverMatchSpec() {
+            @Override
+            public boolean match(int viewTag, String eventName) {
+              if (!PointerEventHelper.isBubblingEvent(eventName)) {
+                return false;
+              }
+
+              List<TouchTargetHelper.ViewTarget> viewTargets =
+                  mEventState.getHitPathForActivePointer();
+              for (TouchTargetHelper.ViewTarget viewTarget : viewTargets) {
+                if (viewTarget.getViewId() == viewTag && eventName.equals(mEventName)) {
+                  return true;
+                }
+              }
+              return false;
+            }
+          };
+    }
+    return mEventAnimationDriverMatchSpec;
+  }
+
   @Override
   public void onDispose() {
     mPointersEventData = null;
@@ -147,36 +164,79 @@ public void onDispose() {
     }
   }
 
-  private ArrayList<WritableMap> createPointerEvents() {
-    MotionEvent motionEvent = mMotionEvent;
-    ArrayList<WritableMap> pointerEvents = new ArrayList<>();
+  private List<WritableMap> createW3CPointerEvents() {
 
-    for (int index = 0; index < motionEvent.getPointerCount(); index++) {
-      pointerEvents.add(this.createPointerEventData(index));
+    ArrayList<WritableMap> w3cPointerEvents = new ArrayList<>();
+    for (int index = 0; index < mMotionEvent.getPointerCount(); index++) {
+      w3cPointerEvents.add(this.createW3CPointerEvent(index));
     }
 
-    return pointerEvents;
+    return w3cPointerEvents;
   }
 
-  private WritableMap createPointerEventData(int index) {
+  private WritableMap createW3CPointerEvent(int index) {
     WritableMap pointerEvent = Arguments.createMap();
+    int pointerId = mMotionEvent.getPointerId(index);
+
+    // https://www.w3.org/TR/pointerevents/#pointerevent-interface
+    pointerEvent.putDouble("pointerId", pointerId);
+
+    String pointerType = PointerEventHelper.getW3CPointerType(mMotionEvent.getToolType(index));
+    pointerEvent.putString("pointerType", pointerType);
 
-    pointerEvent.putDouble("pointerId", mMotionEvent.getPointerId(index));
-    pointerEvent.putDouble("pressure", mMotionEvent.getPressure(index));
-    pointerEvent.putString(
-        "pointerType", PointerEventHelper.getW3CPointerType(mMotionEvent.getToolType(index)));
+    pointerEvent.putBoolean(
+        "isPrimary",
+        PointerEventHelper.isPrimary(pointerId, mEventState.getPrimaryPointerId(), mMotionEvent));
 
+    // https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent
     // Client refers to upper left edge of the content area (viewport)
     // We define the viewport to be ReactRootView
-    pointerEvent.putDouble("clientX", mMotionEvent.getX(index));
-    pointerEvent.putDouble("clientY", mMotionEvent.getY(index));
+    float[] eventCoords = mEventState.getEventCoordinatesByPointerId().get(pointerId);
+    double clientX = PixelUtil.toDIPFromPixel(eventCoords[0]);
+    double clientY = PixelUtil.toDIPFromPixel(eventCoords[1]);
+    pointerEvent.putDouble("clientX", clientX);
+    pointerEvent.putDouble("clientY", clientY);
+
+    // x,y values are aliases of clientX, clientY
+    pointerEvent.putDouble("x", clientX);
+    pointerEvent.putDouble("y", clientY);
+
+    // page values in react-native are equivalent to client values since rootview is not scrollable
+    pointerEvent.putDouble("pageX", clientX);
+    pointerEvent.putDouble("pageY", clientY);
 
     // Offset refers to upper left edge of the target view
-    pointerEvent.putDouble("offsetX", PixelUtil.toDIPFromPixel(mOffsetX));
-    pointerEvent.putDouble("offsetY", PixelUtil.toDIPFromPixel(mOffsetY));
+    float[] offsetCoords = mEventState.getOffsetByPointerId().get(pointerId);
+    pointerEvent.putDouble("offsetX", PixelUtil.toDIPFromPixel(offsetCoords[0]));
+    pointerEvent.putDouble("offsetY", PixelUtil.toDIPFromPixel(offsetCoords[1]));
 
     pointerEvent.putInt("target", this.getViewTag());
     pointerEvent.putDouble("timestamp", this.getTimestampMs());
+
+    pointerEvent.putInt("detail", 0);
+    pointerEvent.putDouble("tiltX", 0);
+    pointerEvent.putDouble("tiltY", 0);
+
+    if (pointerType.equals(PointerEventHelper.POINTER_TYPE_MOUSE)) {
+      pointerEvent.putDouble("width", 1);
+      pointerEvent.putDouble("height", 1);
+    } else {
+      float majorAxis = PixelUtil.toDIPFromPixel(mMotionEvent.getTouchMajor(index));
+      pointerEvent.putDouble("width", majorAxis);
+      pointerEvent.putDouble("height", majorAxis);
+    }
+
+    int buttonState = mMotionEvent.getButtonState();
+    pointerEvent.putInt(
+        "button",
+        PointerEventHelper.getButtonChange(
+            pointerType, mEventState.getLastButtonState(), buttonState));
+    pointerEvent.putInt(
+        "buttons", PointerEventHelper.getButtons(mEventName, pointerType, buttonState));
+
+    pointerEvent.putDouble(
+        "pressure", PointerEventHelper.getPressure(pointerEvent.getInt("buttons"), mEventName));
+
     return pointerEvent;
   }
 
@@ -187,20 +247,27 @@ private List<WritableMap> createPointersEventData() {
         // Cases where all pointer info is relevant
       case PointerEventHelper.POINTER_MOVE:
       case PointerEventHelper.POINTER_CANCEL:
-        pointersEventData = createPointerEvents();
+        pointersEventData = this.createW3CPointerEvents();
         break;
         // Cases where only the "active" pointer info is relevant
       case PointerEventHelper.POINTER_ENTER:
       case PointerEventHelper.POINTER_DOWN:
       case PointerEventHelper.POINTER_UP:
       case PointerEventHelper.POINTER_LEAVE:
-        pointersEventData = Arrays.asList(createPointerEventData(activePointerIndex));
+      case PointerEventHelper.POINTER_OUT:
+      case PointerEventHelper.POINTER_OVER:
+        pointersEventData = Arrays.asList(createW3CPointerEvent(activePointerIndex));
         break;
     }
 
     return pointersEventData;
   }
 
+  @Override
+  public short getCoalescingKey() {
+    return mCoalescingKey;
+  }
+
   @Override
   public void dispatchModern(RCTModernEventEmitter rctEventEmitter) {
     if (mMotionEvent == null) {
@@ -233,4 +300,64 @@ public void dispatchModern(RCTModernEventEmitter rctEventEmitter) {
           PointerEventHelper.getEventCategory(mEventName));
     }
   }
+
+  public static class PointerEventState {
+    private int mPrimaryPointerId;
+    private int mActivePointerId;
+    private int mLastButtonState;
+    private int mSurfaceId;
+
+    private Map<Integer, float[]> mOffsetByPointerId;
+    private Map<Integer, List<TouchTargetHelper.ViewTarget>> mHitPathByPointerId;
+    private Map<Integer, float[]> mEventCoordinatesByPointerId;
+
+    public PointerEventState(
+        int primaryPointerId,
+        int activePointerId,
+        int lastButtonState,
+        int surfaceId,
+        Map<Integer, float[]> offsetByPointerId,
+        Map<Integer, List<TouchTargetHelper.ViewTarget>> hitPathByPointerId,
+        Map<Integer, float[]> eventCoordinatesByPointerId) {
+      mPrimaryPointerId = primaryPointerId;
+      mActivePointerId = activePointerId;
+      mLastButtonState = lastButtonState;
+      mSurfaceId = surfaceId;
+      mOffsetByPointerId = offsetByPointerId;
+      mHitPathByPointerId = hitPathByPointerId;
+      mEventCoordinatesByPointerId = eventCoordinatesByPointerId;
+    }
+
+    public int getLastButtonState() {
+      return mLastButtonState;
+    }
+
+    public int getPrimaryPointerId() {
+      return mPrimaryPointerId;
+    }
+
+    public int getSurfaceId() {
+      return mSurfaceId;
+    }
+
+    public int getActivePointerId() {
+      return mActivePointerId;
+    }
+
+    public final Map<Integer, float[]> getOffsetByPointerId() {
+      return mOffsetByPointerId;
+    }
+
+    public final Map<Integer, List<TouchTargetHelper.ViewTarget>> getHitPathByPointerId() {
+      return mHitPathByPointerId;
+    }
+
+    public final Map<Integer, float[]> getEventCoordinatesByPointerId() {
+      return mEventCoordinatesByPointerId;
+    }
+
+    public final List<TouchTargetHelper.ViewTarget> getHitPathForActivePointer() {
+      return mHitPathByPointerId.get(mActivePointerId);
+    }
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEventHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEventHelper.java
index 4ea2fd1ec5c3..da6b77cd1a2b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEventHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEventHelper.java
@@ -7,6 +7,7 @@
 
 package com.facebook.react.uimanager.events;
 
+import android.view.InputDevice;
 import android.view.MotionEvent;
 import android.view.View;
 import androidx.annotation.Nullable;
@@ -22,8 +23,6 @@ public class PointerEventHelper {
   public static final String POINTER_TYPE_MOUSE = "mouse";
   public static final String POINTER_TYPE_UNKNOWN = "";
 
-  private static final int X_FLAG_SUPPORTS_HOVER = 0x01000000;
-
   public static enum EVENT {
     CANCEL,
     CANCEL_CAPTURE,
@@ -37,6 +36,10 @@ public static enum EVENT {
     MOVE_CAPTURE,
     UP,
     UP_CAPTURE,
+    OUT,
+    OUT_CAPTURE,
+    OVER,
+    OVER_CAPTURE,
   };
 
   public static final String POINTER_CANCEL = "topPointerCancel";
@@ -45,6 +48,8 @@ public static enum EVENT {
   public static final String POINTER_LEAVE = "topPointerLeave";
   public static final String POINTER_MOVE = "topPointerMove";
   public static final String POINTER_UP = "topPointerUp";
+  public static final String POINTER_OVER = "topPointerOver";
+  public static final String POINTER_OUT = "topPointerOut";
 
   /** We don't dispatch capture events from native; that's currently handled by JS. */
   public static @Nullable String getDispatchableEventName(EVENT event) {
@@ -61,12 +66,64 @@ public static enum EVENT {
         return PointerEventHelper.POINTER_CANCEL;
       case UP:
         return PointerEventHelper.POINTER_UP;
+      case OVER:
+        return PointerEventHelper.POINTER_OVER;
+      case OUT:
+        return PointerEventHelper.POINTER_OUT;
       default:
         FLog.e(ReactConstants.TAG, "No dispatchable event name for type: " + event);
         return null;
     }
   }
 
+  // https://w3c.github.io/pointerevents/#the-buttons-property
+  public static int getButtons(String eventName, String pointerType, int buttonState) {
+    if (isExitEvent(eventName)) {
+      return 0;
+    }
+    if (POINTER_TYPE_TOUCH.equals(pointerType)) {
+      return 1;
+    }
+    return buttonState;
+  }
+
+  // https://w3c.github.io/pointerevents/#the-button-property
+  public static int getButtonChange(
+      String pointerType, int lastButtonState, int currentButtonState) {
+    // Always return 0 for touch
+    if (POINTER_TYPE_TOUCH.equals(pointerType)) {
+      return 0;
+    }
+
+    int changedMask = currentButtonState ^ lastButtonState;
+    if (changedMask == 0) {
+      return -1;
+    }
+
+    switch (changedMask) {
+      case MotionEvent.BUTTON_PRIMARY: // left button, touch/pen contact
+        return 0;
+      case MotionEvent.BUTTON_TERTIARY: // middle mouse
+        return 1;
+      case MotionEvent.BUTTON_SECONDARY: // rightbutton, Pen barrel button
+        return 2;
+      case MotionEvent.BUTTON_BACK:
+        return 3;
+      case MotionEvent.BUTTON_FORWARD:
+        return 4;
+        // TOD0 - Pen eraser button maps to what?
+    }
+    return -1;
+  }
+
+  public static boolean isPrimary(int pointerId, int primaryPointerId, MotionEvent event) {
+    if (supportsHover(event)) {
+      return true;
+    }
+
+    return pointerId == primaryPointerId;
+  }
+
   public static String getW3CPointerType(final int toolType) {
     // https://www.w3.org/TR/pointerevents3/#dom-pointerevent-pointertype
     switch (toolType) {
@@ -87,7 +144,6 @@ public static boolean isListening(@Nullable View view, EVENT event) {
       return false;
     }
 
-    Object value = null;
     switch (event) {
       case DOWN:
       case DOWN_CAPTURE:
@@ -96,32 +152,11 @@ public static boolean isListening(@Nullable View view, EVENT event) {
       case CANCEL:
       case CANCEL_CAPTURE:
         return true;
-      case ENTER:
-        value = view.getTag(R.id.pointer_enter);
-        break;
-      case ENTER_CAPTURE:
-        value = view.getTag(R.id.pointer_enter_capture);
-        break;
-      case LEAVE:
-        value = view.getTag(R.id.pointer_leave);
-        break;
-      case LEAVE_CAPTURE:
-        value = view.getTag(R.id.pointer_leave_capture);
-        break;
-      case MOVE:
-        value = view.getTag(R.id.pointer_move);
-        break;
-      case MOVE_CAPTURE:
-        value = view.getTag(R.id.pointer_move_capture);
-        break;
-    }
-
-    if (value == null) {
-      return false;
     }
 
-    if (value instanceof Boolean) {
-      return (Boolean) value;
+    Integer pointerEvents = (Integer) view.getTag(R.id.pointer_events);
+    if (pointerEvents != null) {
+      return (pointerEvents.intValue() & (1 << event.ordinal())) != 0;
     }
     return false;
   }
@@ -140,6 +175,8 @@ public static int getEventCategory(String pointerEventType) {
       case POINTER_MOVE:
       case POINTER_ENTER:
       case POINTER_LEAVE:
+      case POINTER_OVER:
+      case POINTER_OUT:
         return EventCategoryDef.CONTINUOUS;
     }
 
@@ -147,26 +184,46 @@ public static int getEventCategory(String pointerEventType) {
   }
 
   public static boolean supportsHover(MotionEvent motionEvent) {
-    // A flag has been set on the MotionEvent to indicate it supports hover
-    // See D36958947 on justifications for this.
-    // TODO(luwe): Leverage previous events to determine if MotionEvent
-    //  is from an input device that supports hover
-    boolean supportsHoverFlag = (motionEvent.getFlags() & X_FLAG_SUPPORTS_HOVER) != 0;
-    if (supportsHoverFlag) {
-      return true;
-    }
+    int source = motionEvent.getSource();
+    return source == InputDevice.SOURCE_MOUSE || source == InputDevice.SOURCE_CLASS_POINTER;
+  }
 
-    int toolType = motionEvent.getToolType(motionEvent.getActionIndex());
-    String pointerType = getW3CPointerType(toolType);
+  public static boolean isExitEvent(String eventName) {
+    switch (eventName) {
+      case POINTER_UP:
+      case POINTER_LEAVE:
+      case POINTER_OUT:
+        return true;
+      default:
+        return false;
+    }
+  }
 
-    if (pointerType.equals(POINTER_TYPE_MOUSE)) {
-      return true;
-    } else if (pointerType.equals(POINTER_TYPE_PEN)) {
-      return true; // true?
-    } else if (pointerType.equals(POINTER_TYPE_TOUCH)) {
-      return false;
+  // https://w3c.github.io/pointerevents/#dom-pointerevent-pressure
+  public static double getPressure(int buttonState, String eventName) {
+    if (isExitEvent(eventName)) {
+      return 0;
     }
 
-    return false;
+    // Assume  we don't support pressure on our platform for now
+    //  For hardware and platforms that do not support pressure,
+    //  the value MUST be 0.5 when in the active buttons state
+    //  and 0 otherwise.
+    boolean inActiveButtonState = buttonState != 0;
+    return inActiveButtonState ? 0.5 : 0;
+  }
+
+  public static boolean isBubblingEvent(String eventName) {
+    switch (eventName) {
+      case POINTER_UP:
+      case POINTER_DOWN:
+      case POINTER_OVER:
+      case POINTER_OUT:
+      case POINTER_MOVE:
+      case POINTER_CANCEL:
+        return true;
+      default:
+        return false;
+    }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK
index 6792e1ac8c2c..67849ff191f7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "util",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/util/BUCK b/ReactAndroid/src/main/java/com/facebook/react/util/BUCK
index 0ec9a4033b00..bfcbd4be218f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/util/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/util/BUCK
@@ -6,7 +6,6 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/util/RNLog.java b/ReactAndroid/src/main/java/com/facebook/react/util/RNLog.java
index 280ff714ac55..438750cf415e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/util/RNLog.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/util/RNLog.java
@@ -61,7 +61,7 @@ public static void a(String message) {
    * @param message The message to log.
    */
   public static void w(ReactContext context, String message) {
-    RNLog.logInternal(context, message, WARN);
+    logInternal(context, message, WARN);
     FLog.w(ReactConstants.TAG, message);
   }
 
@@ -72,7 +72,7 @@ public static void w(ReactContext context, String message) {
    * @param message The message to log.
    */
   public static void e(ReactContext context, String message) {
-    RNLog.logInternal(context, message, ERROR);
+    logInternal(context, message, ERROR);
     FLog.e(ReactConstants.TAG, message);
   }
 
@@ -88,7 +88,7 @@ public static void e(String message) {
 
   private static void logInternal(ReactContext context, String message, int level) {
     if (level >= MINIMUM_LEVEL_FOR_UI) {
-      if (context != null && message != null) {
+      if (context != null && context.hasActiveReactInstance() && message != null) {
         context.getJSModule(RCTLog.class).logIfNoNativeHook(levelToString(level), message);
       }
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK
index d243c13c491b..4a06ec1e4293 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "common",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK
index 280adadfce5b..9677362369c1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "drawer",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java
index 3cebb40d7bdc..ab9bb7d30d3e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java
@@ -25,6 +25,7 @@
   public static final int DEFAULT_DRAWER_WIDTH = LayoutParams.MATCH_PARENT;
   private int mDrawerPosition = Gravity.START;
   private int mDrawerWidth = DEFAULT_DRAWER_WIDTH;
+  private boolean mDragging = false;
 
   public ReactDrawerLayout(ReactContext reactContext) {
     super(reactContext);
@@ -35,6 +36,7 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
     try {
       if (super.onInterceptTouchEvent(ev)) {
         NativeGestureUtil.notifyNativeGestureStarted(this, ev);
+        mDragging = true;
         return true;
       }
     } catch (IllegalArgumentException e) {
@@ -47,6 +49,16 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
     return false;
   }
 
+  @Override
+  public boolean onTouchEvent(MotionEvent ev) {
+    int action = ev.getActionMasked();
+    if (action == MotionEvent.ACTION_UP && mDragging) {
+      NativeGestureUtil.notifyNativeGestureEnded(this, ev);
+      mDragging = false;
+    }
+    return super.onTouchEvent(ev);
+  }
+
   /* package */ void openDrawer() {
     openDrawer(mDrawerPosition);
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK
index 0e2e0e4831ff..f4a3f14b2020 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK
@@ -8,10 +8,8 @@ rn_android_library(
     name = "imageevents",
     srcs = IMAGE_EVENT_FILES,
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
@@ -37,10 +35,8 @@ rn_android_library(
         exclude = IMAGE_EVENT_FILES,
     ),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
@@ -65,6 +61,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
+        react_native_target("java/com/facebook/react/util:util"),
         react_native_target("java/com/facebook/react/modules/fresco:fresco"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/views/imagehelper:withmultisource"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
index a118b9b607ab..30a6ed20bdf5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
@@ -19,7 +19,6 @@
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.widget.Toast;
 import androidx.annotation.Nullable;
 import com.facebook.common.internal.Objects;
 import com.facebook.common.references.CloseableReference;
@@ -51,6 +50,7 @@
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.events.EventDispatcher;
+import com.facebook.react.util.RNLog;
 import com.facebook.react.views.imagehelper.ImageSource;
 import com.facebook.react.views.imagehelper.MultiSourceHelper;
 import com.facebook.react.views.imagehelper.MultiSourceHelper.MultiSourceResult;
@@ -67,8 +67,6 @@
 public class ReactImageView extends GenericDraweeView {
 
   public static final int REMOTE_IMAGE_FADE_DURATION_MS = 300;
-  public static final String REMOTE_TRANSPARENT_BITMAP_URI =
-      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=";
 
   private static float[] sComputedCornerRadii = new float[4];
 
@@ -309,30 +307,30 @@ public void setSource(@Nullable ReadableArray sources) {
     List<ImageSource> tmpSources = new LinkedList<>();
 
     if (sources == null || sources.size() == 0) {
-      ImageSource imageSource = new ImageSource(getContext(), REMOTE_TRANSPARENT_BITMAP_URI);
+      tmpSources.add(ImageSource.getTransparentBitmapImageSource(getContext()));
+    } else if (sources.size() == 1) {
+      // Optimize for the case where we have just one uri, case in which we don't need the sizes
+      ReadableMap source = sources.getMap(0);
+      ImageSource imageSource = new ImageSource(getContext(), source.getString("uri"));
+      if (Uri.EMPTY.equals(imageSource.getUri())) {
+        warnImageSource(source.getString("uri"));
+        imageSource = ImageSource.getTransparentBitmapImageSource(getContext());
+      }
       tmpSources.add(imageSource);
     } else {
-      // Optimize for the case where we have just one uri, case in which we don't need the sizes
-      if (sources.size() == 1) {
-        ReadableMap source = sources.getMap(0);
-        String uri = source.getString("uri");
-        ImageSource imageSource = new ImageSource(getContext(), uri);
-        tmpSources.add(imageSource);
+      for (int idx = 0; idx < sources.size(); idx++) {
+        ReadableMap source = sources.getMap(idx);
+        ImageSource imageSource =
+            new ImageSource(
+                getContext(),
+                source.getString("uri"),
+                source.getDouble("width"),
+                source.getDouble("height"));
         if (Uri.EMPTY.equals(imageSource.getUri())) {
-          warnImageSource(uri);
-        }
-      } else {
-        for (int idx = 0; idx < sources.size(); idx++) {
-          ReadableMap source = sources.getMap(idx);
-          String uri = source.getString("uri");
-          ImageSource imageSource =
-              new ImageSource(
-                  getContext(), uri, source.getDouble("width"), source.getDouble("height"));
-          tmpSources.add(imageSource);
-          if (Uri.EMPTY.equals(imageSource.getUri())) {
-            warnImageSource(uri);
-          }
+          warnImageSource(source.getString("uri"));
+          imageSource = ImageSource.getTransparentBitmapImageSource(getContext());
         }
+        tmpSources.add(imageSource);
       }
     }
 
@@ -542,6 +540,11 @@ public void setControllerListener(ControllerListener controllerListener) {
     maybeUpdateView();
   }
 
+  // VisibleForTesting
+  public @Nullable ImageSource getImageSource() {
+    return mImageSource;
+  }
+
   @Override
   protected void onSizeChanged(int w, int h, int oldw, int oldh) {
     super.onSizeChanged(w, h, oldw, oldh);
@@ -568,8 +571,7 @@ private boolean isTiled() {
   private void setSourceImage() {
     mImageSource = null;
     if (mSources.isEmpty()) {
-      ImageSource imageSource = new ImageSource(getContext(), REMOTE_TRANSPARENT_BITMAP_URI);
-      mSources.add(imageSource);
+      mSources.add(ImageSource.getTransparentBitmapImageSource(getContext()));
     } else if (hasMultipleSources()) {
       MultiSourceResult multiSource =
           MultiSourceHelper.getBestSourceForSize(getWidth(), getHeight(), mSources);
@@ -597,11 +599,9 @@ private boolean shouldResize(ImageSource imageSource) {
 
   private void warnImageSource(String uri) {
     if (ReactBuildConfig.DEBUG) {
-      Toast.makeText(
-              getContext(),
-              "Warning: Image source \"" + uri + "\" doesn't exist",
-              Toast.LENGTH_SHORT)
-          .show();
+      RNLog.w(
+          (ReactContext) getContext(),
+          "ReactImageView: Image source \"" + uri + "\" doesn't exist");
     }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK
index a4b867062086..ed0986c2e1e3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/BUCK
@@ -7,10 +7,8 @@ rn_android_library(
         exclude = ["MultiSourceHelper.java"],
     ),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
@@ -27,10 +25,8 @@ rn_android_library(
     name = "withmultisource",
     srcs = ["MultiSourceHelper.java"],
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java
index 94a3e1c8ace9..6a5361be9690 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java
@@ -9,14 +9,15 @@
 
 import android.content.Context;
 import android.net.Uri;
-import androidx.annotation.Nullable;
-import com.facebook.infer.annotation.Assertions;
 import java.util.Objects;
 
 /** Class describing an image source (network URI or resource) and size. */
 public class ImageSource {
 
-  private @Nullable Uri mUri;
+  private static final String TRANSPARENT_BITMAP_URI =
+      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=";
+
+  private Uri mUri;
   private String mSource;
   private double mSize;
   private boolean isResource;
@@ -30,6 +31,10 @@ public ImageSource(Context context, String source, double width, double height)
     mUri = computeUri(context);
   }
 
+  public static ImageSource getTransparentBitmapImageSource(Context context) {
+    return new ImageSource(context, TRANSPARENT_BITMAP_URI);
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
@@ -57,7 +62,7 @@ public String getSource() {
 
   /** Get the URI for this image - can be either a parsed network URI or a resource URI. */
   public Uri getUri() {
-    return Assertions.assertNotNull(mUri);
+    return mUri;
   }
 
   /** Get the area of this image. */
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK
index 5c946b073f31..4418ccfcfe58 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "modal",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
index 2840de71e0b8..b8046f5da76c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
@@ -12,6 +12,7 @@
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.os.Build;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -119,7 +120,9 @@ public void addView(View child, int index) {
 
   @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
@@ -326,11 +329,17 @@ public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
     if (currentActivity != null && !currentActivity.isFinishing()) {
       mDialog.show();
       if (context instanceof Activity) {
-        mDialog
-            .getWindow()
-            .getDecorView()
-            .setSystemUiVisibility(
-                ((Activity) context).getWindow().getDecorView().getSystemUiVisibility());
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R) {
+          int appearance =
+              ((Activity) context).getWindow().getInsetsController().getSystemBarsAppearance();
+          mDialog.getWindow().getInsetsController().setSystemBarsAppearance(appearance, appearance);
+        } else {
+          mDialog
+              .getWindow()
+              .getDecorView()
+              .setSystemUiVisibility(
+                  ((Activity) context).getWindow().getDecorView().getSystemUiVisibility());
+        }
       }
       mDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK
index 22d65ad2fdeb..52d4b639706a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "progressbar",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK
index 691b5837d120..4a3644e5adfd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "scroll",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
index 964c8d721ba8..3c962f03565a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
@@ -532,6 +532,7 @@ public boolean onTouchEvent(MotionEvent ev) {
       float velocityX = mVelocityHelper.getXVelocity();
       float velocityY = mVelocityHelper.getYVelocity();
       ReactScrollViewHelper.emitScrollEndDragEvent(this, velocityX, velocityY);
+      NativeGestureUtil.notifyNativeGestureEnded(this, ev);
       mDragging = false;
       // After the touch finishes, we may need to do some scrolling afterwards either as a result
       // of a fling or because we need to page align the content
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
index 7f44e14e432f..ae0a51274e71 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
@@ -20,6 +20,7 @@
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -404,6 +405,7 @@ public boolean onTouchEvent(MotionEvent ev) {
       float velocityX = mVelocityHelper.getXVelocity();
       float velocityY = mVelocityHelper.getYVelocity();
       ReactScrollViewHelper.emitScrollEndDragEvent(this, velocityX, velocityY);
+      NativeGestureUtil.notifyNativeGestureEnded(this, ev);
       mDragging = false;
       // After the touch finishes, we may need to do some scrolling afterwards either as a result
       // of a fling or because we need to page align the content
@@ -479,18 +481,7 @@ public boolean getChildVisibleRect(View child, Rect r, android.graphics.Point of
 
   @Override
   public void fling(int velocityY) {
-    // Workaround.
-    // On Android P if a ScrollView is inverted, we will get a wrong sign for
-    // velocityY (see https://issuetracker.google.com/issues/112385925).
-    // At the same time, mOnScrollDispatchHelper tracks the correct velocity direction.
-    //
-    // Hence, we can use the absolute value from whatever the OS gives
-    // us and use the sign of what mOnScrollDispatchHelper has tracked.
-    float signum = Math.signum(mOnScrollDispatchHelper.getYFlingVelocity());
-    if (signum == 0) {
-      signum = Math.signum(velocityY);
-    }
-    final int correctedVelocityY = (int) (Math.abs(velocityY) * signum);
+    final int correctedVelocityY = correctFlingVelocityY(velocityY);
 
     if (mPagingEnabled) {
       flingAndSnap(correctedVelocityY);
@@ -529,6 +520,25 @@ public void fling(int velocityY) {
     handlePostTouchScrolling(0, correctedVelocityY);
   }
 
+  private int correctFlingVelocityY(int velocityY) {
+    if (Build.VERSION.SDK_INT != Build.VERSION_CODES.P) {
+      return velocityY;
+    }
+
+    // Workaround.
+    // On Android P if a ScrollView is inverted, we will get a wrong sign for
+    // velocityY (see https://issuetracker.google.com/issues/112385925).
+    // At the same time, mOnScrollDispatchHelper tracks the correct velocity direction.
+    //
+    // Hence, we can use the absolute value from whatever the OS gives
+    // us and use the sign of what mOnScrollDispatchHelper has tracked.
+    float signum = Math.signum(mOnScrollDispatchHelper.getYFlingVelocity());
+    if (signum == 0) {
+      signum = Math.signum(velocityY);
+    }
+    return (int) (Math.abs(velocityY) * signum);
+  }
+
   private void enableFpsListener() {
     if (isScrollPerfLoggingEnabled()) {
       Assertions.assertNotNull(mFpsListener);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
index 6e7ad8cc3345..b574cb501b04 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
@@ -22,7 +22,6 @@
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.FabricViewStateManager;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.UIManagerHelper;
@@ -102,16 +101,6 @@ private static <T extends ViewGroup & HasScrollEventThrottle> void emitScrollEve
   private static <T extends ViewGroup & HasScrollEventThrottle> void emitScrollEvent(
       T scrollView, ScrollEventType scrollEventType, float xVelocity, float yVelocity) {
     long now = System.currentTimeMillis();
-    // Throttle the scroll event if scrollEventThrottle is set to be equal or more than 17 ms.
-    // We limit the delta to 17ms so that small throttles intended to enable 60fps updates will not
-    // inadvertently filter out any scroll events.
-    if (ReactFeatureFlags.enableScrollEventThrottle
-        && scrollView.getScrollEventThrottle()
-            >= Math.max(17, now - scrollView.getLastScrollDispatchTime())) {
-      // Scroll events are throttled.
-      return;
-    }
-
     View contentView = scrollView.getChildAt(0);
 
     if (contentView == null) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK
index 08c8ed857ba7..e402f20b8b6d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "slider",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java
index 2ac05779a12b..8f97341d2956 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java
@@ -15,7 +15,7 @@
 /** Event emitted by a ReactSliderManager when user changes slider position. */
 public class ReactSliderEvent extends Event<ReactSliderEvent> {
 
-  public static final String EVENT_NAME = "topChange";
+  public static final String EVENT_NAME = "topValueChange";
 
   private final double mValue;
   private final boolean mFromUser;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK
index d9dc3facec13..a1fe56f942e5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "swiperefresh",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java
index ab1cd9a9ca74..f0d9111ab152 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java
@@ -25,6 +25,7 @@ public class ReactSwipeRefreshLayout extends SwipeRefreshLayout {
   private int mTouchSlop;
   private float mPrevTouchX;
   private boolean mIntercepted;
+  private boolean mNativeGestureStarted = false;
 
   public ReactSwipeRefreshLayout(ReactContext reactContext) {
     super(reactContext);
@@ -86,6 +87,7 @@ public void requestDisallowInterceptTouchEvent(boolean disallowIntercept) {
   public boolean onInterceptTouchEvent(MotionEvent ev) {
     if (shouldInterceptTouchEvent(ev) && super.onInterceptTouchEvent(ev)) {
       NativeGestureUtil.notifyNativeGestureStarted(this, ev);
+      mNativeGestureStarted = true;
 
       // If the pull-to-refresh gesture is interrupted by a parent with its own
       // onInterceptTouchEvent then the refresh indicator gets stuck on-screen
@@ -99,6 +101,16 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
     return false;
   }
 
+  @Override
+  public boolean onTouchEvent(MotionEvent ev) {
+    int action = ev.getActionMasked();
+    if (action == MotionEvent.ACTION_UP && mNativeGestureStarted) {
+      NativeGestureUtil.notifyNativeGestureEnded(this, ev);
+      mNativeGestureStarted = false;
+    }
+    return super.onTouchEvent(ev);
+  }
+
   /**
    * {@link SwipeRefreshLayout} completely bypasses ViewGroup's "disallowIntercept" by overriding
    * {@link ViewGroup#onInterceptTouchEvent} and never calling super.onInterceptTouchEvent(). This
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK
index 8b41f567cb58..ad8db8e74eae 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "switchview",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK
index bdbb666184a1..c7513327f39a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK
@@ -7,10 +7,8 @@ rn_android_library(
     name = "text",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "KOTLIN",
     pure_kotlin = False,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
index bdc9d249816a..0c8a7f0621b9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
@@ -17,7 +17,6 @@
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.common.mapbuffer.MapBuffer;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.IViewManagerWithChildren;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate;
@@ -132,13 +131,10 @@ public boolean needsCustomLayoutForChildren() {
   @Override
   public Object updateState(
       ReactTextView view, ReactStylesDiffMap props, StateWrapper stateWrapper) {
-    if (ReactFeatureFlags.mapBufferSerializationEnabled) {
-      MapBuffer stateMapBuffer = stateWrapper.getStateDataMapBuffer();
-      if (stateMapBuffer != null) {
-        return getReactTextUpdate(view, props, stateMapBuffer);
-      }
+    MapBuffer stateMapBuffer = stateWrapper.getStateDataMapBuffer();
+    if (stateMapBuffer != null) {
+      return getReactTextUpdate(view, props, stateMapBuffer);
     }
-
     ReadableNativeMap state = stateWrapper.getStateData();
     if (state == null) {
       return null;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.java
index 76da16072cde..6ca731ef4ff1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.java
@@ -85,6 +85,66 @@ public static int parseFontStyle(@Nullable String fontStyleString) {
           case "proportional-nums":
             features.add("'pnum'");
             break;
+          case "stylistic-one":
+            features.add("'ss01'");
+            break;
+          case "stylistic-two":
+            features.add("'ss02'");
+            break;
+          case "stylistic-three":
+            features.add("'ss03'");
+            break;
+          case "stylistic-four":
+            features.add("'ss04'");
+            break;
+          case "stylistic-five":
+            features.add("'ss05'");
+            break;
+          case "stylistic-six":
+            features.add("'ss06'");
+            break;
+          case "stylistic-seven":
+            features.add("'ss07'");
+            break;
+          case "stylistic-eight":
+            features.add("'ss08'");
+            break;
+          case "stylistic-nine":
+            features.add("'ss09'");
+            break;
+          case "stylistic-ten":
+            features.add("'ss10'");
+            break;
+          case "stylistic-eleven":
+            features.add("'ss11'");
+            break;
+          case "stylistic-twelve":
+            features.add("'ss12'");
+            break;
+          case "stylistic-thirteen":
+            features.add("'ss13'");
+            break;
+          case "stylistic-fourteen":
+            features.add("'ss14'");
+            break;
+          case "stylistic-fifteen":
+            features.add("'ss15'");
+            break;
+          case "stylistic-sixteen":
+            features.add("'ss16'");
+            break;
+          case "stylistic-seventeen":
+            features.add("'ss17'");
+            break;
+          case "stylistic-eighteen":
+            features.add("'ss18'");
+            break;
+          case "stylistic-nineteen":
+            features.add("'ss19'");
+            break;
+          case "stylistic-twenty":
+            features.add("'ss20'");
+            break;
         }
       }
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java
index 8706e70b102b..787ab9bb14db 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java
@@ -444,6 +444,66 @@ private void setFontVariant(@Nullable MapBuffer fontVariant) {
           case "proportional-nums":
             features.add("'pnum'");
             break;
+          case "stylistic-one":
+            features.add("'ss01'");
+            break;
+          case "stylistic-two":
+            features.add("'ss02'");
+            break;
+          case "stylistic-three":
+            features.add("'ss03'");
+            break;
+          case "stylistic-four":
+            features.add("'ss04'");
+            break;
+          case "stylistic-five":
+            features.add("'ss05'");
+            break;
+          case "stylistic-six":
+            features.add("'ss06'");
+            break;
+          case "stylistic-seven":
+            features.add("'ss07'");
+            break;
+          case "stylistic-eight":
+            features.add("'ss08'");
+            break;
+          case "stylistic-nine":
+            features.add("'ss09'");
+            break;
+          case "stylistic-ten":
+            features.add("'ss10'");
+            break;
+          case "stylistic-eleven":
+            features.add("'ss11'");
+            break;
+          case "stylistic-twelve":
+            features.add("'ss12'");
+            break;
+          case "stylistic-thirteen":
+            features.add("'ss13'");
+            break;
+          case "stylistic-fourteen":
+            features.add("'ss14'");
+            break;
+          case "stylistic-fifteen":
+            features.add("'ss15'");
+            break;
+          case "stylistic-sixteen":
+            features.add("'ss16'");
+            break;
+          case "stylistic-seventeen":
+            features.add("'ss17'");
+            break;
+          case "stylistic-eighteen":
+            features.add("'ss18'");
+            break;
+          case "stylistic-nineteen":
+            features.add("'ss19'");
+            break;
+          case "stylistic-twenty":
+            features.add("'ss20'");
+            break;
         }
       }
     }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
index c8bdae6949d2..964152d93df5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
@@ -31,7 +31,6 @@
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.ViewProps;
@@ -193,30 +192,8 @@ public static Spannable getOrCreateSpannableForText(
       ReadableMap attributedString,
       @Nullable ReactTextViewManagerCallback reactTextViewManagerCallback) {
 
-    Spannable preparedSpannableText;
-
-    if (ReactFeatureFlags.enableSpannableCache) {
-      synchronized (sSpannableCacheLock) {
-        preparedSpannableText = sSpannableCache.get((ReadableNativeMap) attributedString);
-        if (preparedSpannableText != null) {
-          return preparedSpannableText;
-        }
-      }
-
-      preparedSpannableText =
-          createSpannableFromAttributedString(
-              context, attributedString, reactTextViewManagerCallback);
-
-      synchronized (sSpannableCacheLock) {
-        sSpannableCache.put((ReadableNativeMap) attributedString, preparedSpannableText);
-      }
-    } else {
-      preparedSpannableText =
-          createSpannableFromAttributedString(
-              context, attributedString, reactTextViewManagerCallback);
-    }
-
-    return preparedSpannableText;
+    return createSpannableFromAttributedString(
+        context, attributedString, reactTextViewManagerCallback);
   }
 
   private static Spannable createSpannableFromAttributedString(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
index ecbf0d45489b..e2a8c05f2f0a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
@@ -29,7 +29,6 @@
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.common.mapbuffer.MapBuffer;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.yoga.YogaConstants;
 import com.facebook.yoga.YogaMeasureMode;
@@ -106,6 +105,11 @@ public static boolean isRTL(MapBuffer attributedString) {
 
     MapBuffer fragment = fragments.getMapBuffer((short) 0);
     MapBuffer textAttributes = fragment.getMapBuffer(FR_KEY_TEXT_ATTRIBUTES);
+
+    if (!textAttributes.contains(TextAttributeProps.TA_KEY_LAYOUT_DIRECTION)) {
+      return false;
+    }
+
     return TextAttributeProps.getLayoutDirection(
             textAttributes.getString(TextAttributeProps.TA_KEY_LAYOUT_DIRECTION))
         == LayoutDirection.RTL;
@@ -204,30 +208,8 @@ public static Spannable getOrCreateSpannableForText(
       MapBuffer attributedString,
       @Nullable ReactTextViewManagerCallback reactTextViewManagerCallback) {
 
-    Spannable preparedSpannableText;
-
-    if (ReactFeatureFlags.enableSpannableCache) {
-      synchronized (sSpannableCacheLock) {
-        preparedSpannableText = sSpannableCache.get(attributedString);
-        if (preparedSpannableText != null) {
-          return preparedSpannableText;
-        }
-      }
-
-      preparedSpannableText =
-          createSpannableFromAttributedString(
-              context, attributedString, reactTextViewManagerCallback);
-
-      synchronized (sSpannableCacheLock) {
-        sSpannableCache.put(attributedString, preparedSpannableText);
-      }
-    } else {
-      preparedSpannableText =
-          createSpannableFromAttributedString(
-              context, attributedString, reactTextViewManagerCallback);
-    }
-
-    return preparedSpannableText;
+    return createSpannableFromAttributedString(
+        context, attributedString, reactTextViewManagerCallback);
   }
 
   private static Spannable createSpannableFromAttributedString(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK
index 76225cec3f88..e48762cb597e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "frescosupport",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     visibility = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK
index c39304468373..233f1e12611a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK
@@ -1,15 +1,17 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "IS_OSS_BUILD", "YOGA_TARGET", "react_native_android_toplevel_dep", "react_native_dep", "react_native_target", "rn_android_library")
+
+# TODO(T115916830): Remove when Kotlin files are used in this module
+KOTLIN_STDLIB_DEPS = [react_native_android_toplevel_dep("third-party/kotlin:kotlin-stdlib")] if IS_OSS_BUILD else []
 
 rn_android_library(
     name = "textinput",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
-    language = "JAVA",
+    language = "KOTLIN",
+    pure_kotlin = False,
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
@@ -29,8 +31,10 @@ rn_android_library(
         react_native_target("java/com/facebook/react/views/imagehelper:imagehelper"),
         react_native_target("java/com/facebook/react/views/scroll:scroll"),
         react_native_target("java/com/facebook/react/views/text:text"),
+        react_native_target("java/com/facebook/react/common/mapbuffer:mapbuffer"),
         react_native_target("java/com/facebook/react/views/view:view"),
-    ],
+        react_native_target("java/com/facebook/react/config:config"),
+    ] + KOTLIN_STDLIB_DEPS,
     exported_deps = [
         react_native_dep("third-party/android/androidx:appcompat"),
     ],
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index 4847b9b5d86e..14863e498018 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -95,7 +95,7 @@ public class ReactEditText extends AppCompatEditText
   private @Nullable TextWatcherDelegator mTextWatcherDelegator;
   private int mStagedInputType;
   protected boolean mContainsImages;
-  private @Nullable Boolean mBlurOnSubmit;
+  private @Nullable String mSubmitBehavior = null;
   private boolean mDisableFullscreen;
   private @Nullable String mReturnKeyType;
   private @Nullable SelectionWatcher mSelectionWatcher;
@@ -135,7 +135,6 @@ public ReactEditText(Context context) {
     mDefaultGravityVertical = getGravity() & Gravity.VERTICAL_GRAVITY_MASK;
     mNativeEventCount = 0;
     mIsSettingTextFromJS = false;
-    mBlurOnSubmit = null;
     mDisableFullscreen = false;
     mListeners = null;
     mTextWatcherDelegator = null;
@@ -256,7 +255,7 @@ public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
               inputConnection, reactContext, this, mEventDispatcher);
     }
 
-    if (isMultiline() && getBlurOnSubmit()) {
+    if (isMultiline() && (shouldBlurOnReturn() || shouldSubmitOnReturn())) {
       // Remove IME_FLAG_NO_ENTER_ACTION to keep the original IME_OPTION
       outAttrs.imeOptions &= ~EditorInfo.IME_FLAG_NO_ENTER_ACTION;
     }
@@ -380,21 +379,52 @@ public void setSelectionWatcher(SelectionWatcher selectionWatcher) {
     mSelectionWatcher = selectionWatcher;
   }
 
-  public void setBlurOnSubmit(@Nullable Boolean blurOnSubmit) {
-    mBlurOnSubmit = blurOnSubmit;
-  }
-
   public void setOnKeyPress(boolean onKeyPress) {
     mOnKeyPress = onKeyPress;
   }
 
-  public boolean getBlurOnSubmit() {
-    if (mBlurOnSubmit == null) {
-      // Default blurOnSubmit
-      return isMultiline() ? false : true;
+  public boolean shouldBlurOnReturn() {
+    String submitBehavior = getSubmitBehavior();
+    boolean shouldBlur;
+
+    // Default shouldBlur
+    if (submitBehavior == null) {
+      if (!isMultiline()) {
+        shouldBlur = true;
+      } else {
+        shouldBlur = false;
+      }
+    } else {
+      shouldBlur = submitBehavior.equals("blurAndSubmit");
+    }
+
+    return shouldBlur;
+  }
+
+  public boolean shouldSubmitOnReturn() {
+    String submitBehavior = getSubmitBehavior();
+    boolean shouldSubmit;
+
+    // Default shouldSubmit
+    if (submitBehavior == null) {
+      if (!isMultiline()) {
+        shouldSubmit = true;
+      } else {
+        shouldSubmit = false;
+      }
+    } else {
+      shouldSubmit = submitBehavior.equals("submit") || submitBehavior.equals("blurAndSubmit");
     }
 
-    return mBlurOnSubmit;
+    return shouldSubmit;
+  }
+
+  public String getSubmitBehavior() {
+    return mSubmitBehavior;
+  }
+
+  public void setSubmitBehavior(String submitBehavior) {
+    mSubmitBehavior = submitBehavior;
   }
 
   public void setDisableFullscreenUI(boolean disableFullscreenUI) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index f3134f9cb1dc..85fb317a2a9d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -44,6 +44,7 @@
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.MapBuilder;
+import com.facebook.react.common.mapbuffer.MapBuffer;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.FabricViewStateManager;
@@ -69,6 +70,7 @@
 import com.facebook.react.views.text.TextAttributeProps;
 import com.facebook.react.views.text.TextInlineImageSpan;
 import com.facebook.react.views.text.TextLayoutManager;
+import com.facebook.react.views.text.TextLayoutManagerMapBuffer;
 import com.facebook.react.views.text.TextTransform;
 import com.facebook.yoga.YogaConstants;
 import java.lang.reflect.Field;
@@ -83,6 +85,12 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
   public static final String TAG = ReactTextInputManager.class.getSimpleName();
   public static final String REACT_CLASS = "AndroidTextInput";
 
+  // See also ReactTextViewManager
+  private static final short TX_STATE_KEY_ATTRIBUTED_STRING = 0;
+  private static final short TX_STATE_KEY_PARAGRAPH_ATTRIBUTES = 1;
+  private static final short TX_STATE_KEY_HASH = 2;
+  private static final short TX_STATE_KEY_MOST_RECENT_EVENT_COUNT = 3;
+
   private static final int[] SPACING_TYPES = {
     Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,
   };
@@ -441,9 +449,9 @@ public void setOnSelectionChange(final ReactEditText view, boolean onSelectionCh
     }
   }
 
-  @ReactProp(name = "blurOnSubmit")
-  public void setBlurOnSubmit(ReactEditText view, @Nullable Boolean blurOnSubmit) {
-    view.setBlurOnSubmit(blurOnSubmit);
+  @ReactProp(name = "submitBehavior")
+  public void setSubmitBehavior(ReactEditText view, @Nullable String submitBehavior) {
+    view.setSubmitBehavior(submitBehavior);
   }
 
   @ReactProp(name = "onContentSizeChange", defaultBoolean = false)
@@ -625,6 +633,11 @@ public void setUnderlineColor(ReactEditText view, @Nullable Integer underlineCol
     // See https://code.google.com/p/android/issues/detail?id=191754 for more info
     Drawable background = view.getBackground();
     Drawable drawableToMutate = background;
+
+    if (background == null) {
+      return;
+    }
+
     if (background.getConstantState() != null) {
       try {
         drawableToMutate = background.mutate();
@@ -1077,36 +1090,38 @@ public void onFocusChange(View v, boolean hasFocus) {
           @Override
           public boolean onEditorAction(TextView v, int actionId, KeyEvent keyEvent) {
             if ((actionId & EditorInfo.IME_MASK_ACTION) != 0 || actionId == EditorInfo.IME_NULL) {
-              boolean blurOnSubmit = editText.getBlurOnSubmit();
               boolean isMultiline = editText.isMultiline();
 
+              boolean shouldSubmit = editText.shouldSubmitOnReturn();
+              boolean shouldBlur = editText.shouldBlurOnReturn();
+
               // Motivation:
-              // * blurOnSubmit && isMultiline => Clear focus; prevent default behaviour (return
+              // * shouldSubmit => Clear focus; prevent default behavior (return true);
+              // * shouldBlur => Submit; prevent default behavior (return true);
+              // * !shouldBlur && !shouldSubmit && isMultiline => Perform default behavior (return
+              // false);
+              // * !shouldBlur && !shouldSubmit && !isMultiline => Prevent default behavior (return
               // true);
-              // * blurOnSubmit && !isMultiline => Clear focus; prevent default behaviour (return
-              // true);
-              // * !blurOnSubmit && isMultiline => Perform default behaviour (return false);
-              // * !blurOnSubmit && !isMultiline => Prevent default behaviour (return true).
-              // Additionally we always generate a `submit` event.
-
-              EventDispatcher eventDispatcher = getEventDispatcher(reactContext, editText);
-              eventDispatcher.dispatchEvent(
-                  new ReactTextInputSubmitEditingEvent(
-                      reactContext.getSurfaceId(),
-                      editText.getId(),
-                      editText.getText().toString()));
+              if (shouldSubmit) {
+                EventDispatcher eventDispatcher = getEventDispatcher(reactContext, editText);
+                eventDispatcher.dispatchEvent(
+                    new ReactTextInputSubmitEditingEvent(
+                        reactContext.getSurfaceId(),
+                        editText.getId(),
+                        editText.getText().toString()));
+              }
 
-              if (blurOnSubmit) {
+              if (shouldBlur) {
                 editText.clearFocus();
               }
 
               // Prevent default behavior except when we want it to insert a newline.
-              if (blurOnSubmit || !isMultiline) {
+              if (shouldBlur || shouldSubmit || !isMultiline) {
                 return true;
               }
 
-              // If we've reached this point, it means that the TextInput has 'blurOnSubmit' set to
-              // false and 'multiline' set to true. But it's still possible to get IME_ACTION_NEXT
+              // If we've reached this point, it means that the TextInput has 'submitBehavior' set
+              // nullish and 'multiline' set to true. But it's still possible to get IME_ACTION_NEXT
               // and IME_ACTION_PREVIOUS here in case if 'disableFullscreenUI' is false and Android
               // decides to render this EditText in the full screen mode (when a phone has the
               // landscape orientation for example). The full screen EditText also renders an action
@@ -1284,6 +1299,11 @@ public Object updateState(
 
     stateManager.setStateWrapper(stateWrapper);
 
+    MapBuffer stateMapBuffer = stateWrapper.getStateDataMapBuffer();
+    if (stateMapBuffer != null) {
+      return getReactTextUpdate(view, props, stateMapBuffer);
+    }
+
     ReadableNativeMap state = stateWrapper.getStateData();
     if (state == null) {
       return null;
@@ -1316,4 +1336,39 @@ public Object updateState(
         TextAttributeProps.getJustificationMode(props),
         containsMultipleFragments);
   }
+
+  public Object getReactTextUpdate(ReactEditText view, ReactStylesDiffMap props, MapBuffer state) {
+    // If native wants to update the state wrapper but the state data hasn't actually
+    // changed, the MapBuffer may be empty
+    if (state.getCount() == 0) {
+      return null;
+    }
+
+    MapBuffer attributedString = state.getMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING);
+    MapBuffer paragraphAttributes = state.getMapBuffer(TX_STATE_KEY_PARAGRAPH_ATTRIBUTES);
+    if (attributedString == null || paragraphAttributes == null) {
+      throw new IllegalArgumentException(
+          "Invalid TextInput State (MapBuffer) was received as a parameters");
+    }
+
+    Spannable spanned =
+        TextLayoutManagerMapBuffer.getOrCreateSpannableForText(
+            view.getContext(), attributedString, mReactTextViewManagerCallback);
+
+    boolean containsMultipleFragments =
+        attributedString.getMapBuffer(TextLayoutManagerMapBuffer.AS_KEY_FRAGMENTS).getCount() > 1;
+
+    int textBreakStrategy =
+        TextAttributeProps.getTextBreakStrategy(
+            paragraphAttributes.getString(TextLayoutManagerMapBuffer.PA_KEY_TEXT_BREAK_STRATEGY));
+
+    return ReactTextUpdate.buildReactTextUpdateFromState(
+        spanned,
+        state.getInt(TX_STATE_KEY_MOST_RECENT_EVENT_COUNT),
+        TextAttributeProps.getTextAlignment(
+            props, TextLayoutManagerMapBuffer.isRTL(attributedString)),
+        textBreakStrategy,
+        TextAttributeProps.getJustificationMode(props),
+        containsMultipleFragments);
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/BUCK
index a4f854d9545c..5efd187e053e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/BUCK
@@ -4,10 +4,8 @@ rn_android_library(
     name = "unimplementedview",
     srcs = glob(["*.java"]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "JAVA",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK
index 4c78e7313b14..2db76a78180d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK
@@ -7,10 +7,8 @@ rn_android_library(
         "*.kt",
     ]),
     autoglob = False,
-    is_androidx = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     language = "KOTLIN",
     provided_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferPropSetter.kt b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferPropSetter.kt
index 68b917d0b1b4..7218daf70cf9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferPropSetter.kt
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferPropSetter.kt
@@ -58,6 +58,12 @@ object ReactMapBufferPropSetter {
   private const val VP_POINTER_ENTER_CAPTURE = 38
   private const val VP_POINTER_LEAVE_CAPTURE = 39
   private const val VP_POINTER_MOVE_CAPTURE = 40
+  private const val VP_POINTER_OUT = 41
+  private const val VP_POINTER_OUT_CAPTURE = 42
+  private const val VP_POINTER_OVER = 43
+  private const val VP_POINTER_OVER_CAPTURE = 44
+  private const val VP_BORDER_CURVES = 45 // iOS only
+  private const val VP_FG_COLOR = 46 // iOS only?
 
   // Yoga values
   private const val YG_BORDER_WIDTH = 100
@@ -137,6 +143,9 @@ object ReactMapBufferPropSetter {
           // TODO: color for some reason can be object in Java but not in C++
           viewManager.backgroundColor(view, entry.intValue)
         }
+        VP_FG_COLOR -> {
+          // Prop not used on Android?
+        }
         VP_BORDER_COLOR -> {
           viewManager.borderColor(view, entry.mapBufferValue)
         }
@@ -144,7 +153,10 @@ object ReactMapBufferPropSetter {
           viewManager.borderRadius(view, entry.mapBufferValue)
         }
         VP_BORDER_STYLE -> {
-          viewManager.borderStyle(view, entry.intValue)
+          val styleBuffer = entry.mapBufferValue
+          if (styleBuffer.contains(CORNER_ALL)) {
+            viewManager.borderStyle(view, (styleBuffer.getDouble(CORNER_ALL)).toInt())
+          }
         }
         VP_ELEVATION -> {
           viewManager.setElevation(view, entry.doubleValue.toFloat())
@@ -197,6 +209,18 @@ object ReactMapBufferPropSetter {
         VP_POINTER_MOVE_CAPTURE -> {
           viewManager.setPointerMoveCapture(view, entry.booleanValue)
         }
+        VP_POINTER_OUT -> {
+          viewManager.setPointerOut(view, entry.booleanValue)
+        }
+        VP_POINTER_OUT_CAPTURE -> {
+          viewManager.setPointerOutCapture(view, entry.booleanValue)
+        }
+        VP_POINTER_OVER -> {
+          viewManager.setPointerOver(view, entry.booleanValue)
+        }
+        VP_POINTER_OVER_CAPTURE -> {
+          viewManager.setPointerOverCapture(view, entry.booleanValue)
+        }
         VP_REMOVE_CLIPPED_SUBVIEW -> {
           viewManager.setRemoveClippedSubviews(view, entry.booleanValue)
         }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java
index 6a53ed80f1be..827aaec706ea 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java
@@ -791,7 +791,7 @@ private void updatePath() {
 
     /** Compute mInnerTopLeftCorner */
     mInnerTopLeftCorner.x = mInnerClipTempRectForBorderRadius.left;
-    mInnerTopLeftCorner.y = mInnerClipTempRectForBorderRadius.top;
+    mInnerTopLeftCorner.y = mInnerClipTempRectForBorderRadius.top * 2;
 
     getEllipseIntersectionWithLine(
         // Ellipse Bounds
@@ -817,7 +817,7 @@ private void updatePath() {
     }
 
     mInnerBottomLeftCorner.x = mInnerClipTempRectForBorderRadius.left;
-    mInnerBottomLeftCorner.y = mInnerClipTempRectForBorderRadius.bottom;
+    mInnerBottomLeftCorner.y = mInnerClipTempRectForBorderRadius.bottom * -2;
 
     getEllipseIntersectionWithLine(
         // Ellipse Bounds
@@ -843,7 +843,7 @@ private void updatePath() {
     }
 
     mInnerTopRightCorner.x = mInnerClipTempRectForBorderRadius.right;
-    mInnerTopRightCorner.y = mInnerClipTempRectForBorderRadius.top;
+    mInnerTopRightCorner.y = mInnerClipTempRectForBorderRadius.top * 2;
 
     getEllipseIntersectionWithLine(
         // Ellipse Bounds
@@ -869,7 +869,7 @@ private void updatePath() {
     }
 
     mInnerBottomRightCorner.x = mInnerClipTempRectForBorderRadius.right;
-    mInnerBottomRightCorner.y = mInnerClipTempRectForBorderRadius.bottom;
+    mInnerBottomRightCorner.y = mInnerClipTempRectForBorderRadius.bottom * -2;
 
     getEllipseIntersectionWithLine(
         // Ellipse Bounds
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
index 93afe79dc7f5..0d39356857e2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
@@ -33,7 +33,6 @@
 import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.annotations.VisibleForTesting;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
 import com.facebook.react.touch.OnInterceptTouchEventListener;
 import com.facebook.react.touch.ReactHitSlopView;
@@ -828,8 +827,7 @@ protected void dispatchDraw(Canvas canvas) {
 
   @Override
   protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
-    boolean drawWithZ =
-        child.getElevation() > 0 && ReactFeatureFlags.insertZReorderBarriersOnViewGroupChildren;
+    boolean drawWithZ = child.getElevation() > 0;
 
     if (drawWithZ) {
       CanvasUtil.enableZ(canvas, true);
diff --git a/ReactAndroid/src/main/java/com/facebook/systrace/BUCK b/ReactAndroid/src/main/java/com/facebook/systrace/BUCK
index f5de217fa454..a3c16292a2c9 100644
--- a/ReactAndroid/src/main/java/com/facebook/systrace/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/systrace/BUCK
@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "systrace",
@@ -8,4 +8,7 @@ rn_android_library(
     visibility = [
         "PUBLIC",
     ],
+    deps = [
+        react_native_dep("third-party/android/androidx:tracing"),
+    ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java b/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java
index 0754f9558418..497caf8a26b7 100644
--- a/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java
+++ b/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java
@@ -7,7 +7,7 @@
 
 package com.facebook.systrace;
 
-import android.os.Trace;
+import androidx.tracing.Trace;
 
 /**
  * Systrace stub that mostly does nothing but delegates to Trace for beginning/ending sections. The
@@ -55,21 +55,35 @@ public static void endSection(long tag) {
     Trace.endSection();
   }
 
-  public static void beginAsyncSection(long tag, final String sectionName, final int cookie) {}
+  public static void beginAsyncSection(long tag, final String sectionName, final int cookie) {
+    Trace.beginAsyncSection(sectionName, cookie);
+  }
 
   public static void beginAsyncSection(
-      long tag, final String sectionName, final int cookie, final long startNanos) {}
+      long tag, final String sectionName, final int cookie, final long startNanos) {
+    beginAsyncSection(tag, sectionName, cookie);
+  }
 
-  public static void endAsyncSection(long tag, final String sectionName, final int cookie) {}
+  public static void endAsyncSection(long tag, final String sectionName, final int cookie) {
+    Trace.endAsyncSection(sectionName, cookie);
+  }
 
   public static void endAsyncSection(
-      long tag, final String sectionName, final int cookie, final long endNanos) {}
+      long tag, final String sectionName, final int cookie, final long endNanos) {
+    endAsyncSection(tag, sectionName, cookie);
+  }
 
-  public static void traceCounter(long tag, final String counterName, final int counterValue) {}
+  public static void traceCounter(long tag, final String counterName, final int counterValue) {
+    Trace.setCounter(counterName, counterValue);
+  }
 
-  public static void startAsyncFlow(long tag, final String sectionName, final int cookie) {}
+  public static void startAsyncFlow(long tag, final String sectionName, final int cookie) {
+    beginAsyncSection(tag, sectionName, cookie);
+  }
 
   public static void stepAsyncFlow(long tag, final String sectionName, final int cookie) {}
 
-  public static void endAsyncFlow(long tag, final String sectionName, final int cookie) {}
+  public static void endAsyncFlow(long tag, final String sectionName, final int cookie) {
+    endAsyncSection(tag, sectionName, cookie);
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java b/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java
index 0690f3ecea12..9ad0a396f817 100644
--- a/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java
+++ b/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java
@@ -7,17 +7,19 @@
 
 package com.facebook.systrace;
 
-/** Systrace stub. */
+import java.util.ArrayList;
+import java.util.List;
+
 public final class SystraceMessage {
 
-  private static final Builder NOOP_BUILDER = new NoopBuilder();
+  public static Boolean INCLUDE_ARGS = false;
 
   public static Builder beginSection(long tag, String sectionName) {
-    return NOOP_BUILDER;
+    return new StartSectionBuilder(tag, sectionName);
   }
 
   public static Builder endSection(long tag) {
-    return NOOP_BUILDER;
+    return new EndSectionBuilder(tag);
   }
 
   public abstract static class Builder {
@@ -33,13 +35,64 @@ public abstract static class Builder {
     public abstract Builder arg(String key, double value);
   }
 
-  private interface Flusher {
-    void flush(StringBuilder builder);
+  private static class StartSectionBuilder extends Builder {
+    private String mSectionName;
+    private long mTag;
+    private List<String> mArgs = new ArrayList<>();
+
+    public StartSectionBuilder(long tag, String sectionName) {
+      mTag = tag;
+      mSectionName = sectionName;
+    }
+
+    @Override
+    public void flush() {
+      Systrace.beginSection(
+          mTag,
+          mSectionName
+              + (INCLUDE_ARGS && mArgs.size() > 0 ? (" (" + String.join(", ", mArgs) + ")") : ""));
+    }
+
+    @Override
+    public Builder arg(String key, Object value) {
+      addArg(key, String.valueOf(value));
+      return this;
+    }
+
+    @Override
+    public Builder arg(String key, int value) {
+      addArg(key, String.valueOf(value));
+      return this;
+    }
+
+    @Override
+    public Builder arg(String key, long value) {
+      addArg(key, String.valueOf(value));
+      return this;
+    }
+
+    @Override
+    public Builder arg(String key, double value) {
+      addArg(key, String.valueOf(value));
+      return this;
+    }
+
+    private void addArg(String key, String value) {
+      mArgs.add(key + ": " + value);
+    }
   }
 
-  private static class NoopBuilder extends Builder {
+  private static class EndSectionBuilder extends Builder {
+    private long mTag;
+
+    public EndSectionBuilder(long tag) {
+      mTag = tag;
+    }
+
     @Override
-    public void flush() {}
+    public void flush() {
+      Systrace.endSection(mTag);
+    }
 
     @Override
     public Builder arg(String key, Object value) {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java
index 5411e39f2efe..a60d77e0f294 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 public enum YogaAlign {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java
index eeecd85ed47c..a949ddc3ce1c 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 public enum YogaDimension {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java
index 344c0f8079e9..7cedba3a05e6 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 public enum YogaDirection {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java
index aa94b0536a9e..d4c4685fcb22 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 public enum YogaDisplay {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java
index 929b3315b332..6b915348230d 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 public enum YogaEdge {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
index f54c7b6e1cd2..3fabbb917292 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 public enum YogaExperimentalFeature {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java
index c314c0cf03cd..719888a1864e 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 public enum YogaFlexDirection {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaGutter.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaGutter.java
new file mode 100644
index 000000000000..2b4be1c08d98
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaGutter.java
@@ -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.
+ */
+
+// @generated by enums.py
+
+package com.facebook.yoga;
+
+public enum YogaGutter {
+  COLUMN(0),
+  ROW(1),
+  ALL(2);
+
+  private final int mIntValue;
+
+  YogaGutter(int intValue) {
+    mIntValue = intValue;
+  }
+
+  public int intValue() {
+    return mIntValue;
+  }
+
+  public static YogaGutter fromInt(int value) {
+    switch (value) {
+      case 0: return COLUMN;
+      case 1: return ROW;
+      case 2: return ALL;
+      default: throw new IllegalArgumentException("Unknown enum value: " + value);
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java
index e19213f7e8b6..4be1ed71d39d 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 public enum YogaJustify {
@@ -32,8 +34,7 @@ public static YogaJustify fromInt(int value) {
       case 2: return FLEX_END;
       case 3: return SPACE_BETWEEN;
       case 4: return SPACE_AROUND;
-      case 5:
-        return SPACE_EVENLY;
+      case 5: return SPACE_EVENLY;
       default: throw new IllegalArgumentException("Unknown enum value: " + value);
     }
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java
index f105145aea42..85076706c378 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java
index 1750d2a1f431..0c77c23897e7 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 public enum YogaMeasureMode {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.java
index 1aca48216461..f6c53c3b64fc 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.java
@@ -15,7 +15,7 @@ public class YogaNative {
   static {
     SoLoader.loadLibrary("yoga");
   }
-  
+
   // JNI methods that use Vanilla JNI
   // YGConfig related
   static native long jni_YGConfigNewJNI();
@@ -108,6 +108,8 @@ public class YogaNative {
   static native void jni_YGNodeStyleSetMaxHeightPercentJNI(long nativePointer, float percent);
   static native float jni_YGNodeStyleGetAspectRatioJNI(long nativePointer);
   static native void jni_YGNodeStyleSetAspectRatioJNI(long nativePointer, float aspectRatio);
+  static native float jni_YGNodeStyleGetGapJNI(long nativePointer, int gutter);
+  static native void jni_YGNodeStyleSetGapJNI(long nativePointer, int gutter, float gapLength);
   static native void jni_YGNodeSetHasMeasureFuncJNI(long nativePointer, boolean hasMeasureFunc);
   static native void jni_YGNodeSetHasBaselineFuncJNI(long nativePointer, boolean hasMeasureFunc);
   static native void jni_YGNodePrintJNI(long nativePointer);
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
index cbba2f55e042..1f19ec5bbdee 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
@@ -188,6 +188,10 @@ public interface Inputs {
 
   public abstract void setAspectRatio(float aspectRatio);
 
+  public abstract float getGap(YogaGutter gutter);
+
+  public abstract void setGap(YogaGutter gutter, float gapLength);
+
   public abstract float getLayoutX();
 
   public abstract float getLayoutY();
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java
index 87517b63ccf0..85aebb3fcc21 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java
@@ -725,4 +725,14 @@ public void markLayoutSeen() {
     }
     mHasNewLayout = false;
   }
+
+  @Override
+  public float getGap(YogaGutter gutter) {
+    return YogaNative.jni_YGNodeStyleGetGapJNI(mNativePointer, gutter.intValue());
+  }
+
+  @Override
+  public void setGap(YogaGutter gutter, float gapLength) {
+    YogaNative.jni_YGNodeStyleSetGapJNI(mNativePointer, gutter.intValue(), gapLength);
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java
index 1d90eec34c5b..b8828014cf86 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 public enum YogaNodeType {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java
index 321d4e00a655..8e59966b9a9d 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 public enum YogaOverflow {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java
index 6663a0ee66d4..cf735fbe073d 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 public enum YogaPositionType {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java
index 8c1a34d95591..54eacc51d3a1 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 public enum YogaPrintOptions {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java
index e2ab8bffb72f..3614ec1059d2 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 public enum YogaUnit {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java
index e7e6014328ca..cf87e9ef5eca 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 package com.facebook.yoga;
 
 public enum YogaWrap {
diff --git a/ReactAndroid/src/main/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/CMakeLists.txt
index eb4150fa0068..c7ee6155e9cc 100644
--- a/ReactAndroid/src/main/jni/CMakeLists.txt
+++ b/ReactAndroid/src/main/jni/CMakeLists.txt
@@ -8,6 +8,13 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 project(ReactAndroid)
 
+# If you have ccache installed, we're going to honor it.
+find_program(CCACHE_FOUND ccache)
+if(CCACHE_FOUND)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+endif(CCACHE_FOUND)
+
 # Make sure every shared lib includes a .note.gnu.build-id header
 add_link_options(-Wl,--build-id)
 add_compile_options(-Wall -Werror -std=c++1y)
@@ -30,6 +37,8 @@ endfunction()
 
 # Third-party prefabs
 find_package(hermes-engine REQUIRED CONFIG)
+find_package(fbjni REQUIRED CONFIG)
+add_library(fbjni ALIAS fbjni::fbjni)
 
 # Third-party downloaded targets
 add_react_third_party_ndk_subdir(glog)
@@ -47,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)
@@ -89,18 +99,18 @@ add_react_common_subdir(react/nativemodule/core)
 
 # ReactAndroid JNI targets
 add_react_build_subdir(generated/source/codegen/jni)
-add_react_android_subdir(src/main/java/com/facebook/hermes/reactexecutor)
-add_react_android_subdir(src/main/jni/first-party/fbjni)
 add_react_android_subdir(src/main/jni/first-party/fb)
 add_react_android_subdir(src/main/jni/first-party/fbgloginit)
 add_react_android_subdir(src/main/jni/first-party/yogajni)
+add_react_android_subdir(src/main/jni/react/cxxcomponents)
 add_react_android_subdir(src/main/jni/react/jni)
-add_react_android_subdir(src/main/java/com/facebook/react/reactperflogger/jni)
-add_react_android_subdir(src/main/java/com/facebook/react/jscexecutor)
-add_react_android_subdir(src/main/java/com/facebook/react/turbomodule/core/jni)
-add_react_android_subdir(src/main/java/com/facebook/react/uimanager/jni)
-add_react_android_subdir(src/main/java/com/facebook/react/common/mapbuffer/jni)
-add_react_android_subdir(src/main/java/com/facebook/react/fabric/jni)
-add_react_android_subdir(src/main/java/com/facebook/react/modules/blob/jni)
-add_react_android_subdir(src/main/java/com/facebook/hermes/instrumentation/)
-
+add_react_android_subdir(src/main/jni/react/reactperflogger)
+add_react_android_subdir(src/main/jni/react/jscexecutor)
+add_react_android_subdir(src/main/jni/react/turbomodule)
+add_react_android_subdir(src/main/jni/react/uimanager)
+add_react_android_subdir(src/main/jni/react/mapbuffer)
+add_react_android_subdir(src/main/jni/react/reactnativeblob)
+add_react_android_subdir(src/main/jni/react/fabric)
+add_react_android_subdir(src/main/jni/react/newarchdefaults)
+add_react_android_subdir(src/main/jni/react/hermes/reactexecutor)
+add_react_android_subdir(src/main/jni/react/hermes/instrumentation/)
diff --git a/ReactAndroid/src/main/jni/first-party/fbjni/.gitignore b/ReactAndroid/src/main/jni/first-party/fbjni/.gitignore
deleted file mode 100644
index cdcdafaf0651..000000000000
--- a/ReactAndroid/src/main/jni/first-party/fbjni/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/headers/
-/jni/
diff --git a/ReactAndroid/src/main/jni/first-party/fbjni/Android.mk b/ReactAndroid/src/main/jni/first-party/fbjni/Android.mk
deleted file mode 100644
index bc61e176b946..000000000000
--- a/ReactAndroid/src/main/jni/first-party/fbjni/Android.mk
+++ /dev/null
@@ -1,14 +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.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(LOCAL_PATH)/jni/$(TARGET_ARCH_ABI)/libfbjni.so
-
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/headers
-LOCAL_MODULE := libfbjni
-
-include $(PREBUILT_SHARED_LIBRARY)
diff --git a/ReactAndroid/src/main/jni/first-party/fbjni/CMakeLists.txt b/ReactAndroid/src/main/jni/first-party/fbjni/CMakeLists.txt
deleted file mode 100644
index f8fa27c5a97a..000000000000
--- a/ReactAndroid/src/main/jni/first-party/fbjni/CMakeLists.txt
+++ /dev/null
@@ -1,15 +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.
-
-cmake_minimum_required(VERSION 3.13)
-set(CMAKE_VERBOSE_MAKEFILE on)
-
-add_library(fbjni SHARED IMPORTED GLOBAL)
-set_target_properties(fbjni
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${CMAKE_CURRENT_SOURCE_DIR}/jni/${ANDROID_ABI}/libfbjni.so)
-
-target_include_directories(fbjni INTERFACE headers)
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp
index 6b6fb7f43ebd..e531681cda96 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp
@@ -147,7 +147,7 @@ static int YGJNILogFunc(
     if (*jloggerPtr) {
       JNIEnv* env = getCurrentEnv();
 
-      jclass cl = env->FindClass("Lcom/facebook/yoga/YogaLogLevel;");
+      jclass cl = env->FindClass("com/facebook/yoga/YogaLogLevel");
       static const jmethodID smethodId =
           facebook::yoga::vanillajni::getStaticMethodId(
               env, cl, "fromInt", "(I)Lcom/facebook/yoga/YogaLogLevel;");
@@ -386,7 +386,7 @@ static void jni_YGNodeCalculateLayoutJNI(
     }
   } catch (const std::logic_error& ex) {
     env->ExceptionClear();
-    jclass cl = env->FindClass("Ljava/lang/IllegalStateException;");
+    jclass cl = env->FindClass("java/lang/IllegalStateException");
     static const jmethodID methodId = facebook::yoga::vanillajni::getMethodId(
         env, cl, "<init>", "(Ljava/lang/String;)V");
     auto throwable = env->NewObject(cl, methodId, env->NewStringUTF(ex.what()));
@@ -734,6 +734,27 @@ static jlong jni_YGNodeCloneJNI(JNIEnv* env, jobject obj, jlong nativePointer) {
   return reinterpret_cast<jlong>(clonedYogaNode);
 }
 
+static jfloat jni_YGNodeStyleGetGapJNI(
+    JNIEnv* env,
+    jobject obj,
+    jlong nativePointer,
+    jint gutter) {
+  return (jfloat) YGNodeStyleGetGap(
+      _jlong2YGNodeRef(nativePointer), static_cast<YGGutter>(gutter));
+}
+
+static void jni_YGNodeStyleSetGapJNI(
+    JNIEnv* env,
+    jobject obj,
+    jlong nativePointer,
+    jint gutter,
+    jfloat gapLength) {
+  YGNodeStyleSetGap(
+      _jlong2YGNodeRef(nativePointer),
+      static_cast<YGGutter>(gutter),
+      static_cast<float>(gapLength));
+}
+
 // Yoga specific properties, not compatible with flexbox specification
 YG_NODE_JNI_STYLE_PROP(jfloat, float, AspectRatio);
 
@@ -971,6 +992,8 @@ static JNINativeMethod methods[] = {
     {"jni_YGNodeSetHasMeasureFuncJNI",
      "(JZ)V",
      (void*) jni_YGNodeSetHasMeasureFuncJNI},
+    {"jni_YGNodeStyleGetGapJNI", "(JI)F", (void*) jni_YGNodeStyleGetGapJNI},
+    {"jni_YGNodeStyleSetGapJNI", "(JIF)V", (void*) jni_YGNodeStyleSetGapJNI},
     {"jni_YGNodeSetHasBaselineFuncJNI",
      "(JZ)V",
      (void*) jni_YGNodeSetHasBaselineFuncJNI},
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YogaJniException.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YogaJniException.cpp
index edc20986bb77..81bdf28f9054 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YogaJniException.cpp
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YogaJniException.cpp
@@ -15,7 +15,7 @@ namespace yoga {
 namespace vanillajni {
 
 YogaJniException::YogaJniException() {
-  jclass cl = getCurrentEnv()->FindClass("Ljava/lang/RuntimeException;");
+  jclass cl = getCurrentEnv()->FindClass("java/lang/RuntimeException");
   static const jmethodID methodId = facebook::yoga::vanillajni::getMethodId(
       getCurrentEnv(), cl, "<init>", "()V");
   auto throwable = getCurrentEnv()->NewObject(cl, methodId);
diff --git a/ReactAndroid/src/main/jni/react/cxxcomponents/BUCK b/ReactAndroid/src/main/jni/react/cxxcomponents/BUCK
new file mode 100644
index 000000000000..3c51f2f3f16d
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/cxxcomponents/BUCK
@@ -0,0 +1,44 @@
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "CXX",
+    "react_native_xplat_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
+
+rn_xplat_cxx_library(
+    name = "components",
+    srcs = glob(
+        ["**/*.cpp"],
+    ),
+    headers = glob(
+        ["**/*.h"],
+    ),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "**/*.h"),
+        ],
+        prefix = "react/cxxcomponents",
+    ),
+    force_static = True,
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+    ],
+    platforms = (APPLE, ANDROID, CXX),
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    soname = "libcxxcomponents.$(ext)",
+    visibility = ["PUBLIC"],
+    deps = [
+        "//third-party/glog:glog",
+        "//xplat/fbsystrace:fbsystrace",
+        "//xplat/folly:memory",
+        "//xplat/folly:molly",
+        react_native_xplat_target("react/renderer/core:core"),
+    ],
+)
diff --git a/ReactAndroid/src/main/jni/react/cxxcomponents/CMakeLists.txt b/ReactAndroid/src/main/jni/react/cxxcomponents/CMakeLists.txt
new file mode 100644
index 000000000000..b60af533acb3
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/cxxcomponents/CMakeLists.txt
@@ -0,0 +1,22 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments)
+
+file(GLOB_RECURSE cxxcomponents_SRC CONFIGURE_DEPENDS *.cpp *.h)
+
+add_library(cxxcomponents SHARED ${cxxcomponents_SRC})
+
+target_include_directories(cxxcomponents PUBLIC .)
+set_target_properties(cxxcomponents PROPERTIES LINKER_LANGUAGE CXX)
diff --git a/ReactAndroid/src/main/jni/react/cxxcomponents/Component.h b/ReactAndroid/src/main/jni/react/cxxcomponents/Component.h
new file mode 100644
index 000000000000..6ddda4efbdcf
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/cxxcomponents/Component.h
@@ -0,0 +1,66 @@
+/*
+ * 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 <react/renderer/core/Props.h>
+#include <react/renderer/core/ReactPrimitives.h>
+#include <memory>
+#include <string>
+
+namespace facebook::react {
+
+class Component {
+ public:
+  Component(Tag tag, Props::Shared initialProps)
+      : tag_(tag), props_(std::move(initialProps)) {}
+
+  virtual ~Component() = default;
+
+  /*
+   * Called for updating component's props.
+   * Receiver must update native view props accordingly changed props.
+   */
+  virtual void updateProps(
+      Props::Shared const &oldProps,
+      Props::Shared const &newProps) = 0;
+
+  /*
+   * Called for mounting (attaching) a child component view inside `self`
+   * component view.
+   * Receiver must add `childComponent` as a sub component.
+   */
+  virtual void mountChildComponent(
+      std::shared_ptr<facebook::react::Component> childComponent,
+      int index){};
+
+  /*
+   * Called for unmounting (detaching) a child component view from `self`
+   * component view.
+   * Receiver must remove `childComponent` from a sub component
+   */
+  virtual void unmountChildComponent(
+      std::shared_ptr<facebook::react::Component> childComponent,
+      int index){};
+
+  /*
+   * Called for updating component's state.
+   * Receiver must update native view according to changed state.
+   */
+  virtual void updateState(){};
+
+  /*
+   * Called when the component is being deleted.
+   */
+  virtual void deleteComponent() = 0;
+
+ protected:
+  Tag tag_ = -1;
+  Props::Shared props_;
+};
+
+} // namespace facebook::react
diff --git a/ReactAndroid/src/main/jni/react/cxxcomponents/ComponentManager.h b/ReactAndroid/src/main/jni/react/cxxcomponents/ComponentManager.h
new file mode 100644
index 000000000000..3f2123b89778
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/cxxcomponents/ComponentManager.h
@@ -0,0 +1,26 @@
+/*
+ * 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 <react/cxxcomponents/Component.h>
+#include <react/renderer/core/Props.h>
+
+namespace facebook::react {
+
+class ComponentManager {
+ public:
+  ComponentManager() {}
+
+  virtual std::shared_ptr<Component> createComponent(
+      Tag tag,
+      Props::Shared initialProps) = 0;
+
+  virtual ~ComponentManager() = default;
+};
+
+} // namespace facebook::react
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/AsyncEventBeat.cpp b/ReactAndroid/src/main/jni/react/fabric/AsyncEventBeat.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/AsyncEventBeat.cpp
rename to ReactAndroid/src/main/jni/react/fabric/AsyncEventBeat.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/AsyncEventBeat.h b/ReactAndroid/src/main/jni/react/fabric/AsyncEventBeat.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/AsyncEventBeat.h
rename to ReactAndroid/src/main/jni/react/fabric/AsyncEventBeat.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK b/ReactAndroid/src/main/jni/react/fabric/BUCK
similarity index 93%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK
rename to ReactAndroid/src/main/jni/react/fabric/BUCK
index 613a7bc8711e..b8e6516cb044 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK
+++ b/ReactAndroid/src/main/jni/react/fabric/BUCK
@@ -7,14 +7,13 @@ rn_xplat_cxx_library(
     header_namespace = "",
     exported_headers = subdir_glob(
         [
-            ("", "**/*.h"),
+            ("", "*.h"),
         ],
         prefix = "react/fabric",
     ),
     fbandroid_allow_jni_merging = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = ANDROID,
     preprocessor_flags = [
@@ -24,6 +23,7 @@ rn_xplat_cxx_library(
     soname = "libfabricjni.$(ext)",
     visibility = ["PUBLIC"],
     deps = [
+        react_native_xplat_target("butter:butter"),
         react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
         react_native_xplat_target("react/config:config"),
         react_native_xplat_target("react/renderer/animations:animations"),
@@ -34,9 +34,9 @@ rn_xplat_cxx_library(
         react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
         react_native_xplat_target("react/renderer/components/scrollview:scrollview"),
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
+        "//xplat/js/react-native-github/ReactAndroid/src/main/jni/react/cxxcomponents:components",
         react_native_target("jni/react/jni:jni"),
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:molly",
         "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
         "//xplat/third-party/linker_lib:atomic",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp b/ReactAndroid/src/main/jni/react/fabric/Binding.cpp
similarity index 89%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp
rename to ReactAndroid/src/main/jni/react/fabric/Binding.cpp
index be2a0f1e7493..955682299fdd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp
+++ b/ReactAndroid/src/main/jni/react/fabric/Binding.cpp
@@ -8,6 +8,7 @@
 #include "Binding.h"
 
 #include "AsyncEventBeat.h"
+#include "CppComponentRegistry.h"
 #include "EventEmitterWrapper.h"
 #include "JBackgroundExecutor.h"
 #include "ReactNativeConfigHolder.h"
@@ -22,6 +23,7 @@
 #include <react/renderer/animations/LayoutAnimationDriver.h>
 #include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
 #include <react/renderer/components/scrollview/ScrollViewProps.h>
+#include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/core/EventBeat.h>
 #include <react/renderer/core/EventEmitter.h>
 #include <react/renderer/core/conversions.h>
@@ -360,7 +362,8 @@ void Binding::installFabricUIManager(
     jni::alias_ref<jobject> javaUIManager,
     EventBeatManager *eventBeatManager,
     ComponentFactory *componentsRegistry,
-    jni::alias_ref<jobject> reactNativeConfig) {
+    jni::alias_ref<jobject> reactNativeConfig,
+    CppComponentRegistry *cppComponentRegistry) {
   SystraceSection s("FabricUIManagerBinding::installFabricUIManager");
 
   std::shared_ptr<const ReactNativeConfig> config =
@@ -369,24 +372,24 @@ void Binding::installFabricUIManager(
   enableFabricLogs_ =
       config->getBool("react_fabric:enabled_android_fabric_logs");
 
-  disableRevisionCheckForPreallocation_ =
-      config->getBool("react_fabric:disable_revision_check_for_preallocation");
-
-  disablePreallocationOnClone_ =
-      getFeatureFlagValue("disablePreallocationOnClone");
-
   if (enableFabricLogs_) {
     LOG(WARNING) << "Binding::installFabricUIManager() was called (address: "
                  << this << ").";
   }
 
+  // TODO[T135327389]: Investigate why code relying on CppComponentRegistry
+  // crashing during hot reload restart.
+  // sharedCppComponentRegistry_ =
+  //     std::shared_ptr<const facebook::react::CppComponentRegistry>(
+  //         cppComponentRegistry ? cppComponentRegistry : nullptr);
+
   // Use std::lock and std::adopt_lock to prevent deadlocks by locking mutexes
   // at the same time
   std::unique_lock<butter::shared_mutex> lock(installMutex_);
 
   auto globalJavaUiManager = make_global(javaUIManager);
-  mountingManager_ =
-      std::make_shared<FabricMountingManager>(config, globalJavaUiManager);
+  mountingManager_ = std::make_shared<FabricMountingManager>(
+      config, sharedCppComponentRegistry_, globalJavaUiManager);
 
   ContextContainer::Shared contextContainer =
       std::make_shared<ContextContainer>();
@@ -431,25 +434,15 @@ void Binding::installFabricUIManager(
   reactNativeConfig_ = config;
 
   contextContainer->insert(
-      "MapBufferSerializationEnabled",
-      getFeatureFlagValue("mapBufferSerializationEnabled"));
+      "CalculateTransformedFramesEnabled",
+      getFeatureFlagValue("calculateTransformedFramesEnabled"));
 
   disablePreallocateViews_ = reactNativeConfig_->getBool(
       "react_fabric:disabled_view_preallocation_android");
 
-  dispatchPreallocationInBackground_ = reactNativeConfig_->getBool(
-      "react_native_new_architecture:dispatch_preallocation_in_bg");
-
-  contextContainer->insert(
-      "EnableLargeTextMeasureCache",
-      getFeatureFlagValue("enableLargeTextMeasureCache"));
-
   // Props setter pattern feature
-  Props::enablePropIteratorSetter =
+  CoreFeatures::enablePropIteratorSetter =
       getFeatureFlagValue("enableCppPropsIteratorSetter");
-  AccessibilityProps::enablePropIteratorSetter =
-      Props::enablePropIteratorSetter;
-  BaseTextProps::enablePropIteratorSetter = Props::enablePropIteratorSetter;
 
   // RemoveDelete mega-op
   ShadowViewMutation::PlatformSupportsRemoveDeleteTreeInstruction =
@@ -458,12 +451,20 @@ void Binding::installFabricUIManager(
   auto toolbox = SchedulerToolbox{};
   toolbox.contextContainer = contextContainer;
   toolbox.componentRegistryFactory = componentsRegistry->buildRegistryFunction;
+
+  // TODO: (T130208323) runtimeExecutor should execute lambdas after
+  // main bundle eval, and bindingsInstallExecutor should execute before.
+  toolbox.bridgelessBindingsExecutor = std::nullopt;
   toolbox.runtimeExecutor = runtimeExecutor;
+
   toolbox.synchronousEventBeatFactory = synchronousBeatFactory;
   toolbox.asynchronousEventBeatFactory = asynchronousBeatFactory;
 
-  backgroundExecutor_ = JBackgroundExecutor::create("fabric_bg");
-  toolbox.backgroundExecutor = backgroundExecutor_;
+  if (reactNativeConfig_->getBool(
+          "react_fabric:enable_background_executor_android")) {
+    backgroundExecutor_ = JBackgroundExecutor::create("fabric_bg");
+    toolbox.backgroundExecutor = backgroundExecutor_;
+  }
 
   animationDriver_ = std::make_shared<LayoutAnimationDriver>(
       runtimeExecutor, contextContainer, this);
@@ -482,6 +483,7 @@ void Binding::uninstallFabricUIManager() {
   scheduler_ = nullptr;
   mountingManager_ = nullptr;
   reactNativeConfig_ = nullptr;
+  sharedCppComponentRegistry_ = nullptr;
 }
 
 std::shared_ptr<FabricMountingManager> Binding::verifyMountingManager(
@@ -518,40 +520,20 @@ void Binding::schedulerDidRequestPreliminaryViewAllocation(
   preallocateView(surfaceId, shadowNode);
 }
 
-void Binding::schedulerDidCloneShadowNode(
+void Binding::preallocateView(
     SurfaceId surfaceId,
-    ShadowNode const &oldShadowNode,
-    ShadowNode const &newShadowNode) {
-  if (disablePreallocationOnClone_) {
+    ShadowNode const &shadowNode) {
+  auto name = std::string(shadowNode.getComponentName());
+
+  // Disable preallocation in java for C++ view managers
+  // RootComponents that are implmented as C++ view managers are still
+  // preallocated (this could be avoided by using Portals)
+  if (sharedCppComponentRegistry_ && sharedCppComponentRegistry_.get() &&
+      sharedCppComponentRegistry_->containsComponentManager(name) &&
+      !sharedCppComponentRegistry_->isRootComponent(name)) {
     return;
   }
-  // This is only necessary if view preallocation was skipped during
-  // createShadowNode
-
-  // We may need to PreAllocate a ShadowNode at this point if this is the
-  // earliest point it is possible to do so:
-  // 1. The revision is exactly 1
-  // 2. At revision 0 (the old node), View Preallocation would have been skipped
 
-  if (!disableRevisionCheckForPreallocation_) {
-    if (newShadowNode.getProps()->revision != 1) {
-      return;
-    }
-    if (oldShadowNode.getProps()->revision != 0) {
-      return;
-    }
-  }
-
-  // If the new node is concrete and the old wasn't, we can preallocate
-  if (!oldShadowNode.getTraits().check(ShadowNodeTraits::Trait::FormsView) &&
-      newShadowNode.getTraits().check(ShadowNodeTraits::Trait::FormsView)) {
-    preallocateView(surfaceId, newShadowNode);
-  }
-}
-
-void Binding::preallocateView(
-    SurfaceId surfaceId,
-    ShadowNode const &shadowNode) {
   auto shadowView = ShadowView(shadowNode);
   auto preallocationFunction = [this,
                                 surfaceId,
@@ -564,11 +546,7 @@ void Binding::preallocateView(
     mountingManager->preallocateShadowView(surfaceId, shadowView);
   };
 
-  if (dispatchPreallocationInBackground_) {
-    backgroundExecutor_(preallocationFunction);
-  } else {
-    preallocationFunction();
-  }
+  preallocationFunction();
 }
 
 void Binding::schedulerDidDispatchCommand(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h b/ReactAndroid/src/main/jni/react/fabric/Binding.h
similarity index 92%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h
rename to ReactAndroid/src/main/jni/react/fabric/Binding.h
index ddfe7a5018b7..a69fe98fc6c3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h
+++ b/ReactAndroid/src/main/jni/react/fabric/Binding.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "CppComponentRegistry.h"
 #include "FabricMountingManager.h"
 
 #include <memory>
@@ -65,7 +66,8 @@ class Binding : public jni::HybridClass<Binding>,
       jni::alias_ref<jobject> javaUIManager,
       EventBeatManager *eventBeatManager,
       ComponentFactory *componentsRegistry,
-      jni::alias_ref<jobject> reactNativeConfig);
+      jni::alias_ref<jobject> reactNativeConfig,
+      CppComponentRegistry *cppComponentRegistry);
 
   void startSurface(
       jint surfaceId,
@@ -100,11 +102,6 @@ class Binding : public jni::HybridClass<Binding>,
       const SurfaceId surfaceId,
       const ShadowNode &shadowNode) override;
 
-  void schedulerDidCloneShadowNode(
-      SurfaceId surfaceId,
-      const ShadowNode &oldShadowNode,
-      const ShadowNode &newShadowNode) override;
-
   void schedulerDidDispatchCommand(
       const ShadowView &shadowView,
       std::string const &commandName,
@@ -150,11 +147,10 @@ class Binding : public jni::HybridClass<Binding>,
   float pointScaleFactor_ = 1;
 
   std::shared_ptr<const ReactNativeConfig> reactNativeConfig_{nullptr};
+  std::shared_ptr<const facebook::react::CppComponentRegistry>
+      sharedCppComponentRegistry_{nullptr};
   bool disablePreallocateViews_{false};
   bool enableFabricLogs_{false};
-  bool disableRevisionCheckForPreallocation_{false};
-  bool dispatchPreallocationInBackground_{false};
-  bool disablePreallocationOnClone_{false};
 };
 
 } // namespace react
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/react/fabric/CMakeLists.txt
similarity index 97%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CMakeLists.txt
rename to ReactAndroid/src/main/jni/react/fabric/CMakeLists.txt
index 7afd884900a7..920103e9cb8b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CMakeLists.txt
+++ b/ReactAndroid/src/main/jni/react/fabric/CMakeLists.txt
@@ -18,6 +18,7 @@ target_include_directories(fabricjni PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(
         fabricjni
         butter
+        cxxcomponents
         fb
         fbjni
         folly_runtime
@@ -44,7 +45,7 @@ target_link_libraries(
         react_render_uimanager
         react_utils
         react_config
-        reactnativeutilsjni
+        reactnativejni
         rrc_image
         rrc_modal
         rrc_progressbar
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactory.cpp b/ReactAndroid/src/main/jni/react/fabric/ComponentFactory.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactory.cpp
rename to ReactAndroid/src/main/jni/react/fabric/ComponentFactory.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactory.h b/ReactAndroid/src/main/jni/react/fabric/ComponentFactory.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactory.h
rename to ReactAndroid/src/main/jni/react/fabric/ComponentFactory.h
diff --git a/ReactAndroid/src/main/jni/react/fabric/ComponentRegistryResolver.cpp b/ReactAndroid/src/main/jni/react/fabric/ComponentRegistryResolver.cpp
new file mode 100644
index 000000000000..5560590ac21e
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/fabric/ComponentRegistryResolver.cpp
@@ -0,0 +1,51 @@
+/*
+ * 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 "ComponentRegistryResolver.h"
+
+#include <android/log.h>
+
+namespace facebook {
+namespace react {
+
+void ComponentRegistryResolver::addComponentManager(
+    std::string name,
+    bool isRootComponent,
+    std::function<std::shared_ptr<facebook::react::ComponentManager>(
+        const std::string &name)> f) {
+  ComponentResolverData data = {isRootComponent, std::move(f)};
+  resolverMap_.insert({name, data});
+}
+
+bool ComponentRegistryResolver::containsComponentManager(
+    std::string componentName) const {
+  return resolverMap_.contains(componentName);
+}
+
+std::shared_ptr<facebook::react::ComponentManager>
+ComponentRegistryResolver::getComponentManager(
+    std::string componentName) const {
+  auto iterator = resolverMap_.find(componentName);
+  if (iterator != resolverMap_.end()) {
+    return iterator->second.getComponentManagerFunction(componentName);
+  }
+
+  return nullptr;
+}
+
+bool ComponentRegistryResolver::isRootComponent(
+    std::string componentName) const {
+  auto iterator = resolverMap_.find(componentName);
+  if (iterator != resolverMap_.end()) {
+    return iterator->second.isRootComponent;
+  }
+
+  return false;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/jni/react/fabric/ComponentRegistryResolver.h b/ReactAndroid/src/main/jni/react/fabric/ComponentRegistryResolver.h
new file mode 100644
index 000000000000..5d8adec466aa
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/fabric/ComponentRegistryResolver.h
@@ -0,0 +1,47 @@
+/*
+ * 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 <fbjni/fbjni.h>
+#include <react/cxxcomponents/ComponentManager.h>
+
+namespace facebook {
+namespace react {
+
+struct ComponentResolverData {
+  bool isRootComponent;
+  std::function<std::shared_ptr<facebook::react::ComponentManager>(
+      const std::string &name)>
+      getComponentManagerFunction;
+};
+
+using ComponentResolverMap = butter::map<std::string, ComponentResolverData>;
+
+class ComponentRegistryResolver {
+ public:
+  ComponentRegistryResolver(){};
+
+  void addComponentManager(
+      std::string name,
+      bool isRootComponent,
+      std::function<std::shared_ptr<facebook::react::ComponentManager>(
+          const std::string &name)> f);
+
+  bool containsComponentManager(std::string componentName) const;
+
+  bool isRootComponent(std::string componentName) const;
+
+  std::shared_ptr<facebook::react::ComponentManager> getComponentManager(
+      std::string name) const;
+
+ private:
+  butter::map<std::string, ComponentResolverData> resolverMap_{};
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.cpp b/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.cpp
rename to ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.h b/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.h
rename to ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.h
diff --git a/ReactAndroid/src/main/jni/react/fabric/CppComponentRegistry.cpp b/ReactAndroid/src/main/jni/react/fabric/CppComponentRegistry.cpp
new file mode 100644
index 000000000000..b1f845a09d6d
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/fabric/CppComponentRegistry.cpp
@@ -0,0 +1,73 @@
+/*
+ * 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 "CppComponentRegistry.h"
+#include <android/log.h>
+#include <fbjni/fbjni.h>
+#include <jsi/jsi.h>
+#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
+
+using namespace facebook::jsi;
+
+namespace facebook {
+namespace react {
+
+jni::local_ref<CppComponentRegistry::jhybriddata>
+CppComponentRegistry::initHybrid(jni::alias_ref<jclass>) {
+  return makeCxxInstance();
+}
+
+void CppComponentRegistry::registerNatives() {
+  registerHybrid({
+      makeNativeMethod("initHybrid", CppComponentRegistry::initHybrid),
+  });
+}
+
+void CppComponentRegistry::addComponentManager(
+    std::string name,
+    bool isRootComponent,
+    std::function<std::shared_ptr<facebook::react::ComponentManager>(
+        const std::string &name)> f) {
+  componentManagerResolver_.addComponentManager(name, isRootComponent, f);
+}
+
+bool CppComponentRegistry::containsComponentManager(std::string name) const {
+  return componentManagerResolver_.containsComponentManager(name);
+}
+
+std::shared_ptr<facebook::react::ComponentManager>
+CppComponentRegistry::getComponentManager(const std::string &name) const {
+  return componentManagerResolver_.getComponentManager(name);
+}
+
+std::shared_ptr<facebook::react::Component>
+CppComponentRegistry::getComponentInstance(Tag tag) const {
+  return components_[tag];
+}
+
+bool CppComponentRegistry::isRootComponent(std::string name) const {
+  return componentManagerResolver_.isRootComponent(name);
+}
+
+std::shared_ptr<facebook::react::Component>
+CppComponentRegistry::createComponentInstance(
+    const std::string &componentName,
+    Tag tag,
+    Props::Shared initialProps) const {
+  // TODO: cache component managers
+  auto componentManager = getComponentManager(componentName);
+  auto component = componentManager->createComponent(tag, initialProps);
+  components_[tag] = component;
+  return component;
+}
+
+void CppComponentRegistry::deleteComponentInstance(Tag tag) const {
+  components_.erase(tag);
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/jni/react/fabric/CppComponentRegistry.h b/ReactAndroid/src/main/jni/react/fabric/CppComponentRegistry.h
new file mode 100644
index 000000000000..0354a19cde77
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/fabric/CppComponentRegistry.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 <fbjni/fbjni.h>
+#include <glog/logging.h>
+#include <jsi/jsi.h>
+#include <react/utils/ContextContainer.h>
+#include <mutex>
+#include <unordered_set>
+
+#include <react/cxxcomponents/Component.h>
+#include <react/cxxcomponents/ComponentManager.h>
+#include <react/fabric/ComponentRegistryResolver.h>
+
+namespace facebook {
+namespace react {
+
+class Instance;
+
+class CppComponentRegistry : public jni::HybridClass<CppComponentRegistry> {
+ public:
+  constexpr static const char *const kJavaDescriptor =
+      "Lcom/facebook/react/fabric/CppComponentRegistry;";
+
+  static void registerNatives();
+
+  void addComponentManager(
+      std::string name,
+      bool isRootComponent,
+      std::function<std::shared_ptr<facebook::react::ComponentManager>(
+          const std::string &name)> f);
+
+  bool isRootComponent(std::string name) const;
+
+  bool containsComponentManager(std::string name) const;
+
+  std::shared_ptr<facebook::react::ComponentManager> getComponentManager(
+      const std::string &name) const;
+
+  std::shared_ptr<facebook::react::Component> getComponentInstance(
+      Tag tag) const;
+
+  std::shared_ptr<facebook::react::Component> createComponentInstance(
+      const std::string &componentName,
+      Tag tag,
+      Props::Shared initialProps) const;
+
+  void deleteComponentInstance(Tag tag) const;
+
+ private:
+  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);
+  ComponentRegistryResolver componentManagerResolver_{};
+  mutable butter::map<Tag, std::shared_ptr<facebook::react::Component>>
+      components_{};
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/jni/react/fabric/CppViewMutationsWrapper.cpp b/ReactAndroid/src/main/jni/react/fabric/CppViewMutationsWrapper.cpp
new file mode 100644
index 000000000000..eb85fae4fe70
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/fabric/CppViewMutationsWrapper.cpp
@@ -0,0 +1,100 @@
+/*
+ * 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 "CppViewMutationsWrapper.h"
+
+#include <react/renderer/core/ReactPrimitives.h>
+
+#include <fbjni/fbjni.h>
+#include <glog/logging.h>
+
+using namespace facebook::jni;
+
+namespace facebook {
+namespace react {
+
+jni::local_ref<CppViewMutationsWrapper::jhybriddata>
+CppViewMutationsWrapper::initHybrid(jni::alias_ref<jclass>) {
+  return makeCxxInstance();
+}
+
+void CppViewMutationsWrapper::registerNatives() {
+  registerHybrid({
+      makeNativeMethod("initHybrid", CppViewMutationsWrapper::initHybrid),
+      makeNativeMethod(
+          "runCppViewMutations", CppViewMutationsWrapper::runCppViewMutations),
+  });
+}
+
+void CppViewMutationsWrapper::runCppViewMutations() {
+  // TODO implement rendering logic:
+  // - caching of componengtManagers of views into maps
+  // - caching of allocated views
+  // - logic for each mutation instruction
+  // - Define API in ComponentManager
+  // - Define API in Component
+  // - see RCTMountingManager.mm for logic
+  for (const auto &mutation : *cppViewMutations) {
+    const auto &newChildShadowView = mutation.newChildShadowView;
+    auto &mutationType = mutation.type;
+    auto componentName = newChildShadowView.componentName;
+    auto tag = mutation.newChildShadowView.tag;
+
+    switch (mutationType) {
+      case ShadowViewMutation::Create: {
+        auto component = cppComponentRegistry->createComponentInstance(
+            componentName, tag, newChildShadowView.props);
+        break;
+      }
+      case ShadowViewMutation::Remove: {
+        auto parentTag = mutation.parentShadowView.tag;
+        auto parentComponent =
+            cppComponentRegistry->getComponentInstance(parentTag);
+        auto childComponent = cppComponentRegistry->getComponentInstance(
+            mutation.newChildShadowView.tag);
+        parentComponent->unmountChildComponent(childComponent, mutation.index);
+        break;
+      }
+      case ShadowViewMutation::Delete: {
+        cppComponentRegistry->deleteComponentInstance(tag);
+        break;
+      }
+      case ShadowViewMutation::Update: {
+        auto component = cppComponentRegistry->getComponentInstance(tag);
+        if (mutation.oldChildShadowView.props !=
+            mutation.newChildShadowView.props) {
+          component->updateProps(
+              mutation.oldChildShadowView.props,
+              mutation.newChildShadowView.props);
+        }
+        break;
+      }
+      case ShadowViewMutation::Insert: {
+        auto parentTag = mutation.parentShadowView.tag;
+        auto parentComponent =
+            cppComponentRegistry->getComponentInstance(parentTag);
+        auto childTag = mutation.newChildShadowView.tag;
+        auto childComponent =
+            cppComponentRegistry->getComponentInstance(childTag);
+        auto oldProps = mutation.oldChildShadowView.props;
+        auto newProps = mutation.newChildShadowView.props;
+        childComponent->updateProps(oldProps, newProps);
+
+        if (childComponent && parentComponent) {
+          parentComponent->mountChildComponent(childComponent, mutation.index);
+        }
+        break;
+      }
+      default: {
+        break;
+      }
+    }
+  }
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/jni/react/fabric/CppViewMutationsWrapper.h b/ReactAndroid/src/main/jni/react/fabric/CppViewMutationsWrapper.h
new file mode 100644
index 000000000000..6e875b6d6475
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/fabric/CppViewMutationsWrapper.h
@@ -0,0 +1,39 @@
+/*
+ * 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 <react/fabric/CppComponentRegistry.h>
+
+#include <fbjni/fbjni.h>
+#include <react/jni/ReadableNativeMap.h>
+#include <react/renderer/mounting/ShadowViewMutation.h>
+
+namespace facebook {
+namespace react {
+
+class CppViewMutationsWrapper
+    : public jni::HybridClass<CppViewMutationsWrapper> {
+ public:
+  constexpr static const char *const kJavaDescriptor =
+      "Lcom/facebook/react/fabric/CppViewMutationsWrapper;";
+
+  static void registerNatives();
+
+  // TODO move this to a constructor or init methods
+  std::shared_ptr<ShadowViewMutationList> cppViewMutations;
+
+  std::shared_ptr<const CppComponentRegistry> cppComponentRegistry;
+
+  void runCppViewMutations();
+
+ private:
+  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.cpp b/ReactAndroid/src/main/jni/react/fabric/EventBeatManager.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.cpp
rename to ReactAndroid/src/main/jni/react/fabric/EventBeatManager.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.h b/ReactAndroid/src/main/jni/react/fabric/EventBeatManager.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.h
rename to ReactAndroid/src/main/jni/react/fabric/EventBeatManager.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp b/ReactAndroid/src/main/jni/react/fabric/EventEmitterWrapper.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp
rename to ReactAndroid/src/main/jni/react/fabric/EventEmitterWrapper.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h b/ReactAndroid/src/main/jni/react/fabric/EventEmitterWrapper.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h
rename to ReactAndroid/src/main/jni/react/fabric/EventEmitterWrapper.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountItem.cpp b/ReactAndroid/src/main/jni/react/fabric/FabricMountItem.cpp
similarity index 91%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountItem.cpp
rename to ReactAndroid/src/main/jni/react/fabric/FabricMountItem.cpp
index 05979307245a..d204f306a0b6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountItem.cpp
+++ b/ReactAndroid/src/main/jni/react/fabric/FabricMountItem.cpp
@@ -44,8 +44,10 @@ CppMountItem CppMountItem::UpdatePropsMountItem(
 CppMountItem CppMountItem::UpdateStateMountItem(ShadowView const &shadowView) {
   return {CppMountItem::Type::UpdateState, {}, {}, shadowView, -1};
 }
-CppMountItem CppMountItem::UpdateLayoutMountItem(ShadowView const &shadowView) {
-  return {CppMountItem::Type::UpdateLayout, {}, {}, shadowView, -1};
+CppMountItem CppMountItem::UpdateLayoutMountItem(
+    ShadowView const &shadowView,
+    ShadowView const &parentView) {
+  return {CppMountItem::Type::UpdateLayout, parentView, {}, shadowView, -1};
 }
 CppMountItem CppMountItem::UpdateEventEmitterMountItem(
     ShadowView const &shadowView) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountItem.h b/ReactAndroid/src/main/jni/react/fabric/FabricMountItem.h
similarity index 93%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountItem.h
rename to ReactAndroid/src/main/jni/react/fabric/FabricMountItem.h
index 1de6263467e7..adc6ed81b043 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountItem.h
+++ b/ReactAndroid/src/main/jni/react/fabric/FabricMountItem.h
@@ -46,7 +46,9 @@ struct CppMountItem final {
 
   static CppMountItem UpdateStateMountItem(ShadowView const &shadowView);
 
-  static CppMountItem UpdateLayoutMountItem(ShadowView const &shadowView);
+  static CppMountItem UpdateLayoutMountItem(
+      ShadowView const &shadowView,
+      ShadowView const &parentView);
 
   static CppMountItem UpdateEventEmitterMountItem(ShadowView const &shadowView);
 
@@ -71,6 +73,7 @@ struct CppMountItem final {
     UpdatePadding = 512,
     UpdateOverflowInset = 1024,
     RemoveDeleteTree = 2048,
+    RunCPPMutations = 4096
   };
 
 #pragma mark - Fields
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.cpp b/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp
similarity index 90%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.cpp
rename to ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp
index c67032f9b9a7..b0df63865242 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.cpp
+++ b/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp
@@ -6,12 +6,13 @@
  */
 
 #include "FabricMountingManager.h"
+#include "CppViewMutationsWrapper.h"
 #include "EventEmitterWrapper.h"
 #include "StateWrapperImpl.h"
-#include "viewPropConversions.h"
 
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/components/scrollview/ScrollViewProps.h>
+#include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/core/conversions.h>
 #include <react/renderer/debug/SystraceSection.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>
@@ -38,19 +39,15 @@ static bool getFeatureFlagValue(const char *name) {
 
 FabricMountingManager::FabricMountingManager(
     std::shared_ptr<const ReactNativeConfig> &config,
+    std::shared_ptr<const CppComponentRegistry> &cppComponentRegistry,
     global_ref<jobject> &javaUIManager)
     : javaUIManager_(javaUIManager),
-      enableEarlyEventEmitterUpdate_(
-          config->getBool("react_fabric:enable_early_event_emitter_update")),
-      disablePreallocateViews_(
-          config->getBool("react_fabric:disabled_view_preallocation_android")),
+      cppComponentRegistry_(cppComponentRegistry),
       disableRevisionCheckForPreallocation_(config->getBool(
           "react_fabric:disable_revision_check_for_preallocation")),
-      useOverflowInset_(getFeatureFlagValue("useOverflowInset")),
-      shouldRememberAllocatedViews_(
-          getFeatureFlagValue("shouldRememberAllocatedViews")),
-      useMapBufferForViewProps_(config->getBool(
-          "react_native_new_architecture:use_mapbuffer_for_viewprops")) {}
+      useOverflowInset_(getFeatureFlagValue("useOverflowInset")) {
+  CoreFeatures::enableMapBuffer = getFeatureFlagValue("useMapBufferProps");
+}
 
 void FabricMountingManager::onSurfaceStart(SurfaceId surfaceId) {
   std::lock_guard lock(allocatedViewsMutex_);
@@ -79,9 +76,11 @@ static inline int getIntBufferSizeForType(CppMountItem::Type mountItemType) {
     case CppMountItem::Type::UpdatePadding:
       return 5; // tag, top, left, bottom, right
     case CppMountItem::Type::UpdateLayout:
-      return 6; // tag, x, y, w, h, DisplayType
+      return 7; // tag, parentTag, x, y, w, h, DisplayType
     case CppMountItem::Type::UpdateOverflowInset:
       return 5; // tag, left, top, right, bottom
+    case CppMountItem::Type::RunCPPMutations:
+      return 1;
     case CppMountItem::Undefined:
     case CppMountItem::Multiple:
       return -1;
@@ -124,7 +123,8 @@ static inline void computeBufferSizes(
     std::vector<CppMountItem> &cppUpdatePaddingMountItems,
     std::vector<CppMountItem> &cppUpdateLayoutMountItems,
     std::vector<CppMountItem> &cppUpdateOverflowInsetMountItems,
-    std::vector<CppMountItem> &cppUpdateEventEmitterMountItems) {
+    std::vector<CppMountItem> &cppUpdateEventEmitterMountItems,
+    ShadowViewMutationList &cppViewMutations) {
   CppMountItem::Type lastType = CppMountItem::Type::Undefined;
   int numSameType = 0;
   for (auto const &mountItem : cppCommonMountItems) {
@@ -183,6 +183,11 @@ static inline void computeBufferSizes(
       cppDeleteMountItems.size(),
       batchMountItemIntsSize,
       batchMountItemObjectsSize);
+
+  if (cppViewMutations.size() > 0) {
+    batchMountItemIntsSize++;
+    batchMountItemObjectsSize++;
+  }
 }
 
 static inline void writeIntBufferTypePreamble(
@@ -247,17 +252,17 @@ static inline float scale(Float value, Float pointScaleFactor) {
 local_ref<jobject> FabricMountingManager::getProps(
     ShadowView const &oldShadowView,
     ShadowView const &newShadowView) {
-  if (useMapBufferForViewProps_ &&
-      newShadowView.traits.check(ShadowNodeTraits::Trait::View)) {
+  if (CoreFeatures::enableMapBuffer &&
+      newShadowView.traits.check(
+          ShadowNodeTraits::Trait::AndroidMapBufferPropsSupported)) {
     react_native_assert(
         newShadowView.props->rawProps.empty() &&
         "Raw props must be empty when views are using mapbuffer");
-    auto oldProps = oldShadowView.props != nullptr
-        ? static_cast<ViewProps const &>(*oldShadowView.props)
-        : ViewProps{};
-    auto newProps = static_cast<ViewProps const &>(*newShadowView.props);
-    return JReadableMapBuffer::createWithContents(
-        viewPropsDiff(oldProps, newProps));
+
+    // MapBufferBuilder must be constructed and live in this scope,
+    MapBufferBuilder builder;
+    newShadowView.props->propsDiffMapBuffer(&*oldShadowView.props, builder);
+    return JReadableMapBuffer::createWithContents(builder.build());
   } else {
     return ReadableNativeMap::newObjectCxxArgs(newShadowView.props->rawProps);
   }
@@ -293,7 +298,7 @@ void FabricMountingManager::executeMount(
   std::vector<CppMountItem> cppUpdateLayoutMountItems;
   std::vector<CppMountItem> cppUpdateOverflowInsetMountItems;
   std::vector<CppMountItem> cppUpdateEventEmitterMountItems;
-
+  auto cppViewMutations = ShadowViewMutationList();
   {
     std::lock_guard allocatedViewsLock(allocatedViewsMutex_);
 
@@ -306,9 +311,6 @@ void FabricMountingManager::executeMount(
       LOG(ERROR) << "Executing commit after surface was stopped!";
     }
 
-    bool noRevisionCheck =
-        disablePreallocateViews_ || disableRevisionCheckForPreallocation_;
-
     for (const auto &mutation : mutations) {
       const auto &parentShadowView = mutation.parentShadowView;
       const auto &oldChildShadowView = mutation.oldChildShadowView;
@@ -318,15 +320,30 @@ void FabricMountingManager::executeMount(
 
       bool isVirtual = mutation.mutatedViewIsVirtual();
 
+      // Detect if the mutation instruction belongs to C++ view managers
+      if (cppComponentRegistry_) {
+        auto componentName = newChildShadowView.componentName
+            ? newChildShadowView.componentName
+            : oldChildShadowView.componentName;
+        auto name = std::string(componentName);
+        if (cppComponentRegistry_->containsComponentManager(name)) {
+          // is this thread safe?
+          cppViewMutations.push_back(mutation);
+
+          // This is a hack that could be avoided by using Portals
+          // Only execute mutations instructions for Root C++ ViewManagers
+          // because Root C++ Components have a Android view counterpart.
+          if (!cppComponentRegistry_->isRootComponent(name)) {
+            continue;
+          }
+        }
+      }
+
       switch (mutationType) {
         case ShadowViewMutation::Create: {
-          bool revisionCheck =
-              noRevisionCheck || newChildShadowView.props->revision > 1;
           bool allocationCheck =
               !allocatedViewTags.contains(newChildShadowView.tag);
-          bool shouldCreateView =
-              shouldRememberAllocatedViews_ ? allocationCheck : revisionCheck;
-
+          bool shouldCreateView = allocationCheck;
           if (shouldCreateView) {
             cppCommonMountItems.push_back(
                 CppMountItem::CreateMountItem(newChildShadowView));
@@ -381,7 +398,7 @@ void FabricMountingManager::executeMount(
                 newChildShadowView.layoutMetrics) {
               cppUpdateLayoutMountItems.push_back(
                   CppMountItem::UpdateLayoutMountItem(
-                      mutation.newChildShadowView));
+                      mutation.newChildShadowView, parentShadowView));
             }
 
             // OverflowInset: This is the values indicating boundaries including
@@ -411,13 +428,10 @@ void FabricMountingManager::executeMount(
             cppCommonMountItems.push_back(CppMountItem::InsertMountItem(
                 parentShadowView, newChildShadowView, index));
 
-            bool revisionCheck =
-                noRevisionCheck || newChildShadowView.props->revision > 1;
             bool allocationCheck =
                 allocatedViewTags.find(newChildShadowView.tag) ==
                 allocatedViewTags.end();
-            bool shouldCreateView =
-                shouldRememberAllocatedViews_ ? allocationCheck : revisionCheck;
+            bool shouldCreateView = allocationCheck;
             if (shouldCreateView) {
               cppUpdatePropsMountItems.push_back(
                   CppMountItem::UpdatePropsMountItem({}, newChildShadowView));
@@ -441,7 +455,8 @@ void FabricMountingManager::executeMount(
 
             // Layout
             cppUpdateLayoutMountItems.push_back(
-                CppMountItem::UpdateLayoutMountItem(newChildShadowView));
+                CppMountItem::UpdateLayoutMountItem(
+                    newChildShadowView, parentShadowView));
 
             // OverflowInset: This is the values indicating boundaries including
             // children of the current view. The layout of current view may not
@@ -469,8 +484,7 @@ void FabricMountingManager::executeMount(
       }
     }
 
-    if (shouldRememberAllocatedViews_ &&
-        allocatedViewsIterator != allocatedViewRegistry_.end()) {
+    if (allocatedViewsIterator != allocatedViewRegistry_.end()) {
       auto &views = allocatedViewsIterator->second;
       for (auto const &mutation : mutations) {
         switch (mutation.type) {
@@ -501,7 +515,8 @@ void FabricMountingManager::executeMount(
       cppUpdatePaddingMountItems,
       cppUpdateLayoutMountItems,
       cppUpdateOverflowInsetMountItems,
-      cppUpdateEventEmitterMountItems);
+      cppUpdateEventEmitterMountItems,
+      cppViewMutations);
 
   static auto createMountItemsIntBufferBatchContainer =
       jni::findClassStatic(UIManagerJavaDescriptor)
@@ -548,7 +563,7 @@ void FabricMountingManager::executeMount(
   int intBufferPosition = 0;
   int objBufferPosition = 0;
   int prevMountItemType = -1;
-  jint temp[6];
+  jint temp[7];
   for (int i = 0; i < cppCommonMountItems.size(); i++) {
     const auto &mountItem = cppCommonMountItems[i];
     const auto &mountItemType = mountItem.type;
@@ -723,13 +738,14 @@ void FabricMountingManager::executeMount(
           toInt(mountItem.newChildShadowView.layoutMetrics.displayType);
 
       temp[0] = mountItem.newChildShadowView.tag;
-      temp[1] = x;
-      temp[2] = y;
-      temp[3] = w;
-      temp[4] = h;
-      temp[5] = displayType;
-      env->SetIntArrayRegion(intBufferArray, intBufferPosition, 6, temp);
-      intBufferPosition += 6;
+      temp[1] = mountItem.parentShadowView.tag;
+      temp[2] = x;
+      temp[3] = y;
+      temp[4] = w;
+      temp[5] = h;
+      temp[6] = displayType;
+      env->SetIntArrayRegion(intBufferArray, intBufferPosition, 7, temp);
+      intBufferPosition += 7;
     }
   }
   if (!cppUpdateOverflowInsetMountItems.empty()) {
@@ -807,6 +823,36 @@ void FabricMountingManager::executeMount(
     }
   }
 
+  if (cppViewMutations.size() > 0) {
+    writeIntBufferTypePreamble(
+        CppMountItem::Type::RunCPPMutations,
+        1,
+        env,
+        intBufferArray,
+        intBufferPosition);
+
+    // TODO review this logic and memory mamangement
+    // this might not be necessary:
+    // temp[0] = 1234;
+    // env->SetIntArrayRegion(intBufferArray, intBufferPosition, 1, temp);
+    // intBufferPosition += 1;
+
+    // Do not hold a reference to javaCppMutations from the C++ side.
+    auto javaCppMutations = CppViewMutationsWrapper::newObjectJavaArgs();
+    CppViewMutationsWrapper *cppViewMutationsWrapper = cthis(javaCppMutations);
+
+    // TODO move this to init methods
+    cppViewMutationsWrapper->cppComponentRegistry = cppComponentRegistry_;
+    // TODO is moving the cppViewMutations safe / thread safe?
+    // cppViewMutations will be accessed from the UI Thread in a near future
+    // can they dissapear?
+    cppViewMutationsWrapper->cppViewMutations =
+        std::make_shared<std::vector<facebook::react::ShadowViewMutation>>(
+            std::move(cppViewMutations));
+
+    (*objBufferArray)[objBufferPosition++] = javaCppMutations.get();
+  }
+
   // If there are no items, we pass a nullptr instead of passing the object
   // through the JNI
   auto batch = createMountItemsIntBufferBatchContainer(
@@ -836,7 +882,7 @@ void FabricMountingManager::executeMount(
 void FabricMountingManager::preallocateShadowView(
     SurfaceId surfaceId,
     ShadowView const &shadowView) {
-  if (shouldRememberAllocatedViews_) {
+  {
     std::lock_guard lock(allocatedViewsMutex_);
     auto allocatedViewsIterator = allocatedViewRegistry_.find(surfaceId);
     if (allocatedViewsIterator == allocatedViewRegistry_.end()) {
@@ -869,14 +915,6 @@ void FabricMountingManager::preallocateShadowView(
 
   // Do not hold a reference to javaEventEmitter from the C++ side.
   local_ref<EventEmitterWrapper::JavaPart> javaEventEmitter = nullptr;
-  if (enableEarlyEventEmitterUpdate_) {
-    SharedEventEmitter eventEmitter = shadowView.eventEmitter;
-    if (eventEmitter != nullptr) {
-      javaEventEmitter = EventEmitterWrapper::newObjectJavaArgs();
-      EventEmitterWrapper *cEventEmitter = cthis(javaEventEmitter);
-      cEventEmitter->eventEmitter = eventEmitter;
-    }
-  }
 
   local_ref<JObject> props = getProps({}, shadowView);
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.h b/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h
similarity index 91%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.h
rename to ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h
index ebd95dd80946..d5f068eae78e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/FabricMountingManager.h
+++ b/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "CppComponentRegistry.h"
 #include "FabricMountItem.h"
 
 #include <react/config/ReactNativeConfig.h>
@@ -33,6 +34,7 @@ class FabricMountingManager final {
 
   FabricMountingManager(
       std::shared_ptr<const ReactNativeConfig> &config,
+      std::shared_ptr<const CppComponentRegistry> &cppComponentRegistry,
       jni::global_ref<jobject> &javaUIManager);
 
   void onSurfaceStart(SurfaceId surfaceId);
@@ -68,13 +70,10 @@ class FabricMountingManager final {
 
   butter::map<SurfaceId, butter::set<Tag>> allocatedViewRegistry_{};
   std::recursive_mutex allocatedViewsMutex_;
+  std::shared_ptr<const CppComponentRegistry> cppComponentRegistry_;
 
-  bool const enableEarlyEventEmitterUpdate_{false};
-  bool const disablePreallocateViews_{false};
   bool const disableRevisionCheckForPreallocation_{false};
   bool const useOverflowInset_{false};
-  bool const shouldRememberAllocatedViews_{false};
-  bool const useMapBufferForViewProps_{false};
 
   jni::local_ref<jobject> getProps(
       ShadowView const &oldShadowView,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/JBackgroundExecutor.cpp b/ReactAndroid/src/main/jni/react/fabric/JBackgroundExecutor.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/JBackgroundExecutor.cpp
rename to ReactAndroid/src/main/jni/react/fabric/JBackgroundExecutor.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/JBackgroundExecutor.h b/ReactAndroid/src/main/jni/react/fabric/JBackgroundExecutor.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/JBackgroundExecutor.h
rename to ReactAndroid/src/main/jni/react/fabric/JBackgroundExecutor.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/JFabricUIManager.cpp b/ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/JFabricUIManager.cpp
rename to ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/JFabricUIManager.h b/ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/JFabricUIManager.h
rename to ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/react/fabric/OnLoad.cpp
similarity index 90%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp
rename to ReactAndroid/src/main/jni/react/fabric/OnLoad.cpp
index 7ebf9b5247ee..b7825d4bb9f8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp
+++ b/ReactAndroid/src/main/jni/react/fabric/OnLoad.cpp
@@ -10,6 +10,7 @@
 #include "Binding.h"
 #include "ComponentFactory.h"
 #include "CoreComponentsRegistry.h"
+#include "CppViewMutationsWrapper.h"
 #include "EventBeatManager.h"
 #include "EventEmitterWrapper.h"
 #include "StateWrapperImpl.h"
@@ -20,6 +21,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
     facebook::react::Binding::registerNatives();
     facebook::react::EventBeatManager::registerNatives();
     facebook::react::EventEmitterWrapper::registerNatives();
+    facebook::react::CppViewMutationsWrapper::registerNatives();
     facebook::react::StateWrapperImpl::registerNatives();
     facebook::react::ComponentFactory::registerNatives();
     facebook::react::CoreComponentsRegistry::registerNatives();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ReactNativeConfigHolder.cpp b/ReactAndroid/src/main/jni/react/fabric/ReactNativeConfigHolder.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ReactNativeConfigHolder.cpp
rename to ReactAndroid/src/main/jni/react/fabric/ReactNativeConfigHolder.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ReactNativeConfigHolder.h b/ReactAndroid/src/main/jni/react/fabric/ReactNativeConfigHolder.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ReactNativeConfigHolder.h
rename to ReactAndroid/src/main/jni/react/fabric/ReactNativeConfigHolder.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.cpp b/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.cpp
rename to ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h b/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h
rename to ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/SurfaceHandlerBinding.cpp b/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/SurfaceHandlerBinding.cpp
rename to ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/SurfaceHandlerBinding.h b/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/jni/SurfaceHandlerBinding.h
rename to ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.h
diff --git a/ReactAndroid/src/main/jni/react/fabric/viewPropConversions.h b/ReactAndroid/src/main/jni/react/fabric/viewPropConversions.h
new file mode 100644
index 000000000000..fe44e662340b
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/fabric/viewPropConversions.h
@@ -0,0 +1,215 @@
+/*
+ * 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 <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/components/view/ViewPropsMapBuffer.h>
+#include <react/renderer/components/view/conversions.h>
+#include <react/renderer/graphics/conversions.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+
+#include <optional>
+
+namespace facebook {
+namespace react {
+
+namespace {
+static MapBuffer convertAccessibilityActions(
+    std::vector<AccessibilityAction> const &actions) {
+  MapBufferBuilder builder(actions.size());
+  for (auto i = 0; i < actions.size(); i++) {
+    auto const &action = actions[i];
+    MapBufferBuilder actionsBuilder(2);
+    actionsBuilder.putString(ACCESSIBILITY_ACTION_NAME, action.name);
+    if (action.label.has_value()) {
+      actionsBuilder.putString(
+          ACCESSIBILITY_ACTION_LABEL, action.label.value());
+    }
+    builder.putMapBuffer(i, actionsBuilder.build());
+  }
+  return builder.build();
+}
+
+static MapBuffer convertAccessibilityLabelledBy(
+    AccessibilityLabelledBy const &labelledBy) {
+  MapBufferBuilder builder(labelledBy.value.size());
+  for (auto i = 0; i < labelledBy.value.size(); i++) {
+    builder.putString(i, labelledBy.value[i]);
+  }
+  return builder.build();
+}
+
+// AccessibilityState values
+constexpr MapBuffer::Key ACCESSIBILITY_STATE_BUSY = 0;
+constexpr MapBuffer::Key ACCESSIBILITY_STATE_DISABLED = 1;
+constexpr MapBuffer::Key ACCESSIBILITY_STATE_EXPANDED = 2;
+constexpr MapBuffer::Key ACCESSIBILITY_STATE_SELECTED = 3;
+constexpr MapBuffer::Key ACCESSIBILITY_STATE_CHECKED = 4;
+
+MapBuffer convertAccessibilityState(AccessibilityState const &state) {
+  MapBufferBuilder builder(5);
+  builder.putBool(ACCESSIBILITY_STATE_BUSY, state.busy);
+  builder.putBool(ACCESSIBILITY_STATE_DISABLED, state.disabled);
+  builder.putBool(ACCESSIBILITY_STATE_EXPANDED, state.expanded);
+  builder.putBool(ACCESSIBILITY_STATE_SELECTED, state.selected);
+  int checked;
+  switch (state.checked) {
+    case AccessibilityState::Unchecked:
+      checked = 0;
+      break;
+    case AccessibilityState::Checked:
+      checked = 1;
+      break;
+    case AccessibilityState::Mixed:
+      checked = 2;
+      break;
+    case AccessibilityState::None:
+      checked = 3;
+      break;
+  }
+  builder.putInt(ACCESSIBILITY_STATE_CHECKED, checked);
+  return builder.build();
+}
+
+inline void putOptionalColor(
+    MapBufferBuilder &builder,
+    MapBuffer::Key key,
+    std::optional<SharedColor> const &color) {
+  builder.putInt(key, color.has_value() ? toAndroidRepr(color.value()) : -1);
+}
+
+constexpr MapBuffer::Key EDGE_TOP = 0;
+constexpr MapBuffer::Key EDGE_LEFT = 1;
+constexpr MapBuffer::Key EDGE_RIGHT = 2;
+constexpr MapBuffer::Key EDGE_BOTTOM = 3;
+constexpr MapBuffer::Key EDGE_START = 4;
+constexpr MapBuffer::Key EDGE_END = 5;
+constexpr MapBuffer::Key EDGE_ALL = 6;
+
+MapBuffer convertBorderColors(CascadedBorderColors const &colors) {
+  MapBufferBuilder builder(7);
+  putOptionalColor(builder, EDGE_TOP, colors.top);
+  putOptionalColor(builder, EDGE_RIGHT, colors.right);
+  putOptionalColor(builder, EDGE_BOTTOM, colors.bottom);
+  putOptionalColor(builder, EDGE_LEFT, colors.left);
+  putOptionalColor(builder, EDGE_START, colors.start);
+  putOptionalColor(builder, EDGE_END, colors.end);
+  putOptionalColor(builder, EDGE_ALL, colors.all);
+  return builder.build();
+}
+
+constexpr MapBuffer::Key CORNER_TOP_LEFT = 0;
+constexpr MapBuffer::Key CORNER_TOP_RIGHT = 1;
+constexpr MapBuffer::Key CORNER_BOTTOM_RIGHT = 2;
+constexpr MapBuffer::Key CORNER_BOTTOM_LEFT = 3;
+constexpr MapBuffer::Key CORNER_TOP_START = 4;
+constexpr MapBuffer::Key CORNER_TOP_END = 5;
+constexpr MapBuffer::Key CORNER_BOTTOM_END = 6;
+constexpr MapBuffer::Key CORNER_BOTTOM_START = 7;
+constexpr MapBuffer::Key CORNER_ALL = 8;
+
+inline void putOptionalFloat(
+    MapBufferBuilder &builder,
+    MapBuffer::Key key,
+    std::optional<Float> const &value) {
+  builder.putDouble(key, value.value_or(NAN));
+}
+
+MapBuffer convertBorderRadii(CascadedBorderRadii const &radii) {
+  MapBufferBuilder builder(9);
+  putOptionalFloat(builder, CORNER_TOP_LEFT, radii.topLeft);
+  putOptionalFloat(builder, CORNER_TOP_RIGHT, radii.topRight);
+  putOptionalFloat(builder, CORNER_BOTTOM_RIGHT, radii.bottomRight);
+  putOptionalFloat(builder, CORNER_BOTTOM_LEFT, radii.bottomLeft);
+  putOptionalFloat(builder, CORNER_TOP_START, radii.topStart);
+  putOptionalFloat(builder, CORNER_TOP_END, radii.topEnd);
+  putOptionalFloat(builder, CORNER_BOTTOM_END, radii.bottomEnd);
+  putOptionalFloat(builder, CORNER_BOTTOM_START, radii.bottomStart);
+  putOptionalFloat(builder, CORNER_ALL, radii.all);
+  return builder.build();
+}
+
+MapBuffer convertBorderWidths(YGStyle::Edges const &border) {
+  MapBufferBuilder builder(7);
+  putOptionalFloat(
+      builder, EDGE_TOP, optionalFloatFromYogaValue(border[YGEdgeTop]));
+  putOptionalFloat(
+      builder, EDGE_RIGHT, optionalFloatFromYogaValue(border[YGEdgeRight]));
+  putOptionalFloat(
+      builder, EDGE_BOTTOM, optionalFloatFromYogaValue(border[YGEdgeBottom]));
+  putOptionalFloat(
+      builder, EDGE_LEFT, optionalFloatFromYogaValue(border[YGEdgeLeft]));
+  putOptionalFloat(
+      builder, EDGE_START, optionalFloatFromYogaValue(border[YGEdgeStart]));
+  putOptionalFloat(
+      builder, EDGE_END, optionalFloatFromYogaValue(border[YGEdgeEnd]));
+  putOptionalFloat(
+      builder, EDGE_ALL, optionalFloatFromYogaValue(border[YGEdgeAll]));
+  return builder.build();
+}
+
+MapBuffer convertEdgeInsets(EdgeInsets const &insets) {
+  MapBufferBuilder builder(4);
+  builder.putDouble(EDGE_TOP, insets.top);
+  builder.putDouble(EDGE_RIGHT, insets.right);
+  builder.putDouble(EDGE_BOTTOM, insets.bottom);
+  builder.putDouble(EDGE_LEFT, insets.left);
+  return builder.build();
+}
+
+#ifdef ANDROID
+
+constexpr MapBuffer::Key NATIVE_DRAWABLE_KIND = 0;
+constexpr MapBuffer::Key NATIVE_DRAWABLE_ATTRIBUTE = 1;
+constexpr MapBuffer::Key NATIVE_DRAWABLE_COLOR = 2;
+constexpr MapBuffer::Key NATIVE_DRAWABLE_BORDERLESS = 3;
+constexpr MapBuffer::Key NATIVE_DRAWABLE_RIPPLE_RADIUS = 4;
+
+MapBuffer convertNativeBackground(std::optional<NativeDrawable> const &value) {
+  if (!value.has_value()) {
+    return MapBufferBuilder::EMPTY();
+  }
+
+  auto const &drawable = value.value();
+  MapBufferBuilder builder(4);
+  switch (drawable.kind) {
+    case NativeDrawable::Kind::ThemeAttr:
+      builder.putInt(NATIVE_DRAWABLE_KIND, 0);
+      builder.putString(NATIVE_DRAWABLE_ATTRIBUTE, drawable.themeAttr);
+      break;
+    case NativeDrawable::Kind::Ripple:
+      builder.putInt(NATIVE_DRAWABLE_KIND, 1);
+      if (drawable.ripple.color.has_value()) {
+        builder.putInt(NATIVE_DRAWABLE_COLOR, drawable.ripple.color.value());
+      }
+
+      builder.putBool(NATIVE_DRAWABLE_BORDERLESS, drawable.ripple.borderless);
+      if (drawable.ripple.rippleRadius.has_value()) {
+        builder.putDouble(
+            NATIVE_DRAWABLE_RIPPLE_RADIUS,
+            drawable.ripple.rippleRadius.value());
+      }
+      break;
+  }
+  return builder.build();
+}
+
+#endif
+
+MapBuffer convertTransform(Transform const &transform) {
+  MapBufferBuilder builder(16);
+  for (int32_t i = 0; i < transform.matrix.size(); i++) {
+    builder.putDouble(i, transform.matrix[i]);
+  }
+  return builder.build();
+}
+} // namespace
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/.clang-tidy b/ReactAndroid/src/main/jni/react/hermes/.clang-tidy
similarity index 61%
rename from ReactAndroid/src/main/java/com/facebook/hermes/.clang-tidy
rename to ReactAndroid/src/main/jni/react/hermes/.clang-tidy
index c98fd78ff64b..8edbbc799e94 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/.clang-tidy
+++ b/ReactAndroid/src/main/jni/react/hermes/.clang-tidy
@@ -1,4 +1,5 @@
 ---
+InheritParentConfig: true
 Checks: '>
 clang-diagnostic-*,
 '
diff --git a/ReactAndroid/src/main/jni/react/hermes/instrumentation/BUCK b/ReactAndroid/src/main/jni/react/hermes/instrumentation/BUCK
new file mode 100644
index 000000000000..f2c0e6ef2ef5
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/hermes/instrumentation/BUCK
@@ -0,0 +1,27 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "react_native_target", "react_native_xplat_dep", "rn_xplat_cxx_library")
+
+rn_xplat_cxx_library(
+    name = "jni_hermes_samplingprofiler",
+    srcs = [
+        "HermesSamplingProfiler.cpp",
+        "OnLoad.cpp",
+    ],
+    headers = ["HermesSamplingProfiler.h"],
+    header_namespace = "",
+    compiler_flags_enable_exceptions = True,  # TODO: is this necessary?
+    compiler_flags_enable_rtti = True,  # TODO: is this necessary?
+    fbandroid_allow_jni_merging = True,
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+    ],
+    platforms = ANDROID,
+    soname = "libjsijniprofiler.$(ext)",
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_target("jni/react/jni:jni"),
+        FBJNI_TARGET,
+        react_native_xplat_dep("hermes/API:HermesAPI"),
+    ],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/CMakeLists.txt b/ReactAndroid/src/main/jni/react/hermes/instrumentation/CMakeLists.txt
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/CMakeLists.txt
rename to ReactAndroid/src/main/jni/react/hermes/instrumentation/CMakeLists.txt
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/HermesMemoryDumper.h b/ReactAndroid/src/main/jni/react/hermes/instrumentation/HermesMemoryDumper.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/HermesMemoryDumper.h
rename to ReactAndroid/src/main/jni/react/hermes/instrumentation/HermesMemoryDumper.h
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/HermesSamplingProfiler.cpp b/ReactAndroid/src/main/jni/react/hermes/instrumentation/HermesSamplingProfiler.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/HermesSamplingProfiler.cpp
rename to ReactAndroid/src/main/jni/react/hermes/instrumentation/HermesSamplingProfiler.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/HermesSamplingProfiler.h b/ReactAndroid/src/main/jni/react/hermes/instrumentation/HermesSamplingProfiler.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/HermesSamplingProfiler.h
rename to ReactAndroid/src/main/jni/react/hermes/instrumentation/HermesSamplingProfiler.h
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/OnLoad.cpp b/ReactAndroid/src/main/jni/react/hermes/instrumentation/OnLoad.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/OnLoad.cpp
rename to ReactAndroid/src/main/jni/react/hermes/instrumentation/OnLoad.cpp
diff --git a/ReactAndroid/src/main/jni/react/hermes/reactexecutor/BUCK b/ReactAndroid/src/main/jni/react/hermes/reactexecutor/BUCK
new file mode 100644
index 000000000000..e292584fa628
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/hermes/reactexecutor/BUCK
@@ -0,0 +1,19 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_xplat_cxx_library")
+
+rn_xplat_cxx_library(
+    name = "jni-interface",
+    srcs = [],
+    header_namespace = "hermes/reactexecutor",
+    exported_headers = glob(["*.h"]),
+    visibility = ["PUBLIC"],
+)
+
+rn_xplat_cxx_library(
+    name = "jni",
+    srcs = ["OnLoad.cpp"],
+    headers = [],
+    header_namespace = "",
+    compiler_flags = ["-fexceptions"],
+    soname = "libhermes_executor.$(ext)",
+    visibility = ["PUBLIC"],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/CMakeLists.txt b/ReactAndroid/src/main/jni/react/hermes/reactexecutor/CMakeLists.txt
similarity index 61%
rename from ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/CMakeLists.txt
rename to ReactAndroid/src/main/jni/react/hermes/reactexecutor/CMakeLists.txt
index d446141c7ed9..550b324e8219 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/CMakeLists.txt
+++ b/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
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/OnLoad.cpp b/ReactAndroid/src/main/jni/react/hermes/reactexecutor/OnLoad.cpp
similarity index 84%
rename from ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/OnLoad.cpp
rename to ReactAndroid/src/main/jni/react/hermes/reactexecutor/OnLoad.cpp
index 304603fd12e1..2a102d5d2655 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/OnLoad.cpp
+++ b/ReactAndroid/src/main/jni/react/hermes/reactexecutor/OnLoad.cpp
@@ -69,26 +69,39 @@ class HermesExecutorHolder
       "Lcom/facebook/hermes/reactexecutor/HermesExecutor;";
 
   static jni::local_ref<jhybriddata> initHybridDefaultConfig(
-      jni::alias_ref<jclass>) {
+      jni::alias_ref<jclass>,
+      bool enableDebugger,
+      std::string debuggerName) {
     JReactMarker::setLogPerfMarkerIfNeeded();
 
     std::call_once(flag, []() {
       facebook::hermes::HermesRuntime::setFatalHandler(hermesFatalHandler);
     });
-    return makeCxxInstance(
-        std::make_unique<HermesExecutorFactory>(installBindings));
+    auto factory = std::make_unique<HermesExecutorFactory>(installBindings);
+    factory->setEnableDebugger(enableDebugger);
+    if (!debuggerName.empty()) {
+      factory->setDebuggerName(debuggerName);
+    }
+    return makeCxxInstance(std::move(factory));
   }
 
   static jni::local_ref<jhybriddata> initHybrid(
       jni::alias_ref<jclass>,
+      bool enableDebugger,
+      std::string debuggerName,
       jlong heapSizeMB) {
     JReactMarker::setLogPerfMarkerIfNeeded();
     auto runtimeConfig = makeRuntimeConfig(heapSizeMB);
     std::call_once(flag, []() {
       facebook::hermes::HermesRuntime::setFatalHandler(hermesFatalHandler);
     });
-    return makeCxxInstance(std::make_unique<HermesExecutorFactory>(
-        installBindings, JSIExecutor::defaultTimeoutInvoker, runtimeConfig));
+    auto factory = std::make_unique<HermesExecutorFactory>(
+        installBindings, JSIExecutor::defaultTimeoutInvoker, runtimeConfig);
+    factory->setEnableDebugger(enableDebugger);
+    if (!debuggerName.empty()) {
+      factory->setDebuggerName(debuggerName);
+    }
+    return makeCxxInstance(std::move(factory));
   }
 
   static bool canLoadFile(jni::alias_ref<jclass>, const std::string &path) {
diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK
index 787eb0f14bd6..5ce1930b4e22 100644
--- a/ReactAndroid/src/main/jni/react/jni/BUCK
+++ b/ReactAndroid/src/main/jni/react/jni/BUCK
@@ -42,7 +42,6 @@ rn_xplat_cxx_library(
     fbandroid_allow_jni_merging = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = ANDROID,
     preprocessor_flags = [
@@ -58,10 +57,11 @@ rn_xplat_cxx_library(
         "//xplat/third-party/linker_lib:android",
         "//xplat/third-party/linker_lib:atomic",
         "//third-party/glog:glog",
-        "//xplat/folly:molly",
+        "//xplat/folly:dynamic",
+        "//xplat/folly:json",
         "//fbandroid/xplat/fbgloginit:fbgloginit",
         "//xplat/fbsystrace:fbsystrace",
-        react_native_target("java/com/facebook/react/turbomodule/core/jni:callinvokerholder"),
+        react_native_target("jni/react/turbomodule:callinvokerholder"),
         react_native_xplat_target("cxxreact:bridge"),
         react_native_xplat_target("cxxreact:jsbigstring"),
         react_native_xplat_target("cxxreact:module"),
diff --git a/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt
index e001b79550d3..cf8ffe295e41 100644
--- a/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt
+++ b/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt
@@ -6,8 +6,6 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-# TODO Those two libraries are building against the same sources
-# and should probably be merged
 file(GLOB reactnativejni_SRC CONFIGURE_DEPENDS *.cpp)
 
 add_compile_options(
@@ -17,32 +15,6 @@ add_compile_options(
         -std=c++17
         -DWITH_INSPECTOR=1)
 
-##########################
-### React Native Utils ###
-##########################
-
-add_library(
-        reactnativeutilsjni
-        SHARED
-        ${reactnativejni_SRC}
-)
-
-# TODO This should not be ../../
-target_include_directories(reactnativeutilsjni PUBLIC ../../)
-
-target_link_libraries(reactnativeutilsjni
-        android
-        callinvokerholder
-        fb
-        fbjni
-        folly_runtime
-        glog_init
-        react_render_runtimescheduler
-        reactnative
-        runtimeexecutor
-        yoga
-        )
-
 ######################
 ### reactnativejni ###
 ######################
@@ -67,7 +39,6 @@ target_link_libraries(reactnativejni
         logger
         react_render_runtimescheduler
         reactnative
-        reactnativeutilsjni
         runtimeexecutor
         yoga
         )
diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
index 6a936c66f66f..e44913e4fd08 100644
--- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
@@ -93,21 +93,12 @@ class JInstanceCallback : public InstanceCallback {
 } // namespace
 
 jni::local_ref<CatalystInstanceImpl::jhybriddata>
-CatalystInstanceImpl::initHybrid(
-    jni::alias_ref<jclass>,
-    bool enableRuntimeScheduler,
-    bool enableRuntimeSchedulerInTurboModule) {
-  return makeCxxInstance(
-      enableRuntimeScheduler, enableRuntimeSchedulerInTurboModule);
+CatalystInstanceImpl::initHybrid(jni::alias_ref<jclass>) {
+  return makeCxxInstance();
 }
 
-CatalystInstanceImpl::CatalystInstanceImpl(
-    bool enableRuntimeScheduler,
-    bool enableRuntimeSchedulerInTurboModule)
-    : instance_(std::make_unique<Instance>()),
-      enableRuntimeScheduler_(enableRuntimeScheduler),
-      enableRuntimeSchedulerInTurboModule_(
-          enableRuntimeScheduler && enableRuntimeSchedulerInTurboModule) {}
+CatalystInstanceImpl::CatalystInstanceImpl()
+    : instance_(std::make_unique<Instance>()) {}
 
 void CatalystInstanceImpl::warnOnLegacyNativeModuleSystemUse() {
   CxxNativeModule::setShouldWarnOnUse(true);
@@ -382,17 +373,12 @@ void CatalystInstanceImpl::handleMemoryPressure(int pressureLevel) {
 jni::alias_ref<CallInvokerHolder::javaobject>
 CatalystInstanceImpl::getJSCallInvokerHolder() {
   if (!jsCallInvokerHolder_) {
-    if (enableRuntimeSchedulerInTurboModule_) {
-      auto runtimeScheduler = getRuntimeScheduler();
-      auto runtimeSchedulerCallInvoker =
-          std::make_shared<RuntimeSchedulerCallInvoker>(
-              runtimeScheduler->cthis()->get());
-      jsCallInvokerHolder_ = jni::make_global(
-          CallInvokerHolder::newObjectCxxArgs(runtimeSchedulerCallInvoker));
-    } else {
-      jsCallInvokerHolder_ = jni::make_global(
-          CallInvokerHolder::newObjectCxxArgs(instance_->getJSCallInvoker()));
-    }
+    auto runtimeScheduler = getRuntimeScheduler();
+    auto runtimeSchedulerCallInvoker =
+        std::make_shared<RuntimeSchedulerCallInvoker>(
+            runtimeScheduler->cthis()->get());
+    jsCallInvokerHolder_ = jni::make_global(
+        CallInvokerHolder::newObjectCxxArgs(runtimeSchedulerCallInvoker));
   }
   return jsCallInvokerHolder_;
 }
@@ -440,7 +426,7 @@ CatalystInstanceImpl::getRuntimeExecutor() {
 
 jni::alias_ref<JRuntimeScheduler::javaobject>
 CatalystInstanceImpl::getRuntimeScheduler() {
-  if (enableRuntimeScheduler_ && !runtimeScheduler_) {
+  if (!runtimeScheduler_) {
     auto runtimeExecutor = instance_->getRuntimeExecutor();
     auto runtimeScheduler = std::make_shared<RuntimeScheduler>(runtimeExecutor);
 
diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
index fe635bf48250..cd242903faba 100644
--- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
+++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
@@ -37,10 +37,7 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
   static constexpr auto kJavaDescriptor =
       "Lcom/facebook/react/bridge/CatalystInstanceImpl;";
 
-  static jni::local_ref<jhybriddata> initHybrid(
-      jni::alias_ref<jclass>,
-      bool enableRuntimeScheduler,
-      bool enableRuntimeSchedulerInTurboModule);
+  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);
 
   static void registerNatives();
 
@@ -51,9 +48,7 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
  private:
   friend HybridBase;
 
-  CatalystInstanceImpl(
-      bool enableRuntimeScheduler,
-      bool enableRuntimeSchedulerInTurboModule);
+  CatalystInstanceImpl();
 
   void initializeBridge(
       jni::alias_ref<ReactCallback::javaobject> callback,
@@ -120,9 +115,6 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
   jni::global_ref<CallInvokerHolder::javaobject> nativeCallInvokerHolder_;
   jni::global_ref<JRuntimeExecutor::javaobject> runtimeExecutor_;
   jni::global_ref<JRuntimeScheduler::javaobject> runtimeScheduler_;
-
-  bool const enableRuntimeScheduler_;
-  bool const enableRuntimeSchedulerInTurboModule_;
 };
 
 } // namespace react
diff --git a/ReactAndroid/src/main/jni/react/jni/JCallback.h b/ReactAndroid/src/main/jni/react/jni/JCallback.h
index 504ad92281f3..da480384d9e8 100644
--- a/ReactAndroid/src/main/jni/react/jni/JCallback.h
+++ b/ReactAndroid/src/main/jni/react/jni/JCallback.h
@@ -30,9 +30,16 @@ class JCxxCallbackImpl : public jni::HybridClass<JCxxCallbackImpl, JCallback> {
       "Lcom/facebook/react/bridge/CxxCallbackImpl;";
 
   static void registerNatives() {
+#if __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#endif
     javaClassStatic()->registerNatives({
         makeNativeMethod("nativeInvoke", JCxxCallbackImpl::invoke),
     });
+#if __clang__
+#pragma clang diagnostic pop
+#endif
   }
 
  private:
diff --git a/ReactAndroid/src/main/jni/react/jscexecutor/BUCK b/ReactAndroid/src/main/jni/react/jscexecutor/BUCK
new file mode 100644
index 000000000000..8b3e82eb665f
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/jscexecutor/BUCK
@@ -0,0 +1,22 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "react_native_target", "react_native_xplat_target", "rn_xplat_cxx_library")
+
+rn_xplat_cxx_library(
+    name = "jni",
+    srcs = glob(["*.cpp"]),
+    headers = glob(["*.h"]),
+    header_namespace = "",
+    compiler_flags_enable_exceptions = True,  # TODO: is this necessary?
+    compiler_flags_enable_rtti = True,  # TODO: is this necessary?
+    fbandroid_allow_jni_merging = True,
+    platforms = ANDROID,
+    soname = "libjscexecutor.$(ext)",
+    visibility = [
+        react_native_target("java/com/facebook/react/jscexecutor:jscexecutor"),
+    ],
+    deps = [
+        FBJNI_TARGET,
+        react_native_target("jni/react/jni:jni"),
+        react_native_xplat_target("jsc:JSCRuntime"),
+        react_native_xplat_target("jsiexecutor:jsiexecutor"),
+    ],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/CMakeLists.txt b/ReactAndroid/src/main/jni/react/jscexecutor/CMakeLists.txt
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/jscexecutor/CMakeLists.txt
rename to ReactAndroid/src/main/jni/react/jscexecutor/CMakeLists.txt
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/OnLoad.cpp b/ReactAndroid/src/main/jni/react/jscexecutor/OnLoad.cpp
similarity index 98%
rename from ReactAndroid/src/main/java/com/facebook/react/jscexecutor/OnLoad.cpp
rename to ReactAndroid/src/main/jni/react/jscexecutor/OnLoad.cpp
index 60450b5c404b..9d38412d1cb9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/OnLoad.cpp
+++ b/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>
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/BUCK b/ReactAndroid/src/main/jni/react/mapbuffer/BUCK
similarity index 93%
rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/BUCK
rename to ReactAndroid/src/main/jni/react/mapbuffer/BUCK
index 8047ab116a19..d211b7cdfe42 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/BUCK
+++ b/ReactAndroid/src/main/jni/react/mapbuffer/BUCK
@@ -14,7 +14,6 @@ rn_xplat_cxx_library(
     fbandroid_allow_jni_merging = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = ANDROID,
     preprocessor_flags = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/react/mapbuffer/CMakeLists.txt
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/CMakeLists.txt
rename to ReactAndroid/src/main/jni/react/mapbuffer/CMakeLists.txt
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/.clang-tidy b/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/.clang-tidy
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/.clang-tidy
rename to ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/.clang-tidy
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JReadableMapBuffer.cpp b/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JReadableMapBuffer.cpp
rename to ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JReadableMapBuffer.h b/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JReadableMapBuffer.h
rename to ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JWritableMapBuffer.cpp b/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JWritableMapBuffer.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JWritableMapBuffer.cpp
rename to ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JWritableMapBuffer.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JWritableMapBuffer.h b/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JWritableMapBuffer.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JWritableMapBuffer.h
rename to ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JWritableMapBuffer.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/OnLoad.cpp b/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/OnLoad.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/OnLoad.cpp
rename to ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/OnLoad.cpp
diff --git a/ReactAndroid/src/main/jni/react/newarchdefaults/CMakeLists.txt b/ReactAndroid/src/main/jni/react/newarchdefaults/CMakeLists.txt
new file mode 100644
index 000000000000..fefaedfa3b05
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/newarchdefaults/CMakeLists.txt
@@ -0,0 +1,22 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"ReactNative\")
+
+file(GLOB react_newarchdefaults_SRC CONFIGURE_DEPENDS *.cpp)
+
+add_library(react_newarchdefaults SHARED ${react_newarchdefaults_SRC})
+
+target_include_directories(react_newarchdefaults PUBLIC .)
+
+target_link_libraries(react_newarchdefaults
+        fbjni
+        fabricjni
+        react_nativemodule_core
+        react_codegen_rncore
+        jsi)
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterComponentsRegistry.cpp b/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.cpp
similarity index 68%
rename from packages/rn-tester/android/app/src/main/jni/RNTesterComponentsRegistry.cpp
rename to ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.cpp
index ad8370b19e23..00e2cfc15ec5 100644
--- a/packages/rn-tester/android/app/src/main/jni/RNTesterComponentsRegistry.cpp
+++ b/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.cpp
@@ -5,33 +5,34 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "RNTesterComponentsRegistry.h"
+#include "DefaultComponentsRegistry.h"
 
 #include <CoreComponentsRegistry.h>
 #include <fbjni/fbjni.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/renderer/components/AppSpecs/ComponentDescriptors.h>
 #include <react/renderer/components/rncore/ComponentDescriptors.h>
 
 namespace facebook {
 namespace react {
 
-RNTesterComponentsRegistry::RNTesterComponentsRegistry(
-    ComponentFactory *delegate)
+std::function<void(std::shared_ptr<ComponentDescriptorProviderRegistry const>)>
+    DefaultComponentsRegistry::registerComponentDescriptorsFromEntryPoint{};
+
+DefaultComponentsRegistry::DefaultComponentsRegistry(ComponentFactory *delegate)
     : delegate_(delegate) {}
 
 std::shared_ptr<ComponentDescriptorProviderRegistry const>
-RNTesterComponentsRegistry::sharedProviderRegistry() {
+DefaultComponentsRegistry::sharedProviderRegistry() {
   auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
 
-  providerRegistry->add(concreteComponentDescriptorProvider<
-                        RNTMyNativeViewComponentDescriptor>());
+  (DefaultComponentsRegistry::registerComponentDescriptorsFromEntryPoint)(
+      providerRegistry);
 
   return providerRegistry;
 }
 
-jni::local_ref<RNTesterComponentsRegistry::jhybriddata>
-RNTesterComponentsRegistry::initHybrid(
+jni::local_ref<DefaultComponentsRegistry::jhybriddata>
+DefaultComponentsRegistry::initHybrid(
     jni::alias_ref<jclass>,
     ComponentFactory *delegate) {
   auto instance = makeCxxInstance(delegate);
@@ -40,7 +41,7 @@ RNTesterComponentsRegistry::initHybrid(
       [](EventDispatcher::Weak const &eventDispatcher,
          ContextContainer::Shared const &contextContainer)
       -> ComponentDescriptorRegistry::Shared {
-    auto registry = RNTesterComponentsRegistry::sharedProviderRegistry()
+    auto registry = DefaultComponentsRegistry::sharedProviderRegistry()
                         ->createComponentDescriptorRegistry(
                             {eventDispatcher, contextContainer});
 
@@ -59,9 +60,9 @@ RNTesterComponentsRegistry::initHybrid(
   return instance;
 }
 
-void RNTesterComponentsRegistry::registerNatives() {
+void DefaultComponentsRegistry::registerNatives() {
   registerHybrid({
-      makeNativeMethod("initHybrid", RNTesterComponentsRegistry::initHybrid),
+      makeNativeMethod("initHybrid", DefaultComponentsRegistry::initHybrid),
   });
 }
 
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterComponentsRegistry.h b/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.h
similarity index 64%
rename from packages/rn-tester/android/app/src/main/jni/RNTesterComponentsRegistry.h
rename to ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.h
index 121dff5cb446..921101b6aafa 100644
--- a/packages/rn-tester/android/app/src/main/jni/RNTesterComponentsRegistry.h
+++ b/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.h
@@ -7,23 +7,28 @@
 
 #pragma once
 
-#include <ComponentFactory.h>
 #include <fbjni/fbjni.h>
+#include <react/fabric/ComponentFactory.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 #include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook {
 namespace react {
 
-class RNTesterComponentsRegistry
-    : public facebook::jni::HybridClass<RNTesterComponentsRegistry> {
+class DefaultComponentsRegistry
+    : public facebook::jni::HybridClass<DefaultComponentsRegistry> {
  public:
   constexpr static auto kJavaDescriptor =
-      "Lcom/facebook/react/uiapp/RNTesterComponentsRegistry;";
+      "Lcom/facebook/react/defaults/DefaultComponentsRegistry;";
 
   static void registerNatives();
 
-  RNTesterComponentsRegistry(ComponentFactory *delegate);
+  static std::function<void(
+      std::shared_ptr<ComponentDescriptorProviderRegistry const>)>
+      registerComponentDescriptorsFromEntryPoint;
+
+  DefaultComponentsRegistry(ComponentFactory *delegate);
 
  private:
   friend HybridBase;
diff --git a/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp b/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp
new file mode 100644
index 000000000000..78af98677af6
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp
@@ -0,0 +1,60 @@
+/*
+ * 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 "DefaultTurboModuleManagerDelegate.h"
+
+#include <rncore.h>
+
+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::javaModuleProvider{nullptr};
+
+jni::local_ref<DefaultTurboModuleManagerDelegate::jhybriddata>
+DefaultTurboModuleManagerDelegate::initHybrid(jni::alias_ref<jhybridobject>) {
+  return makeCxxInstance();
+}
+
+void DefaultTurboModuleManagerDelegate::registerNatives() {
+  registerHybrid({
+      makeNativeMethod(
+          "initHybrid", DefaultTurboModuleManagerDelegate::initHybrid),
+  });
+}
+
+std::shared_ptr<TurboModule> DefaultTurboModuleManagerDelegate::getTurboModule(
+    const std::string &name,
+    const std::shared_ptr<CallInvoker> &jsInvoker) {
+  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 moduleProvider = DefaultTurboModuleManagerDelegate::javaModuleProvider;
+  if (moduleProvider) {
+    if (auto resolvedModule = moduleProvider(name, params)) {
+      return resolvedModule;
+    }
+  }
+  return rncore_ModuleProvider(name, params);
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleManagerDelegate.h b/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h
similarity index 57%
rename from packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleManagerDelegate.h
rename to ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h
index d735d4dc521a..c6d37782d9b2 100644
--- a/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleManagerDelegate.h
+++ b/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h
@@ -8,24 +8,35 @@
 #include <memory>
 #include <string>
 
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
 #include <ReactCommon/TurboModuleManagerDelegate.h>
 #include <fbjni/fbjni.h>
 
 namespace facebook {
 namespace react {
 
-class RNTesterTurboModuleManagerDelegate
-    : public jni::HybridClass<
-          RNTesterTurboModuleManagerDelegate,
-          TurboModuleManagerDelegate> {
+class DefaultTurboModuleManagerDelegate : public jni::HybridClass<
+                                              DefaultTurboModuleManagerDelegate,
+                                              TurboModuleManagerDelegate> {
  public:
   static constexpr auto kJavaDescriptor =
-      "Lcom/facebook/react/uiapp/RNTesterTurboModuleManagerDelegate;";
+      "Lcom/facebook/react/defaults/DefaultTurboModuleManagerDelegate;";
 
   static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>);
 
   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 &)>
+      javaModuleProvider;
+
   std::shared_ptr<TurboModule> getTurboModule(
       const std::string &name,
       const std::shared_ptr<CallInvoker> &jsInvoker) override;
@@ -33,12 +44,6 @@ class RNTesterTurboModuleManagerDelegate
       const std::string &name,
       const JavaTurboModule::InitParams &params) override;
 
-  /**
-   * Test-only method. Allows user to verify whether a TurboModule can be
-   * created by instances of this class.
-   */
-  bool canCreateTurboModule(const std::string &name);
-
  private:
   friend HybridBase;
   using HybridBase::HybridBase;
diff --git a/ReactAndroid/src/main/jni/react/newarchdefaults/OnLoad.cpp b/ReactAndroid/src/main/jni/react/newarchdefaults/OnLoad.cpp
new file mode 100644
index 000000000000..f93ba96e8653
--- /dev/null
+++ b/ReactAndroid/src/main/jni/react/newarchdefaults/OnLoad.cpp
@@ -0,0 +1,18 @@
+/*
+ * 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 <fbjni/fbjni.h>
+
+#include "DefaultComponentsRegistry.h"
+#include "DefaultTurboModuleManagerDelegate.h"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+  return facebook::jni::initialize(vm, [] {
+    facebook::react::DefaultTurboModuleManagerDelegate::registerNatives();
+    facebook::react::DefaultComponentsRegistry::registerNatives();
+  });
+}
diff --git a/ReactAndroid/src/main/jni/react/perftests/BUCK b/ReactAndroid/src/main/jni/react/perftests/BUCK
index 3675a6157b28..423628782b85 100644
--- a/ReactAndroid/src/main/jni/react/perftests/BUCK
+++ b/ReactAndroid/src/main/jni/react/perftests/BUCK
@@ -11,7 +11,6 @@ rn_xplat_cxx_library(
     deps = [
         "//fbandroid/native:base",
         "//fbandroid/native/fb:fb",
-        "//xplat/folly:molly",
         react_native_xplat_target("cxxreact:module"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK b/ReactAndroid/src/main/jni/react/reactnativeblob/BUCK
similarity index 90%
rename from ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK
rename to ReactAndroid/src/main/jni/react/reactnativeblob/BUCK
index 410547fb4630..3ef04910b816 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BUCK
+++ b/ReactAndroid/src/main/jni/react/reactnativeblob/BUCK
@@ -7,7 +7,6 @@ rn_xplat_cxx_library(
     header_namespace = "",
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = ANDROID,
     soname = "libreactnativeblob.$(ext)",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BlobCollector.cpp b/ReactAndroid/src/main/jni/react/reactnativeblob/BlobCollector.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BlobCollector.cpp
rename to ReactAndroid/src/main/jni/react/reactnativeblob/BlobCollector.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BlobCollector.h b/ReactAndroid/src/main/jni/react/reactnativeblob/BlobCollector.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BlobCollector.h
rename to ReactAndroid/src/main/jni/react/reactnativeblob/BlobCollector.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/react/reactnativeblob/CMakeLists.txt
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/CMakeLists.txt
rename to ReactAndroid/src/main/jni/react/reactnativeblob/CMakeLists.txt
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/react/reactnativeblob/OnLoad.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/OnLoad.cpp
rename to ReactAndroid/src/main/jni/react/reactnativeblob/OnLoad.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/BUCK b/ReactAndroid/src/main/jni/react/reactperflogger/BUCK
similarity index 93%
rename from ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/BUCK
rename to ReactAndroid/src/main/jni/react/reactperflogger/BUCK
index 5cf0f6d1549c..8421b1b3860e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/BUCK
+++ b/ReactAndroid/src/main/jni/react/reactperflogger/BUCK
@@ -11,7 +11,6 @@ rn_xplat_cxx_library(
     },
     fbandroid_allow_jni_merging = True,
     fbandroid_labels = [
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     labels = ["pfh:ReactNative_CommonInfrastructurePlaceholder"],
     platforms = ANDROID,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/react/reactperflogger/CMakeLists.txt
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/CMakeLists.txt
rename to ReactAndroid/src/main/jni/react/reactperflogger/CMakeLists.txt
diff --git a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/reactperflogger/.clang-tidy b/ReactAndroid/src/main/jni/react/reactperflogger/reactperflogger/.clang-tidy
similarity index 61%
rename from ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/reactperflogger/.clang-tidy
rename to ReactAndroid/src/main/jni/react/reactperflogger/reactperflogger/.clang-tidy
index c98fd78ff64b..8edbbc799e94 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/reactperflogger/.clang-tidy
+++ b/ReactAndroid/src/main/jni/react/reactperflogger/reactperflogger/.clang-tidy
@@ -1,4 +1,5 @@
 ---
+InheritParentConfig: true
 Checks: '>
 clang-diagnostic-*,
 '
diff --git a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/reactperflogger/JNativeModulePerfLogger.h b/ReactAndroid/src/main/jni/react/reactperflogger/reactperflogger/JNativeModulePerfLogger.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/reactperflogger/JNativeModulePerfLogger.h
rename to ReactAndroid/src/main/jni/react/reactperflogger/reactperflogger/JNativeModulePerfLogger.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/reactperflogger/OnLoad.cpp b/ReactAndroid/src/main/jni/react/reactperflogger/reactperflogger/OnLoad.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/reactperflogger/OnLoad.cpp
rename to ReactAndroid/src/main/jni/react/reactperflogger/reactperflogger/OnLoad.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK b/ReactAndroid/src/main/jni/react/turbomodule/BUCK
similarity index 91%
rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK
rename to ReactAndroid/src/main/jni/react/turbomodule/BUCK
index 06ed578353b4..e546b70a0443 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK
+++ b/ReactAndroid/src/main/jni/react/turbomodule/BUCK
@@ -16,7 +16,6 @@ rn_xplat_cxx_library(
     fbandroid_allow_jni_merging = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = ANDROID,
     preprocessor_flags = [
@@ -36,7 +35,7 @@ rn_xplat_cxx_library(
         react_native_xplat_shared_library_target("jsi:jsi"),
         react_native_xplat_target("react/nativemodule/core:core"),
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
-        react_native_target("java/com/facebook/react/reactperflogger/jni:jni"),
+        react_native_target("jni/react/reactperflogger:jni"),
     ],
 )
 
@@ -54,7 +53,6 @@ rn_xplat_cxx_library(
     ],
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = ANDROID,
     preferred_linkage = "static",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/react/turbomodule/CMakeLists.txt
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/CMakeLists.txt
rename to ReactAndroid/src/main/jni/react/turbomodule/CMakeLists.txt
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.cpp b/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CallInvokerHolder.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.cpp
rename to ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CallInvokerHolder.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.h b/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CallInvokerHolder.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.h
rename to ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CallInvokerHolder.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CompositeTurboModuleManagerDelegate.cpp b/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CompositeTurboModuleManagerDelegate.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CompositeTurboModuleManagerDelegate.cpp
rename to ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CompositeTurboModuleManagerDelegate.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CompositeTurboModuleManagerDelegate.h b/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CompositeTurboModuleManagerDelegate.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CompositeTurboModuleManagerDelegate.h
rename to ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CompositeTurboModuleManagerDelegate.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/OnLoad.cpp b/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/OnLoad.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/OnLoad.cpp
rename to ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/OnLoad.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp b/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp
rename to ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h b/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h
rename to ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManagerDelegate.h b/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManagerDelegate.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManagerDelegate.h
rename to ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManagerDelegate.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/BUCK b/ReactAndroid/src/main/jni/react/uimanager/BUCK
similarity index 92%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/BUCK
rename to ReactAndroid/src/main/jni/react/uimanager/BUCK
index e510e4323229..c554a6dbdefd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/BUCK
+++ b/ReactAndroid/src/main/jni/react/uimanager/BUCK
@@ -14,7 +14,6 @@ rn_xplat_cxx_library(
     fbandroid_allow_jni_merging = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = ANDROID,
     preprocessor_flags = [
@@ -29,7 +28,6 @@ rn_xplat_cxx_library(
         react_native_xplat_target("react/renderer/componentregistry/native:native"),
         react_native_target("jni/react/jni:jni"),
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:molly",
         "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
         "//xplat/third-party/linker_lib:atomic",
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/react/uimanager/CMakeLists.txt
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/CMakeLists.txt
rename to ReactAndroid/src/main/jni/react/uimanager/CMakeLists.txt
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.cpp b/ReactAndroid/src/main/jni/react/uimanager/ComponentNameResolverManager.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.cpp
rename to ReactAndroid/src/main/jni/react/uimanager/ComponentNameResolverManager.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.h b/ReactAndroid/src/main/jni/react/uimanager/ComponentNameResolverManager.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.h
rename to ReactAndroid/src/main/jni/react/uimanager/ComponentNameResolverManager.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/react/uimanager/OnLoad.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/OnLoad.cpp
rename to ReactAndroid/src/main/jni/react/uimanager/OnLoad.cpp
diff --git a/ReactAndroid/src/main/libraries/fbjni/BUCK b/ReactAndroid/src/main/libraries/fbjni/BUCK
index 4d6d134811ab..f9b1d33925cd 100644
--- a/ReactAndroid/src/main/libraries/fbjni/BUCK
+++ b/ReactAndroid/src/main/libraries/fbjni/BUCK
@@ -2,10 +2,10 @@ load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
 
 fb_native.android_library(
     name = "java",
+    visibility = ["PUBLIC"],
     exported_deps = [
         ":fbjni-binary",
     ],
-    visibility = ["PUBLIC"],
 )
 
 fb_native.android_prebuilt_aar(
diff --git a/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK b/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK
index 2421d56d1c17..7b29b5186710 100644
--- a/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK
+++ b/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK
@@ -2,12 +2,12 @@ load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
 
 fb_native.android_library(
     name = "soloader",
+    visibility = ["PUBLIC"],
     exported_deps = [
         ":annotation-binary",
         ":nativeloader-binary",
         ":soloader-binary",
     ],
-    visibility = ["PUBLIC"],
 )
 
 fb_native.prebuilt_jar(
diff --git a/ReactAndroid/src/main/res/views/uimanager/values/ids.xml b/ReactAndroid/src/main/res/views/uimanager/values/ids.xml
index 405ca4d7af9d..998cb3e222ca 100644
--- a/ReactAndroid/src/main/res/views/uimanager/values/ids.xml
+++ b/ReactAndroid/src/main/res/views/uimanager/values/ids.xml
@@ -9,45 +9,36 @@
   <!-- tag is used to store the nativeID tag -->
   <item type="id" name="view_tag_instance_handle"/>
 
-  <!--tag is used to store accessibilityHint tag-->
+  <!-- tag is used to store accessibilityHint tag-->
   <item type="id" name="accessibility_hint"/>
 
-  <!--tag is used to store accessibilityRole tag-->
+  <!-- tag is used to store accessibilityRole tag-->
   <item type="id" name="accessibility_role"/>
 
-  <!--tag is used to store accessibilityCollection -->
+  <!-- tag is used to store accessibilityCollection -->
   <item type="id" name="accessibility_collection"/>
 
-  <!--tag is used to store accessibilityCollectionItem -->
+  <!-- tag is used to store accessibilityCollectionItem -->
   <item type="id" name="accessibility_collection_item"/>
 
-  <!--tag is used to store accessibilityState -->
+  <!-- tag is used to store accessibilityState -->
   <item type="id" name="accessibility_state"/>
 
-  <!--tag is used to store accessibilityLabel tag-->
+  <!-- tag is used to store accessibilityLabel tag-->
   <item type="id" name="accessibility_label"/>
 
-  <!--tag is used to store accessibilityActions tag-->
+  <!-- tag is used to store accessibilityActions tag-->
   <item type="id" name="accessibility_actions"/>
 
-  <!--tag is used to store accessibilityValue tag -->
+  <!-- tag is used to store accessibilityValue tag -->
   <item type="id" name="accessibility_value"/>
 
-  <!--tag is used to store accessibilityLinks tag -->
+  <!-- tag is used to store accessibilityLinks tag -->
   <item type="id" name="accessibility_links"/>
-  <!--tag is used to store accessibilityLabelledBy tag -->
-  <item type="id" name="labelled_by"/>
-
-  <!-- tag is used to store if a view is subscribed to the pointerenter event -->
-  <item type="id" name="pointer_enter"/>
-  <item type="id" name="pointer_enter_capture"/>
 
-  <!-- tag is used to store if a view is subscribed to the pointerleave event -->
-  <item type="id" name="pointer_leave"/>
-  <item type="id" name="pointer_leave_capture"/>
-
-  <!-- tag is used to store if a view is subscribed to the pointermove event -->
-  <item type="id" name="pointer_move"/>
-  <item type="id" name="pointer_move_capture"/>
+  <!-- tag is used to store accessibilityLabelledBy tag -->
+  <item type="id" name="labelled_by"/>
 
+  <!-- tag is used store bitset of pointer events observed -->
+  <item type="id" name="pointer_events"/>
 </resources>
diff --git a/ReactAndroid/src/main/third-party/android/androidx/BUCK b/ReactAndroid/src/main/third-party/android/androidx/BUCK
index 8bea0a99bf3a..2035a88fc99d 100644
--- a/ReactAndroid/src/main/third-party/android/androidx/BUCK
+++ b/ReactAndroid/src/main/third-party/android/androidx/BUCK
@@ -291,6 +291,15 @@ fb_native.android_library(
     ],
 )
 
+fb_native.android_library(
+    name = "tracing",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":annotation",
+        ":tracing-binary",
+    ],
+)
+
 fb_native.android_library(
     name = "test-monitor",
     visibility = ["PUBLIC"],
@@ -496,6 +505,11 @@ fb_native.android_prebuilt_aar(
     aar = ":swiperefreshlayout-binary-aar",
 )
 
+fb_native.android_prebuilt_aar(
+    name = "tracing-binary",
+    aar = ":tracing-binary-aar",
+)
+
 fb_native.android_prebuilt_aar(
     name = "test-monitor-binary",
     aar = ":test-monitor-binary-aar",
@@ -700,6 +714,12 @@ fb_native.remote_file(
     url = "mvn:androidx.swiperefreshlayout:swiperefreshlayout:aar:1.0.0",
 )
 
+fb_native.remote_file(
+    name = "tracing-binary-aar",
+    sha1 = "cdc41b1335c3857e4136d399f6a7962663d05e5e",
+    url = "mvn:androidx.tracing:tracing:aar:1.1.0",
+)
+
 fb_native.remote_file(
     name = "test-monitor-binary-aar",
     sha1 = "4f3c15d0a1e0c943b233b0dc5d8f1e690cfe7c0a",
diff --git a/ReactAndroid/src/main/third-party/kotlin/BUCK b/ReactAndroid/src/main/third-party/kotlin/BUCK
index c1d09721a553..b96b7417e97d 100644
--- a/ReactAndroid/src/main/third-party/kotlin/BUCK
+++ b/ReactAndroid/src/main/third-party/kotlin/BUCK
@@ -83,7 +83,6 @@ fb_native.remote_file(
 
 fb_native.genrule(
     name = "kotlin-compiler-download",
-    type = "copy",
     srcs = [
         ":annotations-13.0.jar",
         ":kotlin-annotation-processing.jar",
@@ -94,9 +93,10 @@ fb_native.genrule(
         ":kotlin-stdlib.jar",
         ":trove4j.jar",
     ],
+    out = "kotlin-compiler-out",
     cmd = "mkdir ${OUT} && cp ${SRCS} ${OUT}",
     cmd_exe = "@powershell -Command Copy-Item '${SRCS}' '${OUT}'",
-    out = "kotlin-compiler-out",
+    type = "copy",
 )
 
 fb_native.remote_file(
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK b/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK
index 7ab27c360a97..235079472f32 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK
@@ -37,7 +37,6 @@ rn_robolectric_test(
         react_native_target("java/com/facebook/react/modules/dialog:dialog"),
         react_native_target("java/com/facebook/react/modules/network:network"),
         react_native_target("java/com/facebook/react/modules/share:share"),
-        react_native_target("java/com/facebook/react/modules/storage:storage"),
         react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
         react_native_target("java/com/facebook/react/touch:touch"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/storage/AsyncStorageModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/storage/AsyncStorageModuleTest.java
deleted file mode 100644
index d4b2ee2c4c45..000000000000
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/storage/AsyncStorageModuleTest.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.modules.storage;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.JavaOnlyArray;
-import com.facebook.react.bridge.JavaOnlyMap;
-import com.facebook.react.bridge.ReactTestHelper;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.mockito.verification.VerificationMode;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.rule.PowerMockRule;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.android.util.concurrent.RoboExecutorService;
-
-/** Tests for {@link com.facebook.react.modules.storage.AsyncStorageModule}. */
-@PrepareForTest({Arguments.class})
-@PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "androidx.*", "android.*", "org.json.*"})
-@RunWith(RobolectricTestRunner.class)
-public class AsyncStorageModuleTest {
-
-  private AsyncStorageModule mStorage;
-  private JavaOnlyArray mEmptyArray;
-
-  @Rule public PowerMockRule rule = new PowerMockRule();
-
-  @Before
-  public void prepareModules() {
-    PowerMockito.mockStatic(Arguments.class);
-    Mockito.when(Arguments.createArray())
-        .thenAnswer(
-            new Answer<Object>() {
-              @Override
-              public Object answer(InvocationOnMock invocation) throws Throwable {
-                return new JavaOnlyArray();
-              }
-            });
-
-    Mockito.when(Arguments.createMap())
-        .thenAnswer(
-            new Answer<Object>() {
-              @Override
-              public Object answer(InvocationOnMock invocation) throws Throwable {
-                return new JavaOnlyMap();
-              }
-            });
-
-    // don't use Robolectric before initializing mocks
-    mStorage =
-        new AsyncStorageModule(
-            ReactTestHelper.createCatalystContextForTest(), new RoboExecutorService());
-    mEmptyArray = new JavaOnlyArray();
-  }
-
-  @After
-  public void cleanUp() {
-    RuntimeEnvironment.application.deleteDatabase(ReactDatabaseSupplier.DATABASE_NAME);
-    ReactDatabaseSupplier.deleteInstance();
-  }
-
-  @Test
-  public void testMultiSetMultiGet() {
-    final String key1 = "foo1";
-    final String key2 = "foo2";
-    final String fakeKey = "fakeKey";
-    final String value1 = "bar1";
-    final String value2 = "bar2";
-    JavaOnlyArray keyValues = new JavaOnlyArray();
-    keyValues.pushArray(getArray(key1, value1));
-    keyValues.pushArray(getArray(key2, value2));
-
-    Callback setCallback = mock(Callback.class);
-    mStorage.multiSet(keyValues, setCallback);
-    verify(setCallback, Mockito.times(1)).invoke();
-
-    JavaOnlyArray keys = new JavaOnlyArray();
-    keys.pushString(key1);
-    keys.pushString(key2);
-
-    Callback getCallback = mock(Callback.class);
-    mStorage.multiGet(keys, getCallback);
-    verify(getCallback, Mockito.times(1)).invoke(null, keyValues);
-
-    keys.pushString(fakeKey);
-    JavaOnlyArray row3 = new JavaOnlyArray();
-    row3.pushString(fakeKey);
-    row3.pushString(null);
-    keyValues.pushArray(row3);
-
-    Callback getCallback2 = mock(Callback.class);
-    mStorage.multiGet(keys, getCallback2);
-    verify(getCallback2, Mockito.times(1)).invoke(null, keyValues);
-  }
-
-  @Test
-  public void testMultiRemove() {
-    final String key1 = "foo1";
-    final String key2 = "foo2";
-    final String value1 = "bar1";
-    final String value2 = "bar2";
-
-    JavaOnlyArray keyValues = new JavaOnlyArray();
-    keyValues.pushArray(getArray(key1, value1));
-    keyValues.pushArray(getArray(key2, value2));
-    mStorage.multiSet(keyValues, mock(Callback.class));
-
-    JavaOnlyArray keys = new JavaOnlyArray();
-    keys.pushString(key1);
-    keys.pushString(key2);
-
-    Callback getCallback = mock(Callback.class);
-    mStorage.multiRemove(keys, getCallback);
-    verify(getCallback, Mockito.times(1)).invoke();
-
-    Callback getAllCallback = mock(Callback.class);
-    mStorage.getAllKeys(getAllCallback);
-    verify(getAllCallback, Mockito.times(1)).invoke(null, mEmptyArray);
-
-    mStorage.multiSet(keyValues, mock(Callback.class));
-
-    keys.pushString("fakeKey");
-    Callback getCallback2 = mock(Callback.class);
-    mStorage.multiRemove(keys, getCallback2);
-    verify(getCallback2, Mockito.times(1)).invoke();
-
-    Callback getAllCallback2 = mock(Callback.class);
-    mStorage.getAllKeys(getAllCallback2);
-    verify(getAllCallback2, Mockito.times(1)).invoke(null, mEmptyArray);
-  }
-
-  @Test
-  public void testMultiMerge() throws Exception {
-    final String mergeKey = "mergeTest";
-
-    JSONObject value = new JSONObject();
-    value.put("foo1", "bar1");
-    value.put("foo2", createJSONArray("val1", "val2", 3));
-    value.put("foo3", 1001);
-    value.put("foo4", createJSONObject("key1", "randomValueThatWillNeverBeUsed"));
-
-    mStorage.multiSet(JavaOnlyArray.of(getArray(mergeKey, value.toString())), mock(Callback.class));
-    {
-      Callback callback = mock(Callback.class);
-      mStorage.multiGet(getArray(mergeKey), callback);
-      verify(callback, Mockito.times(1))
-          .invoke(null, JavaOnlyArray.of(getArray(mergeKey, value.toString())));
-    }
-
-    value.put("foo1", 1001);
-    value.put("foo2", createJSONObject("key1", "val1"));
-    value.put("foo3", "bar1");
-    value.put("foo4", createJSONArray("val1", "val2", 3));
-
-    JSONObject newValue = new JSONObject();
-    newValue.put("foo2", createJSONObject("key2", "val2"));
-
-    JSONObject newValue2 = new JSONObject();
-    newValue2.put("foo2", createJSONObject("key1", "val3"));
-
-    mStorage.multiMerge(
-        JavaOnlyArray.of(
-            JavaOnlyArray.of(mergeKey, value.toString()),
-            JavaOnlyArray.of(mergeKey, newValue.toString()),
-            JavaOnlyArray.of(mergeKey, newValue2.toString())),
-        mock(Callback.class));
-
-    value.put("foo2", createJSONObject("key1", "val3", "key2", "val2"));
-    Callback callback = mock(Callback.class);
-    mStorage.multiGet(getArray(mergeKey), callback);
-    verify(callback, Mockito.times(1))
-        .invoke(null, JavaOnlyArray.of(getArray(mergeKey, value.toString())));
-  }
-
-  @Test
-  public void testGetAllKeys() {
-    final String[] keys = {"foo", "foo2"};
-    final String[] values = {"bar", "bar2"};
-    JavaOnlyArray keyValues = new JavaOnlyArray();
-    keyValues.pushArray(getArray(keys[0], values[0]));
-    keyValues.pushArray(getArray(keys[1], values[1]));
-    mStorage.multiSet(keyValues, mock(Callback.class));
-
-    JavaOnlyArray storedKeys = new JavaOnlyArray();
-    storedKeys.pushString(keys[0]);
-    storedKeys.pushString(keys[1]);
-
-    Callback getAllCallback = mock(Callback.class);
-    mStorage.getAllKeys(getAllCallback);
-    verify(getAllCallback, Mockito.times(1)).invoke(null, storedKeys);
-
-    Callback getAllCallback2 = mock(Callback.class);
-    mStorage.multiRemove(getArray(keys[0]), mock(Callback.class));
-
-    mStorage.getAllKeys(getAllCallback2);
-    verify(getAllCallback2, Mockito.times(1)).invoke(null, getArray(keys[1]));
-
-    mStorage.multiRemove(getArray(keys[1]), mock(Callback.class));
-    Callback getAllCallback3 = mock(Callback.class);
-    mStorage.getAllKeys(getAllCallback3);
-    verify(getAllCallback3, Mockito.times(1)).invoke(null, mEmptyArray);
-  }
-
-  @Test
-  public void testClear() {
-    JavaOnlyArray keyValues = new JavaOnlyArray();
-    keyValues.pushArray(getArray("foo", "foo2"));
-    keyValues.pushArray(getArray("bar", "bar2"));
-    mStorage.multiSet(keyValues, mock(Callback.class));
-
-    Callback clearCallback2 = mock(Callback.class);
-    mStorage.clear(clearCallback2);
-    verify(clearCallback2, Mockito.times(1)).invoke();
-
-    Callback getAllCallback2 = mock(Callback.class);
-    mStorage.getAllKeys(getAllCallback2);
-    verify(getAllCallback2, Mockito.times(1)).invoke(null, mEmptyArray);
-  }
-
-  @Test
-  public void testHugeMultiGetMultiGet() {
-    // Test with many keys, so that it's above the 999 limit per batch imposed by SQLite.
-    final int keyCount = 1001;
-    // don't set keys that divide by this magical number, so that we can check that multiGet works,
-    // and returns null for missing keys
-    final int magicalNumber = 343;
-
-    JavaOnlyArray keyValues = new JavaOnlyArray();
-    for (int i = 0; i < keyCount; i++) {
-      if (i % magicalNumber > 0) {
-        keyValues.pushArray(getArray("key" + i, "value" + i));
-      }
-    }
-    mStorage.multiSet(keyValues, mock(Callback.class));
-    JavaOnlyArray keys = new JavaOnlyArray();
-    for (int i = 0; i < keyCount; i++) {
-      keys.pushString("key" + i);
-    }
-    mStorage.multiGet(
-        keys,
-        new Callback() {
-          @Override
-          public void invoke(Object... args) {
-            assertThat(args.length).isEqualTo(2);
-            JavaOnlyArray resultArray = (JavaOnlyArray) args[1];
-
-            assertThat(resultArray.size()).isEqualTo(keyCount);
-            boolean keyReceived[] = new boolean[keyCount];
-            for (int i = 0; i < keyCount; i++) {
-              String key = resultArray.getArray(i).getString(0).substring(3);
-              int idx = Integer.parseInt(key);
-              assertThat(keyReceived[idx]).isFalse();
-              keyReceived[idx] = true;
-
-              if (idx % magicalNumber > 0) {
-                String value = resultArray.getArray(i).getString(1).substring(5);
-                assertThat(key).isEqualTo(value);
-              } else {
-                assertThat(resultArray.getArray(i).isNull(1));
-              }
-            }
-          }
-        });
-
-    // Test removal in same test, since it's costly to set up the test again.
-    // Remove only odd keys
-    JavaOnlyArray keyRemoves = new JavaOnlyArray();
-    for (int i = 0; i < keyCount; i++) {
-      if (i % 2 > 0) {
-        keyRemoves.pushString("key" + i);
-      }
-    }
-    mStorage.multiRemove(keyRemoves, mock(Callback.class));
-    mStorage.getAllKeys(
-        new Callback() {
-          @Override
-          public void invoke(Object... args) {
-            JavaOnlyArray resultArray = (JavaOnlyArray) args[1];
-            assertThat(resultArray.size()).isEqualTo(499);
-            for (int i = 0; i < resultArray.size(); i++) {
-              String key = resultArray.getString(i).substring(3);
-              int idx = Integer.parseInt(key);
-              assertThat(idx % 2).isEqualTo(0);
-            }
-          }
-        });
-  }
-
-  private static JSONArray createJSONArray(Object... objects) {
-    return new JSONArray(Arrays.asList(objects));
-  }
-
-  private static JSONObject createJSONObject(Object... keysAndValues) {
-    if (keysAndValues.length % 2 != 0) {
-      throw new IllegalArgumentException("You must provide the same number of keys and values");
-    }
-    Map map = new HashMap();
-    for (int i = 0; i < keysAndValues.length; i += 2) {
-      map.put(keysAndValues[i], keysAndValues[i + 1]);
-    }
-    return new JSONObject(map);
-  }
-
-  private JavaOnlyArray getArray(String... values) {
-    JavaOnlyArray array = new JavaOnlyArray();
-    for (String value : values) {
-      array.pushString(value);
-    }
-    return array;
-  }
-
-  private static void waitForAsync() {
-    Robolectric.flushForegroundThreadScheduler();
-    Robolectric.flushBackgroundThreadScheduler();
-  }
-
-  private static <T> T verify(T mock, VerificationMode mode) {
-    waitForAsync();
-    return Mockito.verify(mock, mode);
-  }
-}
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK
index 58399a57095c..5b7de8ec555f 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK
@@ -10,7 +10,6 @@ rn_robolectric_test(
         "SimpleViewPropertyTest.java",
     ],
     contacts = ["oncall+fbandroid_sheriff@xmail.facebook.com"],
-    is_androidx = True,
     language = "JAVA",
     visibility = [
         "PUBLIC",
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java
index 2a7881975911..2aae5ed152d5 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java
@@ -11,9 +11,6 @@
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.graphics.Color;
@@ -21,10 +18,7 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 import com.facebook.react.ReactRootView;
-import com.facebook.react.animation.Animation;
-import com.facebook.react.animation.AnimationPropertyUpdater;
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.CatalystInstance;
 import com.facebook.react.bridge.JavaOnlyArray;
 import com.facebook.react.bridge.JavaOnlyMap;
@@ -460,44 +454,6 @@ public void testLayoutPropertyUpdatingOnlyOnLayoutChange() {
     assertThat(view0.getLeft()).isEqualTo(1);
   }
 
-  private static class AnimationStub extends Animation {
-
-    public AnimationStub(int animationID, AnimationPropertyUpdater propertyUpdater) {
-      super(animationID, propertyUpdater);
-    }
-
-    @Override
-    public void run() {}
-  }
-
-  @Test
-  public void testAddAndRemoveAnimation() {
-    UIManagerModule uiManagerModule = getUIManagerModule();
-    TestMoveDeleteHierarchy hierarchy = createMoveDeleteHierarchy(uiManagerModule);
-
-    AnimationPropertyUpdater mockPropertyUpdater = mock(AnimationPropertyUpdater.class);
-    Animation mockAnimation = spy(new AnimationStub(1000, mockPropertyUpdater));
-    Callback callbackMock = mock(Callback.class);
-
-    int rootTag = hierarchy.rootView;
-    uiManagerModule.createView(
-        hierarchy.rootView,
-        ReactViewManager.REACT_CLASS,
-        rootTag,
-        JavaOnlyMap.of("collapsable", false));
-
-    uiManagerModule.registerAnimation(mockAnimation);
-    uiManagerModule.addAnimation(hierarchy.rootView, 1000, callbackMock);
-    uiManagerModule.removeAnimation(hierarchy.rootView, 1000);
-
-    uiManagerModule.onBatchComplete();
-    executePendingFrameCallbacks();
-
-    verify(callbackMock, times(1)).invoke(false);
-    verify(mockAnimation).run();
-    verify(mockAnimation).cancel();
-  }
-
   /**
    * Makes sure replaceExistingNonRootView by replacing a view with a new view that has a background
    * color set.
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/BUCK b/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/BUCK
index 1dcd20c25142..9e25be3b51d3 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/BUCK
@@ -5,9 +5,7 @@ rn_robolectric_test(
     srcs = glob(["**/*.java"]),
     contacts = ["oncall+react_native@xmail.facebook.com"],
     language = "JAVA",
-    visibility = [
-        "PUBLIC",
-    ],
+    visibility = ["PUBLIC"],
     deps = [
         YOGA_TARGET,
         react_native_dep("third-party/java/assertj:assertj-core"),
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/BUCK b/ReactAndroid/src/test/java/com/facebook/react/views/BUCK
index d624727def62..8a3f5f828798 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/BUCK
@@ -28,6 +28,8 @@ rn_robolectric_test(
         react_native_dep("third-party/java/okio:okio"),
         react_native_target("java/com/facebook/react:react"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_target("java/com/facebook/react/util:util"),
+        react_native_target("java/com/facebook/react/views/imagehelper:imagehelper"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/touch:touch"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java
index 99788ecb6d79..a2e255f1e4db 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java
@@ -14,22 +14,31 @@
 import android.graphics.Color;
 import android.util.DisplayMetrics;
 import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.CatalystInstance;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.JavaOnlyArray;
 import com.facebook.react.bridge.JavaOnlyMap;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactTestHelper;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.util.RNLog;
+import com.facebook.react.views.imagehelper.ImageSource;
 import com.facebook.soloader.SoLoader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.rule.PowerMockRule;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
@@ -38,6 +47,7 @@
  * Verify that {@link ScalingUtils} properties are being applied correctly by {@link
  * ReactImageManager}.
  */
+@PrepareForTest({Arguments.class, RNLog.class})
 @RunWith(RobolectricTestRunner.class)
 @PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "androidx.*", "android.*"})
 public class ReactImagePropertyTest {
@@ -50,6 +60,29 @@ public class ReactImagePropertyTest {
 
   @Before
   public void setup() {
+    PowerMockito.mockStatic(Arguments.class);
+    PowerMockito.when(Arguments.createArray())
+        .thenAnswer(
+            new Answer<Object>() {
+              @Override
+              public Object answer(InvocationOnMock invocation) {
+                return new JavaOnlyArray();
+              }
+            });
+    PowerMockito.when(Arguments.createMap())
+        .thenAnswer(
+            new Answer<Object>() {
+              @Override
+              public Object answer(InvocationOnMock invocation) {
+                return new JavaOnlyMap();
+              }
+            });
+
+    // RNLog is stubbed out and the whole class need to be mocked
+    PowerMockito.mockStatic(RNLog.class);
+    PowerMockito.doNothing().when(RNLog.class);
+    RNLog.w(null, "");
+
     SoLoader.setInTestMode();
     mContext = new ReactApplicationContext(RuntimeEnvironment.application);
     mCatalystInstanceMock = ReactTestHelper.createMockCatalystInstance();
@@ -140,4 +173,20 @@ public void testTintColor() {
     viewManager.updateProperties(view, buildStyles("tintColor", null));
     assertNull(view.getColorFilter());
   }
+
+  @Test
+  public void testNullSrcs() {
+    ReactImageManager viewManager = new ReactImageManager();
+    ReactImageView view = viewManager.createViewInstance(mThemeContext);
+    WritableArray sources = Arguments.createArray();
+    WritableMap srcObj = Arguments.createMap();
+    srcObj.putNull("uri");
+    srcObj.putNull("width");
+    srcObj.putNull("height");
+    sources.pushMap(srcObj);
+    viewManager.setSource(view, sources);
+    view.maybeUpdateView();
+    assertEquals(
+        ImageSource.getTransparentBitmapImageSource(view.getContext()), view.getImageSource());
+  }
 }
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java
index a817b810d416..edf798ab86e2 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java
@@ -194,7 +194,7 @@ public void testBlurMultiline() {
     ReactEditText view = mManager.createViewInstance(mThemedContext);
 
     mManager.updateProperties(view, buildStyles("multiline", true));
-    mManager.updateProperties(view, buildStyles("blurOnSubmit", true));
+    mManager.updateProperties(view, buildStyles("submitBehavior", "blurAndSubmit"));
 
     EditorInfo editorInfo = new EditorInfo();
     editorInfo.imeOptions = EditorInfo.IME_ACTION_DONE | EditorInfo.IME_FLAG_NO_ENTER_ACTION;
diff --git a/ReactAndroid/src/test/resources/BUCK b/ReactAndroid/src/test/resources/BUCK
index 3c1553a6085f..f708abf66553 100644
--- a/ReactAndroid/src/test/resources/BUCK
+++ b/ReactAndroid/src/test/resources/BUCK
@@ -10,7 +10,6 @@ fb_native.java_library(
     srcs = [],
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     resources = [
         "robolectric.properties",
diff --git a/ReactCommon/React-Fabric.podspec b/ReactCommon/React-Fabric.podspec
index 48b6b74e541a..9c9d69348759 100644
--- a/ReactCommon/React-Fabric.podspec
+++ b/ReactCommon/React-Fabric.podspec
@@ -16,7 +16,7 @@ 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_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'
 folly_dep_name = 'RCT-Folly/Fabric'
 boost_compiler_flags = '-Wno-documentation'
@@ -252,6 +252,15 @@ Pod::Spec.new do |s|
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
+  s.subspec "mapbuffer" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/renderer/mapbuffer/**/*.{m,mm,cpp,h}"
+    ss.exclude_files        = "react/renderer/mapbuffer/tests"
+    ss.header_dir           = "react/renderer/mapbuffer"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  end
+
   s.subspec "mounting" do |ss|
     ss.dependency             folly_dep_name, folly_version
     ss.compiler_flags       = folly_compiler_flags
@@ -315,7 +324,8 @@ Pod::Spec.new do |s|
     ss.source_files         = "react/renderer/leakchecker/**/*.{cpp,h}"
     ss.exclude_files        = "react/renderer/leakchecker/tests"
     ss.header_dir           = "react/renderer/leakchecker"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"",
+                                "GCC_WARN_PEDANTIC" => "YES" }
   end
 
   s.subspec "runtimescheduler" do |ss|
@@ -324,13 +334,14 @@ Pod::Spec.new do |s|
     ss.source_files         = "react/renderer/runtimescheduler/**/*.{cpp,h}"
     ss.exclude_files        = "react/renderer/runtimescheduler/tests"
     ss.header_dir           = "react/renderer/runtimescheduler"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+    ss.pod_target_xcconfig  = {"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"",
+                               "GCC_WARN_PEDANTIC" => "YES" }
   end
 
   s.subspec "utils" do |ss|
     ss.source_files         = "react/utils/*.{m,mm,cpp,h}"
     ss.header_dir           = "react/utils"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\""}
   end
 
 end
diff --git a/ReactCommon/ReactCommon.podspec b/ReactCommon/ReactCommon.podspec
index c6696a4d10da..64d418a246e7 100644
--- a/ReactCommon/ReactCommon.podspec
+++ b/ReactCommon/ReactCommon.podspec
@@ -16,7 +16,7 @@ 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_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'
 boost_compiler_flags = '-Wno-documentation'
 
@@ -32,14 +32,14 @@ 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" }
+                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
+                               "GCC_WARN_PEDANTIC" => "YES" }
 
   # 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
@@ -50,9 +50,21 @@ 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}"
+      excluded_files = ENV['USE_FRAMEWORKS'] == nil ?
+        "react/nativemodule/core/ReactCommon/LongLivedObject.h" :
+        "react/nativemodule/core/ReactCommon/{LongLivedObject,CallbackWrapper}.h"
+      sss.exclude_files = excluded_files
     end
 
     s.subspec "react_debug_core" do |sss|
diff --git a/ReactCommon/butter/BUCK b/ReactCommon/butter/BUCK
index e2a65707f069..58c92e8f7a26 100644
--- a/ReactCommon/butter/BUCK
+++ b/ReactCommon/butter/BUCK
@@ -29,12 +29,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "butter",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -47,8 +47,9 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
+        "//xplat/folly:container_f14_hash",
         "//xplat/folly:memory",
-        "//xplat/folly:molly",
+        "//xplat/folly:shared_mutex",
+        "//xplat/folly:small_vector",
     ],
 )
diff --git a/ReactCommon/butter/CMakeLists.txt b/ReactCommon/butter/CMakeLists.txt
index f0369712e434..2f374d951651 100644
--- a/ReactCommon/butter/CMakeLists.txt
+++ b/ReactCommon/butter/CMakeLists.txt
@@ -11,7 +11,9 @@ add_compile_options(
         -fexceptions
         -frtti
         -std=c++17
-        -Wall)
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments)
 
 add_library(butter INTERFACE)
 
diff --git a/ReactCommon/callinvoker/BUCK b/ReactCommon/callinvoker/BUCK
index 0cd39207d875..dda5b563bcd5 100644
--- a/ReactCommon/callinvoker/BUCK
+++ b/ReactCommon/callinvoker/BUCK
@@ -10,9 +10,9 @@ rn_xplat_cxx_library(
         ],
         prefix = "ReactCommon",
     ),
+    compiler_flags_pedantic = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE, CXX),
     preferred_linkage = "static",
diff --git a/ReactCommon/callinvoker/CMakeLists.txt b/ReactCommon/callinvoker/CMakeLists.txt
index 58da1e6a1f07..f2206d066fb5 100644
--- a/ReactCommon/callinvoker/CMakeLists.txt
+++ b/ReactCommon/callinvoker/CMakeLists.txt
@@ -6,7 +6,13 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall)
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments)
 
 add_library(callinvoker INTERFACE)
 
diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK
index 0f23dd8fea8c..c22ce5b7d065 100644
--- a/ReactCommon/cxxreact/BUCK
+++ b/ReactCommon/cxxreact/BUCK
@@ -12,17 +12,17 @@ rn_xplat_cxx_library(
         ],
         prefix = "cxxreact",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = get_apple_compiler_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
-        "//xplat/folly:molly",
+        "//xplat/folly:dynamic",
     ],
 )
 
@@ -36,18 +36,23 @@ rn_xplat_cxx_library(
         [("", "JSBigString.h")],
         prefix = "cxxreact",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = get_apple_compiler_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
+        "//third-party/glog:glog",
+        "//xplat/folly:exception",
         "//xplat/folly:memory",
-        "//xplat/folly:molly",
+        "//xplat/folly:portability_fcntl",
+        "//xplat/folly:portability_sys_mman",
+        "//xplat/folly:portability_sys_stat",
+        "//xplat/folly:portability_unistd",
         "//xplat/folly:scope_guard",
     ],
 )
@@ -60,10 +65,10 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-fno-omit-frame-pointer",
     ],
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = get_apple_compiler_flags(),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     soname = "libxplat_react_module_samplemodule.$(ext)",
     visibility = [
@@ -73,7 +78,6 @@ rn_xplat_cxx_library(
         ":module",
         "//third-party/glog:glog",
         "//xplat/folly:memory",
-        "//xplat/folly:molly",
     ],
 )
 
@@ -118,13 +122,13 @@ rn_xplat_cxx_library(
         )
         for header in CXXREACT_PUBLIC_HEADERS
     ]),
+    compiler_flags_pedantic = True,
     fbandroid_preprocessor_flags = get_android_inspector_flags(),
     fbobjc_compiler_flags = get_apple_compiler_flags(),
     fbobjc_force_static = True,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -139,17 +143,19 @@ rn_xplat_cxx_library(
     deps = [
         ":jsbigstring",
         ":module",
+        "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
+        "//xplat/folly:conv",
+        "//xplat/folly:dynamic",
+        "//xplat/folly:json",
         "//xplat/folly:memory",
-        "//xplat/folly:molly",
+        "//xplat/folly:move_wrapper",
+        "//xplat/folly:optional",
         "//xplat/jsi:jsi",
         react_native_xplat_target("callinvoker:callinvoker"),
         react_native_xplat_target("jsinspector:jsinspector"),
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
         react_native_xplat_target("reactperflogger:reactperflogger"),
         react_native_xplat_target("logger:logger"),
-        "//third-party/glog:glog",
-        "//xplat/folly:optional",
     ],
 )
diff --git a/ReactCommon/cxxreact/CxxNativeModule.cpp b/ReactCommon/cxxreact/CxxNativeModule.cpp
index fbfdaa0aeb41..ef5c5ea532b6 100644
--- a/ReactCommon/cxxreact/CxxNativeModule.cpp
+++ b/ReactCommon/cxxreact/CxxNativeModule.cpp
@@ -185,34 +185,42 @@ void CxxNativeModule::invoke(
   // stack.  I'm told that will be possible in the future.  TODO
   // mhorowitz #7128529: convert C++ exceptions to Java
 
-  messageQueueThread_->runOnQueue(
-      [method, params = std::move(params), first, second, callId]() {
+  const auto &moduleName = name_;
+  SystraceSection s(
+      "CxxMethodCallQueue", "module", moduleName, "method", method.name);
+  messageQueueThread_->runOnQueue([method,
+                                   moduleName,
+                                   params = std::move(params),
+                                   first,
+                                   second,
+                                   callId]() {
 #ifdef WITH_FBSYSTRACE
-        if (callId != -1) {
-          fbsystrace_end_async_flow(TRACE_TAG_REACT_APPS, "native", callId);
-        }
+    if (callId != -1) {
+      fbsystrace_end_async_flow(TRACE_TAG_REACT_APPS, "native", callId);
+    }
 #else
-        (void)(callId);
+    (void)(callId);
 #endif
-        SystraceSection s(method.name.c_str());
-        try {
-          method.func(std::move(params), first, second);
-        } catch (const facebook::xplat::JsArgumentException &ex) {
-          throw;
-        } catch (std::exception &e) {
-          LOG(ERROR) << "std::exception. Method call " << method.name.c_str()
-                     << " failed: " << e.what();
-          std::terminate();
-        } catch (std::string &error) {
-          LOG(ERROR) << "std::string. Method call " << method.name.c_str()
-                     << " failed: " << error.c_str();
-          std::terminate();
-        } catch (...) {
-          LOG(ERROR) << "Method call " << method.name.c_str()
-                     << " failed. unknown error";
-          std::terminate();
-        }
-      });
+    SystraceSection s(
+        "CxxMethodCallDispatch", "module", moduleName, "method", method.name);
+    try {
+      method.func(std::move(params), first, second);
+    } catch (const facebook::xplat::JsArgumentException &ex) {
+      throw;
+    } catch (std::exception &e) {
+      LOG(ERROR) << "std::exception. Method call " << method.name.c_str()
+                 << " failed: " << e.what();
+      std::terminate();
+    } catch (std::string &error) {
+      LOG(ERROR) << "std::string. Method call " << method.name.c_str()
+                 << " failed: " << error.c_str();
+      std::terminate();
+    } catch (...) {
+      LOG(ERROR) << "Method call " << method.name.c_str()
+                 << " failed. unknown error";
+      std::terminate();
+    }
+  });
 }
 
 MethodCallResult CxxNativeModule::callSerializableNativeHook(
diff --git a/ReactCommon/cxxreact/JSBundleType.h b/ReactCommon/cxxreact/JSBundleType.h
index a9cdbc806a78..0dee53c0be91 100644
--- a/ReactCommon/cxxreact/JSBundleType.h
+++ b/ReactCommon/cxxreact/JSBundleType.h
@@ -36,16 +36,19 @@ enum struct ScriptTag {
  * bytes from a bundle in a way that gives access to that information.
  */
 FOLLY_PACK_PUSH
+
+struct FOLLY_PACK_ATTR Magic32 {
+  uint32_t value;
+  uint32_t reserved_;
+};
+
 struct FOLLY_PACK_ATTR BundleHeader {
   BundleHeader() {
     std::memset(this, 0, sizeof(BundleHeader));
   }
 
   union {
-    struct {
-      uint32_t value;
-      uint32_t reserved_;
-    } magic32;
+    Magic32 magic32;
     uint64_t magic64;
   };
   uint32_t version;
diff --git a/ReactCommon/cxxreact/JSExecutor.h b/ReactCommon/cxxreact/JSExecutor.h
index 18125ed04274..4d6e45f9c379 100644
--- a/ReactCommon/cxxreact/JSExecutor.h
+++ b/ReactCommon/cxxreact/JSExecutor.h
@@ -128,8 +128,7 @@ class RN_EXPORT JSExecutor {
    */
   virtual std::string getDescription() = 0;
 
-  virtual void handleMemoryPressure(__attribute__((unused)) int pressureLevel) {
-  }
+  virtual void handleMemoryPressure([[maybe_unused]] int pressureLevel) {}
 
   virtual void destroy() {}
   virtual ~JSExecutor() {}
diff --git a/ReactCommon/cxxreact/NativeToJsBridge.cpp b/ReactCommon/cxxreact/NativeToJsBridge.cpp
index 88a933915e84..ce54a90dea0a 100644
--- a/ReactCommon/cxxreact/NativeToJsBridge.cpp
+++ b/ReactCommon/cxxreact/NativeToJsBridge.cpp
@@ -52,7 +52,7 @@ class JsToNativeBridge : public react::ExecutorDelegate {
   }
 
   void callNativeModules(
-      __attribute__((unused)) JSExecutor &executor,
+      [[maybe_unused]] JSExecutor &executor,
       folly::dynamic &&calls,
       bool isEndOfBatch) override {
     CHECK(m_registry || calls.empty())
@@ -85,7 +85,7 @@ class JsToNativeBridge : public react::ExecutorDelegate {
   }
 
   MethodCallResult callSerializableNativeHook(
-      __attribute__((unused)) JSExecutor &executor,
+      [[maybe_unused]] JSExecutor &executor,
       unsigned int moduleId,
       unsigned int methodId,
       folly::dynamic &&args) override {
diff --git a/ReactCommon/cxxreact/React-cxxreact.podspec b/ReactCommon/cxxreact/React-cxxreact.podspec
index c4498e9d3f1f..8888f8547334 100644
--- a/ReactCommon/cxxreact/React-cxxreact.podspec
+++ b/ReactCommon/cxxreact/React-cxxreact.podspec
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "12.4", :tvos => "12.4" }
+  s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "*.{cpp,h}"
   s.exclude_files          = "SampleCxxModule.*"
diff --git a/ReactCommon/cxxreact/ReactNativeVersion.h b/ReactCommon/cxxreact/ReactNativeVersion.h
index 631530267251..8f2f6d86256c 100644
--- a/ReactCommon/cxxreact/ReactNativeVersion.h
+++ b/ReactCommon/cxxreact/ReactNativeVersion.h
@@ -16,9 +16,9 @@ namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
-  int32_t Minor = 0;
+  int32_t Minor = 71;
   int32_t Patch = 0;
-  std::string_view Prerelease = "";
+  std::string_view Prerelease = "rc.5";
 } ReactNativeVersion;
 
 } // namespace facebook::react
diff --git a/ReactCommon/cxxreact/SampleCxxModule.cpp b/ReactCommon/cxxreact/SampleCxxModule.cpp
index c84aa1594ec4..2474be8ad689 100644
--- a/ReactCommon/cxxreact/SampleCxxModule.cpp
+++ b/ReactCommon/cxxreact/SampleCxxModule.cpp
@@ -163,7 +163,7 @@ void SampleCxxModule::save(folly::dynamic args) {
   sample_->save(std::move(m));
 }
 
-void SampleCxxModule::load(__unused folly::dynamic args, Callback cb) {
+void SampleCxxModule::load([[maybe_unused]] folly::dynamic args, Callback cb) {
   dynamic d = dynamic::object;
   for (const auto &p : sample_->load()) {
     d.insert(p.first, p.second);
diff --git a/ReactCommon/cxxreact/SystraceSection.h b/ReactCommon/cxxreact/SystraceSection.h
index 3527f09fe7eb..46996ff2bb74 100644
--- a/ReactCommon/cxxreact/SystraceSection.h
+++ b/ReactCommon/cxxreact/SystraceSection.h
@@ -14,6 +14,16 @@
 namespace facebook {
 namespace react {
 
+/**
+ * Allow providing an fbsystrace implementation that can short-circuit out
+ * quickly and can throttle too frequent events so we can get useful traces even
+ * if rendering etc. is spinning. For throttling we'll need file/line info so we
+ * use a macro.
+ */
+#if defined(WITH_LOOM_TRACE)
+#define SystraceSection                                         \
+  static constexpr const char systraceSectionFile[] = __FILE__; \
+  fbsystrace::FbSystraceSection<systraceSectionFile, __LINE__>
 /**
  * This is a convenience class to avoid lots of verbose profiling
  * #ifdefs.  If WITH_FBSYSTRACE is not defined, the optimizer will
@@ -23,7 +33,7 @@ namespace react {
  * different values in different files, there is no inconsistency in the sizes
  * of defined symbols.
  */
-#ifdef WITH_FBSYSTRACE
+#elif defined(WITH_FBSYSTRACE)
 struct ConcreteSystraceSection {
  public:
   template <typename... ConvertsToStringPiece>
diff --git a/ReactCommon/hermes/React-hermes.podspec b/ReactCommon/hermes/React-hermes.podspec
index d08e5b68a7ca..bb20d12e242b 100644
--- a/ReactCommon/hermes/React-hermes.podspec
+++ b/ReactCommon/hermes/React-hermes.podspec
@@ -5,6 +5,10 @@
 
 require "json"
 
+# Whether Hermes is built for Release or Debug is determined by the PRODUCTION envvar.
+build_type = ENV['PRODUCTION'] == "1" ? :release : :debug
+
+# package.json
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
@@ -23,9 +27,9 @@ boost_compiler_flags = '-Wno-documentation'
 Pod::Spec.new do |s|
   s.name                   = "React-hermes"
   s.version                = version
-  s.summary                = "-"  # TODO
+  s.summary                = "Hermes engine for React Native"
   s.homepage               = "https://reactnative.dev/"
-  s.license                = package["license"]
+  s.license                = package['license']
   s.author                 = "Facebook, Inc. and its affiliates"
   s.platforms              = { :osx => "10.14", :ios => "12.4" }
   s.source                 = source
@@ -36,12 +40,10 @@ Pod::Spec.new do |s|
   s.public_header_files    = "executor/HermesExecutorFactory.h"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.pod_target_xcconfig    = {
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/libevent/include\"",
-                               "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1",
-                             }
+                               "HEADER_SEARCH_PATHS" => "\"${PODS_ROOT}/hermes-engine/destroot/include\" \"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/libevent/include\""
+                             }.merge!(build_type == :debug ? { "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1" } : {})
   s.header_dir             = "reacthermes"
   s.dependency "React-cxxreact", version
-  s.dependency "React-jsi", version
   s.dependency "React-jsiexecutor", version
   s.dependency "React-jsinspector", version
   s.dependency "React-perflogger", version
diff --git a/ReactCommon/hermes/executor/CMakeLists.txt b/ReactCommon/hermes/executor/CMakeLists.txt
index a6d8bbac1ddf..10cf67f5f0e7 100644
--- a/ReactCommon/hermes/executor/CMakeLists.txt
+++ b/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
         )
diff --git a/ReactCommon/hermes/executor/HermesExecutorFactory.cpp b/ReactCommon/hermes/executor/HermesExecutorFactory.cpp
index e1ab6c8cdcc6..500eac9340a6 100644
--- a/ReactCommon/hermes/executor/HermesExecutorFactory.cpp
+++ b/ReactCommon/hermes/executor/HermesExecutorFactory.cpp
@@ -41,23 +41,16 @@ class HermesExecutorRuntimeAdapter
     : public facebook::hermes::inspector::RuntimeAdapter {
  public:
   HermesExecutorRuntimeAdapter(
-      std::shared_ptr<Runtime> runtime,
-      HermesRuntime &hermesRuntime,
+      std::shared_ptr<HermesRuntime> runtime,
       std::shared_ptr<MessageQueueThread> thread)
-      : runtime_(runtime),
-        hermesRuntime_(hermesRuntime),
-        thread_(std::move(thread)) {}
+      : runtime_(runtime), thread_(std::move(thread)) {}
 
   virtual ~HermesExecutorRuntimeAdapter() = default;
 
-  jsi::Runtime &getRuntime() override {
+  HermesRuntime &getRuntime() override {
     return *runtime_;
   }
 
-  debugger::Debugger &getDebugger() override {
-    return hermesRuntime_.getDebugger();
-  }
-
   void tickleJs() override {
     // The queue will ensure that runtime_ is still valid when this
     // gets invoked.
@@ -69,8 +62,7 @@ class HermesExecutorRuntimeAdapter
   }
 
  private:
-  std::shared_ptr<Runtime> runtime_;
-  HermesRuntime &hermesRuntime_;
+  std::shared_ptr<HermesRuntime> runtime_;
 
   std::shared_ptr<MessageQueueThread> thread_;
 };
@@ -155,23 +147,28 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
   DecoratedRuntime(
       std::unique_ptr<Runtime> runtime,
       HermesRuntime &hermesRuntime,
-      std::shared_ptr<MessageQueueThread> jsQueue)
+      std::shared_ptr<MessageQueueThread> jsQueue,
+      bool enableDebugger,
+      const std::string &debuggerName)
       : jsi::WithRuntimeDecorator<ReentrancyCheck>(*runtime, reentrancyCheck_),
-        runtime_(std::move(runtime)),
-        hermesRuntime_(hermesRuntime) {
+        runtime_(std::move(runtime)) {
 #ifdef HERMES_ENABLE_DEBUGGER
-    auto adapter = std::make_unique<HermesExecutorRuntimeAdapter>(
-        runtime_, hermesRuntime_, jsQueue);
-    facebook::hermes::inspector::chrome::enableDebugging(
-        std::move(adapter), "Hermes React Native");
-#else
-    (void)hermesRuntime_;
+    enableDebugger_ = enableDebugger;
+    if (enableDebugger_) {
+      std::shared_ptr<HermesRuntime> rt(runtime_, &hermesRuntime);
+      auto adapter =
+          std::make_unique<HermesExecutorRuntimeAdapter>(rt, jsQueue);
+      debugToken_ = facebook::hermes::inspector::chrome::enableDebugging(
+          std::move(adapter), debuggerName);
+    }
 #endif
   }
 
   ~DecoratedRuntime() {
 #ifdef HERMES_ENABLE_DEBUGGER
-    facebook::hermes::inspector::chrome::disableDebugging(*runtime_);
+    if (enableDebugger_) {
+      facebook::hermes::inspector::chrome::disableDebugging(debugToken_);
+    }
 #endif
   }
 
@@ -185,11 +182,22 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
 
   std::shared_ptr<Runtime> runtime_;
   ReentrancyCheck reentrancyCheck_;
-  HermesRuntime &hermesRuntime_;
+#ifdef HERMES_ENABLE_DEBUGGER
+  bool enableDebugger_;
+  facebook::hermes::inspector::chrome::DebugSessionToken debugToken_;
+#endif
 };
 
 } // namespace
 
+void HermesExecutorFactory::setEnableDebugger(bool enableDebugger) {
+  enableDebugger_ = enableDebugger;
+}
+
+void HermesExecutorFactory::setDebuggerName(const std::string &debuggerName) {
+  debuggerName_ = debuggerName;
+}
+
 std::unique_ptr<JSExecutor> HermesExecutorFactory::createJSExecutor(
     std::shared_ptr<ExecutorDelegate> delegate,
     std::shared_ptr<MessageQueueThread> jsQueue) {
@@ -197,7 +205,11 @@ std::unique_ptr<JSExecutor> HermesExecutorFactory::createJSExecutor(
       makeHermesRuntimeSystraced(runtimeConfig_);
   HermesRuntime &hermesRuntimeRef = *hermesRuntime;
   auto decoratedRuntime = std::make_shared<DecoratedRuntime>(
-      std::move(hermesRuntime), hermesRuntimeRef, jsQueue);
+      std::move(hermesRuntime),
+      hermesRuntimeRef,
+      jsQueue,
+      enableDebugger_,
+      debuggerName_);
 
   // So what do we have now?
   // DecoratedRuntime -> HermesRuntime
@@ -221,6 +233,12 @@ std::unique_ptr<JSExecutor> HermesExecutorFactory::createJSExecutor(
       decoratedRuntime, delegate, jsQueue, timeoutInvoker_, runtimeInstaller_);
 }
 
+::hermes::vm::RuntimeConfig HermesExecutorFactory::defaultRuntimeConfig() {
+  return ::hermes::vm::RuntimeConfig::Builder()
+      .withEnableSampleProfiling(true)
+      .build();
+}
+
 HermesExecutor::HermesExecutor(
     std::shared_ptr<jsi::Runtime> runtime,
     std::shared_ptr<ExecutorDelegate> delegate,
diff --git a/ReactCommon/hermes/executor/HermesExecutorFactory.h b/ReactCommon/hermes/executor/HermesExecutorFactory.h
index 5d4468e3668b..d0d5352ba545 100644
--- a/ReactCommon/hermes/executor/HermesExecutorFactory.h
+++ b/ReactCommon/hermes/executor/HermesExecutorFactory.h
@@ -21,21 +21,29 @@ class HermesExecutorFactory : public JSExecutorFactory {
       JSIExecutor::RuntimeInstaller runtimeInstaller,
       const JSIScopedTimeoutInvoker &timeoutInvoker =
           JSIExecutor::defaultTimeoutInvoker,
-      ::hermes::vm::RuntimeConfig runtimeConfig = ::hermes::vm::RuntimeConfig())
+      ::hermes::vm::RuntimeConfig runtimeConfig = defaultRuntimeConfig())
       : runtimeInstaller_(runtimeInstaller),
         timeoutInvoker_(timeoutInvoker),
         runtimeConfig_(std::move(runtimeConfig)) {
     assert(timeoutInvoker_ && "Should not have empty timeoutInvoker");
   }
 
+  void setEnableDebugger(bool enableDebugger);
+
+  void setDebuggerName(const std::string &debuggerName);
+
   std::unique_ptr<JSExecutor> createJSExecutor(
       std::shared_ptr<ExecutorDelegate> delegate,
       std::shared_ptr<MessageQueueThread> jsQueue) override;
 
  private:
+  static ::hermes::vm::RuntimeConfig defaultRuntimeConfig();
+
   JSIExecutor::RuntimeInstaller runtimeInstaller_;
   JSIScopedTimeoutInvoker timeoutInvoker_;
   ::hermes::vm::RuntimeConfig runtimeConfig_;
+  bool enableDebugger_ = true;
+  std::string debuggerName_ = "Hermes React Native";
 };
 
 class HermesExecutor : public JSIExecutor {
diff --git a/ReactCommon/hermes/inspector/BUCK b/ReactCommon/hermes/inspector/BUCK
index 9099fb6e59da..53bbdb2d0231 100644
--- a/ReactCommon/hermes/inspector/BUCK
+++ b/ReactCommon/hermes/inspector/BUCK
@@ -26,7 +26,6 @@ CFLAGS_BY_MODE = {
 }
 
 CHROME_EXPORTED_HEADERS = [
-    "chrome/AutoAttachUtils.h",
     "chrome/Connection.h",
     "chrome/ConnectionDemux.h",
     "chrome/MessageConverters.h",
@@ -49,7 +48,7 @@ fb_xplat_cxx_library(
     exported_headers = CHROME_EXPORTED_HEADERS,
     compiler_flags = CFLAGS_BY_MODE[hermes_build_mode()],
     fbobjc_header_path_prefix = "hermes/inspector/chrome",
-    labels = ["supermodule:xplat/default/public.hermes"],
+    labels = [],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     tests = [":chrome-tests"],
@@ -117,7 +116,7 @@ fb_xplat_cxx_library(
         "//fbandroid/libraries/fbjni:fbjni",
     ],
     fbobjc_header_path_prefix = "hermes/inspector/detail",
-    labels = ["supermodule:xplat/default/public.hermes"],
+    labels = [],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     tests = [":detail-tests"],
@@ -191,11 +190,11 @@ fb_xplat_cxx_library(
     exported_headers = INSPECTOR_EXPORTED_HEADERS,
     compiler_flags = CFLAGS_BY_MODE[hermes_build_mode()],
     cxx_tests = [":inspector-tests"],
+    exported_preprocessor_flags = get_hermes_shared_library_preprocessor_flags(),
     fbobjc_header_path_prefix = "hermes/inspector",
-    labels = ["supermodule:xplat/default/public.hermes"],
+    labels = [],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
-    preprocessor_flags = get_hermes_shared_library_preprocessor_flags(),
     visibility = [
         "PUBLIC",
     ],
diff --git a/ReactCommon/hermes/inspector/CMakeLists.txt b/ReactCommon/hermes/inspector/CMakeLists.txt
index 14f6f1ce2639..1b4c6a3b59f4 100644
--- a/ReactCommon/hermes/inspector/CMakeLists.txt
+++ b/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
diff --git a/ReactCommon/hermes/inspector/Inspector.cpp b/ReactCommon/hermes/inspector/Inspector.cpp
index 8ec9f82b6b8a..9aafecb214df 100644
--- a/ReactCommon/hermes/inspector/Inspector.cpp
+++ b/ReactCommon/hermes/inspector/Inspector.cpp
@@ -108,7 +108,7 @@ Inspector::Inspector(
     InspectorObserver &observer,
     bool pauseOnFirstStatement)
     : adapter_(adapter),
-      debugger_(adapter->getDebugger()),
+      debugger_(adapter->getRuntime().getDebugger()),
       observer_(observer),
       executor_(std::make_unique<detail::SerialExecutor>("hermes-inspector")) {
   // TODO (t26491391): make tickleJs a real Hermes runtime API
diff --git a/ReactCommon/hermes/inspector/RuntimeAdapter.cpp b/ReactCommon/hermes/inspector/RuntimeAdapter.cpp
index d88ff8256b9b..0085acee3723 100644
--- a/ReactCommon/hermes/inspector/RuntimeAdapter.cpp
+++ b/ReactCommon/hermes/inspector/RuntimeAdapter.cpp
@@ -16,20 +16,15 @@ RuntimeAdapter::~RuntimeAdapter() = default;
 void RuntimeAdapter::tickleJs() {}
 
 SharedRuntimeAdapter::SharedRuntimeAdapter(
-    std::shared_ptr<jsi::Runtime> runtime,
-    debugger::Debugger &debugger)
-    : runtime_(std::move(runtime)), debugger_(debugger) {}
+    std::shared_ptr<HermesRuntime> runtime)
+    : runtime_(std::move(runtime)) {}
 
 SharedRuntimeAdapter::~SharedRuntimeAdapter() = default;
 
-jsi::Runtime &SharedRuntimeAdapter::getRuntime() {
+HermesRuntime &SharedRuntimeAdapter::getRuntime() {
   return *runtime_;
 }
 
-debugger::Debugger &SharedRuntimeAdapter::getDebugger() {
-  return debugger_;
-}
-
 } // namespace inspector
 } // namespace hermes
 } // namespace facebook
diff --git a/ReactCommon/hermes/inspector/RuntimeAdapter.h b/ReactCommon/hermes/inspector/RuntimeAdapter.h
index c07882470239..0e7f06140a92 100644
--- a/ReactCommon/hermes/inspector/RuntimeAdapter.h
+++ b/ReactCommon/hermes/inspector/RuntimeAdapter.h
@@ -37,8 +37,7 @@ class INSPECTOR_EXPORT RuntimeAdapter {
   virtual ~RuntimeAdapter() = 0;
 
   /// getRuntime should return the runtime encapsulated by this adapter.
-  virtual jsi::Runtime &getRuntime() = 0;
-  virtual debugger::Debugger &getDebugger() = 0;
+  virtual HermesRuntime &getRuntime() = 0;
 
   /// tickleJs is a method that subclasses can choose to override to make the
   /// inspector more responsive. If overridden, it should call the "__tickleJs"
@@ -63,17 +62,13 @@ class INSPECTOR_EXPORT RuntimeAdapter {
  */
 class INSPECTOR_EXPORT SharedRuntimeAdapter : public RuntimeAdapter {
  public:
-  SharedRuntimeAdapter(
-      std::shared_ptr<jsi::Runtime> runtime,
-      debugger::Debugger &debugger);
+  SharedRuntimeAdapter(std::shared_ptr<HermesRuntime> runtime);
   ~SharedRuntimeAdapter() override;
 
-  jsi::Runtime &getRuntime() override;
-  debugger::Debugger &getDebugger() override;
+  HermesRuntime &getRuntime() override;
 
  private:
-  std::shared_ptr<jsi::Runtime> runtime_;
-  debugger::Debugger &debugger_;
+  std::shared_ptr<HermesRuntime> runtime_;
 };
 
 } // namespace inspector
diff --git a/ReactCommon/hermes/inspector/chrome/AutoAttachUtils.cpp b/ReactCommon/hermes/inspector/chrome/AutoAttachUtils.cpp
deleted file mode 100644
index 6b787aa51052..000000000000
--- a/ReactCommon/hermes/inspector/chrome/AutoAttachUtils.cpp
+++ /dev/null
@@ -1,151 +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.
- */
-
-#include "AutoAttachUtils.h"
-
-#ifdef _WINDOWS
-namespace facebook {
-namespace hermes {
-namespace inspector {
-namespace chrome {
-bool isNetworkInspected(
-    const std::string &,
-    const std::string &,
-    const std::string &) {
-  return false;
-}
-} // namespace chrome
-} // namespace inspector
-} // namespace hermes
-} // namespace facebook
-
-#else
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <unistd.h>
-
-#include <folly/String.h>
-
-namespace facebook {
-namespace hermes {
-namespace inspector {
-namespace chrome {
-
-// The following code is copied from
-// https://phabricator.intern.facebook.com/diffusion/FBS/browse/master/xplat/js/react-native-github/ReactCommon/cxxreact/JSCExecutor.cpp;431c4d01b7072d9a1a52f8bd6c6ba2ff3e47e25d$250
-bool isNetworkInspected(
-    const std::string &owner,
-    const std::string &app,
-    const std::string &device) {
-  auto connect_socket = [](int socket_desc, std::string address, int port) {
-    if (socket_desc < 0) {
-      close(socket_desc);
-      return false;
-    }
-
-    struct timeval tv;
-    tv.tv_sec = 1;
-    tv.tv_usec = 0;
-    auto sock_opt_rcv_resp = setsockopt(
-        socket_desc,
-        SOL_SOCKET,
-        SO_RCVTIMEO,
-        (const char *)&tv,
-        sizeof(struct timeval));
-    if (sock_opt_rcv_resp < 0) {
-      close(socket_desc);
-      return false;
-    }
-
-    auto sock_opt_snd_resp = setsockopt(
-        socket_desc,
-        SOL_SOCKET,
-        SO_SNDTIMEO,
-        (const char *)&tv,
-        sizeof(struct timeval));
-    if (sock_opt_snd_resp < 0) {
-      close(socket_desc);
-      return false;
-    }
-
-    struct sockaddr_in server;
-    server.sin_addr.s_addr = inet_addr(address.c_str());
-    server.sin_family = AF_INET;
-    server.sin_port = htons(port);
-    auto connect_resp =
-        ::connect(socket_desc, (struct sockaddr *)&server, sizeof(server));
-    if (connect_resp < 0) {
-      ::close(socket_desc);
-      return false;
-    }
-
-    return true;
-  };
-
-  int socket_desc = socket(AF_INET, SOCK_STREAM, 0);
-
-  if (!connect_socket(socket_desc, "127.0.0.1", 8082)) {
-#if defined(__ANDROID__)
-    socket_desc = socket(AF_INET, SOCK_STREAM, 0);
-    if (!connect_socket(socket_desc, "10.0.2.2", 8082) /* emulator */) {
-      socket_desc = socket(AF_INET, SOCK_STREAM, 0);
-      if (!connect_socket(socket_desc, "10.0.3.2", 8082) /* genymotion */) {
-        return false;
-      }
-    }
-#else //! defined(__ANDROID__)
-    return false;
-#endif // defined(__ANDROID__)
-  }
-
-  std::string escapedOwner =
-      folly::uriEscape<std::string>(owner, folly::UriEscapeMode::QUERY);
-  std::string escapedApp =
-      folly::uriEscape<std::string>(app, folly::UriEscapeMode::QUERY);
-  std::string escapedDevice =
-      folly::uriEscape<std::string>(device, folly::UriEscapeMode::QUERY);
-  std::string msg = folly::to<std::string>(
-      "GET /autoattach?title=",
-      escapedOwner,
-      "&app=",
-      escapedApp,
-      "&device=",
-      escapedDevice,
-      " HTTP/1.1\r\n\r\n");
-  auto send_resp = ::send(socket_desc, msg.c_str(), msg.length(), 0);
-  if (send_resp < 0) {
-    close(socket_desc);
-    return false;
-  }
-
-  char server_reply[200];
-  server_reply[199] = '\0';
-  auto recv_resp =
-      ::recv(socket_desc, server_reply, sizeof(server_reply) - 1, 0);
-  if (recv_resp < 0) {
-    close(socket_desc);
-    return false;
-  }
-
-  std::string response(server_reply);
-  if (response.size() < 25) {
-    close(socket_desc);
-    return false;
-  }
-  auto responseCandidate = response.substr(response.size() - 25);
-  auto found =
-      responseCandidate.find("{\"autoattach\":true}") != std::string::npos;
-  close(socket_desc);
-  return found;
-}
-
-} // namespace chrome
-} // namespace inspector
-} // namespace hermes
-} // namespace facebook
-
-#endif
diff --git a/ReactCommon/hermes/inspector/chrome/Connection.cpp b/ReactCommon/hermes/inspector/chrome/Connection.cpp
index b7b264093b22..fbe0a3d35889 100644
--- a/ReactCommon/hermes/inspector/chrome/Connection.cpp
+++ b/ReactCommon/hermes/inspector/chrome/Connection.cpp
@@ -40,6 +40,7 @@ namespace m = ::facebook::hermes::inspector::chrome::message;
 static const char *const kVirtualBreakpointPrefix = "virtualbreakpoint-";
 static const char *const kBeforeScriptWithSourceMapExecution =
     "beforeScriptWithSourceMapExecution";
+static const char *const kUserEnteredScriptPrefix = "userScript";
 
 /*
  * Connection::Impl
@@ -54,7 +55,7 @@ class Connection::Impl : public inspector::InspectorObserver,
       bool waitForDebugger);
   ~Impl();
 
-  jsi::Runtime &getRuntime();
+  HermesRuntime &getRuntime();
   std::string getTitle() const;
 
   bool connect(std::unique_ptr<IRemoteConnection> remoteConn);
@@ -104,9 +105,11 @@ class Connection::Impl : public inspector::InspectorObserver,
   void handle(const m::profiler::StartRequest &req) override;
   void handle(const m::profiler::StopRequest &req) override;
   void handle(const m::runtime::CallFunctionOnRequest &req) override;
+  void handle(const m::runtime::CompileScriptRequest &req) override;
   void handle(const m::runtime::EvaluateRequest &req) override;
   void handle(const m::runtime::GetHeapUsageRequest &req) override;
   void handle(const m::runtime::GetPropertiesRequest &req) override;
+  void handle(const m::runtime::GlobalLexicalScopeNamesRequest &req) override;
   void handle(const m::runtime::RunIfWaitingForDebuggerRequest &req) override;
 
  private:
@@ -139,7 +142,7 @@ class Connection::Impl : public inspector::InspectorObserver,
 
   template <typename C>
   void runInExecutor(int id, C callback) {
-    folly::via(executor_.get(), [cb = std::move(callback)]() { cb(); });
+    executor_->add([cb = std::move(callback)]() { cb(); });
   }
 
   std::shared_ptr<RuntimeAdapter> runtimeAdapter_;
@@ -159,6 +162,10 @@ class Connection::Impl : public inspector::InspectorObserver,
   std::mutex parsedScriptsMutex_;
   std::vector<std::string> parsedScripts_;
 
+  // preparedScripts_ stores user-entered scripts that have been prepared for
+  // execution, and may be invoked by a later command.
+  std::vector<std::shared_ptr<const jsi::PreparedJavaScript>> preparedScripts_;
+
   // Some events are represented as a mode in Hermes but a breakpoint in CDP,
   // e.g. "beforeScriptExecution" and "beforeScriptWithSourceMapExecution".
   // Keep track of these separately. The caller should lock the
@@ -202,7 +209,7 @@ Connection::Impl::Impl(
 
 Connection::Impl::~Impl() = default;
 
-jsi::Runtime &Connection::Impl::getRuntime() {
+HermesRuntime &Connection::Impl::getRuntime() {
   return runtimeAdapter_->getRuntime();
 }
 
@@ -383,8 +390,7 @@ void Connection::Impl::onScriptParsed(
   m::debugger::ScriptParsedNotification note;
   note.scriptId = folly::to<std::string>(info.fileId);
   note.url = info.fileName;
-  // TODO(jpporto): fix test cases sending invalid context id.
-  // note.executionContextId = kHermesExecutionContextId;
+  note.executionContextId = kHermesExecutionContextId;
 
   if (!info.sourceMappingUrl.empty()) {
     note.sourceMapURL = info.sourceMappingUrl;
@@ -729,14 +735,6 @@ void Connection::Impl::handle(
 }
 
 void Connection::Impl::handle(const m::profiler::StartRequest &req) {
-  auto *hermesRT = dynamic_cast<HermesRuntime *>(&getRuntime());
-
-  if (!hermesRT) {
-    sendResponseToClientViaExecutor(m::makeErrorResponse(
-        req.id, m::ErrorCode::ServerError, "Unhandled Runtime kind."));
-    return;
-  }
-
   runInExecutor(req.id, [this, id = req.id]() {
     HermesRuntime::enableSamplingProfiler();
     sendResponseToClient(m::makeOkResponse(id));
@@ -744,13 +742,7 @@ void Connection::Impl::handle(const m::profiler::StartRequest &req) {
 }
 
 void Connection::Impl::handle(const m::profiler::StopRequest &req) {
-  auto *hermesRT = dynamic_cast<HermesRuntime *>(&getRuntime());
-
-  if (!hermesRT) {
-    sendResponseToClientViaExecutor(m::makeErrorResponse(
-        req.id, m::ErrorCode::ServerError, "Unhandled Runtime kind."));
-    return;
-  }
+  HermesRuntime *hermesRT = &getRuntime();
 
   runInExecutor(req.id, [this, id = req.id, hermesRT]() {
     HermesRuntime::disableSamplingProfiler();
@@ -1091,6 +1083,42 @@ void Connection::Impl::handle(const m::runtime::CallFunctionOnRequest &req) {
       .thenError<std::exception>(sendErrorToClient(req.id));
 }
 
+void Connection::Impl::handle(const m::runtime::CompileScriptRequest &req) {
+  auto resp = std::make_shared<m::runtime::CompileScriptResponse>();
+  resp->id = req.id;
+
+  inspector_
+      ->executeIfEnabled(
+          "Runtime.compileScriptRequest",
+          [this, req, resp](const debugger::ProgramState &state) {
+            if (req.executionContextId.hasValue() &&
+                req.executionContextId.value() != kHermesExecutionContextId) {
+              throw std::invalid_argument("Invalid execution context");
+            }
+
+            auto source = std::make_shared<jsi::StringBuffer>(req.expression);
+            std::shared_ptr<const jsi::PreparedJavaScript> preparedScript;
+            try {
+              preparedScript =
+                  getRuntime().prepareJavaScript(source, req.sourceURL);
+            } catch (const facebook::jsi::JSIException &err) {
+              resp->exceptionDetails = m::runtime::ExceptionDetails();
+              resp->exceptionDetails->text = err.what();
+              return;
+            }
+
+            if (req.persistScript) {
+              auto scriptId = folly::to<std::string>(
+                  kUserEnteredScriptPrefix, preparedScripts_.size());
+              preparedScripts_.push_back(std::move(preparedScript));
+              resp->scriptId = scriptId;
+            }
+          })
+      .via(executor_.get())
+      .thenValue([this, resp](auto &&) { sendResponseToClient(*resp); })
+      .thenError<std::exception>(sendErrorToClient(req.id));
+}
+
 void Connection::Impl::handle(const m::runtime::EvaluateRequest &req) {
   auto remoteObjPtr = std::make_shared<m::runtime::RemoteObject>();
 
@@ -1411,20 +1439,14 @@ Connection::Impl::makePropsFromValue(
 }
 
 void Connection::Impl::handle(const m::runtime::GetHeapUsageRequest &req) {
-  auto resp = std::make_shared<m::runtime::GetHeapUsageResponse>();
-  resp->id = req.id;
-
-  inspector_
-      ->executeIfEnabled(
-          "Runtime.getHeapUsage",
-          [this, req, resp](const debugger::ProgramState &state) {
-            auto heapInfo = getRuntime().instrumentation().getHeapInfo(false);
-            resp->usedSize = heapInfo["hermes_allocatedBytes"];
-            resp->totalSize = heapInfo["hermes_heapSize"];
-          })
-      .via(executor_.get())
-      .thenValue([this, resp](auto &&) { sendResponseToClient(*resp); })
-      .thenError<std::exception>(sendErrorToClient(req.id));
+  runInExecutor(req.id, [this, req]() {
+    auto heapInfo = getRuntime().instrumentation().getHeapInfo(false);
+    auto resp = std::make_shared<m::runtime::GetHeapUsageResponse>();
+    resp->id = req.id;
+    resp->usedSize = heapInfo["hermes_allocatedBytes"];
+    resp->totalSize = heapInfo["hermes_heapSize"];
+    sendResponseToClient(*resp);
+  });
 }
 
 void Connection::Impl::handle(const m::runtime::GetPropertiesRequest &req) {
@@ -1451,6 +1473,45 @@ void Connection::Impl::handle(const m::runtime::GetPropertiesRequest &req) {
       .thenError<std::exception>(sendErrorToClient(req.id));
 }
 
+void Connection::Impl::handle(
+    const m::runtime::GlobalLexicalScopeNamesRequest &req) {
+  auto resp = std::make_shared<m::runtime::GlobalLexicalScopeNamesResponse>();
+  resp->id = req.id;
+
+  inspector_
+      ->executeIfEnabled(
+          "Runtime.globalLexicalScopeNames",
+          [req, resp](const debugger::ProgramState &state) {
+            if (req.executionContextId.hasValue() &&
+                req.executionContextId.value() != kHermesExecutionContextId) {
+              throw std::invalid_argument("Invalid execution context");
+            }
+
+            const debugger::LexicalInfo &lexicalInfo = state.getLexicalInfo(0);
+            debugger::ScopeDepth scopeCount = lexicalInfo.getScopesCount();
+            if (scopeCount == 0) {
+              return;
+            }
+
+            const debugger::ScopeDepth globalScopeIndex = scopeCount - 1;
+            uint32_t variableCount =
+                lexicalInfo.getVariablesCountInScope(globalScopeIndex);
+            resp->names.reserve(variableCount);
+            for (uint32_t i = 0; i < variableCount; i++) {
+              debugger::String name =
+                  state.getVariableInfo(0, globalScopeIndex, i).name;
+              // The global scope has some entries prefixed with '?', which are
+              // not valid identifiers.
+              if (!name.empty() && name.front() != '?') {
+                resp->names.push_back(name);
+              }
+            }
+          })
+      .via(executor_.get())
+      .thenValue([this, resp](auto &&) { sendResponseToClient(*resp); })
+      .thenError<std::exception>(sendErrorToClient(req.id));
+}
+
 void Connection::Impl::handle(
     const m::runtime::RunIfWaitingForDebuggerRequest &req) {
   if (inspector_->isAwaitingDebuggerOnStart()) {
@@ -1539,7 +1600,7 @@ Connection::Connection(
 
 Connection::~Connection() = default;
 
-jsi::Runtime &Connection::getRuntime() {
+HermesRuntime &Connection::getRuntime() {
   return impl_->getRuntime();
 }
 
diff --git a/ReactCommon/hermes/inspector/chrome/Connection.h b/ReactCommon/hermes/inspector/chrome/Connection.h
index 92dbbdf4a3a6..2bd8e7d084aa 100644
--- a/ReactCommon/hermes/inspector/chrome/Connection.h
+++ b/ReactCommon/hermes/inspector/chrome/Connection.h
@@ -35,7 +35,7 @@ class INSPECTOR_EXPORT Connection {
   ~Connection();
 
   /// getRuntime returns the underlying runtime being debugged.
-  jsi::Runtime &getRuntime();
+  HermesRuntime &getRuntime();
 
   /// getTitle returns the name of the friendly name of the runtime that's shown
   /// to users in Nuclide.
diff --git a/ReactCommon/hermes/inspector/chrome/ConnectionDemux.cpp b/ReactCommon/hermes/inspector/chrome/ConnectionDemux.cpp
index 7b35662eec8c..51965247a89c 100644
--- a/ReactCommon/hermes/inspector/chrome/ConnectionDemux.cpp
+++ b/ReactCommon/hermes/inspector/chrome/ConnectionDemux.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "ConnectionDemux.h"
-#include "AutoAttachUtils.h"
 #include "Connection.h"
 
 #include <jsinspector/InspectorInterfaces.h>
@@ -63,7 +62,7 @@ ConnectionDemux::ConnectionDemux(facebook::react::IInspector &inspector)
 
 ConnectionDemux::~ConnectionDemux() = default;
 
-int ConnectionDemux::enableDebugging(
+DebugSessionToken ConnectionDemux::enableDebugging(
     std::unique_ptr<RuntimeAdapter> adapter,
     const std::string &title) {
   std::lock_guard<std::mutex> lock(mutex_);
@@ -85,30 +84,18 @@ int ConnectionDemux::enableDebugging(
     removePage(pageId);
   }
 
-  // TODO(hypuk): Provide real app and device names.
   auto waitForDebugger =
-      (inspectedContexts_->find(title) != inspectedContexts_->end()) ||
-      isNetworkInspected(title, "app_name", "device_name");
-
+      (inspectedContexts_->find(title) != inspectedContexts_->end());
   return addPage(
       std::make_shared<Connection>(std::move(adapter), title, waitForDebugger));
 }
 
-void ConnectionDemux::disableDebugging(jsi::Runtime &runtime) {
+void ConnectionDemux::disableDebugging(DebugSessionToken session) {
   std::lock_guard<std::mutex> lock(mutex_);
-
-  for (auto &it : conns_) {
-    int pageId = it.first;
-    auto &conn = it.second;
-
-    if (&(conn->getRuntime()) == &runtime) {
-      removePage(pageId);
-
-      // must break here. removePage mutates conns_, so range-for iterator is
-      // now invalid.
-      break;
-    }
+  if (conns_.find(session) == conns_.end()) {
+    return;
   }
+  removePage(session);
 }
 
 int ConnectionDemux::addPage(std::shared_ptr<Connection> conn) {
@@ -132,6 +119,8 @@ void ConnectionDemux::removePage(int pageId) {
   globalInspector_.removePage(pageId);
 
   auto conn = conns_.at(pageId);
+  std::string title = conn->getTitle();
+  inspectedContexts_->erase(title);
   conn->disconnect();
   conns_.erase(pageId);
 }
diff --git a/ReactCommon/hermes/inspector/chrome/ConnectionDemux.h b/ReactCommon/hermes/inspector/chrome/ConnectionDemux.h
index 7ade9eb89c32..e9510b4b0604 100644
--- a/ReactCommon/hermes/inspector/chrome/ConnectionDemux.h
+++ b/ReactCommon/hermes/inspector/chrome/ConnectionDemux.h
@@ -16,6 +16,7 @@
 #include <hermes/hermes.h>
 #include <hermes/inspector/RuntimeAdapter.h>
 #include <hermes/inspector/chrome/Connection.h>
+#include <hermes/inspector/chrome/Registration.h>
 #include <jsinspector/InspectorInterfaces.h>
 
 namespace facebook {
@@ -36,10 +37,10 @@ class ConnectionDemux {
   ConnectionDemux(const ConnectionDemux &) = delete;
   ConnectionDemux &operator=(const ConnectionDemux &) = delete;
 
-  int enableDebugging(
+  DebugSessionToken enableDebugging(
       std::unique_ptr<RuntimeAdapter> adapter,
       const std::string &title);
-  void disableDebugging(jsi::Runtime &runtime);
+  void disableDebugging(DebugSessionToken session);
 
  private:
   int addPage(std::shared_ptr<Connection> conn);
diff --git a/ReactCommon/hermes/inspector/chrome/MessageConverters.cpp b/ReactCommon/hermes/inspector/chrome/MessageConverters.cpp
index 3ffc17d0b5aa..7bf892d59f45 100644
--- a/ReactCommon/hermes/inspector/chrome/MessageConverters.cpp
+++ b/ReactCommon/hermes/inspector/chrome/MessageConverters.cpp
@@ -211,6 +211,16 @@ m::runtime::RemoteObject m::runtime::makeRemoteObject(
   } else if (value.isString()) {
     result.type = "string";
     result.value = value.getString(runtime).utf8(runtime);
+  } else if (value.isSymbol()) {
+    result.type = "symbol";
+    auto sym = value.getSymbol(runtime);
+    result.description = sym.toString(runtime);
+    result.objectId =
+        objTable.addValue(jsi::Value(std::move(sym)), objectGroup);
+  } else if (value.isBigInt()) {
+    auto strRepresentation =
+        value.getBigInt(runtime).toString(runtime).utf8(runtime) + 'n';
+    result.description = result.unserializableValue = strRepresentation;
   } else if (value.isObject()) {
     jsi::Object obj = value.getObject(runtime);
 
diff --git a/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp b/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp
index 551874682ba5..3ae62d24002f 100644
--- a/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp
+++ b/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) Meta Platforms, Inc. and affiliates. All Rights Reserved.
-// @generated SignedSource<<f6f9a72f332587809b4e50ab054e0a74>>
+// @generated SignedSource<<8397f2428e68a26e014f91fdb77c1eb3>>
 
 #include "MessageTypes.h"
 
@@ -63,9 +63,12 @@ std::unique_ptr<Request> Request::fromJsonThrowOnError(const std::string &str) {
       {"Profiler.start", makeUnique<profiler::StartRequest>},
       {"Profiler.stop", makeUnique<profiler::StopRequest>},
       {"Runtime.callFunctionOn", makeUnique<runtime::CallFunctionOnRequest>},
+      {"Runtime.compileScript", makeUnique<runtime::CompileScriptRequest>},
       {"Runtime.evaluate", makeUnique<runtime::EvaluateRequest>},
       {"Runtime.getHeapUsage", makeUnique<runtime::GetHeapUsageRequest>},
       {"Runtime.getProperties", makeUnique<runtime::GetPropertiesRequest>},
+      {"Runtime.globalLexicalScopeNames",
+       makeUnique<runtime::GlobalLexicalScopeNamesRequest>},
       {"Runtime.runIfWaitingForDebugger",
        makeUnique<runtime::RunIfWaitingForDebuggerRequest>},
   };
@@ -1110,6 +1113,39 @@ void runtime::CallFunctionOnRequest::accept(RequestHandler &handler) const {
   handler.handle(*this);
 }
 
+runtime::CompileScriptRequest::CompileScriptRequest()
+    : Request("Runtime.compileScript") {}
+
+runtime::CompileScriptRequest::CompileScriptRequest(const dynamic &obj)
+    : Request("Runtime.compileScript") {
+  assign(id, obj, "id");
+  assign(method, obj, "method");
+
+  dynamic params = obj.at("params");
+  assign(expression, params, "expression");
+  assign(sourceURL, params, "sourceURL");
+  assign(persistScript, params, "persistScript");
+  assign(executionContextId, params, "executionContextId");
+}
+
+dynamic runtime::CompileScriptRequest::toDynamic() const {
+  dynamic params = dynamic::object;
+  put(params, "expression", expression);
+  put(params, "sourceURL", sourceURL);
+  put(params, "persistScript", persistScript);
+  put(params, "executionContextId", executionContextId);
+
+  dynamic obj = dynamic::object;
+  put(obj, "id", id);
+  put(obj, "method", method);
+  put(obj, "params", std::move(params));
+  return obj;
+}
+
+void runtime::CompileScriptRequest::accept(RequestHandler &handler) const {
+  handler.handle(*this);
+}
+
 runtime::EvaluateRequest::EvaluateRequest() : Request("Runtime.evaluate") {}
 
 runtime::EvaluateRequest::EvaluateRequest(const dynamic &obj)
@@ -1199,6 +1235,38 @@ void runtime::GetPropertiesRequest::accept(RequestHandler &handler) const {
   handler.handle(*this);
 }
 
+runtime::GlobalLexicalScopeNamesRequest::GlobalLexicalScopeNamesRequest()
+    : Request("Runtime.globalLexicalScopeNames") {}
+
+runtime::GlobalLexicalScopeNamesRequest::GlobalLexicalScopeNamesRequest(
+    const dynamic &obj)
+    : Request("Runtime.globalLexicalScopeNames") {
+  assign(id, obj, "id");
+  assign(method, obj, "method");
+
+  auto it = obj.find("params");
+  if (it != obj.items().end()) {
+    dynamic params = it->second;
+    assign(executionContextId, params, "executionContextId");
+  }
+}
+
+dynamic runtime::GlobalLexicalScopeNamesRequest::toDynamic() const {
+  dynamic params = dynamic::object;
+  put(params, "executionContextId", executionContextId);
+
+  dynamic obj = dynamic::object;
+  put(obj, "id", id);
+  put(obj, "method", method);
+  put(obj, "params", std::move(params));
+  return obj;
+}
+
+void runtime::GlobalLexicalScopeNamesRequest::accept(
+    RequestHandler &handler) const {
+  handler.handle(*this);
+}
+
 runtime::RunIfWaitingForDebuggerRequest::RunIfWaitingForDebuggerRequest()
     : Request("Runtime.runIfWaitingForDebugger") {}
 
@@ -1422,6 +1490,25 @@ dynamic runtime::CallFunctionOnResponse::toDynamic() const {
   return obj;
 }
 
+runtime::CompileScriptResponse::CompileScriptResponse(const dynamic &obj) {
+  assign(id, obj, "id");
+
+  dynamic res = obj.at("result");
+  assign(scriptId, res, "scriptId");
+  assign(exceptionDetails, res, "exceptionDetails");
+}
+
+dynamic runtime::CompileScriptResponse::toDynamic() const {
+  dynamic res = dynamic::object;
+  put(res, "scriptId", scriptId);
+  put(res, "exceptionDetails", exceptionDetails);
+
+  dynamic obj = dynamic::object;
+  put(obj, "id", id);
+  put(obj, "result", std::move(res));
+  return obj;
+}
+
 runtime::EvaluateResponse::EvaluateResponse(const dynamic &obj) {
   assign(id, obj, "id");
 
@@ -1481,6 +1568,24 @@ dynamic runtime::GetPropertiesResponse::toDynamic() const {
   return obj;
 }
 
+runtime::GlobalLexicalScopeNamesResponse::GlobalLexicalScopeNamesResponse(
+    const dynamic &obj) {
+  assign(id, obj, "id");
+
+  dynamic res = obj.at("result");
+  assign(names, res, "names");
+}
+
+dynamic runtime::GlobalLexicalScopeNamesResponse::toDynamic() const {
+  dynamic res = dynamic::object;
+  put(res, "names", names);
+
+  dynamic obj = dynamic::object;
+  put(obj, "id", id);
+  put(obj, "result", std::move(res));
+  return obj;
+}
+
 /// Notifications
 debugger::BreakpointResolvedNotification::BreakpointResolvedNotification()
     : Notification("Debugger.breakpointResolved") {}
diff --git a/ReactCommon/hermes/inspector/chrome/MessageTypes.h b/ReactCommon/hermes/inspector/chrome/MessageTypes.h
index c74a21d357e1..fb5e10d32d1a 100644
--- a/ReactCommon/hermes/inspector/chrome/MessageTypes.h
+++ b/ReactCommon/hermes/inspector/chrome/MessageTypes.h
@@ -1,5 +1,5 @@
 // Copyright (c) Meta Platforms, Inc. and affiliates. All Rights Reserved.
-// @generated SignedSource<<fcbcfeecbc72ca30c8ed005ad47839bb>>
+// @generated SignedSource<<2bada3d9c303c840ddcc292c7ba52604>>
 
 #pragma once
 
@@ -52,6 +52,8 @@ struct CallArgument;
 struct CallFrame;
 struct CallFunctionOnRequest;
 struct CallFunctionOnResponse;
+struct CompileScriptRequest;
+struct CompileScriptResponse;
 struct ConsoleAPICalledNotification;
 struct EvaluateRequest;
 struct EvaluateResponse;
@@ -63,6 +65,8 @@ struct GetHeapUsageRequest;
 struct GetHeapUsageResponse;
 struct GetPropertiesRequest;
 struct GetPropertiesResponse;
+struct GlobalLexicalScopeNamesRequest;
+struct GlobalLexicalScopeNamesResponse;
 struct InternalPropertyDescriptor;
 struct PropertyDescriptor;
 struct RemoteObject;
@@ -139,9 +143,11 @@ struct RequestHandler {
   virtual void handle(const profiler::StartRequest &req) = 0;
   virtual void handle(const profiler::StopRequest &req) = 0;
   virtual void handle(const runtime::CallFunctionOnRequest &req) = 0;
+  virtual void handle(const runtime::CompileScriptRequest &req) = 0;
   virtual void handle(const runtime::EvaluateRequest &req) = 0;
   virtual void handle(const runtime::GetHeapUsageRequest &req) = 0;
   virtual void handle(const runtime::GetPropertiesRequest &req) = 0;
+  virtual void handle(const runtime::GlobalLexicalScopeNamesRequest &req) = 0;
   virtual void handle(const runtime::RunIfWaitingForDebuggerRequest &req) = 0;
 };
 
@@ -177,9 +183,11 @@ struct NoopRequestHandler : public RequestHandler {
   void handle(const profiler::StartRequest &req) override {}
   void handle(const profiler::StopRequest &req) override {}
   void handle(const runtime::CallFunctionOnRequest &req) override {}
+  void handle(const runtime::CompileScriptRequest &req) override {}
   void handle(const runtime::EvaluateRequest &req) override {}
   void handle(const runtime::GetHeapUsageRequest &req) override {}
   void handle(const runtime::GetPropertiesRequest &req) override {}
+  void handle(const runtime::GlobalLexicalScopeNamesRequest &req) override {}
   void handle(const runtime::RunIfWaitingForDebuggerRequest &req) override {}
 };
 
@@ -650,6 +658,19 @@ struct runtime::CallFunctionOnRequest : public Request {
   folly::Optional<std::string> objectGroup;
 };
 
+struct runtime::CompileScriptRequest : public Request {
+  CompileScriptRequest();
+  explicit CompileScriptRequest(const folly::dynamic &obj);
+
+  folly::dynamic toDynamic() const override;
+  void accept(RequestHandler &handler) const override;
+
+  std::string expression;
+  std::string sourceURL;
+  bool persistScript{};
+  folly::Optional<runtime::ExecutionContextId> executionContextId;
+};
+
 struct runtime::EvaluateRequest : public Request {
   EvaluateRequest();
   explicit EvaluateRequest(const folly::dynamic &obj);
@@ -686,6 +707,16 @@ struct runtime::GetPropertiesRequest : public Request {
   folly::Optional<bool> ownProperties;
 };
 
+struct runtime::GlobalLexicalScopeNamesRequest : public Request {
+  GlobalLexicalScopeNamesRequest();
+  explicit GlobalLexicalScopeNamesRequest(const folly::dynamic &obj);
+
+  folly::dynamic toDynamic() const override;
+  void accept(RequestHandler &handler) const override;
+
+  folly::Optional<runtime::ExecutionContextId> executionContextId;
+};
+
 struct runtime::RunIfWaitingForDebuggerRequest : public Request {
   RunIfWaitingForDebuggerRequest();
   explicit RunIfWaitingForDebuggerRequest(const folly::dynamic &obj);
@@ -787,6 +818,15 @@ struct runtime::CallFunctionOnResponse : public Response {
   folly::Optional<runtime::ExceptionDetails> exceptionDetails;
 };
 
+struct runtime::CompileScriptResponse : public Response {
+  CompileScriptResponse() = default;
+  explicit CompileScriptResponse(const folly::dynamic &obj);
+  folly::dynamic toDynamic() const override;
+
+  folly::Optional<runtime::ScriptId> scriptId;
+  folly::Optional<runtime::ExceptionDetails> exceptionDetails;
+};
+
 struct runtime::EvaluateResponse : public Response {
   EvaluateResponse() = default;
   explicit EvaluateResponse(const folly::dynamic &obj);
@@ -816,6 +856,14 @@ struct runtime::GetPropertiesResponse : public Response {
   folly::Optional<runtime::ExceptionDetails> exceptionDetails;
 };
 
+struct runtime::GlobalLexicalScopeNamesResponse : public Response {
+  GlobalLexicalScopeNamesResponse() = default;
+  explicit GlobalLexicalScopeNamesResponse(const folly::dynamic &obj);
+  folly::dynamic toDynamic() const override;
+
+  std::vector<std::string> names;
+};
+
 /// Notifications
 struct debugger::BreakpointResolvedNotification : public Notification {
   BreakpointResolvedNotification();
diff --git a/ReactCommon/hermes/inspector/chrome/Registration.cpp b/ReactCommon/hermes/inspector/chrome/Registration.cpp
index 4f0baf27eaed..4560b94950c8 100644
--- a/ReactCommon/hermes/inspector/chrome/Registration.cpp
+++ b/ReactCommon/hermes/inspector/chrome/Registration.cpp
@@ -22,14 +22,14 @@ ConnectionDemux &demux() {
 
 } // namespace
 
-void enableDebugging(
+DebugSessionToken enableDebugging(
     std::unique_ptr<RuntimeAdapter> adapter,
     const std::string &title) {
-  demux().enableDebugging(std::move(adapter), title);
+  return demux().enableDebugging(std::move(adapter), title);
 }
 
-void disableDebugging(jsi::Runtime &runtime) {
-  demux().disableDebugging(runtime);
+void disableDebugging(DebugSessionToken session) {
+  demux().disableDebugging(session);
 }
 
 } // namespace chrome
diff --git a/ReactCommon/hermes/inspector/chrome/Registration.h b/ReactCommon/hermes/inspector/chrome/Registration.h
index f14ac7f31929..d4a5ef578922 100644
--- a/ReactCommon/hermes/inspector/chrome/Registration.h
+++ b/ReactCommon/hermes/inspector/chrome/Registration.h
@@ -18,20 +18,24 @@ namespace hermes {
 namespace inspector {
 namespace chrome {
 
+using DebugSessionToken = int;
+
 /*
  * enableDebugging adds this runtime to the list of debuggable JS targets
- * (called "pages" in the higher-leavel React Native API) in this process. It
- * should be called before any JS runs in the runtime.
+ * (called "pages" in the higher-level React Native API) in this process. It
+ * should be called before any JS runs in the runtime. The returned token
+ * can be used to disable debugging for this runtime.
  */
-extern void enableDebugging(
+extern DebugSessionToken enableDebugging(
     std::unique_ptr<RuntimeAdapter> adapter,
     const std::string &title);
 
 /*
  * disableDebugging removes this runtime from the list of debuggable JS targets
- * in this process.
+ * in this process. The runtime to remove is identified by the token returned
+ * from enableDebugging.
  */
-extern void disableDebugging(jsi::Runtime &runtime);
+extern void disableDebugging(DebugSessionToken session);
 
 } // namespace chrome
 } // namespace inspector
diff --git a/ReactCommon/hermes/inspector/chrome/cli/main.cpp b/ReactCommon/hermes/inspector/chrome/cli/main.cpp
index 8071bcc11aab..1dbeb9995958 100644
--- a/ReactCommon/hermes/inspector/chrome/cli/main.cpp
+++ b/ReactCommon/hermes/inspector/chrome/cli/main.cpp
@@ -213,9 +213,11 @@ static void runDebuggerLoop(
 
 static void runScript(const std::string &scriptSource, const std::string &url) {
   std::shared_ptr<fbhermes::HermesRuntime> runtime(
-      fbhermes::makeHermesRuntime());
-  auto adapter = std::make_unique<fbhermes::inspector::SharedRuntimeAdapter>(
-      runtime, runtime->getDebugger());
+      fbhermes::makeHermesRuntime(::hermes::vm::RuntimeConfig::Builder()
+                                      .withEnableSampleProfiling(true)
+                                      .build()));
+  auto adapter =
+      std::make_unique<fbhermes::inspector::SharedRuntimeAdapter>(runtime);
   fbhermes::inspector::chrome::Connection conn(
       std::move(adapter), "hermes-chrome-debug-server");
   std::thread debuggerLoop(runDebuggerLoop, std::ref(conn), scriptSource);
diff --git a/ReactCommon/hermes/inspector/chrome/tests/ConnectionDemuxTests.cpp b/ReactCommon/hermes/inspector/chrome/tests/ConnectionDemuxTests.cpp
index 4250ee3ac7e7..02f38c085cea 100644
--- a/ReactCommon/hermes/inspector/chrome/tests/ConnectionDemuxTests.cpp
+++ b/ReactCommon/hermes/inspector/chrome/tests/ConnectionDemuxTests.cpp
@@ -98,11 +98,9 @@ TEST(ConnectionDemuxTests, TestEnableDisable) {
   ConnectionDemux demux{*inspector};
 
   int id1 = demux.enableDebugging(
-      std::make_unique<SharedRuntimeAdapter>(runtime1, runtime1->getDebugger()),
-      "page1");
+      std::make_unique<SharedRuntimeAdapter>(runtime1), "page1");
   int id2 = demux.enableDebugging(
-      std::make_unique<SharedRuntimeAdapter>(runtime2, runtime2->getDebugger()),
-      "page2");
+      std::make_unique<SharedRuntimeAdapter>(runtime2), "page2");
 
   expectPages(*inspector, {{id1, "page1"}, {id2, "page2"}});
 
@@ -126,7 +124,7 @@ TEST(ConnectionDemuxTests, TestEnableDisable) {
 
   // Disable debugging on runtime2. This should remove its page from the list
   // and call onDisconnect on its remoteConn
-  demux.disableDebugging(*runtime2);
+  demux.disableDebugging(id2);
   expectPages(*inspector, {{id1, "page1"}});
   remoteData2->expectDisconnected();
 
diff --git a/ReactCommon/hermes/inspector/chrome/tests/ConnectionTests.cpp b/ReactCommon/hermes/inspector/chrome/tests/ConnectionTests.cpp
index b6538ea56e69..64d29f552108 100644
--- a/ReactCommon/hermes/inspector/chrome/tests/ConnectionTests.cpp
+++ b/ReactCommon/hermes/inspector/chrome/tests/ConnectionTests.cpp
@@ -2884,6 +2884,54 @@ TEST(ConnectionTests, testBasicProfilerOperation) {
   asyncRuntime.stop();
 }
 
+TEST(ConnectionTests, testGlobalLexicalScopeNames) {
+  TestContext context;
+  AsyncHermesRuntime &asyncRuntime = context.runtime();
+  SyncConnection &conn = context.conn();
+  int msgId = 1;
+  asyncRuntime.executeScriptAsync(R"(
+    let globalLet = "let";
+    const globalConst = "const";
+    var globalVar = "var";
+
+    let func1 = () => {
+      let local1 = 111;
+      func2();
+    }
+
+    function func2() {
+      let func3 = () => {
+        let local3 = 333;
+        debugger;
+      }
+
+      let local2 = 222;
+      func3();
+    }
+
+    func1();
+  )");
+  send<m::debugger::EnableRequest>(conn, msgId++);
+  expectExecutionContextCreated(conn);
+  expectNotification<m::debugger::ScriptParsedNotification>(conn);
+  expectNotification<m::debugger::PausedNotification>(conn);
+
+  m::runtime::GlobalLexicalScopeNamesRequest req;
+  req.id = msgId;
+  req.executionContextId = 1;
+  conn.send(req.toJson());
+
+  auto resp =
+      expectResponse<m::runtime::GlobalLexicalScopeNamesResponse>(conn, msgId);
+  EXPECT_EQ(resp.id, msgId++);
+  std::sort(resp.names.begin(), resp.names.end());
+  std::vector<std::string> expectedNames{"func1", "globalConst", "globalLet"};
+  EXPECT_EQ(resp.names, expectedNames);
+
+  send<m::debugger::ResumeRequest>(conn, msgId++);
+  expectNotification<m::debugger::ResumedNotification>(conn);
+}
+
 } // namespace chrome
 } // namespace inspector
 } // namespace hermes
diff --git a/ReactCommon/hermes/inspector/chrome/tests/SyncConnection.cpp b/ReactCommon/hermes/inspector/chrome/tests/SyncConnection.cpp
index 60aff01ad0c9..57223de420cc 100644
--- a/ReactCommon/hermes/inspector/chrome/tests/SyncConnection.cpp
+++ b/ReactCommon/hermes/inspector/chrome/tests/SyncConnection.cpp
@@ -56,9 +56,7 @@ SyncConnection::SyncConnection(
     std::shared_ptr<HermesRuntime> runtime,
     bool waitForDebugger)
     : connection_(
-          std::make_unique<SharedRuntimeAdapter>(
-              runtime,
-              runtime->getDebugger()),
+          std::make_unique<SharedRuntimeAdapter>(runtime),
           "testConn",
           waitForDebugger) {
   connection_.connect(std::make_unique<RemoteConnnection>(*this));
diff --git a/ReactCommon/hermes/inspector/tests/InspectorTests.cpp b/ReactCommon/hermes/inspector/tests/InspectorTests.cpp
index 6aa9608cb53d..0be1a7cb6524 100644
--- a/ReactCommon/hermes/inspector/tests/InspectorTests.cpp
+++ b/ReactCommon/hermes/inspector/tests/InspectorTests.cpp
@@ -93,9 +93,7 @@ struct HermesDebugContext {
       folly::Future<Unit> &&finished)
       : runtime(makeHermesRuntime()),
         inspector(
-            std::make_shared<SharedRuntimeAdapter>(
-                runtime,
-                runtime->getDebugger()),
+            std::make_shared<SharedRuntimeAdapter>(runtime),
             observer,
             false),
         stopFlag(false),
diff --git a/ReactCommon/hermes/inspector/tools/message_types.txt b/ReactCommon/hermes/inspector/tools/message_types.txt
index 801ff6a49dce..dec6c3d4afe1 100644
--- a/ReactCommon/hermes/inspector/tools/message_types.txt
+++ b/ReactCommon/hermes/inspector/tools/message_types.txt
@@ -37,3 +37,5 @@ Runtime.executionContextCreated
 Runtime.getHeapUsage
 Runtime.getProperties
 Runtime.runIfWaitingForDebugger
+Runtime.globalLexicalScopeNames
+Runtime.compileScript
diff --git a/ReactCommon/hermes/inspector/tools/msggen/package.json b/ReactCommon/hermes/inspector/tools/msggen/package.json
deleted file mode 100644
index b3dcba4544fb..000000000000
--- a/ReactCommon/hermes/inspector/tools/msggen/package.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "name": "hermes-inspector-msggen",
-  "version": "1.0.0",
-  "license": "MIT",
-  "bin": {
-    "msggen": "./bin/index.js"
-  },
-  "scripts": {
-    "flow": "flow",
-    "build": "babel src --out-dir bin --source-maps",
-    "watch": "babel src --out-dir bin --source-maps --watch",
-    "test": "jest"
-  },
-  "dependencies": {
-    "devtools-protocol": "0.0.959523",
-    "yargs": "^14.2.0"
-  },
-  "devDependencies": {
-    "@babel/cli": "^7.2.0",
-    "@babel/core": "^7.2.0",
-    "@babel/plugin-syntax-flow": "^7.2.0",
-    "@babel/plugin-transform-flow-strip-types": "^7.2.0",
-    "@babel/preset-env": "^7.2.0",
-    "@babel/preset-flow": "^7.2.0",
-    "diff": "3.5.0",
-    "extend": "3.0.2",
-    "jest": "^26.6.3",
-    "nwmatcher": "1.4.4",
-    "randomatic": "3.0.0",
-    "sshpk": "1.16.1",
-    "webpack": "^4.41.0"
-  },
-  "resolutions": {
-    "set-value": "^4.1.0"
-  },
-  "jest": {
-    "transform": {
-      ".*": "<rootDir>/node_modules/babel-jest"
-    }
-  }
-}
diff --git a/ReactCommon/hermes/inspector/tools/msggen/yarn.lock b/ReactCommon/hermes/inspector/tools/msggen/yarn.lock
deleted file mode 100644
index 40a02746282e..000000000000
--- a/ReactCommon/hermes/inspector/tools/msggen/yarn.lock
+++ /dev/null
@@ -1,6088 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@babel/cli@^7.2.0":
-  version "7.7.7"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.7.7.tgz#56849acbf81d1a970dd3d1b3097c8ebf5da3f534"
-  integrity sha512-XQw5KyCZyu/M8/0rYiZyuwbgIQNzOrJzs9dDLX+MieSgBwTLvTj4QVbLmxJACAIvQIDT7PtyHN2sC48EOWTgaA==
-  dependencies:
-    commander "^4.0.1"
-    convert-source-map "^1.1.0"
-    fs-readdir-recursive "^1.1.0"
-    glob "^7.0.0"
-    lodash "^4.17.13"
-    make-dir "^2.1.0"
-    slash "^2.0.0"
-    source-map "^0.5.0"
-  optionalDependencies:
-    chokidar "^2.1.8"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
-  integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==
-  dependencies:
-    "@babel/highlight" "^7.0.0"
-
-"@babel/code-frame@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
-  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
-  dependencies:
-    "@babel/highlight" "^7.12.13"
-
-"@babel/compat-data@^7.13.15":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4"
-  integrity sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==
-
-"@babel/core@^7.1.0", "@babel/core@^7.2.0":
-  version "7.7.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.7.tgz#ee155d2e12300bcc0cff6a8ad46f2af5063803e9"
-  integrity sha512-jlSjuj/7z138NLZALxVgrx13AOtqip42ATZP7+kYl53GvDV6+4dCek1mVUo8z8c8Xnw/mx2q3d9HWh3griuesQ==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.7.7"
-    "@babel/helpers" "^7.7.4"
-    "@babel/parser" "^7.7.7"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    json5 "^2.1.0"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/core@^7.7.5":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.16.tgz#7756ab24396cc9675f1c3fcd5b79fcce192ea96a"
-  integrity sha512-sXHpixBiWWFti0AV2Zq7avpTasr6sIAu7Y396c608541qAU2ui4a193m0KSQmfPSKFZLnQ3cvlKDOm3XkuXm3Q==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.16"
-    "@babel/helper-compilation-targets" "^7.13.16"
-    "@babel/helper-module-transforms" "^7.13.14"
-    "@babel/helpers" "^7.13.16"
-    "@babel/parser" "^7.13.16"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.15"
-    "@babel/types" "^7.13.16"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
-    semver "^6.3.0"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.13.16":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.16.tgz#0befc287031a201d84cdfc173b46b320ae472d14"
-  integrity sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg==
-  dependencies:
-    "@babel/types" "^7.13.16"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.7.4", "@babel/generator@^7.7.7":
-  version "7.7.7"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.7.tgz#859ac733c44c74148e1a72980a64ec84b85f4f45"
-  integrity sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==
-  dependencies:
-    "@babel/types" "^7.7.4"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
-"@babel/helper-annotate-as-pure@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz#bb3faf1e74b74bd547e867e48f551fa6b098b6ce"
-  integrity sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og==
-  dependencies:
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz#5f73f2b28580e224b5b9bd03146a4015d6217f5f"
-  integrity sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-call-delegate@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz#621b83e596722b50c0066f9dc37d3232e461b801"
-  integrity sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-compilation-targets@^7.13.16":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c"
-  integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==
-  dependencies:
-    "@babel/compat-data" "^7.13.15"
-    "@babel/helper-validator-option" "^7.12.17"
-    browserslist "^4.14.5"
-    semver "^6.3.0"
-
-"@babel/helper-create-regexp-features-plugin@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz#6d5762359fd34f4da1500e4cff9955b5299aaf59"
-  integrity sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A==
-  dependencies:
-    "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.6.0"
-
-"@babel/helper-define-map@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz#2841bf92eb8bd9c906851546fe6b9d45e162f176"
-  integrity sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg==
-  dependencies:
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/types" "^7.7.4"
-    lodash "^4.17.13"
-
-"@babel/helper-explode-assignable-expression@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz#fa700878e008d85dc51ba43e9fb835cddfe05c84"
-  integrity sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg==
-  dependencies:
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-function-name@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
-  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.12.13"
-    "@babel/template" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-function-name@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e"
-  integrity sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-get-function-arity@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
-  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-get-function-arity@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0"
-  integrity sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==
-  dependencies:
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-hoist-variables@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz#612384e3d823fdfaaf9fce31550fe5d4db0f3d12"
-  integrity sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ==
-  dependencies:
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-member-expression-to-functions@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
-  integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-member-expression-to-functions@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz#356438e2569df7321a8326644d4b790d2122cb74"
-  integrity sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==
-  dependencies:
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-module-imports@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
-  integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-module-imports@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz#e5a92529f8888bf319a6376abfbd1cebc491ad91"
-  integrity sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ==
-  dependencies:
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-module-transforms@^7.13.14":
-  version "7.13.14"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef"
-  integrity sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==
-  dependencies:
-    "@babel/helper-module-imports" "^7.13.12"
-    "@babel/helper-replace-supers" "^7.13.12"
-    "@babel/helper-simple-access" "^7.13.12"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/helper-validator-identifier" "^7.12.11"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.13"
-    "@babel/types" "^7.13.14"
-
-"@babel/helper-module-transforms@^7.7.4", "@babel/helper-module-transforms@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz#d044da7ffd91ec967db25cd6748f704b6b244835"
-  integrity sha512-A7pSxyJf1gN5qXVcidwLWydjftUN878VkalhXX5iQDuGyiGK3sOrrKKHF4/A4fwHtnsotv/NipwAeLzY4KQPvw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-simple-access" "^7.7.4"
-    "@babel/helper-split-export-declaration" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/types" "^7.7.4"
-    lodash "^4.17.13"
-
-"@babel/helper-optimise-call-expression@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
-  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-optimise-call-expression@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz#034af31370d2995242aa4df402c3b7794b2dcdf2"
-  integrity sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==
-  dependencies:
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-plugin-utils@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
-  integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
-
-"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
-  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
-
-"@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz#0aa6824f7100a2e0e89c1527c23936c152cab351"
-  integrity sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==
-  dependencies:
-    lodash "^4.17.13"
-
-"@babel/helper-remap-async-to-generator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz#c68c2407350d9af0e061ed6726afb4fff16d0234"
-  integrity sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.4"
-    "@babel/helper-wrap-function" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-replace-supers@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
-  integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.13.12"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-replace-supers@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz#3c881a6a6a7571275a72d82e6107126ec9e2cdd2"
-  integrity sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.7.4"
-    "@babel/helper-optimise-call-expression" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-simple-access@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
-  integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-simple-access@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz#a169a0adb1b5f418cfc19f22586b2ebf58a9a294"
-  integrity sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A==
-  dependencies:
-    "@babel/template" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-split-export-declaration@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
-  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-split-export-declaration@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8"
-  integrity sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==
-  dependencies:
-    "@babel/types" "^7.7.4"
-
-"@babel/helper-validator-identifier@^7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
-  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
-
-"@babel/helper-validator-option@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
-  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
-
-"@babel/helper-wrap-function@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz#37ab7fed5150e22d9d7266e830072c0cdd8baace"
-  integrity sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg==
-  dependencies:
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/helpers@^7.13.16":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.17.tgz#b497c7a00e9719d5b613b8982bda6ed3ee94caf6"
-  integrity sha512-Eal4Gce4kGijo1/TGJdqp3WuhllaMLSrW6XcL0ulyUAQOuxHcCafZE8KHg9857gcTehsm/v7RcOx2+jp0Ryjsg==
-  dependencies:
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.17"
-    "@babel/types" "^7.13.17"
-
-"@babel/helpers@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.4.tgz#62c215b9e6c712dadc15a9a0dcab76c92a940302"
-  integrity sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==
-  dependencies:
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/highlight@^7.0.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540"
-  integrity sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^4.0.0"
-
-"@babel/highlight@^7.12.13":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
-  integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.7.4", "@babel/parser@^7.7.7":
-  version "7.7.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.7.tgz#1b886595419cf92d811316d5b715a53ff38b4937"
-  integrity sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==
-
-"@babel/parser@^7.12.13", "@babel/parser@^7.13.16":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz#0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37"
-  integrity sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==
-
-"@babel/plugin-proposal-async-generator-functions@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz#0351c5ac0a9e927845fffd5b82af476947b7ce6d"
-  integrity sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.7.4"
-    "@babel/plugin-syntax-async-generators" "^7.7.4"
-
-"@babel/plugin-proposal-dynamic-import@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz#dde64a7f127691758cbfed6cf70de0fa5879d52d"
-  integrity sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
-
-"@babel/plugin-proposal-json-strings@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz#7700a6bfda771d8dc81973249eac416c6b4c697d"
-  integrity sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-json-strings" "^7.7.4"
-
-"@babel/plugin-proposal-object-rest-spread@^7.7.7":
-  version "7.7.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.7.tgz#9f27075004ab99be08c5c1bd653a2985813cb370"
-  integrity sha512-3qp9I8lelgzNedI3hrhkvhaEYree6+WHnyA/q4Dza9z7iEIs1eyhWyJnetk3jJ69RT0AT4G0UhEGwyGFJ7GUuQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz#ec21e8aeb09ec6711bc0a39ca49520abee1de379"
-  integrity sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
-
-"@babel/plugin-proposal-unicode-property-regex@^7.7.7":
-  version "7.7.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.7.tgz#433fa9dac64f953c12578b29633f456b68831c4e"
-  integrity sha512-80PbkKyORBUVm1fbTLrHpYdJxMThzM1UqFGh0ALEhO9TYbG86Ah9zQYAB/84axz2vcxefDLdZwWwZNlYARlu9w==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-async-generators@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz#331aaf310a10c80c44a66b238b6e49132bd3c889"
-  integrity sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-async-generators@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
-  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-bigint@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
-  integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-class-properties@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
-  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-syntax-dynamic-import@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec"
-  integrity sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-flow@^7.2.0", "@babel/plugin-syntax-flow@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.7.4.tgz#6d91b59e1a0e4c17f36af2e10dd64ef220919d7b"
-  integrity sha512-2AMAWl5PsmM5KPkB22cvOkUyWk6MjUaqhHNU5nSPUl/ns3j5qLfw2SuYP5RbVZ0tfLvePr4zUScbICtDP2CUNw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-import-meta@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
-  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-json-strings@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz#86e63f7d2e22f9e27129ac4e83ea989a382e86cc"
-  integrity sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
-  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
-  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
-  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-numeric-separator@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
-  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-object-rest-spread@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz#47cf220d19d6d0d7b154304701f468fc1cc6ff46"
-  integrity sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-object-rest-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
-  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-catch-binding@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz#a3e38f59f4b6233867b4a92dcb0ee05b2c334aa6"
-  integrity sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
-  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-chaining@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
-  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-top-level-await@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz#bd7d8fa7b9fee793a36e4027fd6dd1aa32f946da"
-  integrity sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
-  integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-arrow-functions@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz#76309bd578addd8aee3b379d809c802305a98a12"
-  integrity sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-async-to-generator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz#694cbeae6d613a34ef0292713fa42fb45c4470ba"
-  integrity sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.7.4"
-
-"@babel/plugin-transform-block-scoped-functions@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz#d0d9d5c269c78eaea76227ace214b8d01e4d837b"
-  integrity sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-block-scoping@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz#200aad0dcd6bb80372f94d9e628ea062c58bf224"
-  integrity sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    lodash "^4.17.13"
-
-"@babel/plugin-transform-classes@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz#c92c14be0a1399e15df72667067a8f510c9400ec"
-  integrity sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.4"
-    "@babel/helper-define-map" "^7.7.4"
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/helper-optimise-call-expression" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.7.4"
-    "@babel/helper-split-export-declaration" "^7.7.4"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-computed-properties@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz#e856c1628d3238ffe12d668eb42559f79a81910d"
-  integrity sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-destructuring@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz#2b713729e5054a1135097b6a67da1b6fe8789267"
-  integrity sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-dotall-regex@^7.7.7":
-  version "7.7.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.7.tgz#3e9713f1b69f339e87fa796b097d73ded16b937b"
-  integrity sha512-b4in+YlTeE/QmTgrllnb3bHA0HntYvjz8O3Mcbx75UBPJA2xhb5A8nle498VhxSXJHQefjtQxpnLPehDJ4TRlg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-duplicate-keys@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz#3d21731a42e3f598a73835299dd0169c3b90ac91"
-  integrity sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-exponentiation-operator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz#dd30c0191e3a1ba19bcc7e389bdfddc0729d5db9"
-  integrity sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-flow-strip-types@^7.2.0", "@babel/plugin-transform-flow-strip-types@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.7.4.tgz#cc73f85944782df1d77d80977bc097920a8bf31a"
-  integrity sha512-w9dRNlHY5ElNimyMYy0oQowvQpwt/PRHI0QS98ZJCTZU2bvSnKXo5zEiD5u76FBPigTm8TkqzmnUTg16T7qbkA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-flow" "^7.7.4"
-
-"@babel/plugin-transform-for-of@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz#248800e3a5e507b1f103d8b4ca998e77c63932bc"
-  integrity sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-function-name@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz#75a6d3303d50db638ff8b5385d12451c865025b1"
-  integrity sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g==
-  dependencies:
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz#27fe87d2b5017a2a5a34d1c41a6b9f6a6262643e"
-  integrity sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-member-expression-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz#aee127f2f3339fc34ce5e3055d7ffbf7aa26f19a"
-  integrity sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-modules-amd@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.5.tgz#39e0fb717224b59475b306402bb8eedab01e729c"
-  integrity sha512-CT57FG4A2ZUNU1v+HdvDSDrjNWBrtCmSH6YbbgN3Lrf0Di/q/lWRxZrE72p3+HCCz9UjfZOEBdphgC0nzOS6DQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.7.5"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
-"@babel/plugin-transform-modules-commonjs@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.5.tgz#1d27f5eb0bcf7543e774950e5b2fa782e637b345"
-  integrity sha512-9Cq4zTFExwFhQI6MT1aFxgqhIsMWQWDVwOgLzl7PTWJHsNaqFvklAU+Oz6AQLAS0dJKTwZSOCo20INwktxpi3Q==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.7.5"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-simple-access" "^7.7.4"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
-"@babel/plugin-transform-modules-systemjs@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz#cd98152339d3e763dfe838b7d4273edaf520bb30"
-  integrity sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
-"@babel/plugin-transform-modules-umd@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz#1027c355a118de0aae9fee00ad7813c584d9061f"
-  integrity sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-named-capturing-groups-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz#fb3bcc4ee4198e7385805007373d6b6f42c98220"
-  integrity sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
-
-"@babel/plugin-transform-new-target@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz#4a0753d2d60639437be07b592a9e58ee00720167"
-  integrity sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-object-super@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz#48488937a2d586c0148451bf51af9d7dda567262"
-  integrity sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.7.4"
-
-"@babel/plugin-transform-parameters@^7.7.7":
-  version "7.7.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.7.tgz#7a884b2460164dc5f194f668332736584c760007"
-  integrity sha512-OhGSrf9ZBrr1fw84oFXj5hgi8Nmg+E2w5L7NhnG0lPvpDtqd7dbyilM2/vR8CKbJ907RyxPh2kj6sBCSSfI9Ew==
-  dependencies:
-    "@babel/helper-call-delegate" "^7.7.4"
-    "@babel/helper-get-function-arity" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-property-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz#2388d6505ef89b266103f450f9167e6bd73f98c2"
-  integrity sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-regenerator@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.5.tgz#3a8757ee1a2780f390e89f246065ecf59c26fce9"
-  integrity sha512-/8I8tPvX2FkuEyWbjRCt4qTAgZK0DVy8QRguhA524UH48RfGJy94On2ri+dCuwOpcerPRl9O4ebQkRcVzIaGBw==
-  dependencies:
-    regenerator-transform "^0.14.0"
-
-"@babel/plugin-transform-reserved-words@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz#6a7cf123ad175bb5c69aec8f6f0770387ed3f1eb"
-  integrity sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-shorthand-properties@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz#74a0a9b2f6d67a684c6fbfd5f0458eb7ba99891e"
-  integrity sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-spread@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz#aa673b356fe6b7e70d69b6e33a17fef641008578"
-  integrity sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-sticky-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz#ffb68c05090c30732076b1285dc1401b404a123c"
-  integrity sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-
-"@babel/plugin-transform-template-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz#1eb6411736dd3fe87dbd20cc6668e5121c17d604"
-  integrity sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-typeof-symbol@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz#3174626214f2d6de322882e498a38e8371b2140e"
-  integrity sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-unicode-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz#a3c0f65b117c4c81c5b6484f2a5e7b95346b83ae"
-  integrity sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/preset-env@^7.2.0":
-  version "7.7.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.7.tgz#c294167b91e53e7e36d820e943ece8d0c7fe46ac"
-  integrity sha512-pCu0hrSSDVI7kCVUOdcMNQEbOPJ52E+LrQ14sN8uL2ALfSqePZQlKrOy+tM4uhEdYlCHi4imr8Zz2cZe9oSdIg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.7.4"
-    "@babel/plugin-proposal-dynamic-import" "^7.7.4"
-    "@babel/plugin-proposal-json-strings" "^7.7.4"
-    "@babel/plugin-proposal-object-rest-spread" "^7.7.7"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.7.4"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.7.7"
-    "@babel/plugin-syntax-async-generators" "^7.7.4"
-    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
-    "@babel/plugin-syntax-json-strings" "^7.7.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
-    "@babel/plugin-syntax-top-level-await" "^7.7.4"
-    "@babel/plugin-transform-arrow-functions" "^7.7.4"
-    "@babel/plugin-transform-async-to-generator" "^7.7.4"
-    "@babel/plugin-transform-block-scoped-functions" "^7.7.4"
-    "@babel/plugin-transform-block-scoping" "^7.7.4"
-    "@babel/plugin-transform-classes" "^7.7.4"
-    "@babel/plugin-transform-computed-properties" "^7.7.4"
-    "@babel/plugin-transform-destructuring" "^7.7.4"
-    "@babel/plugin-transform-dotall-regex" "^7.7.7"
-    "@babel/plugin-transform-duplicate-keys" "^7.7.4"
-    "@babel/plugin-transform-exponentiation-operator" "^7.7.4"
-    "@babel/plugin-transform-for-of" "^7.7.4"
-    "@babel/plugin-transform-function-name" "^7.7.4"
-    "@babel/plugin-transform-literals" "^7.7.4"
-    "@babel/plugin-transform-member-expression-literals" "^7.7.4"
-    "@babel/plugin-transform-modules-amd" "^7.7.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.7.5"
-    "@babel/plugin-transform-modules-systemjs" "^7.7.4"
-    "@babel/plugin-transform-modules-umd" "^7.7.4"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.4"
-    "@babel/plugin-transform-new-target" "^7.7.4"
-    "@babel/plugin-transform-object-super" "^7.7.4"
-    "@babel/plugin-transform-parameters" "^7.7.7"
-    "@babel/plugin-transform-property-literals" "^7.7.4"
-    "@babel/plugin-transform-regenerator" "^7.7.5"
-    "@babel/plugin-transform-reserved-words" "^7.7.4"
-    "@babel/plugin-transform-shorthand-properties" "^7.7.4"
-    "@babel/plugin-transform-spread" "^7.7.4"
-    "@babel/plugin-transform-sticky-regex" "^7.7.4"
-    "@babel/plugin-transform-template-literals" "^7.7.4"
-    "@babel/plugin-transform-typeof-symbol" "^7.7.4"
-    "@babel/plugin-transform-unicode-regex" "^7.7.4"
-    "@babel/types" "^7.7.4"
-    browserslist "^4.6.0"
-    core-js-compat "^3.6.0"
-    invariant "^2.2.2"
-    js-levenshtein "^1.1.3"
-    semver "^5.5.0"
-
-"@babel/preset-flow@^7.2.0":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.7.4.tgz#99c1349b6fd7132783196de181e6b32d0949427e"
-  integrity sha512-6LbUqcHD8BcRtXMOp5bc5nJeU8RlKh6q5U8TgZeCrf9ebBdW8Wyy5ujAUnbJfmzQ56Kkq5XtwErC/5+5RHyFYA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.7.4"
-
-"@babel/template@^7.12.13", "@babel/template@^7.3.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
-  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/parser" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/template@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
-  integrity sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558"
-  integrity sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.7.4"
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/helper-split-export-declaration" "^7.7.4"
-    "@babel/parser" "^7.7.4"
-    "@babel/types" "^7.7.4"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.13.17":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.17.tgz#c85415e0c7d50ac053d758baec98b28b2ecfeea3"
-  integrity sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.16"
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.13.16"
-    "@babel/types" "^7.13.17"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
-  integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.13.16", "@babel/types@^7.13.17", "@babel/types@^7.3.3":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz#48010a115c9fba7588b4437dd68c9469012b38b4"
-  integrity sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
-    to-fast-properties "^2.0.0"
-
-"@bcoe/v8-coverage@^0.2.3":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
-  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
-
-"@cnakazawa/watch@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
-  integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==
-  dependencies:
-    exec-sh "^0.3.2"
-    minimist "^1.2.0"
-
-"@istanbuljs/load-nyc-config@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
-  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
-  dependencies:
-    camelcase "^5.3.1"
-    find-up "^4.1.0"
-    get-package-type "^0.1.0"
-    js-yaml "^3.13.1"
-    resolve-from "^5.0.0"
-
-"@istanbuljs/schema@^0.1.2":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
-  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
-
-"@jest/console@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2"
-  integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    jest-message-util "^26.6.2"
-    jest-util "^26.6.2"
-    slash "^3.0.0"
-
-"@jest/core@^26.6.3":
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad"
-  integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==
-  dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/reporters" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-changed-files "^26.6.2"
-    jest-config "^26.6.3"
-    jest-haste-map "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.2"
-    jest-resolve-dependencies "^26.6.3"
-    jest-runner "^26.6.3"
-    jest-runtime "^26.6.3"
-    jest-snapshot "^26.6.2"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
-    jest-watcher "^26.6.2"
-    micromatch "^4.0.2"
-    p-each-series "^2.1.0"
-    rimraf "^3.0.0"
-    slash "^3.0.0"
-    strip-ansi "^6.0.0"
-
-"@jest/environment@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c"
-  integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==
-  dependencies:
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    jest-mock "^26.6.2"
-
-"@jest/fake-timers@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad"
-  integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    "@sinonjs/fake-timers" "^6.0.1"
-    "@types/node" "*"
-    jest-message-util "^26.6.2"
-    jest-mock "^26.6.2"
-    jest-util "^26.6.2"
-
-"@jest/globals@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a"
-  integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==
-  dependencies:
-    "@jest/environment" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    expect "^26.6.2"
-
-"@jest/reporters@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6"
-  integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==
-  dependencies:
-    "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    chalk "^4.0.0"
-    collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
-    glob "^7.1.2"
-    graceful-fs "^4.2.4"
-    istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^4.0.3"
-    istanbul-lib-report "^3.0.0"
-    istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.0.2"
-    jest-haste-map "^26.6.2"
-    jest-resolve "^26.6.2"
-    jest-util "^26.6.2"
-    jest-worker "^26.6.2"
-    slash "^3.0.0"
-    source-map "^0.6.0"
-    string-length "^4.0.1"
-    terminal-link "^2.0.0"
-    v8-to-istanbul "^7.0.0"
-  optionalDependencies:
-    node-notifier "^8.0.0"
-
-"@jest/source-map@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535"
-  integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==
-  dependencies:
-    callsites "^3.0.0"
-    graceful-fs "^4.2.4"
-    source-map "^0.6.0"
-
-"@jest/test-result@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18"
-  integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==
-  dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    collect-v8-coverage "^1.0.0"
-
-"@jest/test-sequencer@^26.6.3":
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17"
-  integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==
-  dependencies:
-    "@jest/test-result" "^26.6.2"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^26.6.2"
-    jest-runner "^26.6.3"
-    jest-runtime "^26.6.3"
-
-"@jest/transform@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"
-  integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/types" "^26.6.2"
-    babel-plugin-istanbul "^6.0.0"
-    chalk "^4.0.0"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-util "^26.6.2"
-    micromatch "^4.0.2"
-    pirates "^4.0.1"
-    slash "^3.0.0"
-    source-map "^0.6.1"
-    write-file-atomic "^3.0.0"
-
-"@jest/types@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
-  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
-
-"@sinonjs/commons@^1.7.0":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
-  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
-  dependencies:
-    type-detect "4.0.8"
-
-"@sinonjs/fake-timers@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
-  integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-
-"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
-  version "7.1.14"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402"
-  integrity sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    "@types/babel__generator" "*"
-    "@types/babel__template" "*"
-    "@types/babel__traverse" "*"
-
-"@types/babel__generator@*":
-  version "7.6.1"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz#4901767b397e8711aeb99df8d396d7ba7b7f0e04"
-  integrity sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@types/babel__template@*":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
-  integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.0.8"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.8.tgz#479a4ee3e291a403a1096106013ec22cf9b64012"
-  integrity sha512-yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw==
-  dependencies:
-    "@babel/types" "^7.3.0"
-
-"@types/babel__traverse@^7.0.4":
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz#654f6c4f67568e24c23b367e947098c6206fa639"
-  integrity sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==
-  dependencies:
-    "@babel/types" "^7.3.0"
-
-"@types/graceful-fs@^4.1.2":
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
-  integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
-  dependencies:
-    "@types/node" "*"
-
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
-  integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
-
-"@types/istanbul-lib-coverage@^2.0.1":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
-  integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==
-
-"@types/istanbul-lib-report@*":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c"
-  integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-
-"@types/istanbul-reports@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
-  integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
-  dependencies:
-    "@types/istanbul-lib-report" "*"
-
-"@types/node@*":
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.0.tgz#557dd0da4a6dca1407481df3bbacae0cd6f68042"
-  integrity sha512-YN1d+ae2MCb4U0mMa+Zlb5lWTdpFShbAj5nmte6lel27waMMBfivrm0prC16p/Di3DyTrmerrYUT8/145HXxVw==
-
-"@types/normalize-package-data@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
-  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
-
-"@types/prettier@^2.0.0":
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0"
-  integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==
-
-"@types/stack-utils@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
-  integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
-
-"@types/yargs-parser@*":
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228"
-  integrity sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==
-
-"@types/yargs@^15.0.0":
-  version "15.0.13"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc"
-  integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==
-  dependencies:
-    "@types/yargs-parser" "*"
-
-"@webassemblyjs/ast@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
-  integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.9.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
-    "@webassemblyjs/wast-parser" "1.9.0"
-
-"@webassemblyjs/floating-point-hex-parser@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
-  integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
-
-"@webassemblyjs/helper-api-error@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
-  integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
-
-"@webassemblyjs/helper-buffer@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
-  integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==
-
-"@webassemblyjs/helper-code-frame@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27"
-  integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.9.0"
-
-"@webassemblyjs/helper-fsm@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8"
-  integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==
-
-"@webassemblyjs/helper-module-context@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07"
-  integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==
-  dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-
-"@webassemblyjs/helper-wasm-bytecode@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
-  integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
-
-"@webassemblyjs/helper-wasm-section@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
-  integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==
-  dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-buffer" "1.9.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
-    "@webassemblyjs/wasm-gen" "1.9.0"
-
-"@webassemblyjs/ieee754@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
-  integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
-"@webassemblyjs/leb128@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
-  integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==
-  dependencies:
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/utf8@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
-  integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
-
-"@webassemblyjs/wasm-edit@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
-  integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==
-  dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-buffer" "1.9.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
-    "@webassemblyjs/helper-wasm-section" "1.9.0"
-    "@webassemblyjs/wasm-gen" "1.9.0"
-    "@webassemblyjs/wasm-opt" "1.9.0"
-    "@webassemblyjs/wasm-parser" "1.9.0"
-    "@webassemblyjs/wast-printer" "1.9.0"
-
-"@webassemblyjs/wasm-gen@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
-  integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==
-  dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
-    "@webassemblyjs/ieee754" "1.9.0"
-    "@webassemblyjs/leb128" "1.9.0"
-    "@webassemblyjs/utf8" "1.9.0"
-
-"@webassemblyjs/wasm-opt@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
-  integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==
-  dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-buffer" "1.9.0"
-    "@webassemblyjs/wasm-gen" "1.9.0"
-    "@webassemblyjs/wasm-parser" "1.9.0"
-
-"@webassemblyjs/wasm-parser@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
-  integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==
-  dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-api-error" "1.9.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
-    "@webassemblyjs/ieee754" "1.9.0"
-    "@webassemblyjs/leb128" "1.9.0"
-    "@webassemblyjs/utf8" "1.9.0"
-
-"@webassemblyjs/wast-parser@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914"
-  integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==
-  dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/floating-point-hex-parser" "1.9.0"
-    "@webassemblyjs/helper-api-error" "1.9.0"
-    "@webassemblyjs/helper-code-frame" "1.9.0"
-    "@webassemblyjs/helper-fsm" "1.9.0"
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/wast-printer@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
-  integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==
-  dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/wast-parser" "1.9.0"
-    "@xtuc/long" "4.2.2"
-
-"@xtuc/ieee754@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
-  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
-
-"@xtuc/long@4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
-  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
-
-abab@^2.0.3, abab@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
-  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
-
-acorn-globals@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
-  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
-  dependencies:
-    acorn "^7.1.1"
-    acorn-walk "^7.1.1"
-
-acorn-walk@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
-  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
-
-acorn@^6.4.1:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
-  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
-
-acorn@^7.1.1:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
-acorn@^8.1.0:
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.1.tgz#0d36af126fb6755095879c1dc6fd7edf7d60a5fb"
-  integrity sha512-z716cpm5TX4uzOzILx8PavOE6C6DKshHDw1aQN52M/yNSqE9s5O8SMfyhCCfCJ3HmTL0NkVOi+8a/55T7YB3bg==
-
-ajv-errors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
-  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
-
-ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
-  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
-
-ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ansi-escapes@^4.2.1:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
-  dependencies:
-    type-fest "^0.21.3"
-
-ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
-
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
-  dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
-
-anymatch@^3.0.3, anymatch@~3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
-arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
-
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-
-asn1.js@^5.2.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
-  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
-  dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    safer-buffer "^2.1.0"
-
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-assert@^1.1.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
-  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
-  dependencies:
-    object-assign "^4.1.1"
-    util "0.10.3"
-
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-
-async-each@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
-  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-atob@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz#24390e6ad61386b0a747265754d2a17219de862c"
-  integrity sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==
-
-babel-jest@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
-  integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==
-  dependencies:
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/babel__core" "^7.1.7"
-    babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^26.6.2"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    slash "^3.0.0"
-
-babel-plugin-dynamic-import-node@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
-  integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==
-  dependencies:
-    object.assign "^4.1.0"
-
-babel-plugin-istanbul@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
-  integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@istanbuljs/load-nyc-config" "^1.0.0"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-instrument "^4.0.0"
-    test-exclude "^6.0.0"
-
-babel-plugin-jest-hoist@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d"
-  integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==
-  dependencies:
-    "@babel/template" "^7.3.3"
-    "@babel/types" "^7.3.3"
-    "@types/babel__core" "^7.0.0"
-    "@types/babel__traverse" "^7.0.6"
-
-babel-preset-current-node-syntax@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
-  integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
-  dependencies:
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-bigint" "^7.8.3"
-    "@babel/plugin-syntax-class-properties" "^7.8.3"
-    "@babel/plugin-syntax-import-meta" "^7.8.3"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
-
-babel-preset-jest@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee"
-  integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==
-  dependencies:
-    babel-plugin-jest-hoist "^26.6.2"
-    babel-preset-current-node-syntax "^1.0.0"
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-base64-js@^1.0.2:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-  dependencies:
-    tweetnacl "^0.14.3"
-
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
-binary-extensions@^1.0.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
-  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
-
-binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
-bluebird@^3.5.5:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
-  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
-
-bn.js@^5.0.0, bn.js@^5.1.1:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
-  integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^2.3.1, braces@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
-braces@^3.0.1, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-brorand@^1.0.1, brorand@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
-
-browser-process-hrtime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
-  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
-
-browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
-  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
-  dependencies:
-    buffer-xor "^1.0.3"
-    cipher-base "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.3"
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-browserify-cipher@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
-  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
-  dependencies:
-    browserify-aes "^1.0.4"
-    browserify-des "^1.0.0"
-    evp_bytestokey "^1.0.0"
-
-browserify-des@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
-  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
-  dependencies:
-    cipher-base "^1.0.1"
-    des.js "^1.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
-  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
-  dependencies:
-    bn.js "^5.0.0"
-    randombytes "^2.0.1"
-
-browserify-sign@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
-  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
-  dependencies:
-    bn.js "^5.1.1"
-    browserify-rsa "^4.0.1"
-    create-hash "^1.2.0"
-    create-hmac "^1.1.7"
-    elliptic "^6.5.3"
-    inherits "^2.0.4"
-    parse-asn1 "^5.1.5"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
-
-browserify-zlib@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
-  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
-  dependencies:
-    pako "~1.0.5"
-
-browserslist@^4.14.5:
-  version "4.16.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.5.tgz#952825440bca8913c62d0021334cbe928ef062ae"
-  integrity sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==
-  dependencies:
-    caniuse-lite "^1.0.30001214"
-    colorette "^1.2.2"
-    electron-to-chromium "^1.3.719"
-    escalade "^3.1.1"
-    node-releases "^1.1.71"
-
-browserslist@^4.6.0, browserslist@^4.8.2:
-  version "4.8.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289"
-  integrity sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA==
-  dependencies:
-    caniuse-lite "^1.0.30001015"
-    electron-to-chromium "^1.3.322"
-    node-releases "^1.1.42"
-
-bser@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
-  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
-  dependencies:
-    node-int64 "^0.4.0"
-
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-buffer-xor@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
-
-buffer@^4.3.0:
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
-  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-    isarray "^1.0.0"
-
-builtin-status-codes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
-
-cacache@^12.0.2:
-  version "12.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
-  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
-  dependencies:
-    bluebird "^3.5.5"
-    chownr "^1.1.1"
-    figgy-pudding "^3.5.1"
-    glob "^7.1.4"
-    graceful-fs "^4.1.15"
-    infer-owner "^1.0.3"
-    lru-cache "^5.1.1"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.3"
-    ssri "^6.0.1"
-    unique-filename "^1.1.1"
-    y18n "^4.0.0"
-
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
-  dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
-
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
-camelcase@^5.0.0, camelcase@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-camelcase@^6.0.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
-  integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
-
-caniuse-lite@^1.0.30001015:
-  version "1.0.30001016"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001016.tgz#16ea48d7d6e8caf3cad3295c2d746fe38c4e7f66"
-  integrity sha512-yYQ2QfotceRiH4U+h1Us86WJXtVHDmy3nEKIdYPsZCYnOV5/tMgGbmoIlrMzmh2VXlproqYtVaKeGDBkMZifFA==
-
-caniuse-lite@^1.0.30001214:
-  version "1.0.30001216"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001216.tgz#47418a082a4f952d14d8964ae739e25efb2060a9"
-  integrity sha512-1uU+ww/n5WCJRwUcc9UH/W6925Se5aNnem/G5QaSDga2HzvjYMs8vRbekGUN/PnTZ7ezTHcxxTEb9fgiMYwH6Q==
-
-capture-exit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
-  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
-  dependencies:
-    rsvp "^4.8.4"
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-chalk@^2.0.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
-  integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-char-regex@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
-  integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
-
-chokidar@^2.1.8:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
-  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.1"
-  optionalDependencies:
-    fsevents "^1.2.7"
-
-chokidar@^3.4.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
-  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.5.0"
-  optionalDependencies:
-    fsevents "~2.3.1"
-
-chownr@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
-chrome-trace-event@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
-  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
-
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-
-cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
-  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-cjs-module-lexer@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f"
-  integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==
-
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
-
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
-collect-v8-coverage@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
-  integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
-
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-colorette@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
-  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
-
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-commander@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-4.0.1.tgz#b67622721785993182e807f4883633e6401ba53c"
-  integrity sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
-
-component-emitter@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-concat-stream@^1.5.0:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-console-browserify@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
-  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
-
-constants-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
-
-convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
-  dependencies:
-    safe-buffer "~5.1.1"
-
-copy-concurrently@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
-  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
-  dependencies:
-    aproba "^1.1.1"
-    fs-write-stream-atomic "^1.0.8"
-    iferr "^0.1.5"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.0"
-
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
-core-js-compat@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.0.tgz#4eb6cb69d03d99159ed7c860cd5fcf7d23a62ea9"
-  integrity sha512-Z3eCNjGgoYluH89Jt4wVkfYsc/VdLrA2/woX5lm0isO/pCT+P+Y+o65bOuEnjDJLthdwTBxbCVzptTXtc18fJg==
-  dependencies:
-    browserslist "^4.8.2"
-    semver "7.0.0"
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-create-ecdh@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
-  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
-  dependencies:
-    bn.js "^4.1.0"
-    elliptic "^6.5.3"
-
-create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
-  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
-  dependencies:
-    cipher-base "^1.0.1"
-    inherits "^2.0.1"
-    md5.js "^1.3.4"
-    ripemd160 "^2.0.1"
-    sha.js "^2.4.0"
-
-create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
-  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
-  dependencies:
-    cipher-base "^1.0.3"
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-    ripemd160 "^2.0.0"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-cross-spawn@^7.0.0:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-crypto-browserify@^3.11.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
-  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
-  dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-    randomfill "^1.0.3"
-
-cssom@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
-  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
-
-cssom@~0.3.6:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
-  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
-
-cssstyle@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
-  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
-  dependencies:
-    cssom "~0.3.6"
-
-cyclist@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
-  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
-data-urls@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
-  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
-  dependencies:
-    abab "^2.0.3"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
-
-debug@^2.2.0, debug@^2.3.3:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^4.1.0, debug@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-decimal.js@^10.2.1:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
-  integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==
-
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-
-deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
-
-deepmerge@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
-  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
-
-define-properties@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
-  dependencies:
-    is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
-  dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-des.js@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
-  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
-  dependencies:
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-detect-newline@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
-  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
-
-devtools-protocol@0.0.959523:
-  version "0.0.959523"
-  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.959523.tgz#a7ce62c6b88876081fe5bec866f70e467bc021ba"
-  integrity sha512-taOcAND/oJA5FhJD2I3RA+I8RPdrpPJWwvMBPzTq7Sugev1xTOG3lgtlSfkh5xkjTYw0Ti2CRQq016goFHMoPQ==
-
-diff-sequences@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
-  integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
-
-diff@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
-diffie-hellman@^5.0.0:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
-  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
-  dependencies:
-    bn.js "^4.1.0"
-    miller-rabin "^4.0.0"
-    randombytes "^2.0.0"
-
-domain-browser@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
-
-domexception@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
-  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
-  dependencies:
-    webidl-conversions "^5.0.0"
-
-duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
-  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-electron-to-chromium@^1.3.322:
-  version "1.3.322"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8"
-  integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA==
-
-electron-to-chromium@^1.3.719:
-  version "1.3.720"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.720.tgz#f5d66df8754d993006b7b2ded15ff7738c58bd94"
-  integrity sha512-B6zLTxxaOFP4WZm6DrvgRk8kLFYWNhQ5TrHMC0l5WtkMXhU5UbnvWoTfeEwqOruUSlNMhVLfYak7REX6oC5Yfw==
-
-elliptic@^6.5.3:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
-  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
-  dependencies:
-    bn.js "^4.11.9"
-    brorand "^1.1.0"
-    hash.js "^1.0.0"
-    hmac-drbg "^1.0.1"
-    inherits "^2.0.4"
-    minimalistic-assert "^1.0.1"
-    minimalistic-crypto-utils "^1.0.1"
-
-emittery@^0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82"
-  integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-emojis-list@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
-  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
-
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
-enhanced-resolve@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
-  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.5.0"
-    tapable "^1.0.0"
-
-errno@^0.1.3, errno@~0.1.7:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
-  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
-  dependencies:
-    prr "~1.0.1"
-
-error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
-escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
-
-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-escape-string-regexp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
-  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
-
-escodegen@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
-  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^5.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
-eslint-scope@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
-  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-esprima@^4.0.0, esprima@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esrecurse@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
-  dependencies:
-    estraverse "^5.2.0"
-
-estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
-estraverse@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
-  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
-events@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
-  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-
-evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
-  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
-  dependencies:
-    md5.js "^1.3.4"
-    safe-buffer "^5.1.1"
-
-exec-sh@^0.3.2:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
-  integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
-
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-execa@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
-  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
-  dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-    strip-final-newline "^2.0.0"
-
-exit@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
-
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-expect@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417"
-  integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    ansi-styles "^4.0.0"
-    jest-get-type "^26.3.0"
-    jest-matcher-utils "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-regex-util "^26.0.0"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
-extend@3.0.2, extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
-fast-deep-equal@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fast-levenshtein@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
-
-fb-watchman@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
-  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
-  dependencies:
-    bser "2.1.1"
-
-figgy-pudding@^3.5.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
-  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
-
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-cache-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
-  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^2.0.0"
-    pkg-dir "^3.0.0"
-
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-find-up@^4.0.0, find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
-flush-write-stream@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
-  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.3.6"
-
-for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
-  dependencies:
-    map-cache "^0.2.2"
-
-from2@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-
-fs-readdir-recursive@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
-  integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==
-
-fs-write-stream-atomic@^1.0.8:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
-  dependencies:
-    graceful-fs "^4.1.2"
-    iferr "^0.1.5"
-    imurmurhash "^0.1.4"
-    readable-stream "1 || 2"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fsevents@^1.2.7:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
-  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
-  dependencies:
-    bindings "^1.5.0"
-    nan "^2.12.1"
-
-fsevents@^2.1.2, fsevents@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-gensync@^1.0.0-beta.2:
-  version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
-  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
-
-get-caller-file@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-get-package-type@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
-  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
-
-get-stream@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
-  dependencies:
-    pump "^3.0.0"
-
-get-stream@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
-  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
-  dependencies:
-    pump "^3.0.0"
-
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-parent@~5.1.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-globals@^11.1.0:
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.4:
-  version "4.2.6"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
-  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
-
-growly@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
-  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-has-symbols@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
-
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-hash-base@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
-  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
-
-hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
-  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
-  dependencies:
-    inherits "^2.0.3"
-    minimalistic-assert "^1.0.1"
-
-hmac-drbg@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
-  dependencies:
-    hash.js "^1.0.3"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.1"
-
-hosted-git-info@^2.1.4:
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
-  integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
-
-html-encoding-sniffer@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
-  integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
-  dependencies:
-    whatwg-encoding "^1.0.5"
-
-html-escaper@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
-  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-https-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
-
-human-signals@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
-  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
-
-iconv-lite@0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-ieee754@^1.1.4:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
-iferr@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
-
-import-local@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
-  integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==
-  dependencies:
-    pkg-dir "^4.2.0"
-    resolve-cwd "^3.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
-
-infer-owner@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
-
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-invariant@^2.2.2:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
-  dependencies:
-    loose-envify "^1.0.0"
-
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
-  dependencies:
-    binary-extensions "^1.0.0"
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-ci@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
-  dependencies:
-    ci-info "^2.0.0"
-
-is-core-module@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887"
-  integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==
-  dependencies:
-    has "^1.0.3"
-
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
-  dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
-
-is-docker@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
-  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
-
-is-extglob@^2.1.0, is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-generator-fn@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
-  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-potential-custom-element-name@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
-  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
-
-is-primitive@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-3.0.1.tgz#98c4db1abff185485a657fc2905052b940524d05"
-  integrity sha512-GljRxhWvlCNRfZyORiH77FwdFwGcMO620o37EOYC0ORWdq+WYNVqW0w2Juzew4M+L81l6/QS3t5gkkihyRqv9w==
-
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
-is-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
-  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
-
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
-
-is-wsl@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
-  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
-  dependencies:
-    is-docker "^2.0.0"
-
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-istanbul-lib-coverage@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
-  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
-
-istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
-  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
-  dependencies:
-    "@babel/core" "^7.7.5"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.0.0"
-    semver "^6.3.0"
-
-istanbul-lib-report@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
-  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
-  dependencies:
-    istanbul-lib-coverage "^3.0.0"
-    make-dir "^3.0.0"
-    supports-color "^7.1.0"
-
-istanbul-lib-source-maps@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"
-  integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==
-  dependencies:
-    debug "^4.1.1"
-    istanbul-lib-coverage "^3.0.0"
-    source-map "^0.6.1"
-
-istanbul-reports@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
-  integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
-  dependencies:
-    html-escaper "^2.0.0"
-    istanbul-lib-report "^3.0.0"
-
-jest-changed-files@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"
-  integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    execa "^4.0.0"
-    throat "^5.0.0"
-
-jest-cli@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a"
-  integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==
-  dependencies:
-    "@jest/core" "^26.6.3"
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    chalk "^4.0.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    import-local "^3.0.2"
-    is-ci "^2.0.0"
-    jest-config "^26.6.3"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
-    prompts "^2.0.1"
-    yargs "^15.4.1"
-
-jest-config@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349"
-  integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^26.6.3"
-    "@jest/types" "^26.6.2"
-    babel-jest "^26.6.3"
-    chalk "^4.0.0"
-    deepmerge "^4.2.2"
-    glob "^7.1.1"
-    graceful-fs "^4.2.4"
-    jest-environment-jsdom "^26.6.2"
-    jest-environment-node "^26.6.2"
-    jest-get-type "^26.3.0"
-    jest-jasmine2 "^26.6.3"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.2"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
-    micromatch "^4.0.2"
-    pretty-format "^26.6.2"
-
-jest-diff@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
-  integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
-  dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^26.6.2"
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
-
-jest-docblock@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5"
-  integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==
-  dependencies:
-    detect-newline "^3.0.0"
-
-jest-each@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb"
-  integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    chalk "^4.0.0"
-    jest-get-type "^26.3.0"
-    jest-util "^26.6.2"
-    pretty-format "^26.6.2"
-
-jest-environment-jsdom@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e"
-  integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==
-  dependencies:
-    "@jest/environment" "^26.6.2"
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    jest-mock "^26.6.2"
-    jest-util "^26.6.2"
-    jsdom "^16.4.0"
-
-jest-environment-node@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c"
-  integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==
-  dependencies:
-    "@jest/environment" "^26.6.2"
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    jest-mock "^26.6.2"
-    jest-util "^26.6.2"
-
-jest-get-type@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
-  integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
-
-jest-haste-map@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"
-  integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    "@types/graceful-fs" "^4.1.2"
-    "@types/node" "*"
-    anymatch "^3.0.3"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-regex-util "^26.0.0"
-    jest-serializer "^26.6.2"
-    jest-util "^26.6.2"
-    jest-worker "^26.6.2"
-    micromatch "^4.0.2"
-    sane "^4.0.3"
-    walker "^1.0.7"
-  optionalDependencies:
-    fsevents "^2.1.2"
-
-jest-jasmine2@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd"
-  integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==
-  dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^26.6.2"
-    "@jest/source-map" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    co "^4.6.0"
-    expect "^26.6.2"
-    is-generator-fn "^2.0.0"
-    jest-each "^26.6.2"
-    jest-matcher-utils "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-runtime "^26.6.3"
-    jest-snapshot "^26.6.2"
-    jest-util "^26.6.2"
-    pretty-format "^26.6.2"
-    throat "^5.0.0"
-
-jest-leak-detector@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af"
-  integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==
-  dependencies:
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
-
-jest-matcher-utils@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"
-  integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==
-  dependencies:
-    chalk "^4.0.0"
-    jest-diff "^26.6.2"
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
-
-jest-message-util@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07"
-  integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^26.6.2"
-    "@types/stack-utils" "^2.0.0"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    micromatch "^4.0.2"
-    pretty-format "^26.6.2"
-    slash "^3.0.0"
-    stack-utils "^2.0.2"
-
-jest-mock@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302"
-  integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-
-jest-pnp-resolver@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
-  integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
-
-jest-regex-util@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
-  integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
-
-jest-resolve-dependencies@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6"
-  integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-snapshot "^26.6.2"
-
-jest-resolve@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507"
-  integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    jest-pnp-resolver "^1.2.2"
-    jest-util "^26.6.2"
-    read-pkg-up "^7.0.1"
-    resolve "^1.18.1"
-    slash "^3.0.0"
-
-jest-runner@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"
-  integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==
-  dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/environment" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    emittery "^0.7.1"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-config "^26.6.3"
-    jest-docblock "^26.0.0"
-    jest-haste-map "^26.6.2"
-    jest-leak-detector "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-resolve "^26.6.2"
-    jest-runtime "^26.6.3"
-    jest-util "^26.6.2"
-    jest-worker "^26.6.2"
-    source-map-support "^0.5.6"
-    throat "^5.0.0"
-
-jest-runtime@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b"
-  integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==
-  dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/environment" "^26.6.2"
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/globals" "^26.6.2"
-    "@jest/source-map" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
-    cjs-module-lexer "^0.6.0"
-    collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.4"
-    jest-config "^26.6.3"
-    jest-haste-map "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-mock "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.2"
-    jest-snapshot "^26.6.2"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
-    slash "^3.0.0"
-    strip-bom "^4.0.0"
-    yargs "^15.4.1"
-
-jest-serializer@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1"
-  integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==
-  dependencies:
-    "@types/node" "*"
-    graceful-fs "^4.2.4"
-
-jest-snapshot@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84"
-  integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==
-  dependencies:
-    "@babel/types" "^7.0.0"
-    "@jest/types" "^26.6.2"
-    "@types/babel__traverse" "^7.0.4"
-    "@types/prettier" "^2.0.0"
-    chalk "^4.0.0"
-    expect "^26.6.2"
-    graceful-fs "^4.2.4"
-    jest-diff "^26.6.2"
-    jest-get-type "^26.3.0"
-    jest-haste-map "^26.6.2"
-    jest-matcher-utils "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-resolve "^26.6.2"
-    natural-compare "^1.4.0"
-    pretty-format "^26.6.2"
-    semver "^7.3.2"
-
-jest-util@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
-  integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    is-ci "^2.0.0"
-    micromatch "^4.0.2"
-
-jest-validate@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec"
-  integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    camelcase "^6.0.0"
-    chalk "^4.0.0"
-    jest-get-type "^26.3.0"
-    leven "^3.1.0"
-    pretty-format "^26.6.2"
-
-jest-watcher@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975"
-  integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==
-  dependencies:
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    jest-util "^26.6.2"
-    string-length "^4.0.1"
-
-jest-worker@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
-  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
-
-jest@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"
-  integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==
-  dependencies:
-    "@jest/core" "^26.6.3"
-    import-local "^3.0.2"
-    jest-cli "^26.6.3"
-
-js-levenshtein@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
-  integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==
-
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-jsdom@^16.4.0:
-  version "16.5.3"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz#13a755b3950eb938b4482c407238ddf16f0d2136"
-  integrity sha512-Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA==
-  dependencies:
-    abab "^2.0.5"
-    acorn "^8.1.0"
-    acorn-globals "^6.0.0"
-    cssom "^0.4.4"
-    cssstyle "^2.3.0"
-    data-urls "^2.0.0"
-    decimal.js "^10.2.1"
-    domexception "^2.0.1"
-    escodegen "^2.0.0"
-    html-encoding-sniffer "^2.0.1"
-    is-potential-custom-element-name "^1.0.0"
-    nwsapi "^2.2.0"
-    parse5 "6.0.1"
-    request "^2.88.2"
-    request-promise-native "^1.0.9"
-    saxes "^5.0.1"
-    symbol-tree "^3.2.4"
-    tough-cookie "^4.0.0"
-    w3c-hr-time "^1.0.2"
-    w3c-xmlserializer "^2.0.0"
-    webidl-conversions "^6.1.0"
-    whatwg-encoding "^1.0.5"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.5.0"
-    ws "^7.4.4"
-    xml-name-validator "^3.0.0"
-
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
-
-json-parse-better-errors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
-json-parse-even-better-errors@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
-  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
-  dependencies:
-    minimist "^1.2.0"
-
-json5@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6"
-  integrity sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==
-  dependencies:
-    minimist "^1.2.0"
-
-json5@^2.1.2:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
-  dependencies:
-    minimist "^1.2.5"
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-kleur@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
-  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
-
-leven@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
-  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
-
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-lines-and-columns@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
-  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
-
-loader-runner@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
-  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
-
-loader-utils@^1.2.3:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
-  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^1.0.1"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
-lodash@^4.17.13:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
-
-lodash@^4.17.19, lodash@^4.7.0:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-loose-envify@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-lru-cache@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
-  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
-  dependencies:
-    yallist "^3.0.2"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-make-dir@^2.0.0, make-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
-  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
-  dependencies:
-    pify "^4.0.1"
-    semver "^5.6.0"
-
-make-dir@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
-  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
-  dependencies:
-    semver "^6.0.0"
-
-makeerror@1.0.x:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
-  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
-  dependencies:
-    tmpl "1.0.x"
-
-map-cache@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
-
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
-  dependencies:
-    object-visit "^1.0.0"
-
-math-random@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
-  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
-
-md5.js@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
-  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-memory-fs@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-memory-fs@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
-  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
-micromatch@^3.1.10, micromatch@^3.1.4:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
-micromatch@^4.0.2:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
-
-miller-rabin@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
-  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
-  dependencies:
-    bn.js "^4.0.0"
-    brorand "^1.0.1"
-
-mime-db@1.42.0:
-  version "1.42.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac"
-  integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==
-
-mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.25"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437"
-  integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==
-  dependencies:
-    mime-db "1.42.0"
-
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
-minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-
-minimalistic-crypto-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
-
-minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-mississippi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
-  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^3.0.0"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
-mixin-deep@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
-  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
-
-mkdirp@^0.5.1, mkdirp@^0.5.3:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
-move-concurrently@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
-  dependencies:
-    aproba "^1.1.1"
-    copy-concurrently "^1.0.0"
-    fs-write-stream-atomic "^1.0.8"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.3"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-nan@^2.12.1:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
-  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
-
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
-
-neo-async@^2.5.0, neo-async@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
-  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
-
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
-node-int64@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
-  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
-
-node-libs-browser@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
-  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
-  dependencies:
-    assert "^1.1.1"
-    browserify-zlib "^0.2.0"
-    buffer "^4.3.0"
-    console-browserify "^1.1.0"
-    constants-browserify "^1.0.0"
-    crypto-browserify "^3.11.0"
-    domain-browser "^1.1.1"
-    events "^3.0.0"
-    https-browserify "^1.0.0"
-    os-browserify "^0.3.0"
-    path-browserify "0.0.1"
-    process "^0.11.10"
-    punycode "^1.2.4"
-    querystring-es3 "^0.2.0"
-    readable-stream "^2.3.3"
-    stream-browserify "^2.0.1"
-    stream-http "^2.7.2"
-    string_decoder "^1.0.0"
-    timers-browserify "^2.0.4"
-    tty-browserify "0.0.0"
-    url "^0.11.0"
-    util "^0.11.0"
-    vm-browserify "^1.0.1"
-
-node-modules-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
-  integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
-
-node-notifier@^8.0.0:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5"
-  integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==
-  dependencies:
-    growly "^1.3.0"
-    is-wsl "^2.2.0"
-    semver "^7.3.2"
-    shellwords "^0.1.1"
-    uuid "^8.3.0"
-    which "^2.0.2"
-
-node-releases@^1.1.42:
-  version "1.1.43"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.43.tgz#2c6ca237f88ce11d49631f11190bb01f8d0549f2"
-  integrity sha512-Rmfnj52WNhvr83MvuAWHEqXVoZXCcDQssSOffU4n4XOL9sPrP61mSZ88g25NqmABDvH7PiAlFCzoSCSdzA293w==
-  dependencies:
-    semver "^6.3.0"
-
-node-releases@^1.1.71:
-  version "1.1.71"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
-  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
-
-normalize-package-data@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
-
-npm-run-path@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
-  dependencies:
-    path-key "^3.0.0"
-
-nwmatcher@1.4.4:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
-  integrity sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==
-
-nwsapi@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
-  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
-
-object-keys@^1.0.11, object-keys@^1.0.12:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
-  dependencies:
-    isobject "^3.0.0"
-
-object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
-  dependencies:
-    isobject "^3.0.1"
-
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-onetime@^5.1.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
-optionator@^0.8.1:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
-os-browserify@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
-
-p-each-series@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
-  integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
-p-limit@^2.0.0, p-limit@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-pako@~1.0.5:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
-  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
-
-parallel-transform@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
-  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
-  dependencies:
-    cyclist "^1.0.1"
-    inherits "^2.0.3"
-    readable-stream "^2.1.5"
-
-parse-asn1@^5.0.0, parse-asn1@^5.1.5:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
-  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
-  dependencies:
-    asn1.js "^5.2.0"
-    browserify-aes "^1.0.0"
-    evp_bytestokey "^1.0.0"
-    pbkdf2 "^3.0.3"
-    safe-buffer "^5.1.1"
-
-parse-json@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
-  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    error-ex "^1.3.1"
-    json-parse-even-better-errors "^2.3.0"
-    lines-and-columns "^1.1.6"
-
-parse5@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
-  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
-
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-
-path-browserify@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
-  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
-path-key@^3.0.0, path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
-
-pbkdf2@^3.0.3:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
-  integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
-  dependencies:
-    create-hash "^1.1.2"
-    create-hmac "^1.1.4"
-    ripemd160 "^2.0.1"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
-  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
-pirates@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
-  integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
-  dependencies:
-    node-modules-regexp "^1.0.0"
-
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
-  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
-  dependencies:
-    find-up "^3.0.0"
-
-pkg-dir@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
-  dependencies:
-    find-up "^4.0.0"
-
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
-pretty-format@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
-  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^17.0.1"
-
-private@^0.1.6:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
-
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
-
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-
-prompts@^2.0.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.0.tgz#a444e968fa4cc7e86689a74050685ac8006c4cc4"
-  integrity sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg==
-  dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.3"
-
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
-
-psl@^1.1.28:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.6.0.tgz#60557582ee23b6c43719d9890fb4170ecd91e110"
-  integrity sha512-SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA==
-
-psl@^1.1.33:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-
-public-encrypt@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
-  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
-  dependencies:
-    bn.js "^4.1.0"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    parse-asn1 "^5.0.0"
-    randombytes "^2.0.1"
-    safe-buffer "^5.1.2"
-
-pump@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pumpify@^1.3.3:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
-  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
-  dependencies:
-    duplexify "^3.6.0"
-    inherits "^2.0.3"
-    pump "^2.0.0"
-
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
-
-punycode@^1.2.4:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
-querystring-es3@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
-
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
-
-randomatic@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923"
-  integrity sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==
-  dependencies:
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    math-random "^1.0.1"
-
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-randomfill@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
-  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
-  dependencies:
-    randombytes "^2.0.5"
-    safe-buffer "^5.1.0"
-
-react-is@^17.0.1:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
-  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
-
-read-pkg-up@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
-  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
-  dependencies:
-    find-up "^4.1.0"
-    read-pkg "^5.2.0"
-    type-fest "^0.8.1"
-
-read-pkg@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
-  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
-  dependencies:
-    "@types/normalize-package-data" "^2.4.0"
-    normalize-package-data "^2.5.0"
-    parse-json "^5.0.0"
-    type-fest "^0.6.0"
-
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readdirp@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
-  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    micromatch "^3.1.10"
-    readable-stream "^2.0.2"
-
-readdirp@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
-  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
-  dependencies:
-    picomatch "^2.2.1"
-
-regenerate-unicode-properties@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
-  integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==
-  dependencies:
-    regenerate "^1.4.0"
-
-regenerate@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
-  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
-
-regenerator-transform@^0.14.0:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"
-  integrity sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==
-  dependencies:
-    private "^0.1.6"
-
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
-  dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
-
-regexpu-core@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
-  integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==
-  dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.1.0"
-    regjsgen "^0.5.0"
-    regjsparser "^0.6.0"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.1.0"
-
-regjsgen@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
-  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
-
-regjsparser@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.1.tgz#5b6b28c418f312ef42898dc6865ae2d4b9f0f7a2"
-  integrity sha512-7LutE94sz/NKSYegK+/4E77+8DipxF+Qn2Tmu362AcmsF2NYq/wx3+ObvU90TKEhjf7hQoFXo23ajjrXP7eUgg==
-  dependencies:
-    jsesc "~0.5.0"
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-repeat-element@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
-  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
-
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-request-promise-core@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
-  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
-  dependencies:
-    lodash "^4.17.19"
-
-request-promise-native@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
-  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
-  dependencies:
-    request-promise-core "1.1.4"
-    stealthy-require "^1.1.1"
-    tough-cookie "^2.3.3"
-
-request@^2.88.2:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-resolve-cwd@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
-  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
-  dependencies:
-    resolve-from "^5.0.0"
-
-resolve-from@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
-  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-
-resolve@^1.10.0, resolve@^1.3.2:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.1.tgz#9e018c540fcf0c427d678b9931cbf45e984bcaff"
-  integrity sha512-fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.18.1:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
-  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
-  dependencies:
-    is-core-module "^2.2.0"
-    path-parse "^1.0.6"
-
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
-rimraf@^2.5.4, rimraf@^2.6.3:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
-rimraf@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
-  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
-rsvp@^4.8.4:
-  version "4.8.5"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
-  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
-
-run-queue@^1.0.0, run-queue@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
-  dependencies:
-    aproba "^1.1.1"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
-  dependencies:
-    ret "~0.1.10"
-
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-sane@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
-  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
-  dependencies:
-    "@cnakazawa/watch" "^1.0.3"
-    anymatch "^2.0.0"
-    capture-exit "^2.0.0"
-    exec-sh "^0.3.2"
-    execa "^1.0.0"
-    fb-watchman "^2.0.0"
-    micromatch "^3.1.4"
-    minimist "^1.1.1"
-    walker "~1.0.5"
-
-saxes@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
-  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
-  dependencies:
-    xmlchars "^2.2.0"
-
-schema-utils@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
-  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-errors "^1.0.0"
-    ajv-keywords "^3.1.0"
-
-"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
-semver@^6.0.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-semver@^7.3.2:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
-serialize-javascript@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
-  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
-  dependencies:
-    randombytes "^2.1.0"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-set-value@^2.0.0, set-value@^2.0.1, set-value@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-4.1.0.tgz#aa433662d87081b75ad88a4743bd450f044e7d09"
-  integrity sha512-zTEg4HL0RwVrqcWs3ztF+x1vkxfm0lP+MQQFPiMJTKVceBwEV0A569Ou8l9IYQG8jOZdMVI1hGsc0tmeD2o/Lw==
-  dependencies:
-    is-plain-object "^2.0.4"
-    is-primitive "^3.0.1"
-
-setimmediate@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
-
-sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.11"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-shellwords@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
-  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
-
-signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
-
-sisteransi@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3"
-  integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==
-
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-  dependencies:
-    kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
-  dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^3.1.0"
-
-source-list-map@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
-  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
-
-source-map-resolve@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
-  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
-  dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
-
-source-map-support@^0.5.6:
-  version "0.5.16"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
-  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@~0.5.12:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-url@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
-  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
-
-source-map@^0.5.0, source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-source-map@^0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
-spdx-correct@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
-  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
-  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
-  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
-  integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
-
-split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-  dependencies:
-    extend-shallow "^3.0.0"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-sshpk@1.16.1, sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-ssri@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
-  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
-  dependencies:
-    figgy-pudding "^3.5.1"
-
-stack-utils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277"
-  integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==
-  dependencies:
-    escape-string-regexp "^2.0.0"
-
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
-  dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
-
-stealthy-require@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
-
-stream-browserify@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
-  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "^2.0.2"
-
-stream-each@^1.1.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
-  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
-  dependencies:
-    end-of-stream "^1.1.0"
-    stream-shift "^1.0.0"
-
-stream-http@^2.7.2:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
-  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
-  dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.3.6"
-    to-arraybuffer "^1.0.0"
-    xtend "^4.0.0"
-
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
-
-string-length@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
-  integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
-  dependencies:
-    char-regex "^1.0.2"
-    strip-ansi "^6.0.0"
-
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
-  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
-
-string_decoder@^1.0.0, string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
-  dependencies:
-    ansi-regex "^5.0.0"
-
-strip-bom@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
-  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
-
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^7.0.0, supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-hyperlinks@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
-  integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
-  dependencies:
-    has-flag "^4.0.0"
-    supports-color "^7.0.0"
-
-symbol-tree@^3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
-  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
-
-tapable@^1.0.0, tapable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
-  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-
-terminal-link@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
-  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    supports-hyperlinks "^2.0.0"
-
-terser-webpack-plugin@^1.4.3:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
-  integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==
-  dependencies:
-    cacache "^12.0.2"
-    find-cache-dir "^2.1.0"
-    is-wsl "^1.1.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^4.0.0"
-    source-map "^0.6.1"
-    terser "^4.1.2"
-    webpack-sources "^1.4.0"
-    worker-farm "^1.7.0"
-
-terser@^4.1.2:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
-  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
-
-test-exclude@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
-  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
-  dependencies:
-    "@istanbuljs/schema" "^0.1.2"
-    glob "^7.1.4"
-    minimatch "^3.0.4"
-
-throat@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
-  integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
-
-through2@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
-timers-browserify@^2.0.4:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
-  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
-  dependencies:
-    setimmediate "^1.0.4"
-
-tmpl@1.0.x:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
-  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
-
-to-arraybuffer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
-
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
-  dependencies:
-    kind-of "^3.0.2"
-
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
-  dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
-tough-cookie@^2.3.3, tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tough-cookie@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
-  dependencies:
-    psl "^1.1.33"
-    punycode "^2.1.1"
-    universalify "^0.1.2"
-
-tr46@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
-  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
-  dependencies:
-    punycode "^2.1.1"
-
-tty-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
-  dependencies:
-    prelude-ls "~1.1.2"
-
-type-detect@4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
-
-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-
-type-fest@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
-  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
-
-type-fest@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
-  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
-
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
-  dependencies:
-    is-typedarray "^1.0.0"
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
-unicode-canonical-property-names-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
-  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
-
-unicode-match-property-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
-  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
-  dependencies:
-    unicode-canonical-property-names-ecmascript "^1.0.4"
-    unicode-property-aliases-ecmascript "^1.0.4"
-
-unicode-match-property-value-ecmascript@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277"
-  integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==
-
-unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
-  integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
-
-union-value@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
-  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^2.0.1"
-
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-universalify@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
-  dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
-
-upath@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
-  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
-
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
-use@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
-
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-util@0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
-  dependencies:
-    inherits "2.0.1"
-
-util@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
-  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
-  dependencies:
-    inherits "2.0.3"
-
-uuid@^3.3.2:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
-  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
-
-uuid@^8.3.0:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
-v8-to-istanbul@^7.0.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.1.tgz#04bfd1026ba4577de5472df4f5e89af49de5edda"
-  integrity sha512-p0BB09E5FRjx0ELN6RgusIPsSPhtgexSRcKETybEs6IGOTXJSZqfwxp7r//55nnu0f1AxltY5VvdVqy2vZf9AA==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^1.6.0"
-    source-map "^0.7.3"
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-vm-browserify@^1.0.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
-  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
-
-w3c-hr-time@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
-  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
-  dependencies:
-    browser-process-hrtime "^1.0.0"
-
-w3c-xmlserializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
-  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
-  dependencies:
-    xml-name-validator "^3.0.0"
-
-walker@^1.0.7, walker@~1.0.5:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
-  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
-  dependencies:
-    makeerror "1.0.x"
-
-watchpack-chokidar2@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"
-  integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==
-  dependencies:
-    chokidar "^2.1.8"
-
-watchpack@^1.7.4:
-  version "1.7.5"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
-  integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
-  dependencies:
-    graceful-fs "^4.1.2"
-    neo-async "^2.5.0"
-  optionalDependencies:
-    chokidar "^3.4.1"
-    watchpack-chokidar2 "^2.0.1"
-
-webidl-conversions@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
-  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
-
-webidl-conversions@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
-  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
-
-webpack-sources@^1.4.0, webpack-sources@^1.4.1:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
-  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
-webpack@^4.41.0:
-  version "4.46.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
-  integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-module-context" "1.9.0"
-    "@webassemblyjs/wasm-edit" "1.9.0"
-    "@webassemblyjs/wasm-parser" "1.9.0"
-    acorn "^6.4.1"
-    ajv "^6.10.2"
-    ajv-keywords "^3.4.1"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.5.0"
-    eslint-scope "^4.0.3"
-    json-parse-better-errors "^1.0.2"
-    loader-runner "^2.4.0"
-    loader-utils "^1.2.3"
-    memory-fs "^0.4.1"
-    micromatch "^3.1.10"
-    mkdirp "^0.5.3"
-    neo-async "^2.6.1"
-    node-libs-browser "^2.2.1"
-    schema-utils "^1.0.0"
-    tapable "^1.1.3"
-    terser-webpack-plugin "^1.4.3"
-    watchpack "^1.7.4"
-    webpack-sources "^1.4.1"
-
-whatwg-encoding@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
-  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
-  dependencies:
-    iconv-lite "0.4.24"
-
-whatwg-mimetype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
-  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
-
-whatwg-url@^8.0.0, whatwg-url@^8.5.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3"
-  integrity sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg==
-  dependencies:
-    lodash "^4.7.0"
-    tr46 "^2.0.2"
-    webidl-conversions "^6.1.0"
-
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
-which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-which@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
-worker-farm@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
-  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
-  dependencies:
-    errno "~0.1.7"
-
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-write-file-atomic@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
-  dependencies:
-    imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
-
-ws@^7.4.4:
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
-  integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
-
-xml-name-validator@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
-  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
-
-xmlchars@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
-  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
-
-xtend@^4.0.0, xtend@~4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
-y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
-
-yallist@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
-  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yargs-parser@^15.0.0:
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.0.tgz#cdd7a97490ec836195f59f3f4dbe5ea9e8f75f08"
-  integrity sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs@^14.2.0:
-  version "14.2.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.2.tgz#2769564379009ff8597cdd38fba09da9b493c4b5"
-  integrity sha512-/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA==
-  dependencies:
-    cliui "^5.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^15.0.0"
-
-yargs@^15.4.1:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
diff --git a/ReactCommon/hermes/inspector/tools/run_msggen b/ReactCommon/hermes/inspector/tools/run_msggen
index afe7901ea62f..20e63dffffb2 100755
--- a/ReactCommon/hermes/inspector/tools/run_msggen
+++ b/ReactCommon/hermes/inspector/tools/run_msggen
@@ -12,7 +12,7 @@ FBSOURCE=$(hg root)
 CLANG_FORMAT="${FBSOURCE}/tools/third-party/clang-format/clang-format"
 SIGNEDSOURCE="${FBSOURCE}/tools/signedsource"
 
-cd "${DIR}/msggen"
+pushd "../../../../packages/hermes-inspector-msggen"
 
 yarn install
 yarn build
@@ -28,3 +28,5 @@ node bin/index.js \
 
 "${SIGNEDSOURCE}" sign "${HEADER_PATH}"
 "${SIGNEDSOURCE}" sign "${CPP_PATH}"
+
+popd >/dev/null
diff --git a/ReactCommon/jsc/.clang-tidy b/ReactCommon/jsc/.clang-tidy
new file mode 100644
index 000000000000..9f33ef5a06d8
--- /dev/null
+++ b/ReactCommon/jsc/.clang-tidy
@@ -0,0 +1,6 @@
+---
+Checks: '>
+clang-diagnostic-*,
+'
+InheritParentConfig: true
+...
diff --git a/ReactCommon/jsc/BUCK b/ReactCommon/jsc/BUCK
new file mode 100644
index 000000000000..3981ca830a7b
--- /dev/null
+++ b/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"),
+    ],
+)
diff --git a/ReactCommon/jsc/CMakeLists.txt b/ReactCommon/jsc/CMakeLists.txt
new file mode 100644
index 000000000000..2f387fa996f6
--- /dev/null
+++ b/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)
diff --git a/ReactCommon/jsi/JSCRuntime.cpp b/ReactCommon/jsc/JSCRuntime.cpp
similarity index 96%
rename from ReactCommon/jsi/JSCRuntime.cpp
rename to ReactCommon/jsc/JSCRuntime.cpp
index 5d8487b2cd5b..bbc606561ee3 100644
--- a/ReactCommon/jsi/JSCRuntime.cpp
+++ b/ReactCommon/jsc/JSCRuntime.cpp
@@ -158,6 +158,13 @@ class JSCRuntime : public jsi::Runtime {
 
   std::string symbolToString(const jsi::Symbol &) override;
 
+  jsi::BigInt createBigIntFromInt64(int64_t) override;
+  jsi::BigInt createBigIntFromUint64(uint64_t) override;
+  bool bigintIsInt64(const jsi::BigInt &) override;
+  bool bigintIsUint64(const jsi::BigInt &) override;
+  uint64_t truncate(const jsi::BigInt &) override;
+  jsi::String bigintToString(const jsi::BigInt &, int) override;
+
   jsi::String createStringFromAscii(const char *str, size_t length) override;
   jsi::String createStringFromUtf8(const uint8_t *utf8, size_t length) override;
   std::string utf8(const jsi::String &) override;
@@ -168,6 +175,12 @@ class JSCRuntime : public jsi::Runtime {
       const jsi::Object &) override;
   jsi::HostFunctionType &getHostFunction(const jsi::Function &) override;
 
+  bool hasNativeState(const jsi::Object &) override;
+  std::shared_ptr<jsi::NativeState> getNativeState(
+      const jsi::Object &) override;
+  void setNativeState(const jsi::Object &, std::shared_ptr<jsi::NativeState>)
+      override;
+
   jsi::Value getProperty(const jsi::Object &, const jsi::String &name) override;
   jsi::Value getProperty(const jsi::Object &, const jsi::PropNameID &name)
       override;
@@ -193,6 +206,8 @@ class JSCRuntime : public jsi::Runtime {
   jsi::Value lockWeakObject(jsi::WeakObject &) override;
 
   jsi::Array createArray(size_t length) override;
+  jsi::ArrayBuffer createArrayBuffer(
+      std::shared_ptr<jsi::MutableBuffer> buffer) override;
   size_t size(const jsi::Array &) override;
   size_t size(const jsi::ArrayBuffer &) override;
   uint8_t *data(const jsi::ArrayBuffer &) override;
@@ -680,6 +695,30 @@ std::string JSCRuntime::symbolToString(const jsi::Symbol &sym) {
   return jsi::Value(*this, sym).toString(*this).utf8(*this);
 }
 
+jsi::BigInt JSCRuntime::createBigIntFromInt64(int64_t) {
+  throw std::logic_error("Not implemented");
+}
+
+jsi::BigInt JSCRuntime::createBigIntFromUint64(uint64_t) {
+  throw std::logic_error("Not implemented");
+}
+
+bool JSCRuntime::bigintIsInt64(const jsi::BigInt &) {
+  throw std::logic_error("Not implemented");
+}
+
+bool JSCRuntime::bigintIsUint64(const jsi::BigInt &) {
+  throw std::logic_error("Not implemented");
+}
+
+uint64_t JSCRuntime::truncate(const jsi::BigInt &) {
+  throw std::logic_error("Not implemented");
+}
+
+jsi::String JSCRuntime::bigintToString(const jsi::BigInt &, int) {
+  throw std::logic_error("Not implemented");
+}
+
 jsi::String JSCRuntime::createStringFromAscii(const char *str, size_t length) {
   // Yes we end up double casting for semantic reasons (UTF8 contains ASCII,
   // not the other way around)
@@ -862,6 +901,21 @@ std::shared_ptr<jsi::HostObject> JSCRuntime::getHostObject(
   return metadata->hostObject;
 }
 
+bool JSCRuntime::hasNativeState(const jsi::Object &) {
+  throw std::logic_error("Not implemented");
+}
+
+std::shared_ptr<jsi::NativeState> JSCRuntime::getNativeState(
+    const jsi::Object &) {
+  throw std::logic_error("Not implemented");
+}
+
+void JSCRuntime::setNativeState(
+    const jsi::Object &,
+    std::shared_ptr<jsi::NativeState>) {
+  throw std::logic_error("Not implemented");
+}
+
 jsi::Value JSCRuntime::getProperty(
     const jsi::Object &obj,
     const jsi::String &name) {
@@ -1035,6 +1089,11 @@ jsi::Array JSCRuntime::createArray(size_t length) {
   return createObject(obj).getArray(*this);
 }
 
+jsi::ArrayBuffer JSCRuntime::createArrayBuffer(
+    std::shared_ptr<jsi::MutableBuffer> buffer) {
+  throw std::logic_error("Not implemented");
+}
+
 size_t JSCRuntime::size(const jsi::Array &arr) {
   return static_cast<size_t>(
       getProperty(arr, createPropNameID(getLengthString())).getNumber());
diff --git a/ReactCommon/jsi/JSCRuntime.h b/ReactCommon/jsc/JSCRuntime.h
similarity index 100%
rename from ReactCommon/jsi/JSCRuntime.h
rename to ReactCommon/jsc/JSCRuntime.h
diff --git a/ReactCommon/React-bridging.podspec b/ReactCommon/jsc/React-jsc.podspec
similarity index 53%
rename from ReactCommon/React-bridging.podspec
rename to ReactCommon/jsc/React-jsc.podspec
index 2ea858270d72..6bb2347e57ed 100644
--- a/ReactCommon/React-bridging.podspec
+++ b/ReactCommon/jsc/React-jsc.podspec
@@ -5,7 +5,7 @@
 
 require "json"
 
-package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
+package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
 source = { :git => 'https://github.com/facebook/react-native.git' }
@@ -16,27 +16,22 @@ 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'
-
 Pod::Spec.new do |s|
-  s.name                   = "React-bridging"
+  s.name                   = "React-jsc"
   s.version                = version
-  s.summary                = "-"  # TODO
+  s.summary                = "JavaScriptCore engine for React Native"
   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" }
+  s.source_files           = "JSCRuntime.{cpp,h}"
+  s.exclude_files          = "**/test/*"
+  s.framework              = "JavaScriptCore"
 
-  s.dependency "RCT-Folly", folly_version
   s.dependency "React-jsi", version
+
+  s.subspec "Fabric" do |ss|
+    ss.pod_target_xcconfig  = { "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" }
+  end
 end
diff --git a/ReactCommon/jserrorhandler/BUCK b/ReactCommon/jserrorhandler/BUCK
new file mode 100644
index 000000000000..9edd6729f64e
--- /dev/null
+++ b/ReactCommon/jserrorhandler/BUCK
@@ -0,0 +1,30 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "CXX", "react_native_xplat_target", "rn_xplat_cxx_library")
+
+# TODO: Expolre merging this module into venice so we don't to load this library seperately
+rn_xplat_cxx_library(
+    name = "jserrorhandler",
+    srcs = glob(["*.cpp"]),
+    header_namespace = "",
+    exported_headers = {"JsErrorHandler/JsErrorHandler.h": "JsErrorHandler.h"},
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+    ],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+    ],
+    platforms = (ANDROID, APPLE, CXX),
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        "//xplat/folly:dynamic",
+        "//xplat/folly:json",
+        "//xplat/jsi:jsi",
+        react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
+    ],
+)
diff --git a/ReactCommon/jserrorhandler/JsErrorHandler.cpp b/ReactCommon/jserrorhandler/JsErrorHandler.cpp
new file mode 100644
index 000000000000..0902e68b2b16
--- /dev/null
+++ b/ReactCommon/jserrorhandler/JsErrorHandler.cpp
@@ -0,0 +1,107 @@
+/*
+ * 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 "JsErrorHandler.h"
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#include <regex>
+#include <sstream>
+#include <string>
+#include <vector>
+
+namespace facebook {
+namespace react {
+
+using facebook::react::JSErrorHandlerKey;
+
+static MapBuffer
+parseErrorStack(const jsi::JSError &error, bool isFatal, bool isHermes) {
+  /**
+   * This parses the different stack traces and puts them into one format
+   * This borrows heavily from TraceKit (https://github.com/occ/TraceKit)
+   * This is the same regex from stacktrace-parser.js.
+   */
+  const std::regex REGEX_CHROME(
+      R"(^\s*at (?:(?:(?:Anonymous function)?|((?:\[object object\])?\S+(?: \[as \S+\])?)) )?\(?((?:file|http|https):.*?):(\d+)(?::(\d+))?\)?\s*$)");
+  const std::regex REGEX_GECKO(
+      R"(^(?:\s*([^@]*)(?:\((.*?)\))?@)?(\S.*?):(\d+)(?::(\d+))?\s*$)");
+  const std::regex REGEX_NODE(
+      R"(^\s*at (?:((?:\[object object\])?\S+(?: \[as \S+\])?) )?\(?(.*?):(\d+)(?::(\d+))?\)?\s*$)");
+
+  // Capture groups for Hermes (from parseHermesStack.js):
+  // 1. function name
+  // 2. is this a native stack frame?
+  // 3. is this a bytecode address or a source location?
+  // 4. source URL (filename)
+  // 5. line number (1 based)
+  // 6. column number (1 based) or virtual offset (0 based)
+  const std::regex REGEX_HERMES(
+      R"(^ {4}at (.+?)(?: \((native)\)?| \((address at )?(.*?):(\d+):(\d+)\))$)");
+
+  std::string line;
+  std::stringstream strStream(error.getStack());
+
+  auto errorObj = MapBufferBuilder();
+  std::vector<MapBuffer> frames;
+
+  while (std::getline(strStream, line, '\n')) {
+    auto frame = MapBufferBuilder();
+    auto searchResults = std::smatch{};
+
+    if (isHermes) {
+      if (std::regex_search(line, searchResults, REGEX_HERMES)) {
+        std::string str2 = std::string(searchResults[2]);
+        if (str2.compare("native")) {
+          frame.putString(kFrameFileName, std::string(searchResults[4]));
+          frame.putString(kFrameMethodName, std::string(searchResults[1]));
+          frame.putInt(kFrameLineNumber, std::stoi(searchResults[5]));
+          frame.putInt(kFrameColumnNumber, std::stoi(searchResults[6]));
+          frames.push_back(frame.build());
+        }
+      }
+    } else {
+      if (std::regex_search(line, searchResults, REGEX_GECKO)) {
+        frame.putString(kFrameFileName, std::string(searchResults[3]));
+        frame.putString(kFrameMethodName, std::string(searchResults[1]));
+        frame.putInt(kFrameLineNumber, std::stoi(searchResults[4]));
+        frame.putInt(kFrameColumnNumber, std::stoi(searchResults[5]));
+      } else if (
+          std::regex_search(line, searchResults, REGEX_CHROME) ||
+          std::regex_search(line, searchResults, REGEX_NODE)) {
+        frame.putString(kFrameFileName, std::string(searchResults[2]));
+        frame.putString(kFrameMethodName, std::string(searchResults[1]));
+        frame.putInt(kFrameLineNumber, std::stoi(searchResults[3]));
+        frame.putInt(kFrameColumnNumber, std::stoi(searchResults[4]));
+      } else {
+        continue;
+      }
+      frames.push_back(frame.build());
+    }
+  }
+  errorObj.putMapBufferList(kAllStackFrames, std::move(frames));
+  errorObj.putString(kErrorMessage, "EarlyJsError: " + error.getMessage());
+  // TODO: If needed, can increment exceptionId by 1 each time
+  errorObj.putInt(kExceptionId, 0);
+  errorObj.putBool(kIsFatal, isFatal);
+  return errorObj.build();
+}
+
+JsErrorHandler::JsErrorHandler(
+    JsErrorHandler::JsErrorHandlingFunc jsErrorHandlingFunc) {
+  this->_jsErrorHandlingFunc = jsErrorHandlingFunc;
+};
+
+JsErrorHandler::~JsErrorHandler() {}
+
+void JsErrorHandler::handleJsError(const jsi::JSError &error, bool isFatal) {
+  // TODO: Current error parsing works and is stable. Can investigate using
+  // REGEX_HERMES to get additional Hermes data, though it requires JS setup.
+  MapBuffer errorMap = parseErrorStack(error, isFatal, false);
+  _jsErrorHandlingFunc(std::move(errorMap));
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/jserrorhandler/JsErrorHandler.h b/ReactCommon/jserrorhandler/JsErrorHandler.h
new file mode 100644
index 000000000000..90383e17ca7d
--- /dev/null
+++ b/ReactCommon/jserrorhandler/JsErrorHandler.h
@@ -0,0 +1,39 @@
+/*
+ * 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 <jsi/jsi.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+
+namespace facebook {
+namespace react {
+
+enum JSErrorHandlerKey : uint16_t {
+  kFrameFileName = 0,
+  kFrameMethodName = 1,
+  kFrameLineNumber = 2,
+  kFrameColumnNumber = 3,
+  kAllStackFrames = 4,
+  kErrorMessage = 5,
+  kExceptionId = 6,
+  kIsFatal = 7
+};
+
+class JsErrorHandler {
+ public:
+  using JsErrorHandlingFunc = std::function<void(MapBuffer errorMap)>;
+
+  JsErrorHandler(JsErrorHandlingFunc jsErrorHandlingFunc);
+  ~JsErrorHandler();
+
+  void handleJsError(const jsi::JSError &error, bool isFatal);
+
+ private:
+  JsErrorHandlingFunc _jsErrorHandlingFunc;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/jsi/BUCK b/ReactCommon/jsi/BUCK
index 7186cad79e24..72d8a39190de 100644
--- a/ReactCommon/jsi/BUCK
+++ b/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",
@@ -19,6 +19,7 @@ rn_xplat_cxx_library(
         "-Wdelete-non-virtual-dtor",
         "-Wwrite-strings",
     ],
+    compiler_flags_pedantic = True,
     cxx_compiler_flags = [
         "-Wglobal-constructors",
         "-Wmissing-prototypes",
@@ -29,7 +30,6 @@ rn_xplat_cxx_library(
     ],
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     visibility = ["PUBLIC"],
 )
@@ -43,47 +43,16 @@ rn_xplat_cxx_library(
     exported_headers = [
         "jsi/JSIDynamic.h",
     ],
+    compiler_flags_pedantic = True,
     fbobjc_force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     visibility = [
         "PUBLIC",
     ],
     xcode_public_headers_symlinks = True,
     deps = [
-        "//xplat/folly:molly",
-        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),
-    fbobjc_compiler_flags = [
-        "-Os",
-    ],
-    fbobjc_frameworks = [
-        "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework",
-    ],
-    labels = [
-        "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
-    ],
-    platforms = APPLE,
-    visibility = ["PUBLIC"],
-    xplat_mangled_args = {
-        "soname": "libjscjsi.$(ext)",
-    },
-    exported_deps = [
         react_native_xplat_dep("jsi:jsi"),
     ],
 )
diff --git a/ReactCommon/jsi/CMakeLists.txt b/ReactCommon/jsi/CMakeLists.txt
index 3f2a8c15d3fa..0967a7d7ee69 100644
--- a/ReactCommon/jsi/CMakeLists.txt
+++ b/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)
diff --git a/ReactCommon/jsi/React-jsi.podspec b/ReactCommon/jsi/React-jsi.podspec
index 0e2ee388889c..621faa989600 100644
--- a/ReactCommon/jsi/React-jsi.podspec
+++ b/ReactCommon/jsi/React-jsi.podspec
@@ -5,6 +5,10 @@
 
 require "json"
 
+js_engine = ENV['USE_HERMES'] == "0" ?
+  :jsc :
+  :hermes
+
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
@@ -23,30 +27,34 @@ boost_compiler_flags = '-Wno-documentation'
 Pod::Spec.new do |s|
   s.name                   = "React-jsi"
   s.version                = version
-  s.summary                = "-"  # TODO
+  s.summary                = "JavaScript Interface layer for React Native"
   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           = "**/*.{cpp,h}"
-  s.exclude_files          = "**/test/*"
-  s.framework              = "JavaScriptCore"
+
+  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.header_dir             = "jsi"
-  s.default_subspec        = "Default"
 
   s.dependency "boost", "1.76.0"
   s.dependency "DoubleConversion"
   s.dependency "RCT-Folly", folly_version
   s.dependency "glog"
 
-  s.subspec "Default" do
-    # no-op
-  end
-
-  s.subspec "Fabric" do |ss|
-    ss.pod_target_xcconfig  = { "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" }
+  if js_engine == :jsc
+    s.source_files  = "**/*.{cpp,h}"
+    s.exclude_files = [
+                        "jsi/jsilib-posix.cpp",
+                        "jsi/jsilib-windows.cpp",
+                        "**/test/*"
+                      ]
+
+  elsif js_engine == :hermes
+    # JSI is provided by hermes-engine when Hermes is enabled
+    # Just need to provide JSIDynamic in this case.
+    s.source_files = "jsi/JSIDynamic.{cpp,h}"
+    s.dependency "hermes-engine"
   end
 end
diff --git a/ReactCommon/jsi/jsi/JSIDynamic.cpp b/ReactCommon/jsi/jsi/JSIDynamic.cpp
index 4464cc3b62f9..02f112c0e0ca 100644
--- a/ReactCommon/jsi/jsi/JSIDynamic.cpp
+++ b/ReactCommon/jsi/jsi/JSIDynamic.cpp
@@ -129,8 +129,7 @@ void dynamicFromValueShallow(
     output = value.getNumber();
   } else if (value.isString()) {
     output = value.getString(runtime).utf8(runtime);
-  } else {
-    CHECK(value.isObject());
+  } else if (value.isObject()) {
     Object obj = value.getObject(runtime);
     if (obj.isArray(runtime)) {
       output = folly::dynamic::array();
@@ -140,6 +139,12 @@ void dynamicFromValueShallow(
       output = folly::dynamic::object();
     }
     stack.emplace_back(&output, std::move(obj));
+  } else if (value.isBigInt()) {
+    throw JSError(runtime, "JS BigInts are not convertible to dynamic");
+  } else if (value.isSymbol()) {
+    throw JSError(runtime, "JS Symbols are not convertible to dynamic");
+  } else {
+    throw JSError(runtime, "Value is not convertible to dynamic");
   }
 }
 
diff --git a/ReactCommon/jsi/jsi/decorator.h b/ReactCommon/jsi/jsi/decorator.h
index 6f239c051b7d..9df3a2bc8f50 100644
--- a/ReactCommon/jsi/jsi/decorator.h
+++ b/ReactCommon/jsi/jsi/decorator.h
@@ -193,6 +193,25 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
     return plain_.symbolToString(sym);
   }
 
+  BigInt createBigIntFromInt64(int64_t value) override {
+    return plain_.createBigIntFromInt64(value);
+  }
+  BigInt createBigIntFromUint64(uint64_t value) override {
+    return plain_.createBigIntFromUint64(value);
+  }
+  bool bigintIsInt64(const BigInt& b) override {
+    return plain_.bigintIsInt64(b);
+  }
+  bool bigintIsUint64(const BigInt& b) override {
+    return plain_.bigintIsUint64(b);
+  }
+  uint64_t truncate(const BigInt& b) override {
+    return plain_.truncate(b);
+  }
+  String bigintToString(const BigInt& bigint, int radix) override {
+    return plain_.bigintToString(bigint, radix);
+  }
+
   String createStringFromAscii(const char* str, size_t length) override {
     return plain_.createStringFromAscii(str, length);
   };
@@ -222,6 +241,17 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
     return dhf.target<DecoratedHostFunction>()->plainHF_;
   };
 
+  bool hasNativeState(const Object& o) override {
+    return plain_.hasNativeState(o);
+  }
+  std::shared_ptr<NativeState> getNativeState(const Object& o) override {
+    return plain_.getNativeState(o);
+  }
+  void setNativeState(const Object& o, std::shared_ptr<NativeState> state)
+      override {
+    plain_.setNativeState(o, state);
+  }
+
   Value getProperty(const Object& o, const PropNameID& name) override {
     return plain_.getProperty(o, name);
   };
@@ -272,6 +302,10 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
   Array createArray(size_t length) override {
     return plain_.createArray(length);
   };
+  ArrayBuffer createArrayBuffer(
+      std::shared_ptr<MutableBuffer> buffer) override {
+    return plain_.createArrayBuffer(std::move(buffer));
+  };
   size_t size(const Array& a) override {
     return plain_.size(a);
   };
@@ -671,6 +705,10 @@ class WithRuntimeDecorator : public RuntimeDecorator<Plain, Base> {
     Around around{with_};
     return RD::createArray(length);
   };
+  ArrayBuffer createArrayBuffer(
+      std::shared_ptr<MutableBuffer> buffer) override {
+    return RD::createArrayBuffer(std::move(buffer));
+  };
   size_t size(const Array& a) override {
     Around around{with_};
     return RD::size(a);
diff --git a/ReactCommon/jsi/jsi/jsi-inl.h b/ReactCommon/jsi/jsi/jsi-inl.h
index 3823e8b25535..a7e515834926 100644
--- a/ReactCommon/jsi/jsi/jsi-inl.h
+++ b/ReactCommon/jsi/jsi/jsi-inl.h
@@ -202,6 +202,29 @@ inline std::shared_ptr<HostObject> Object::getHostObject<HostObject>(
   return runtime.getHostObject(*this);
 }
 
+template <typename T>
+inline bool Object::hasNativeState(Runtime& runtime) const {
+  return runtime.hasNativeState(*this) &&
+      std::dynamic_pointer_cast<T>(runtime.getNativeState(*this));
+}
+
+template <>
+inline bool Object::hasNativeState<NativeState>(Runtime& runtime) const {
+  return runtime.hasNativeState(*this);
+}
+
+template <typename T>
+inline std::shared_ptr<T> Object::getNativeState(Runtime& runtime) const {
+  assert(hasNativeState<T>(runtime));
+  return std::static_pointer_cast<T>(runtime.getNativeState(*this));
+}
+
+inline void Object::setNativeState(
+    Runtime& runtime,
+    std::shared_ptr<NativeState> state) const {
+  runtime.setNativeState(*this, state);
+}
+
 inline Array Object::getPropertyNames(Runtime& runtime) const {
   return runtime.getPropertyNames(*this);
 }
@@ -318,5 +341,9 @@ inline Value Function::callAsConstructor(Runtime& runtime, Args&&... args)
       runtime, {detail::toValue(runtime, std::forward<Args>(args))...});
 }
 
+String BigInt::toString(Runtime& runtime, int radix) const {
+  return runtime.bigintToString(*this, radix);
+}
+
 } // namespace jsi
 } // namespace facebook
diff --git a/ReactCommon/jsi/jsi/jsi.cpp b/ReactCommon/jsi/jsi/jsi.cpp
index 3f56d0623b0b..2831571537de 100644
--- a/ReactCommon/jsi/jsi/jsi.cpp
+++ b/ReactCommon/jsi/jsi/jsi.cpp
@@ -66,6 +66,8 @@ Value callGlobalFunction(Runtime& runtime, const char* name, const Value& arg) {
 
 Buffer::~Buffer() = default;
 
+MutableBuffer::~MutableBuffer() = default;
+
 PreparedJavaScript::~PreparedJavaScript() = default;
 
 Value HostObject::get(Runtime&, const PropNameID&) {
@@ -81,6 +83,8 @@ void HostObject::set(Runtime& rt, const PropNameID& name, const Value&) {
 
 HostObject::~HostObject() {}
 
+NativeState::~NativeState() {}
+
 Runtime::~Runtime() {}
 
 Instrumentation& Runtime::instrumentation() {
@@ -379,6 +383,20 @@ String Value::toString(Runtime& runtime) const {
   return toString.call(runtime, *this).getString(runtime);
 }
 
+uint64_t BigInt::asUint64(Runtime& runtime) const {
+  if (!isUint64(runtime)) {
+    throw JSError(runtime, "Lossy truncation in BigInt64::asUint64");
+  }
+  return getUint64(runtime);
+}
+
+int64_t BigInt::asInt64(Runtime& runtime) const {
+  if (!isInt64(runtime)) {
+    throw JSError(runtime, "Lossy truncation in BigInt64::asInt64");
+  }
+  return getInt64(runtime);
+}
+
 Array Array::createWithElements(
     Runtime& rt,
     std::initializer_list<Value> elements) {
diff --git a/ReactCommon/jsi/jsi/jsi.h b/ReactCommon/jsi/jsi/jsi.h
index 7c1479f00682..b50780964ad2 100644
--- a/ReactCommon/jsi/jsi/jsi.h
+++ b/ReactCommon/jsi/jsi/jsi.h
@@ -31,6 +31,10 @@ class FBJSRuntime;
 namespace facebook {
 namespace jsi {
 
+/// Base class for buffers of data or bytecode that need to be passed to the
+/// runtime. The buffer is expected to be fully immutable, so the result of
+/// size(), data(), and the contents of the pointer returned by data() must not
+/// change after construction.
 class JSI_EXPORT Buffer {
  public:
   virtual ~Buffer();
@@ -52,6 +56,18 @@ class JSI_EXPORT StringBuffer : public Buffer {
   std::string s_;
 };
 
+/// Base class for buffers of data that need to be passed to the runtime. The
+/// result of size() and data() must not change after construction. However, the
+/// region pointed to by data() may be modified by the user or the runtime. The
+/// user must ensure that access to the contents of the buffer is properly
+/// synchronised.
+class JSI_EXPORT MutableBuffer {
+ public:
+  virtual ~MutableBuffer();
+  virtual size_t size() const = 0;
+  virtual uint8_t* data() = 0;
+};
+
 /// PreparedJavaScript is a base class representing JavaScript which is in a
 /// form optimized for execution, in a runtime-specific way. Construct one via
 /// jsi::Runtime::prepareJavaScript().
@@ -128,6 +144,13 @@ class JSI_EXPORT HostObject {
   virtual std::vector<PropNameID> getPropertyNames(Runtime& rt);
 };
 
+/// Native state (and destructor) that can be attached to any JS object
+/// using setNativeState.
+class JSI_EXPORT NativeState {
+ public:
+  virtual ~NativeState();
+};
+
 /// Represents a JS runtime.  Movable, but not copyable.  Note that
 /// this object may not be thread-aware, but cannot be used safely from
 /// multiple threads at once.  The application is responsible for
@@ -283,6 +306,13 @@ class JSI_EXPORT Runtime {
 
   virtual std::string symbolToString(const Symbol&) = 0;
 
+  virtual BigInt createBigIntFromInt64(int64_t) = 0;
+  virtual BigInt createBigIntFromUint64(uint64_t) = 0;
+  virtual bool bigintIsInt64(const BigInt&) = 0;
+  virtual bool bigintIsUint64(const BigInt&) = 0;
+  virtual uint64_t truncate(const BigInt&) = 0;
+  virtual String bigintToString(const BigInt&, int) = 0;
+
   virtual String createStringFromAscii(const char* str, size_t length) = 0;
   virtual String createStringFromUtf8(const uint8_t* utf8, size_t length) = 0;
   virtual std::string utf8(const String&) = 0;
@@ -296,6 +326,12 @@ class JSI_EXPORT Runtime {
   virtual std::shared_ptr<HostObject> getHostObject(const jsi::Object&) = 0;
   virtual HostFunctionType& getHostFunction(const jsi::Function&) = 0;
 
+  virtual bool hasNativeState(const jsi::Object&) = 0;
+  virtual std::shared_ptr<NativeState> getNativeState(const jsi::Object&) = 0;
+  virtual void setNativeState(
+      const jsi::Object&,
+      std::shared_ptr<NativeState> state) = 0;
+
   virtual Value getProperty(const Object&, const PropNameID& name) = 0;
   virtual Value getProperty(const Object&, const String& name) = 0;
   virtual bool hasProperty(const Object&, const PropNameID& name) = 0;
@@ -316,6 +352,8 @@ class JSI_EXPORT Runtime {
   virtual Value lockWeakObject(WeakObject&) = 0;
 
   virtual Array createArray(size_t length) = 0;
+  virtual ArrayBuffer createArrayBuffer(
+      std::shared_ptr<MutableBuffer> buffer) = 0;
   virtual size_t size(const Array&) = 0;
   virtual size_t size(const ArrayBuffer&) = 0;
   virtual uint8_t* data(const ArrayBuffer&) = 0;
@@ -494,6 +532,53 @@ class JSI_EXPORT BigInt : public Pointer {
   BigInt(BigInt&& other) = default;
   BigInt& operator=(BigInt&& other) = default;
 
+  /// Create a BigInt representing the signed 64-bit \p value.
+  static BigInt fromInt64(Runtime& runtime, int64_t value) {
+    return runtime.createBigIntFromInt64(value);
+  }
+
+  /// Create a BigInt representing the unsigned 64-bit \p value.
+  static BigInt fromUint64(Runtime& runtime, uint64_t value) {
+    return runtime.createBigIntFromUint64(value);
+  }
+
+  /// \return whether a === b.
+  static bool strictEquals(Runtime& runtime, const BigInt& a, const BigInt& b) {
+    return runtime.strictEquals(a, b);
+  }
+
+  /// \returns This bigint truncated to a signed 64-bit integer.
+  int64_t getInt64(Runtime& runtime) const {
+    return runtime.truncate(*this);
+  }
+
+  /// \returns Whether this bigint can be losslessly converted to int64_t.
+  bool isInt64(Runtime& runtime) const {
+    return runtime.bigintIsInt64(*this);
+  }
+
+  /// \returns This bigint truncated to a signed 64-bit integer. Throws a
+  /// JSIException if the truncation is lossy.
+  int64_t asInt64(Runtime& runtime) const;
+
+  /// \returns This bigint truncated to an unsigned 64-bit integer.
+  uint64_t getUint64(Runtime& runtime) const {
+    return runtime.truncate(*this);
+  }
+
+  /// \returns Whether this bigint can be losslessly converted to uint64_t.
+  bool isUint64(Runtime& runtime) const {
+    return runtime.bigintIsUint64(*this);
+  }
+
+  /// \returns This bigint truncated to an unsigned 64-bit integer. Throws a
+  /// JSIException if the truncation is lossy.
+  uint64_t asUint64(Runtime& runtime) const;
+
+  /// \returns this BigInt converted to a String in base \p radix. Throws a
+  /// JSIException if radix is not in the [2, 36] range.
+  inline String toString(Runtime& runtime, int radix = 10) const;
+
   friend class Runtime;
   friend class Value;
 };
@@ -711,6 +796,25 @@ class JSI_EXPORT Object : public Pointer {
   template <typename T = HostObject>
   std::shared_ptr<T> asHostObject(Runtime& runtime) const;
 
+  /// \return whether this object has native state of type T previously set by
+  /// \c setNativeState.
+  template <typename T = NativeState>
+  bool hasNativeState(Runtime& runtime) const;
+
+  /// \return a shared_ptr to the state previously set by \c setNativeState.
+  /// If \c hasNativeState<T> is false, this will assert. Note that this does a
+  /// type check and will assert if the native state isn't of type \c T
+  template <typename T = NativeState>
+  std::shared_ptr<T> getNativeState(Runtime& runtime) const;
+
+  /// Set the internal native state property of this object, overwriting any old
+  /// value. Creates a new shared_ptr to the object managed by \p state, which
+  /// will live until the value at this property becomes unreachable.
+  ///
+  /// Throws a type error if this object is a proxy or host object.
+  void setNativeState(Runtime& runtime, std::shared_ptr<NativeState> state)
+      const;
+
   /// \return same as \c getProperty(name).asObject(), except with
   /// a better exception message.
   Object getPropertyAsObject(Runtime& runtime, const char* name) const;
@@ -829,6 +933,9 @@ class JSI_EXPORT ArrayBuffer : public Object {
   ArrayBuffer(ArrayBuffer&&) = default;
   ArrayBuffer& operator=(ArrayBuffer&&) = default;
 
+  ArrayBuffer(Runtime& runtime, std::shared_ptr<MutableBuffer> buffer)
+      : ArrayBuffer(runtime.createArrayBuffer(std::move(buffer))) {}
+
   /// \return the size of the ArrayBuffer, according to its byteLength property.
   /// (C++ naming convention)
   size_t size(Runtime& runtime) const {
diff --git a/ReactCommon/jsiexecutor/BUCK b/ReactCommon/jsiexecutor/BUCK
index 24cbabd821fa..8b1abbf9ba50 100644
--- a/ReactCommon/jsiexecutor/BUCK
+++ b/ReactCommon/jsiexecutor/BUCK
@@ -17,14 +17,13 @@ cxx_library(
     ],
     fbandroid_deps = [
         "//third-party/glog:glog",
-        "//xplat/folly:molly",
+        "//xplat/folly:json",
         "//xplat/third-party/linker_lib:atomic",
     ],
     fbobjc_force_static = True,
     fbobjc_header_path_prefix = "",
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE),
     preprocessor_flags = [
diff --git a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
index b6f3f26ad132..10552e0adae0 100644
--- a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
+++ b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
@@ -121,7 +121,6 @@ void JSIExecutor::initializeRuntime() {
               const jsi::Value *args,
               size_t count) { return nativeCallSyncHook(args, count); }));
 
-#if DEBUG
   runtime_->global().setProperty(
       *runtime_,
       "globalEvalWithSourceUrl",
@@ -134,7 +133,6 @@ void JSIExecutor::initializeRuntime() {
               const jsi::Value &,
               const jsi::Value *args,
               size_t count) { return globalEvalWithSourceUrl(args, count); }));
-#endif
 
   if (runtimeInstaller_) {
     runtimeInstaller_(*runtime_);
@@ -175,7 +173,7 @@ void JSIExecutor::setBundleRegistry(std::unique_ptr<RAMBundleRegistry> r) {
             PropNameID::forAscii(*runtime_, "nativeRequire"),
             2,
             [this](
-                __unused Runtime &rt,
+                [[maybe_unused]] Runtime &rt,
                 const facebook::jsi::Value &,
                 const facebook::jsi::Value *args,
                 size_t count) { return nativeRequire(args, count); }));
@@ -244,8 +242,7 @@ void JSIExecutor::callFunction(
   // by value.
   auto errorProducer = [=] {
     std::stringstream ss;
-    ss << "moduleID: " << moduleId << " methodID: " << methodId
-       << " arguments: " << folly::toJson(arguments);
+    ss << "moduleID: " << moduleId << " methodID: " << methodId;
     return ss.str();
   };
 
@@ -527,7 +524,6 @@ Value JSIExecutor::nativeCallSyncHook(const Value *args, size_t count) {
   return returnValue;
 }
 
-#if DEBUG
 Value JSIExecutor::globalEvalWithSourceUrl(const Value *args, size_t count) {
   if (count != 1 && count != 2) {
     throw std::invalid_argument(
@@ -543,7 +539,6 @@ Value JSIExecutor::globalEvalWithSourceUrl(const Value *args, size_t count) {
   return runtime_->evaluateJavaScript(
       std::make_unique<StringBuffer>(std::move(code)), url);
 }
-#endif
 
 void bindNativeLogger(Runtime &runtime, Logger logger) {
   runtime.global().setProperty(
diff --git a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h
index f06d0d32fd09..1a8d01f631f1 100644
--- a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h
+++ b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h
@@ -116,9 +116,7 @@ class JSIExecutor : public JSExecutor {
   void callNativeModules(const jsi::Value &queue, bool isEndOfBatch);
   jsi::Value nativeCallSyncHook(const jsi::Value *args, size_t count);
   jsi::Value nativeRequire(const jsi::Value *args, size_t count);
-#ifdef DEBUG
   jsi::Value globalEvalWithSourceUrl(const jsi::Value *args, size_t count);
-#endif
 
   std::shared_ptr<jsi::Runtime> runtime_;
   std::shared_ptr<ExecutorDelegate> delegate_;
diff --git a/ReactCommon/jsinspector/BUCK b/ReactCommon/jsinspector/BUCK
index 24e63a862a70..6045c8797a93 100644
--- a/ReactCommon/jsinspector/BUCK
+++ b/ReactCommon/jsinspector/BUCK
@@ -26,10 +26,10 @@ rn_xplat_cxx_library(
         ],
         prefix = "jsinspector",
     ),
+    compiler_flags_pedantic = True,
     fbandroid_preferred_linkage = "shared",
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     preprocessor_flags = get_hermes_shared_library_preprocessor_flags(),
diff --git a/ReactCommon/logger/BUCK b/ReactCommon/logger/BUCK
index 09b5f65e1a73..7446aa162942 100644
--- a/ReactCommon/logger/BUCK
+++ b/ReactCommon/logger/BUCK
@@ -26,10 +26,10 @@ rn_xplat_cxx_library(
         ],
         prefix = "logger",
     ),
+    compiler_flags_pedantic = True,
     fbandroid_preferred_linkage = "shared",
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     visibility = [
diff --git a/ReactCommon/logger/React-logger.podspec b/ReactCommon/logger/React-logger.podspec
index 62b5148965a7..193f42e23157 100644
--- a/ReactCommon/logger/React-logger.podspec
+++ b/ReactCommon/logger/React-logger.podspec
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "12.4", :tvos => "12.4" }
+  s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "*.{cpp,h}"
   s.exclude_files          = "SampleCxxModule.*"
diff --git a/ReactCommon/react/bridging/Array.h b/ReactCommon/react/bridging/Array.h
index 330e2e1a4f8b..af36c392d06a 100644
--- a/ReactCommon/react/bridging/Array.h
+++ b/ReactCommon/react/bridging/Array.h
@@ -13,6 +13,7 @@
 #include <deque>
 #include <initializer_list>
 #include <list>
+#include <set>
 #include <tuple>
 #include <utility>
 #include <vector>
@@ -105,4 +106,22 @@ struct Bridging<std::vector<T>>
   }
 };
 
+template <typename T>
+struct Bridging<std::set<T>> : array_detail::BridgingDynamic<std::set<T>> {
+  static std::set<T> fromJs(
+      facebook::jsi::Runtime &rt,
+      const jsi::Array &array,
+      const std::shared_ptr<CallInvoker> &jsInvoker) {
+    size_t length = array.length(rt);
+
+    std::set<T> set;
+    for (size_t i = 0; i < length; i++) {
+      set.insert(
+          bridging::fromJs<T>(rt, array.getValueAtIndex(rt, i), jsInvoker));
+    }
+
+    return set;
+  }
+};
+
 } // namespace facebook::react
diff --git a/ReactCommon/react/bridging/BUCK b/ReactCommon/react/bridging/BUCK
index 72e1dac38a84..b5f531de7022 100644
--- a/ReactCommon/react/bridging/BUCK
+++ b/ReactCommon/react/bridging/BUCK
@@ -7,15 +7,14 @@ rn_xplat_cxx_library(
     exported_headers = glob(["*.h"]),
     compiler_flags_enable_exceptions = True,
     compiler_flags_enable_rtti = True,
+    compiler_flags_pedantic = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE, CXX),
     tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
-        "//xplat/folly:headers_only_do_not_use",
     ],
     exported_deps = [
         react_native_xplat_target("butter:butter"),
@@ -28,6 +27,7 @@ rn_xplat_cxx_library(
     name = "testlib",
     header_namespace = "react/bridging",
     exported_headers = glob(["tests/*.h"]),
+    compiler_flags_pedantic = True,
     platforms = (ANDROID, APPLE, CXX),
     visibility = ["PUBLIC"],
     exported_deps = [
diff --git a/ReactCommon/react/bridging/Base.h b/ReactCommon/react/bridging/Base.h
index 56006f35bf25..4a65364753aa 100644
--- a/ReactCommon/react/bridging/Base.h
+++ b/ReactCommon/react/bridging/Base.h
@@ -94,8 +94,7 @@ template <typename T, std::enable_if_t<is_jsi_v<T>, int> = 0>
 auto toJs(
     jsi::Runtime &rt,
     T &&value,
-    const std::shared_ptr<CallInvoker> & = nullptr)
-    -> decltype(convert(rt, std::forward<T>(value))) {
+    const std::shared_ptr<CallInvoker> & = nullptr) -> remove_cvref_t<T> {
   return convert(rt, std::forward<T>(value));
 }
 
diff --git a/ReactCommon/react/bridging/CMakeLists.txt b/ReactCommon/react/bridging/CMakeLists.txt
index 88d3aba2fae6..18eb946077fe 100644
--- a/ReactCommon/react/bridging/CMakeLists.txt
+++ b/ReactCommon/react/bridging/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"ReactNative\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"ReactNative\")
 
 file(GLOB react_bridging_SRC CONFIGURE_DEPENDS *.cpp)
 
diff --git a/ReactCommon/react/bridging/CallbackWrapper.h b/ReactCommon/react/bridging/CallbackWrapper.h
index fc2980cb9253..8670f2bf08c6 100644
--- a/ReactCommon/react/bridging/CallbackWrapper.h
+++ b/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>
 
diff --git a/ReactCommon/react/bridging/tests/BridgingTest.cpp b/ReactCommon/react/bridging/tests/BridgingTest.cpp
index f213ba5c0d51..a1f50fec9888 100644
--- a/ReactCommon/react/bridging/tests/BridgingTest.cpp
+++ b/ReactCommon/react/bridging/tests/BridgingTest.cpp
@@ -215,6 +215,51 @@ TEST_F(BridgingTest, syncCallbackTest) {
   EXPECT_TRUE(fn.isFunction(rt)); // Ensure the function wasn't invalidated.
 }
 
+TEST_F(BridgingTest, syncCallbackImplicitBridgingTest) {
+  { // Value
+    auto fn = function("(a, b) => a + b");
+    auto cb = bridging::fromJs<SyncCallback<std::string(jsi::Value, int)>>(
+        rt, fn, invoker);
+    jsi::Value foo(jsi::String::createFromAscii(rt, "foo"));
+
+    EXPECT_EQ(cb(std::move(foo), 1), "foo1");
+    EXPECT_EQ(cb(jsi::String::createFromAscii(rt, "bar"), 2), "bar2");
+    EXPECT_TRUE(fn.isFunction(rt));
+  }
+  { // Object
+    auto fn = function("(a, b) => a.obj + b");
+    auto cb = bridging::fromJs<SyncCallback<std::string(jsi::Object, int)>>(
+        rt, fn, invoker);
+
+    jsi::Object foo(rt);
+    foo.setProperty(rt, "obj", "foo");
+
+    EXPECT_EQ(cb(std::move(foo), 1), "foo1");
+    EXPECT_TRUE(fn.isFunction(rt));
+  }
+  { // String
+    auto fn = function("(a, b) => a + b");
+    auto cb = bridging::fromJs<SyncCallback<std::string(jsi::String, int)>>(
+        rt, fn, invoker);
+    jsi::String foo(jsi::String::createFromAscii(rt, "foo"));
+
+    EXPECT_EQ(cb(std::move(foo), 1), "foo1");
+    EXPECT_EQ(cb(jsi::String::createFromAscii(rt, "bar"), 2), "bar2");
+    EXPECT_TRUE(fn.isFunction(rt));
+  }
+  { // Array
+    auto fn = function("(a, b) => a[0] + b");
+    auto cb = bridging::fromJs<SyncCallback<std::string(jsi::Array, int)>>(
+        rt, fn, invoker);
+
+    jsi::Array foo(rt, 1);
+    foo.setValueAtIndex(rt, 0, jsi::String::createFromAscii(rt, "foo"));
+
+    EXPECT_EQ(cb(std::move(foo), 1), "foo1");
+    EXPECT_TRUE(fn.isFunction(rt));
+  }
+}
+
 TEST_F(BridgingTest, asyncCallbackTest) {
   std::string output;
 
@@ -230,6 +275,68 @@ TEST_F(BridgingTest, asyncCallbackTest) {
   EXPECT_EQ("hello"s, output);
 }
 
+TEST_F(BridgingTest, asyncCallbackImplicitBridgingTest) {
+  std::string output;
+  auto func = std::function<void(std::string)>([&](auto str) { output = str; });
+  { // Value
+    auto cb = bridging::fromJs<AsyncCallback<decltype(func), jsi::Value, int>>(
+        rt, function("(func, a, b) => func(a + b)"), invoker);
+    jsi::Value foo(jsi::String::createFromAscii(rt, "foo"));
+
+    cb(func, std::move(foo), 1);
+    flushQueue();
+    EXPECT_EQ(output, "foo1");
+
+    cb(func, jsi::String::createFromAscii(rt, "bar"), 2);
+    flushQueue();
+    EXPECT_EQ(output, "bar2");
+
+    output.clear();
+  }
+  { // Object
+    auto cb = bridging::fromJs<AsyncCallback<decltype(func), jsi::Object, int>>(
+        rt, function("(func, a, b) => func(a.obj + b)"), invoker);
+
+    jsi::Object foo(rt);
+    foo.setProperty(rt, "obj", "foo");
+
+    cb(func, std::move(foo), 1);
+    flushQueue();
+    EXPECT_EQ(output, "foo1");
+
+    output.clear();
+  }
+  { // String
+    auto cb = bridging::fromJs<AsyncCallback<decltype(func), jsi::String, int>>(
+        rt, function("(func, a, b) => func(a + b)"), invoker);
+    jsi::String foo(jsi::String::createFromAscii(rt, "foo"));
+
+    cb(func, std::move(foo), 1);
+    flushQueue();
+    EXPECT_EQ(output, "foo1");
+
+    cb(func, jsi::String::createFromAscii(rt, "bar"), 2);
+    flushQueue();
+    EXPECT_EQ(output, "bar2");
+
+    output.clear();
+  }
+  { // Array
+    auto fn = function("(func, a, b) => func(a[0] + b)");
+    auto cb = bridging::fromJs<AsyncCallback<decltype(func), jsi::Array, int>>(
+        rt, fn, invoker);
+
+    jsi::Array foo(rt, 1);
+    foo.setValueAtIndex(rt, 0, jsi::String::createFromAscii(rt, "foo"));
+
+    cb(func, std::move(foo), 1);
+    flushQueue();
+    EXPECT_EQ(output, "foo1");
+
+    output.clear();
+  }
+}
+
 TEST_F(BridgingTest, promiseTest) {
   auto func = function(
       "(promise, obj) => {"
@@ -324,6 +431,8 @@ TEST_F(BridgingTest, supportTest) {
   EXPECT_TRUE((bridging::supportsFromJs<std::string>));
   EXPECT_TRUE((bridging::supportsFromJs<std::string, jsi::String>));
   EXPECT_TRUE((bridging::supportsFromJs<std::string, jsi::String &>));
+  EXPECT_TRUE((bridging::supportsFromJs<std::set<int>, jsi::Array>));
+  EXPECT_TRUE((bridging::supportsFromJs<std::set<int>, jsi::Array &>));
   EXPECT_TRUE((bridging::supportsFromJs<std::vector<int>, jsi::Array>));
   EXPECT_TRUE((bridging::supportsFromJs<std::vector<int>, jsi::Array &>));
   EXPECT_TRUE(
@@ -346,6 +455,8 @@ TEST_F(BridgingTest, supportTest) {
   EXPECT_FALSE((bridging::supportsFromJs<double, jsi::Object &>));
   EXPECT_FALSE((bridging::supportsFromJs<std::string, jsi::Object>));
   EXPECT_FALSE((bridging::supportsFromJs<std::string, jsi::Object &>));
+  EXPECT_FALSE((bridging::supportsFromJs<std::set<int>, jsi::String>));
+  EXPECT_FALSE((bridging::supportsFromJs<std::set<int>, jsi::String &>));
   EXPECT_FALSE((bridging::supportsFromJs<std::vector<int>, jsi::String>));
   EXPECT_FALSE((bridging::supportsFromJs<std::vector<int>, jsi::String &>));
 
@@ -387,6 +498,8 @@ TEST_F(BridgingTest, supportTest) {
   EXPECT_TRUE((bridging::supportsToJs<double>));
   EXPECT_TRUE((bridging::supportsToJs<std::string>));
   EXPECT_TRUE((bridging::supportsToJs<std::string, jsi::String>));
+  EXPECT_TRUE((bridging::supportsToJs<std::set<int>>));
+  EXPECT_TRUE((bridging::supportsToJs<std::set<int>, jsi::Array>));
   EXPECT_TRUE((bridging::supportsToJs<std::vector<int>>));
   EXPECT_TRUE((bridging::supportsToJs<std::vector<int>, jsi::Array>));
   EXPECT_TRUE((bridging::supportsToJs<std::map<std::string, int>>));
diff --git a/ReactCommon/react/config/BUCK b/ReactCommon/react/config/BUCK
index 767c3a8b0125..3e7e3ae6d361 100644
--- a/ReactCommon/react/config/BUCK
+++ b/ReactCommon/react/config/BUCK
@@ -20,12 +20,12 @@ rn_xplat_cxx_library(
     ),
     compiler_flags_enable_exceptions = True,
     compiler_flags_enable_rtti = True,  # for ReactNativeConfig
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
@@ -38,8 +38,6 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
-        "//xplat/folly:molly",
     ],
 )
diff --git a/ReactCommon/react/config/CMakeLists.txt b/ReactCommon/react/config/CMakeLists.txt
index fea8855cb9cc..d6e93d1cde20 100644
--- a/ReactCommon/react/config/CMakeLists.txt
+++ b/ReactCommon/react/config/CMakeLists.txt
@@ -11,6 +11,8 @@ add_compile_options(
         -frtti
         -std=c++17
         -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
         -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_config_SRC CONFIGURE_DEPENDS *.cpp)
diff --git a/ReactCommon/react/debug/BUCK b/ReactCommon/react/debug/BUCK
index 756cd3dcfa0a..20c7a930f8c5 100644
--- a/ReactCommon/react/debug/BUCK
+++ b/ReactCommon/react/debug/BUCK
@@ -29,6 +29,7 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/debug",
     ),
+    compiler_flags_pedantic = True,
     exported_platform_linker_flags = [
         (
             "^android.*",
@@ -44,7 +45,6 @@ rn_xplat_cxx_library(
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -56,9 +56,8 @@ rn_xplat_cxx_library(
     visibility = ["PUBLIC"],
     deps = [
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
+        "//xplat/folly:conv",
+        "//xplat/folly:format",
     ],
     exported_deps = [
         "//third-party/glog:glog",
diff --git a/ReactCommon/react/debug/CMakeLists.txt b/ReactCommon/react/debug/CMakeLists.txt
index c325fcead16b..620a1c54392c 100644
--- a/ReactCommon/react/debug/CMakeLists.txt
+++ b/ReactCommon/react/debug/CMakeLists.txt
@@ -11,6 +11,8 @@ add_compile_options(
         -frtti
         -std=c++17
         -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
         -DLOG_TAG=\"Fabric\")
 
 
diff --git a/ReactCommon/react/nativemodule/core/BUCK b/ReactCommon/react/nativemodule/core/BUCK
index 1f46f0680491..9de875edcb65 100644
--- a/ReactCommon/react/nativemodule/core/BUCK
+++ b/ReactCommon/react/nativemodule/core/BUCK
@@ -15,6 +15,7 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-Wno-global-constructors",
     ],
+    compiler_flags_pedantic = True,
     fbandroid_deps = [
         react_native_target("jni/react/jni:jni"),
         FBJNI_TARGET,
@@ -57,7 +58,6 @@ rn_xplat_cxx_library(
     ),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
@@ -70,9 +70,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
-        "//xplat/folly:molly",
         "//xplat/jsi:JSIDynamic",
         react_native_xplat_target("cxxreact:bridge"),
         react_native_xplat_target("cxxreact:module"),
diff --git a/ReactCommon/react/nativemodule/core/CMakeLists.txt b/ReactCommon/react/nativemodule/core/CMakeLists.txt
index 841ee87087ce..909cd427f359 100644
--- a/ReactCommon/react/nativemodule/core/CMakeLists.txt
+++ b/ReactCommon/react/nativemodule/core/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"ReactNative\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"ReactNative\")
 
 
 file(GLOB react_nativemodule_core_SRC CONFIGURE_DEPENDS
diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/CallbackWrapper.h b/ReactCommon/react/nativemodule/core/ReactCommon/CallbackWrapper.h
new file mode 100644
index 000000000000..2c105d9c3f72
--- /dev/null
+++ b/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>
diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h
index 92e10268daf0..613665898dca 100644
--- a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h
+++ b/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 {
diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.h b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.h
index 8ac86f431c24..016d38225ae5 100644
--- a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.h
+++ b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.h
@@ -9,9 +9,9 @@
 
 #import <memory>
 
-#import "RCTTurboModule.h"
-
+#import <React/RCTTurboModuleRegistry.h>
 #import <ReactCommon/RuntimeExecutor.h>
+#import "RCTTurboModule.h"
 
 @protocol RCTTurboModuleManagerDelegate <NSObject>
 
diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm
index dffe85b24c05..2b7ef22a6d1d 100644
--- a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm
+++ b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm
@@ -17,6 +17,7 @@
 
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridgeModule.h>
+#import <React/RCTConstants.h>
 #import <React/RCTCxxModule.h>
 #import <React/RCTInitializing.h>
 #import <React/RCTLog.h>
diff --git a/ReactCommon/react/nativemodule/samples/BUCK b/ReactCommon/react/nativemodule/samples/BUCK
index b11b13c7488e..2285cf02648a 100644
--- a/ReactCommon/react/nativemodule/samples/BUCK
+++ b/ReactCommon/react/nativemodule/samples/BUCK
@@ -12,6 +12,7 @@ rn_xplat_cxx_library(
         ],
         prefix = "ReactCommon",
     ),
+    compiler_flags_pedantic = True,
     fbandroid_deps = [
         react_native_target("jni/react/jni:jni"),
         FBJNI_TARGET,
@@ -58,7 +59,6 @@ rn_xplat_cxx_library(
     ),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE),
     preprocessor_flags = [
diff --git a/ReactCommon/react/nativemodule/samples/platform/android/CMakeLists.txt b/ReactCommon/react/nativemodule/samples/platform/android/CMakeLists.txt
index 84d080c08398..bf4abadd8a94 100644
--- a/ReactCommon/react/nativemodule/samples/platform/android/CMakeLists.txt
+++ b/ReactCommon/react/nativemodule/samples/platform/android/CMakeLists.txt
@@ -6,7 +6,15 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"ReactNative\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DFOLLY_NO_CONFIG=1
+        -DLOG_TAG=\"ReactNative\")
 
 file(GLOB sampleturbomodule_SRC CONFIGURE_DEPENDS ReactCommon/*.cpp)
 add_library(sampleturbomodule STATIC ${sampleturbomodule_SRC})
diff --git a/ReactCommon/react/renderer/.clang-tidy b/ReactCommon/react/renderer/.clang-tidy
index f413d1fc8587..d709ad738539 100644
--- a/ReactCommon/react/renderer/.clang-tidy
+++ b/ReactCommon/react/renderer/.clang-tidy
@@ -4,6 +4,7 @@ Checks: '>
 clang-diagnostic-*,
 modernize-avoid-bind,
 modernize-avoid-c-arrays,
+modernize-concat-nested-namespaces,
 modernize-deprecated-headers,
 modernize-deprecated-ios-base-aliases,
 modernize-loop-convert,
@@ -40,5 +41,148 @@ performance-noexcept-move-constructor,
 performance-type-promotion-in-math-fn,
 performance-unnecessary-copy-initialization,
 performance-unnecessary-value-param,
+cppcoreguidelines-macro-usage,
+cppcoreguidelines-narrowing-conversions,
+cppcoreguidelines-no-malloc,
+cppcoreguidelines-pro-bounds-pointer-arithmetic,
+cppcoreguidelines-pro-type-const-cast,
+cppcoreguidelines-pro-type-cstyle-cast,
+cppcoreguidelines-pro-type-member-init,
+cppcoreguidelines-pro-type-reinterpret-cast,
+cppcoreguidelines-pro-type-union-access,
+cppcoreguidelines-pro-type-vararg,
+cppcoreguidelines-slicing,
+cppcoreguidelines-special-member-functions,
+readability-avoid-const-params-in-decls,
+readability-braces-around-statements,
+readability-const-return-type,
+readability-container-size-empty,
+readability-deleted-default,
+readability-delete-null-pointer,
+readability-implicit-bool-conversion,
+readability-inconsistent-declaration-parameter-name,
+readability-isolate-declaration,
+readability-misplaced-array-index,
+readability-named-parameter,
+readability-non-const-parameter,
+readability-redundant-control-flow,
+readability-redundant-declaration,
+readability-redundant-function-ptr-dereference,
+readability-redundant-preprocessor,
+readability-redundant-smartptr-get,
+readability-redundant-string-cstr,
+readability-redundant-string-init,
+readability-simplify-boolean-expr,
+readability-simplify-subscript-expr,
+readability-static-accessed-through-instance,
+readability-static-definition-in-anonymous-namespace,
+readability-string-compare,
+readability-uniqueptr-delete-release,
+misc-definitions-in-headers,
+misc-new-delete-overloads,
+misc-non-copyable-objects,
+misc-static-assert,
+misc-throw-by-value-catch-by-reference,
+misc-unconventional-assign-operator,
+misc-uniqueptr-reset-release,
+misc-unused-alias-decls,
+misc-unused-parameters,
+misc-unused-using-decls,
+bugprone-argument-comment,
+bugprone-assert-side-effect,
+bugprone-bool-pointer-implicit-conversion,
+bugprone-copy-constructor-init,
+bugprone-dangling-handle,
+bugprone-exception-escape,
+bugprone-fold-init-type,
+bugprone-forward-declaration-namespace,
+bugprone-forwarding-reference-overload,
+bugprone-inaccurate-erase,
+bugprone-incorrect-roundings,
+bugprone-integer-division,
+bugprone-macro-parentheses,
+bugprone-macro-repeated-side-effects,
+bugprone-misplaced-operator-in-strlen-in-alloc,
+bugprone-misplaced-widening-cast,
+bugprone-move-forwarding-reference,
+bugprone-multiple-statement-macro,
+bugprone-parent-virtual-call,
+bugprone-sizeof-container,
+bugprone-sizeof-expression,
+bugprone-string-constructor,
+bugprone-string-integer-assignment,
+bugprone-string-literal-with-embedded-nul,
+bugprone-suspicious-enum-usage,
+bugprone-suspicious-memset-usage,
+bugprone-suspicious-missing-comma,
+bugprone-suspicious-semicolon,
+bugprone-suspicious-string-compare,
+bugprone-swapped-arguments,
+bugprone-terminating-continue,
+bugprone-throw-keyword-missing,
+bugprone-too-small-loop-variable,
+bugprone-undefined-memory-manipulation,
+bugprone-undelegated-constructor,
+bugprone-unused-return-value,
+bugprone-use-after-move,
+bugprone-virtual-near-miss,
+clang-analyzer-apiModeling.StdCLibraryFunctions,
+clang-analyzer-apiModeling.TrustNonnull,
+clang-analyzer-apiModeling.google.GTest,
+clang-analyzer-core.CallAndMessage,
+clang-analyzer-core.DivideZero,
+clang-analyzer-core.DynamicTypePropagation,
+clang-analyzer-core.NonNullParamChecker,
+clang-analyzer-core.NonnilStringConstants,
+clang-analyzer-core.NullDereference,
+clang-analyzer-core.StackAddressEscape,
+clang-analyzer-core.UndefinedBinaryOperatorResult,
+clang-analyzer-core.VLASize,
+clang-analyzer-core.builtin.BuiltinFunctions,
+clang-analyzer-core.builtin.NoReturnFunctions,
+clang-analyzer-core.uninitialized.ArraySubscript,
+clang-analyzer-core.uninitialized.Assign,
+clang-analyzer-core.uninitialized.Branch,
+clang-analyzer-core.uninitialized.CapturedBlockVariable,
+clang-analyzer-core.uninitialized.UndefReturn,
+clang-analyzer-cplusplus.InnerPointer,
+clang-analyzer-cplusplus.Move,
+clang-analyzer-cplusplus.NewDelete,
+clang-analyzer-cplusplus.NewDeleteLeaks,
+clang-analyzer-cplusplus.SelfAssignment,
+clang-analyzer-deadcode.DeadStores,
+clang-analyzer-optin.cplusplus.VirtualCall,
+clang-analyzer-optin.mpi.MPI-Checker,
+clang-analyzer-optin.performance.GCDAntipattern,
+clang-analyzer-optin.performance.Padding,
+clang-analyzer-optin.portability.UnixAPI,
+clang-analyzer-nullability.NullPassedToNonnull,
+clang-analyzer-nullability.NullReturnedFromNonnull,
+clang-analyzer-nullability.NullableDereferenced,
+clang-analyzer-nullability.NullablePassedToNonnull,
+clang-analyzer-nullability.NullableReturnedFromNonnull,
+clang-analyzer-security.FloatLoopCounter,
+clang-analyzer-security.insecureAPI.UncheckedReturn,
+clang-analyzer-security.insecureAPI.bcmp,
+clang-analyzer-security.insecureAPI.bcopy,
+clang-analyzer-security.insecureAPI.bzero,
+clang-analyzer-security.insecureAPI.getpw,
+clang-analyzer-security.insecureAPI.gets,
+clang-analyzer-security.insecureAPI.mkstemp,
+clang-analyzer-security.insecureAPI.mktemp,
+clang-analyzer-security.insecureAPI.rand,
+clang-analyzer-security.insecureAPI.strcpy,
+clang-analyzer-security.insecureAPI.vfork,
+clang-analyzer-unix.API,
+clang-analyzer-unix.Malloc,
+clang-analyzer-unix.MallocSizeof,
+clang-analyzer-unix.MismatchedDeallocator,
+clang-analyzer-unix.Vfork,
+clang-analyzer-unix.cstring.BadSizeArg,
+clang-analyzer-unix.cstring.NullArg,
+clang-analyzer-valist.CopyToSelf,
+clang-analyzer-valist.Uninitialized,
+clang-analyzer-valist.Unterminated,
+google-build-using-namespace,
 '
 ...
diff --git a/ReactCommon/react/renderer/animations/BUCK b/ReactCommon/react/renderer/animations/BUCK
index 8c4ad8f448f3..985667af1bfb 100644
--- a/ReactCommon/react/renderer/animations/BUCK
+++ b/ReactCommon/react/renderer/animations/BUCK
@@ -34,12 +34,12 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-lm",
     ],
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -52,10 +52,6 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
-        "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
         react_native_xplat_target("react/config:config"),
         react_native_xplat_target("react/debug:debug"),
@@ -84,7 +80,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":animations",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("react/config:config"),
         react_native_xplat_target("react/renderer/components/image:image"),
diff --git a/ReactCommon/react/renderer/animations/CMakeLists.txt b/ReactCommon/react/renderer/animations/CMakeLists.txt
index 75e3bc4c3632..89fe0368286b 100644
--- a/ReactCommon/react/renderer/animations/CMakeLists.txt
+++ b/ReactCommon/react/renderer/animations/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_animations_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_animations SHARED ${react_render_animations_SRC})
diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp b/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp
index 8ff9569a845e..d045f05f721f 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp
@@ -12,8 +12,7 @@
 #include <react/renderer/animations/utils.h>
 #include <algorithm>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void LayoutAnimationDriver::animationMutationsForFrame(
     SurfaceId surfaceId,
@@ -57,9 +56,9 @@ void LayoutAnimationDriver::animationMutationsForFrame(
 
       // Create the mutation instruction
       mutationsList.emplace_back(ShadowViewMutation::UpdateMutation(
-          keyframe.viewPrev, mutatedShadowView));
+          keyframe.viewPrev, mutatedShadowView, keyframe.parentView));
 
-      PrintMutationInstruction("Animation Progress:", updateMutation);
+      PrintMutationInstruction("Animation Progress:", mutationsList.back());
 
       keyframe.viewPrev = std::move(mutatedShadowView);
 
@@ -107,5 +106,4 @@ void LayoutAnimationDriver::animationMutationsForFrame(
       &shouldFirstComeBeforeSecondMutation);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
index 332790447e8c..b4caab94d44e 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
@@ -14,7 +14,6 @@
 #include <react/debug/flags.h>
 #include <react/debug/react_native_assert.h>
 
-#include <logger/react_native_log.h>
 #include <react/renderer/animations/conversions.h>
 #include <react/renderer/animations/utils.h>
 #include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
@@ -31,30 +30,17 @@
 
 #include <glog/logging.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
 static std::string GetMutationInstructionString(
     ShadowViewMutation const &mutation) {
-  bool mutationIsRemove = mutation.type == ShadowViewMutation::Type::Remove;
-  bool mutationIsInsert = mutation.type == ShadowViewMutation::Type::Insert;
-  bool mutationIsDelete = mutation.type == ShadowViewMutation::Type::Delete;
-  bool mutationIsCreate = mutation.type == ShadowViewMutation::Type::Create;
-  std::string mutationType =
-      (mutationIsRemove
-           ? "REMOVE"
-           : (mutationIsInsert
-                  ? "INSERT"
-                  : (mutationIsDelete
-                         ? "DELETE"
-                         : (mutationIsCreate ? "CREATE" : "UPDATE"))));
-  return mutationType + " [" +
-      std::to_string(
-             mutationIsInsert || mutationIsCreate
-                 ? mutation.newChildShadowView.tag
-                 : mutation.oldChildShadowView.tag) +
-      "]->[" + std::to_string(mutation.parentShadowView.tag) + "] @" +
+  Tag tag = mutation.type == ShadowViewMutation::Type::Insert ||
+          mutation.type == ShadowViewMutation::Type::Create
+      ? mutation.newChildShadowView.tag
+      : mutation.oldChildShadowView.tag;
+  return getDebugName(mutation) + " [" + std::to_string(tag) + "]->[" +
+      std::to_string(mutation.parentShadowView.tag) + "] @" +
       std::to_string(mutation.index);
 }
 
@@ -1196,11 +1182,11 @@ void LayoutAnimationKeyFrameManager::queueFinalMutationsForCompletedKeyFrame(
     AnimationKeyFrame const &keyframe,
     ShadowViewMutation::List &mutationsList,
     bool interrupted,
-    const std::string &logPrefix) const {
+    const std::string & /*logPrefix*/) const {
   if (skipInvalidatedKeyFrames_ && keyframe.invalidated) {
     return;
   }
-  if (keyframe.finalMutationsForKeyFrame.size() > 0) {
+  if (!keyframe.finalMutationsForKeyFrame.empty()) {
     // TODO: modularize this segment, it is repeated 2x in KeyFrameManager
     // as well.
     ShadowView prev = keyframe.viewPrev;
@@ -1241,7 +1227,9 @@ void LayoutAnimationKeyFrameManager::queueFinalMutationsForCompletedKeyFrame(
           break;
         case ShadowViewMutation::Type::Update:
           mutationsList.push_back(ShadowViewMutation::UpdateMutation(
-              prev, finalMutation.newChildShadowView));
+              prev,
+              finalMutation.newChildShadowView,
+              finalMutation.parentShadowView));
           break;
       }
       if (finalMutation.newChildShadowView.tag > 0) {
@@ -1266,7 +1254,7 @@ void LayoutAnimationKeyFrameManager::queueFinalMutationsForCompletedKeyFrame(
       auto mutatedShadowView =
           createInterpolatedShadowView(1, keyframe.viewStart, keyframe.viewEnd);
       auto generatedPenultimateMutation = ShadowViewMutation::UpdateMutation(
-          keyframe.viewPrev, mutatedShadowView);
+          keyframe.viewPrev, mutatedShadowView, keyframe.parentView);
       react_native_assert(
           generatedPenultimateMutation.oldChildShadowView.tag > 0);
       react_native_assert(
@@ -1277,7 +1265,7 @@ void LayoutAnimationKeyFrameManager::queueFinalMutationsForCompletedKeyFrame(
       mutationsList.push_back(generatedPenultimateMutation);
 
       auto generatedMutation = ShadowViewMutation::UpdateMutation(
-          mutatedShadowView, keyframe.viewEnd);
+          mutatedShadowView, keyframe.viewEnd, keyframe.parentView);
       react_native_assert(generatedMutation.oldChildShadowView.tag > 0);
       react_native_assert(generatedMutation.newChildShadowView.tag > 0);
       PrintMutationInstruction(
@@ -1286,7 +1274,7 @@ void LayoutAnimationKeyFrameManager::queueFinalMutationsForCompletedKeyFrame(
       mutationsList.push_back(generatedMutation);
     } else {
       auto mutation = ShadowViewMutation::UpdateMutation(
-          keyframe.viewPrev, keyframe.viewEnd);
+          keyframe.viewPrev, keyframe.viewEnd, keyframe.parentView);
       PrintMutationInstruction(
           logPrefix +
               "Animation Complete: Queuing up Final Synthetic Mutation:",
@@ -1636,15 +1624,19 @@ void LayoutAnimationKeyFrameManager::deleteAnimationsForStoppedSurfaces()
       surfaceIdsToStop_.clear();
     }
 
+#ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
+    std::ostringstream surfaceIdsStr;
+    std::copy(
+        surfaceIdsToStop.begin(),
+        surfaceIdsToStop.end(),
+        std::ostream_iterator<SurfaceId>(surfaceIdsStr, ", "));
+    LOG(ERROR) << "LayoutAnimations: stopping animations due to stopSurface on "
+               << surfaceIdsStr.str();
+#endif
+
     for (auto it = inflightAnimations_.begin();
          it != inflightAnimations_.end();) {
       const auto &animation = *it;
-
-#ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
-      LOG(ERROR)
-          << "LayoutAnimations: stopping animation due to stopSurface on "
-          << surfaceId;
-#endif
       if (surfaceIdsToStop.find(animation.surfaceId) !=
           surfaceIdsToStop.end()) {
         it = inflightAnimations_.erase(it);
@@ -1690,5 +1682,4 @@ void LayoutAnimationKeyFrameManager::simulateImagePropsMemoryAccess(
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp b/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp
index ea6a5e600a98..53fe2d986c43 100644
--- a/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp
+++ b/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp
@@ -32,8 +32,7 @@
 
 MockClock::time_point MockClock::time_ = {};
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static void testShadowNodeTreeLifeCycleLayoutAnimations(
     uint_fast32_t seed,
@@ -64,7 +63,7 @@ static void testShadowNodeTreeLifeCycleLayoutAnimations(
 
   // Create a RuntimeExecutor
   RuntimeExecutor runtimeExecutor =
-      [](std::function<void(jsi::Runtime &)> const &) {};
+      [](std::function<void(jsi::Runtime &)> const & /*unused*/) {};
 
   // Create component descriptor registry for animation driver
   auto providerRegistry =
@@ -158,7 +157,7 @@ static void testShadowNodeTreeLifeCycleLayoutAnimations(
       // If tree randomization produced no changes in the form of mutations,
       // don't bother trying to animate because this violates a bunch of our
       // assumptions in this test
-      if (originalMutations.size() == 0) {
+      if (originalMutations.empty()) {
         continue;
       }
 
@@ -309,8 +308,7 @@ static void testShadowNodeTreeLifeCycleLayoutAnimations(
   SUCCEED();
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 
 using namespace facebook::react;
 
diff --git a/ReactCommon/react/renderer/animations/utils.cpp b/ReactCommon/react/renderer/animations/utils.cpp
index 36b2307e0241..d4b638e3b149 100644
--- a/ReactCommon/react/renderer/animations/utils.cpp
+++ b/ReactCommon/react/renderer/animations/utils.cpp
@@ -8,8 +8,7 @@
 #include "utils.h"
 #include <cmath>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 std::pair<Float, Float> calculateAnimationProgress(
     uint64_t now,
@@ -67,5 +66,4 @@ std::pair<Float, Float> calculateAnimationProgress(
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/attributedstring/AttributedString.cpp b/ReactCommon/react/renderer/attributedstring/AttributedString.cpp
index d2139c3a5270..b244d11b096e 100644
--- a/ReactCommon/react/renderer/attributedstring/AttributedString.cpp
+++ b/ReactCommon/react/renderer/attributedstring/AttributedString.cpp
@@ -9,8 +9,7 @@
 
 #include <react/renderer/debug/DebugStringConvertibleItem.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 using Fragment = AttributedString::Fragment;
 using Fragments = AttributedString::Fragments;
@@ -38,6 +37,11 @@ bool Fragment::operator==(const Fragment &rhs) const {
              rhs.parentShadowView.layoutMetrics);
 }
 
+bool Fragment::isContentEqual(const Fragment &rhs) const {
+  return std::tie(string, textAttributes) ==
+      std::tie(rhs.string, rhs.textAttributes);
+}
+
 bool Fragment::operator!=(const Fragment &rhs) const {
   return !(*this == rhs);
 }
@@ -108,7 +112,7 @@ bool AttributedString::compareTextAttributesWithoutFrame(
     return false;
   }
 
-  for (unsigned i = 0; i < fragments_.size(); i++) {
+  for (size_t i = 0; i < fragments_.size(); i++) {
     if (fragments_[i].textAttributes != rhs.fragments_[i].textAttributes ||
         fragments_[i].string != rhs.fragments_[i].string) {
       return false;
@@ -126,6 +130,20 @@ bool AttributedString::operator!=(const AttributedString &rhs) const {
   return !(*this == rhs);
 }
 
+bool AttributedString::isContentEqual(const AttributedString &rhs) const {
+  if (fragments_.size() != rhs.fragments_.size()) {
+    return false;
+  }
+
+  for (size_t i = 0; i < fragments_.size(); i++) {
+    if (!fragments_[i].isContentEqual(rhs.fragments_[i])) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
 #pragma mark - DebugStringConvertible
 
 #if RN_DEBUG_STRING_CONVERTIBLE
@@ -147,5 +165,4 @@ SharedDebugStringConvertibleList AttributedString::getDebugChildren() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/attributedstring/AttributedString.h b/ReactCommon/react/renderer/attributedstring/AttributedString.h
index 22e205d002e6..2f1858c6f11c 100644
--- a/ReactCommon/react/renderer/attributedstring/AttributedString.h
+++ b/ReactCommon/react/renderer/attributedstring/AttributedString.h
@@ -46,6 +46,12 @@ class AttributedString : public Sealable, public DebugStringConvertible {
      */
     bool isAttachment() const;
 
+    /*
+     * Returns whether the underlying text and attributes are equal,
+     * disregarding layout or other information.
+     */
+    bool isContentEqual(const Fragment &rhs) const;
+
     bool operator==(const Fragment &rhs) const;
     bool operator!=(const Fragment &rhs) const;
   };
@@ -96,6 +102,8 @@ class AttributedString : public Sealable, public DebugStringConvertible {
    */
   bool compareTextAttributesWithoutFrame(const AttributedString &rhs) const;
 
+  bool isContentEqual(const AttributedString &rhs) const;
+
   bool operator==(const AttributedString &rhs) const;
   bool operator!=(const AttributedString &rhs) const;
 
@@ -118,7 +126,11 @@ struct hash<facebook::react::AttributedString::Fragment> {
   size_t operator()(
       const facebook::react::AttributedString::Fragment &fragment) const {
     return folly::hash::hash_combine(
-        0, fragment.string, fragment.textAttributes, fragment.parentShadowView);
+        0,
+        fragment.string,
+        fragment.textAttributes,
+        fragment.parentShadowView,
+        fragment.parentShadowView.layoutMetrics);
   }
 };
 
diff --git a/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp b/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp
index d644a5164d34..9f134d8e977d 100644
--- a/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp
+++ b/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp
@@ -11,8 +11,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 AttributedStringBox::AttributedStringBox()
     : mode_(Mode::Value),
@@ -86,5 +85,4 @@ bool operator!=(
   return !(lhs == rhs);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/attributedstring/BUCK b/ReactCommon/react/renderer/attributedstring/BUCK
index 028c78c822b1..74f9107e2c1f 100644
--- a/ReactCommon/react/renderer/attributedstring/BUCK
+++ b/ReactCommon/react/renderer/attributedstring/BUCK
@@ -31,6 +31,7 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/attributedstring",
     ),
+    compiler_flags_pedantic = True,
     fbandroid_deps = [
         react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
     ],
@@ -39,7 +40,6 @@ rn_xplat_cxx_library(
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -52,9 +52,8 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
+        "//xplat/folly:conv",
+        "//xplat/folly:hash",
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
@@ -79,7 +78,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":attributedstring",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )
diff --git a/ReactCommon/react/renderer/attributedstring/CMakeLists.txt b/ReactCommon/react/renderer/attributedstring/CMakeLists.txt
index 03bc7df962d3..b5399e44e48d 100644
--- a/ReactCommon/react/renderer/attributedstring/CMakeLists.txt
+++ b/ReactCommon/react/renderer/attributedstring/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_attributedstring_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_attributedstring SHARED ${react_render_attributedstring_SRC})
diff --git a/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp b/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp
index 773c8d6a38aa..cec544ea1f76 100644
--- a/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp
+++ b/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp
@@ -12,8 +12,7 @@
 #include <react/renderer/graphics/conversions.h>
 #include <react/utils/FloatComparison.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 bool ParagraphAttributes::operator==(const ParagraphAttributes &rhs) const {
   return std::tie(
@@ -55,5 +54,4 @@ SharedDebugStringConvertibleList ParagraphAttributes::getDebugProps() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
index 3728f0c36125..63b5a4aab19f 100644
--- a/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
+++ b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
@@ -15,8 +15,7 @@
 
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void TextAttributes::apply(TextAttributes textAttributes) {
   // Color
@@ -47,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;
@@ -63,6 +65,9 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   baseWritingDirection = textAttributes.baseWritingDirection.has_value()
       ? textAttributes.baseWritingDirection
       : baseWritingDirection;
+  lineBreakStrategy = textAttributes.lineBreakStrategy.has_value()
+      ? textAttributes.lineBreakStrategy
+      : lineBreakStrategy;
 
   // Decoration
   textDecorationColor = textAttributes.textDecorationColor
@@ -109,8 +114,10 @@ bool TextAttributes::operator==(const TextAttributes &rhs) const {
              fontStyle,
              fontVariant,
              allowFontScaling,
+             dynamicTypeRamp,
              alignment,
              baseWritingDirection,
+             lineBreakStrategy,
              textDecorationColor,
              textDecorationLineType,
              textDecorationStyle,
@@ -128,8 +135,10 @@ bool TextAttributes::operator==(const TextAttributes &rhs) const {
              rhs.fontStyle,
              rhs.fontVariant,
              rhs.allowFontScaling,
+             rhs.dynamicTypeRamp,
              rhs.alignment,
              rhs.baseWritingDirection,
+             rhs.lineBreakStrategy,
              rhs.textDecorationColor,
              rhs.textDecorationLineType,
              rhs.textDecorationStyle,
@@ -182,12 +191,14 @@ SharedDebugStringConvertibleList TextAttributes::getDebugProps() const {
       debugStringConvertibleItem("fontStyle", fontStyle),
       debugStringConvertibleItem("fontVariant", fontVariant),
       debugStringConvertibleItem("allowFontScaling", allowFontScaling),
+      debugStringConvertibleItem("dynamicTypeRamp", dynamicTypeRamp),
       debugStringConvertibleItem("letterSpacing", letterSpacing),
 
       // Paragraph Styles
       debugStringConvertibleItem("lineHeight", lineHeight),
       debugStringConvertibleItem("alignment", alignment),
       debugStringConvertibleItem("baseWritingDirection", baseWritingDirection),
+      debugStringConvertibleItem("lineBreakStrategyIOS", lineBreakStrategy),
 
       // Decoration
       debugStringConvertibleItem("textDecorationColor", textDecorationColor),
@@ -208,5 +219,4 @@ SharedDebugStringConvertibleList TextAttributes::getDebugProps() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.h b/ReactCommon/react/renderer/attributedstring/TextAttributes.h
index 82b8547507e5..89a6ba36f247 100644
--- a/ReactCommon/react/renderer/attributedstring/TextAttributes.h
+++ b/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{};
 
@@ -57,6 +58,7 @@ class TextAttributes : public DebugStringConvertible {
   Float lineHeight{std::numeric_limits<Float>::quiet_NaN()};
   std::optional<TextAlignment> alignment{};
   std::optional<WritingDirection> baseWritingDirection{};
+  std::optional<LineBreakStrategy> lineBreakStrategy{};
 
   // Decoration
   SharedColor textDecorationColor{};
@@ -121,6 +123,7 @@ struct hash<facebook::react::TextAttributes> {
         textAttributes.lineHeight,
         textAttributes.alignment,
         textAttributes.baseWritingDirection,
+        textAttributes.lineBreakStrategy,
         textAttributes.textDecorationColor,
         textAttributes.textDecorationLineType,
         textAttributes.textDecorationStyle,
diff --git a/ReactCommon/react/renderer/attributedstring/conversions.h b/ReactCommon/react/renderer/attributedstring/conversions.h
index 96cbc0c5d7e1..f768de8cd82d 100644
--- a/ReactCommon/react/renderer/attributedstring/conversions.h
+++ b/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:
@@ -420,6 +498,52 @@ inline std::string toString(const WritingDirection &writingDirection) {
   return "auto";
 }
 
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    LineBreakStrategy &result) {
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "none") {
+      result = LineBreakStrategy::None;
+    } else if (string == "push-out") {
+      result = LineBreakStrategy::PushOut;
+    } else if (string == "hangul-word") {
+      result = LineBreakStrategy::HangulWordPriority;
+    } else if (string == "standard") {
+      result = LineBreakStrategy::Standard;
+    } else {
+      LOG(ERROR) << "Unsupported LineBreakStrategy value: " << string;
+      react_native_assert(false);
+      // sane default for prod
+      result = LineBreakStrategy::None;
+    }
+    return;
+  }
+
+  LOG(ERROR) << "Unsupported LineBreakStrategy type";
+  // sane default for prod
+  result = LineBreakStrategy::None;
+}
+
+inline std::string toString(const LineBreakStrategy &lineBreakStrategy) {
+  switch (lineBreakStrategy) {
+    case LineBreakStrategy::None:
+      return "none";
+    case LineBreakStrategy::PushOut:
+      return "push-out";
+    case LineBreakStrategy::HangulWordPriority:
+      return "hangul-word";
+    case LineBreakStrategy::Standard:
+      return "standard";
+  }
+
+  LOG(ERROR) << "Unsupported LineBreakStrategy value";
+  // sane default for prod
+  return "none";
+}
+
 inline void fromRawValue(
     const PropsParserContext &context,
     const RawValue &value,
@@ -873,6 +997,10 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
     _textAttributes(
         "baseWritingDirection", toString(*textAttributes.baseWritingDirection));
   }
+  if (textAttributes.lineBreakStrategy.has_value()) {
+    _textAttributes(
+        "lineBreakStrategyIOS", toString(*textAttributes.lineBreakStrategy));
+  }
   // Decoration
   if (textAttributes.textDecorationColor) {
     _textAttributes(
@@ -982,6 +1110,7 @@ constexpr static MapBuffer::Key TA_KEY_TEXT_SHADOW_COLOR = 19;
 constexpr static MapBuffer::Key TA_KEY_IS_HIGHLIGHTED = 20;
 constexpr static MapBuffer::Key TA_KEY_LAYOUT_DIRECTION = 21;
 constexpr static MapBuffer::Key TA_KEY_ACCESSIBILITY_ROLE = 22;
+constexpr static MapBuffer::Key TA_KEY_LINE_BREAK_STRATEGY = 23;
 
 // constants for ParagraphAttributes serialization
 constexpr static MapBuffer::Key PA_KEY_MAX_NUMBER_OF_LINES = 0;
@@ -1084,6 +1213,11 @@ inline MapBuffer toMapBuffer(const TextAttributes &textAttributes) {
         TA_KEY_BEST_WRITING_DIRECTION,
         toString(*textAttributes.baseWritingDirection));
   }
+  if (textAttributes.lineBreakStrategy.has_value()) {
+    builder.putString(
+        TA_KEY_LINE_BREAK_STRATEGY,
+        toString(*textAttributes.lineBreakStrategy));
+  }
   // Decoration
   if (textAttributes.textDecorationColor) {
     builder.putInt(
diff --git a/ReactCommon/react/renderer/attributedstring/primitives.h b/ReactCommon/react/renderer/attributedstring/primitives.h
index 1535210aca2b..f3ef237c9a82 100644
--- a/ReactCommon/react/renderer/attributedstring/primitives.h
+++ b/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".
@@ -74,6 +88,15 @@ enum class WritingDirection {
   RightToLeft // Right to left writing direction.
 };
 
+enum class LineBreakStrategy {
+  None, // Don't use any line break strategies
+  PushOut, // Use the push out line break strategy.
+  HangulWordPriority, // When specified, it prohibits breaking between Hangul
+                      // characters.
+  Standard // Use the same configuration of line break strategies that the
+           // system uses for standard UI labels.
+};
+
 enum class TextDecorationLineType {
   None,
   Underline,
@@ -181,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 {
diff --git a/ReactCommon/react/renderer/attributedstring/tests/AttributedStringBoxTest.cpp b/ReactCommon/react/renderer/attributedstring/tests/AttributedStringBoxTest.cpp
index e8c0047f987d..b9ddd65ef866 100644
--- a/ReactCommon/react/renderer/attributedstring/tests/AttributedStringBoxTest.cpp
+++ b/ReactCommon/react/renderer/attributedstring/tests/AttributedStringBoxTest.cpp
@@ -10,8 +10,7 @@
 #include <gtest/gtest.h>
 #include <react/renderer/attributedstring/AttributedStringBox.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 TEST(AttributedStringBoxTest, testDefaultConstructor) {
   auto attributedStringBox = AttributedStringBox{};
@@ -101,5 +100,4 @@ TEST(AttributedStringBoxTest, testMoveAssignment) {
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp b/ReactCommon/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp
index 1019578e8c1b..d435dc3213d1 100644
--- a/ReactCommon/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp
+++ b/ReactCommon/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp
@@ -10,8 +10,7 @@
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/attributedstring/primitives.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #ifdef ANDROID
 
@@ -32,5 +31,4 @@ TEST(ParagraphAttributesTest, testToDynamic) {
 
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/componentregistry/BUCK b/ReactCommon/react/renderer/componentregistry/BUCK
index 6b8b907041c9..b1fdde2b6357 100644
--- a/ReactCommon/react/renderer/componentregistry/BUCK
+++ b/ReactCommon/react/renderer/componentregistry/BUCK
@@ -30,12 +30,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/componentregistry",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -45,13 +45,6 @@ rn_xplat_cxx_library(
     ],
     visibility = ["PUBLIC"],
     deps = [
-        "//third-party/glog:glog",
-        "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
-        "//xplat/jsi:JSIDynamic",
-        "//xplat/jsi:jsi",
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/debug:debug"),
diff --git a/ReactCommon/react/renderer/componentregistry/CMakeLists.txt b/ReactCommon/react/renderer/componentregistry/CMakeLists.txt
index 23b256112aa1..fa02501aaf83 100644
--- a/ReactCommon/react/renderer/componentregistry/CMakeLists.txt
+++ b/ReactCommon/react/renderer/componentregistry/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_componentregistry_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_componentregistry SHARED ${react_render_componentregistry_SRC})
diff --git a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp
index 965c7d409fae..1869439cbc77 100644
--- a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp
+++ b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp
@@ -7,11 +7,10 @@
 
 #include "ComponentDescriptorProviderRegistry.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void ComponentDescriptorProviderRegistry::add(
-    ComponentDescriptorProvider provider) const {
+    const ComponentDescriptorProvider &provider) const {
   std::unique_lock<butter::shared_mutex> lock(mutex_);
 
   /*
@@ -81,5 +80,4 @@ ComponentDescriptorProviderRegistry::createComponentDescriptorRegistry(
   return registry;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h
index 182d24a7a8c7..cba678335180 100644
--- a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h
+++ b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h
@@ -33,7 +33,7 @@ class ComponentDescriptorProviderRegistry final {
    * `ComponentDescriptorRegistry`s accordingly.
    * The methods can be called on any thread.
    */
-  void add(ComponentDescriptorProvider provider) const;
+  void add(const ComponentDescriptorProvider &provider) const;
 
   /*
    * ComponenDescriptorRegistry will call the `request` in case if a component
diff --git a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp
index 42fe6e0eff14..23e0330a8601 100644
--- a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp
+++ b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp
@@ -16,8 +16,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ComponentDescriptorRegistry::ComponentDescriptorRegistry(
     ComponentDescriptorParameters parameters,
@@ -50,7 +49,7 @@ void ComponentDescriptorRegistry::add(
 }
 
 void ComponentDescriptorRegistry::registerComponentDescriptor(
-    SharedComponentDescriptor componentDescriptor) const {
+    const SharedComponentDescriptor &componentDescriptor) const {
   ComponentHandle componentHandle = componentDescriptor->getComponentHandle();
   _registryByHandle[componentHandle] = componentDescriptor;
 
@@ -119,11 +118,7 @@ bool ComponentDescriptorRegistry::hasComponentDescriptorAt(
   std::shared_lock<butter::shared_mutex> lock(mutex_);
 
   auto iterator = _registryByHandle.find(componentHandle);
-  if (iterator == _registryByHandle.end()) {
-    return false;
-  }
-
-  return true;
+  return iterator != _registryByHandle.end();
 }
 
 ShadowNode::Shared ComponentDescriptorRegistry::createNode(
@@ -136,8 +131,7 @@ ShadowNode::Shared ComponentDescriptorRegistry::createNode(
   auto const &componentDescriptor = this->at(unifiedComponentName);
 
   auto const fragment = ShadowNodeFamilyFragment{tag, surfaceId, nullptr};
-  auto family =
-      componentDescriptor.createFamily(fragment, std::move(eventTarget));
+  auto family = componentDescriptor.createFamily(fragment, eventTarget);
   auto const props = componentDescriptor.cloneProps(
       PropsParserContext{surfaceId, *contextContainer_.get()},
       nullptr,
@@ -155,7 +149,7 @@ ShadowNode::Shared ComponentDescriptorRegistry::createNode(
 }
 
 void ComponentDescriptorRegistry::setFallbackComponentDescriptor(
-    SharedComponentDescriptor descriptor) {
+    const SharedComponentDescriptor &descriptor) {
   _fallbackComponentDescriptor = descriptor;
   registerComponentDescriptor(descriptor);
 }
@@ -165,5 +159,4 @@ ComponentDescriptorRegistry::getFallbackComponentDescriptor() const {
   return _fallbackComponentDescriptor;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h
index 054af63c032b..d2eeceaf60f9 100644
--- a/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h
+++ b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h
@@ -62,14 +62,15 @@ class ComponentDescriptorRegistry {
       folly::dynamic const &props,
       SharedEventTarget const &eventTarget) const;
 
-  void setFallbackComponentDescriptor(SharedComponentDescriptor descriptor);
+  void setFallbackComponentDescriptor(
+      const SharedComponentDescriptor &descriptor);
   ComponentDescriptor::Shared getFallbackComponentDescriptor() const;
 
  private:
   friend class ComponentDescriptorProviderRegistry;
 
   void registerComponentDescriptor(
-      SharedComponentDescriptor componentDescriptor) const;
+      const SharedComponentDescriptor &componentDescriptor) const;
 
   /*
    * Creates a `ComponentDescriptor` using specified
diff --git a/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp b/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp
index 1588f2e619d4..f50a76ab01fa 100644
--- a/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp
+++ b/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp
@@ -7,8 +7,7 @@
 
 #include "componentNameByReactViewName.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 std::string componentNameByReactViewName(std::string viewName) {
   // We need this function only for the transition period;
@@ -69,5 +68,4 @@ std::string componentNameByReactViewName(std::string viewName) {
   return viewName;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/componentregistry/native/BUCK b/ReactCommon/react/renderer/componentregistry/native/BUCK
index 72507b951e80..de356fba9fa7 100644
--- a/ReactCommon/react/renderer/componentregistry/native/BUCK
+++ b/ReactCommon/react/renderer/componentregistry/native/BUCK
@@ -29,12 +29,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/componentregistry/native",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -44,12 +44,6 @@ rn_xplat_cxx_library(
     ],
     visibility = ["PUBLIC"],
     deps = [
-        "//third-party/glog:glog",
-        "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
-        "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
     ],
 )
diff --git a/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt b/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt
index 270c2e433450..fabef78d62f0 100644
--- a/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt
+++ b/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB rrc_native_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(rrc_native SHARED ${rrc_native_SRC})
diff --git a/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.cpp b/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.cpp
index b23525bddc78..d3e071d0f2f7 100644
--- a/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.cpp
+++ b/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.cpp
@@ -12,15 +12,14 @@
 
 using namespace facebook;
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 /**
  * Public API to install the NativeComponentRegistryBinding.
  */
 NativeComponentRegistryBinding::NativeComponentRegistryBinding(
     const HasComponentProviderFunctionType &&hasComponentProvider)
-    : hasComponentProvider_(std::move(hasComponentProvider)) {}
+    : hasComponentProvider_(hasComponentProvider) {}
 
 void NativeComponentRegistryBinding::install(
     jsi::Runtime &runtime,
@@ -49,7 +48,7 @@ bool NativeComponentRegistryBinding::hasComponent(const std::string &name) {
 
 jsi::Value NativeComponentRegistryBinding::jsProxy(
     jsi::Runtime &runtime,
-    const jsi::Value &thisVal,
+    const jsi::Value & /*thisVal*/,
     const jsi::Value *args,
     size_t count) {
   if (count != 1) {
@@ -61,8 +60,7 @@ jsi::Value NativeComponentRegistryBinding::jsProxy(
 
   bool result = hasComponent(moduleName);
 
-  return jsi::Value(result);
+  return {result};
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/image/BUCK b/ReactCommon/react/renderer/components/image/BUCK
index a26a74dc9ee7..b051675716f4 100644
--- a/ReactCommon/react/renderer/components/image/BUCK
+++ b/ReactCommon/react/renderer/components/image/BUCK
@@ -29,6 +29,7 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/image",
     ),
+    compiler_flags_pedantic = True,
     fbandroid_deps = [
         react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
     ],
@@ -36,7 +37,6 @@ rn_xplat_cxx_library(
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -47,8 +47,6 @@ rn_xplat_cxx_library(
     tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:molly",
         YOGA_CXX_TARGET,
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/debug:debug"),
@@ -73,7 +71,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":image",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )
diff --git a/ReactCommon/react/renderer/components/image/CMakeLists.txt b/ReactCommon/react/renderer/components/image/CMakeLists.txt
index c78c9a26b804..9e5e0989e329 100644
--- a/ReactCommon/react/renderer/components/image/CMakeLists.txt
+++ b/ReactCommon/react/renderer/components/image/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB rrc_image_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(rrc_image SHARED ${rrc_image_SRC})
diff --git a/ReactCommon/react/renderer/components/image/ImageEventEmitter.cpp b/ReactCommon/react/renderer/components/image/ImageEventEmitter.cpp
index 731a592ad920..9ebf3a3d23d9 100644
--- a/ReactCommon/react/renderer/components/image/ImageEventEmitter.cpp
+++ b/ReactCommon/react/renderer/components/image/ImageEventEmitter.cpp
@@ -7,8 +7,7 @@
 
 #include "ImageEventEmitter.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void ImageEventEmitter::onLoadStart() const {
   dispatchEvent("loadStart");
@@ -38,5 +37,4 @@ void ImageEventEmitter::onPartialLoad() const {
   dispatchEvent("partialLoad");
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/image/ImageProps.cpp b/ReactCommon/react/renderer/components/image/ImageProps.cpp
index 37ca6e4208cf..7feac6300f8b 100644
--- a/ReactCommon/react/renderer/components/image/ImageProps.cpp
+++ b/ReactCommon/react/renderer/components/image/ImageProps.cpp
@@ -7,10 +7,10 @@
 
 #include <react/renderer/components/image/ImageProps.h>
 #include <react/renderer/components/image/conversions.h>
+#include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/core/propsConversions.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ImageProps::ImageProps(
     const PropsParserContext &context,
@@ -18,43 +18,84 @@ ImageProps::ImageProps(
     const RawProps &rawProps)
     : ViewProps(context, sourceProps, rawProps),
       sources(
-          convertRawProp(context, rawProps, "source", sourceProps.sources, {})),
-      defaultSources(convertRawProp(
-          context,
-          rawProps,
-          "defaultSource",
-          sourceProps.defaultSources,
-          {})),
-      resizeMode(convertRawProp(
-          context,
-          rawProps,
-          "resizeMode",
-          sourceProps.resizeMode,
-          ImageResizeMode::Stretch)),
-      blurRadius(convertRawProp(
-          context,
-          rawProps,
-          "blurRadius",
-          sourceProps.blurRadius,
-          {})),
-      capInsets(convertRawProp(
-          context,
-          rawProps,
-          "capInsets",
-          sourceProps.capInsets,
-          {})),
-      tintColor(convertRawProp(
-          context,
-          rawProps,
-          "tintColor",
-          sourceProps.tintColor,
-          {})),
-      internal_analyticTag(convertRawProp(
-          context,
-          rawProps,
-          "internal_analyticTag",
-          sourceProps.internal_analyticTag,
-          {})) {}
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.sources
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "source",
+                                                       sourceProps.sources,
+                                                       {})),
+      defaultSources(
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.defaultSources
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "defaultSource",
+                    sourceProps.defaultSources,
+                    {})),
+      resizeMode(
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.resizeMode
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "resizeMode",
+                    sourceProps.resizeMode,
+                    ImageResizeMode::Stretch)),
+      blurRadius(
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.blurRadius
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "blurRadius",
+                                                       sourceProps.blurRadius,
+                                                       {})),
+      capInsets(
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.capInsets
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "capInsets",
+                                                       sourceProps.capInsets,
+                                                       {})),
+      tintColor(
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.tintColor
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "tintColor",
+                                                       sourceProps.tintColor,
+                                                       {})),
+      internal_analyticTag(
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.internal_analyticTag
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "internal_analyticTag",
+                    sourceProps.internal_analyticTag,
+                    {})) {}
 
-} // namespace react
-} // namespace facebook
+void ImageProps::setProp(
+    const PropsParserContext &context,
+    RawPropsPropNameHash hash,
+    const char *propName,
+    RawValue const &value) {
+  // All Props structs setProp methods must always, unconditionally,
+  // call all super::setProp methods, since multiple structs may
+  // reuse the same values.
+  ViewProps::setProp(context, hash, propName, value);
+
+  switch (hash) {
+    RAW_SET_PROP_SWITCH_CASE(sources, "source", {});
+    RAW_SET_PROP_SWITCH_CASE(defaultSources, "defaultSource", {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(resizeMode, ImageResizeMode::Stretch);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(blurRadius, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(capInsets, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(tintColor, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(internal_analyticTag, {});
+  }
+}
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/image/ImageProps.h b/ReactCommon/react/renderer/components/image/ImageProps.h
index dd55bce09614..6c1e4c353617 100644
--- a/ReactCommon/react/renderer/components/image/ImageProps.h
+++ b/ReactCommon/react/renderer/components/image/ImageProps.h
@@ -22,15 +22,21 @@ class ImageProps final : public ViewProps {
       const ImageProps &sourceProps,
       const RawProps &rawProps);
 
+  void setProp(
+      const PropsParserContext &context,
+      RawPropsPropNameHash hash,
+      const char *propName,
+      RawValue const &value);
+
 #pragma mark - Props
 
-  const ImageSources sources{};
-  const ImageSources defaultSources{};
-  const ImageResizeMode resizeMode{ImageResizeMode::Stretch};
-  const Float blurRadius{};
-  const EdgeInsets capInsets{};
-  const SharedColor tintColor{};
-  const std::string internal_analyticTag{};
+  ImageSources sources{};
+  ImageSources defaultSources{};
+  ImageResizeMode resizeMode{ImageResizeMode::Stretch};
+  Float blurRadius{};
+  EdgeInsets capInsets{};
+  SharedColor tintColor{};
+  std::string internal_analyticTag{};
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp b/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp
index 5edd7966c895..a655f9c3ea5e 100644
--- a/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp
@@ -12,8 +12,7 @@
 #include <react/renderer/core/LayoutContext.h>
 #include "ImageState.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 const char ImageComponentName[] = "Image";
 
@@ -94,5 +93,4 @@ void ImageShadowNode::layout(LayoutContext layoutContext) {
   ConcreteViewShadowNode::layout(layoutContext);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/image/ImageState.cpp b/ReactCommon/react/renderer/components/image/ImageState.cpp
index 17b8261d71fc..1de16951a9c6 100644
--- a/ReactCommon/react/renderer/components/image/ImageState.cpp
+++ b/ReactCommon/react/renderer/components/image/ImageState.cpp
@@ -7,8 +7,7 @@
 
 #include "ImageState.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ImageSource ImageState::getImageSource() const {
   return imageSource_;
@@ -22,5 +21,4 @@ Float ImageState::getBlurRadius() const {
   return blurRadius_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/inputaccessory/BUCK b/ReactCommon/react/renderer/components/inputaccessory/BUCK
index 6e26a77b96a8..33df142a8c6a 100644
--- a/ReactCommon/react/renderer/components/inputaccessory/BUCK
+++ b/ReactCommon/react/renderer/components/inputaccessory/BUCK
@@ -24,12 +24,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/inputaccessory",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = APPLE,
     preprocessor_flags = [
diff --git a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK
index 749b0958532e..5e0a1f461894 100644
--- a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK
+++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK
@@ -27,12 +27,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/legacyviewmanagerinterop",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = APPLE,
     preprocessor_flags = [
@@ -41,8 +41,8 @@ rn_xplat_cxx_library(
     ],
     visibility = ["PUBLIC"],
     deps = [
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
+        "//xplat/folly:dynamic",
+        "//xplat/folly:json",
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/components/view:view"),
         "//xplat/js/react-native-github:generated_components-rncore",
diff --git a/ReactCommon/react/renderer/components/modal/BUCK b/ReactCommon/react/renderer/components/modal/BUCK
index fb7ccbc840da..c95a91460136 100644
--- a/ReactCommon/react/renderer/components/modal/BUCK
+++ b/ReactCommon/react/renderer/components/modal/BUCK
@@ -31,7 +31,9 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/modal",
     ),
+    compiler_flags_pedantic = True,
     fbandroid_deps = [
+        "//xplat/folly:dynamic",
         react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
     ],
     fbandroid_exported_headers = subdir_glob(
@@ -59,7 +61,6 @@ rn_xplat_cxx_library(
     ),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -71,9 +72,6 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
         YOGA_CXX_TARGET,
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/debug:debug"),
diff --git a/ReactCommon/react/renderer/components/modal/CMakeLists.txt b/ReactCommon/react/renderer/components/modal/CMakeLists.txt
index 8f5969725397..ed70bda43a57 100644
--- a/ReactCommon/react/renderer/components/modal/CMakeLists.txt
+++ b/ReactCommon/react/renderer/components/modal/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB rrc_modal_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(rrc_modal STATIC ${rrc_modal_SRC})
diff --git a/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.cpp b/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.cpp
index bdf59f88ca15..3598549813af 100644
--- a/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.cpp
@@ -10,10 +10,8 @@
 #include <react/renderer/components/modal/ModalHostViewShadowNode.h>
 #include <react/renderer/core/LayoutContext.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 extern const char ModalHostViewComponentName[] = "ModalHostView";
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/modal/ModalHostViewState.cpp b/ReactCommon/react/renderer/components/modal/ModalHostViewState.cpp
index 1105a3883eb3..9feec1d3856a 100644
--- a/ReactCommon/react/renderer/components/modal/ModalHostViewState.cpp
+++ b/ReactCommon/react/renderer/components/modal/ModalHostViewState.cpp
@@ -7,8 +7,7 @@
 
 #include "ModalHostViewState.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #ifdef ANDROID
 folly::dynamic ModalHostViewState::getDynamic() const {
@@ -17,5 +16,4 @@ folly::dynamic ModalHostViewState::getDynamic() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/progressbar/BUCK b/ReactCommon/react/renderer/components/progressbar/BUCK
index c255c2cd4ede..1cbc166b322c 100644
--- a/ReactCommon/react/renderer/components/progressbar/BUCK
+++ b/ReactCommon/react/renderer/components/progressbar/BUCK
@@ -32,8 +32,10 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/progressbar",
     ),
+    compiler_flags_pedantic = True,
     cxx_tests = [":tests"],
     fbandroid_deps = [
+        "//xplat/folly:dynamic",
         react_native_target("jni/react/jni:jni"),
     ],
     fbandroid_exported_headers = subdir_glob(
@@ -67,7 +69,6 @@ rn_xplat_cxx_library(
     ),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
@@ -78,9 +79,6 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
         YOGA_CXX_TARGET,
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/debug:debug"),
@@ -113,7 +111,6 @@ fb_xplat_cxx_test(
         CXX,
     ),
     deps = [
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )
diff --git a/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt b/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt
index c1bc726cf9ce..f7091a4b8ae6 100644
--- a/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt
+++ b/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB rrc_progressbar_SRC CONFIGURE_DEPENDS android/react/renderer/components/progressbar/*.cpp)
 add_library(rrc_progressbar STATIC ${rrc_progressbar_SRC})
@@ -28,7 +35,7 @@ target_link_libraries(rrc_progressbar
         react_render_debug
         react_render_graphics
         react_render_uimanager
-        reactnativeutilsjni
+        reactnativejni
         rrc_view
         yoga
 )
diff --git a/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.cpp b/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.cpp
index 71ce1f60798a..ea69e87e6444 100644
--- a/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.cpp
+++ b/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.cpp
@@ -13,8 +13,7 @@
 
 using namespace facebook::jni;
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 Size AndroidProgressBarMeasurementsManager::measure(
     SurfaceId surfaceId,
@@ -71,5 +70,4 @@ Size AndroidProgressBarMeasurementsManager::measure(
   return measurement;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.cpp b/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.cpp
index 3d7c97a4a03b..34af90748844 100644
--- a/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.cpp
@@ -10,8 +10,7 @@
 #include <react/renderer/components/progressbar/AndroidProgressBarShadowNode.h>
 #include <react/renderer/core/LayoutContext.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 extern const char AndroidProgressBarComponentName[] = "AndroidProgressBar";
 
@@ -25,11 +24,10 @@ void AndroidProgressBarShadowNode::setAndroidProgressBarMeasurementsManager(
 #pragma mark - LayoutableShadowNode
 
 Size AndroidProgressBarShadowNode::measureContent(
-    LayoutContext const &layoutContext,
+    LayoutContext const & /*layoutContext*/,
     LayoutConstraints const &layoutConstraints) const {
   return measurementsManager_->measure(
       getSurfaceId(), getConcreteProps(), layoutConstraints);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/root/BUCK b/ReactCommon/react/renderer/components/root/BUCK
index 69f2036924fe..be9b9adbeee4 100644
--- a/ReactCommon/react/renderer/components/root/BUCK
+++ b/ReactCommon/react/renderer/components/root/BUCK
@@ -29,11 +29,11 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/root",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -46,9 +46,6 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
         YOGA_CXX_TARGET,
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
@@ -71,7 +68,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":root",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("react/renderer/element:element"),
     ],
diff --git a/ReactCommon/react/renderer/components/root/CMakeLists.txt b/ReactCommon/react/renderer/components/root/CMakeLists.txt
index 96b43b7498a4..8592834feb1e 100644
--- a/ReactCommon/react/renderer/components/root/CMakeLists.txt
+++ b/ReactCommon/react/renderer/components/root/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB rrc_root_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(rrc_root SHARED ${rrc_root_SRC})
diff --git a/ReactCommon/react/renderer/components/root/RootProps.cpp b/ReactCommon/react/renderer/components/root/RootProps.cpp
index 47013f3c14e4..777e7998bd0a 100644
--- a/ReactCommon/react/renderer/components/root/RootProps.cpp
+++ b/ReactCommon/react/renderer/components/root/RootProps.cpp
@@ -10,8 +10,7 @@
 #include <react/renderer/components/view/YogaLayoutableShadowNode.h>
 #include <react/renderer/components/view/conversions.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 // Note that a default/empty context may be passed here from RootShadowNode.
 // If that's a problem and the context is necesary here, refactor RootShadowNode
@@ -26,13 +25,12 @@ RootProps::RootProps(
 // If that's a problem and the context is necesary here, refactor RootShadowNode
 // first.
 RootProps::RootProps(
-    const PropsParserContext &context,
-    RootProps const &sourceProps,
+    const PropsParserContext & /*context*/,
+    RootProps const & /*sourceProps*/,
     LayoutConstraints const &layoutConstraints,
     LayoutContext const &layoutContext)
     : ViewProps(),
       layoutConstraints(layoutConstraints),
       layoutContext(layoutContext){};
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/root/RootShadowNode.cpp b/ReactCommon/react/renderer/components/root/RootShadowNode.cpp
index 20380d422887..ed1165861f9d 100644
--- a/ReactCommon/react/renderer/components/root/RootShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/root/RootShadowNode.cpp
@@ -10,8 +10,7 @@
 #include <react/renderer/components/view/conversions.h>
 #include <react/renderer/debug/SystraceSection.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 const char RootComponentName[] = "RootView";
 
@@ -57,5 +56,4 @@ RootShadowNode::Unshared RootShadowNode::clone(
   return newRootShadowNode;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/safeareaview/BUCK b/ReactCommon/react/renderer/components/safeareaview/BUCK
index f0837d54ada7..544c8c8c9e53 100644
--- a/ReactCommon/react/renderer/components/safeareaview/BUCK
+++ b/ReactCommon/react/renderer/components/safeareaview/BUCK
@@ -24,12 +24,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/safeareaview",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = APPLE,
     preprocessor_flags = [
diff --git a/ReactCommon/react/renderer/components/scrollview/BUCK b/ReactCommon/react/renderer/components/scrollview/BUCK
index 20d52e1e84c1..70a087928a32 100644
--- a/ReactCommon/react/renderer/components/scrollview/BUCK
+++ b/ReactCommon/react/renderer/components/scrollview/BUCK
@@ -32,6 +32,7 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/scrollview",
     ),
+    compiler_flags_pedantic = True,
     fbandroid_deps = [
         react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
     ],
@@ -40,7 +41,6 @@ rn_xplat_cxx_library(
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -53,9 +53,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
+        "//xplat/folly:dynamic",
         YOGA_CXX_TARGET,
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
@@ -78,7 +76,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":scrollview",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )
diff --git a/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt b/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt
index 92927ff96788..d664e5e2faf1 100644
--- a/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt
+++ b/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB rrc_scrollview_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(rrc_scrollview SHARED ${rrc_scrollview_SRC})
diff --git a/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.cpp b/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.cpp
index c009fa42775d..3aaeb4c6f13a 100644
--- a/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.cpp
+++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.cpp
@@ -7,8 +7,7 @@
 
 #include "ScrollViewEventEmitter.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static jsi::Value scrollViewMetricsPayload(
     jsi::Runtime &runtime,
@@ -97,5 +96,4 @@ void ScrollViewEventEmitter::dispatchScrollViewEvent(
       priority);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp b/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp
index ff1611d71fcb..4eff278fdfc1 100644
--- a/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp
+++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp
@@ -8,13 +8,13 @@
 #include "ScrollViewProps.h"
 
 #include <react/renderer/components/scrollview/conversions.h>
+#include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
 #include <react/renderer/graphics/conversions.h>
 
 #include <react/renderer/core/propsConversions.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ScrollViewProps::ScrollViewProps(
     const PropsParserContext &context,
@@ -22,7 +22,7 @@ ScrollViewProps::ScrollViewProps(
     RawProps const &rawProps)
     : ViewProps(context, sourceProps, rawProps),
       alwaysBounceHorizontal(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.alwaysBounceHorizontal
               : convertRawProp(
                     context,
@@ -31,7 +31,7 @@ ScrollViewProps::ScrollViewProps(
                     sourceProps.alwaysBounceHorizontal,
                     {})),
       alwaysBounceVertical(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.alwaysBounceVertical
               : convertRawProp(
                     context,
@@ -40,23 +40,23 @@ ScrollViewProps::ScrollViewProps(
                     sourceProps.alwaysBounceVertical,
                     {})),
       bounces(
-          Props::enablePropIteratorSetter ? sourceProps.bounces
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "bounces",
-                                                sourceProps.bounces,
-                                                true)),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.bounces
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "bounces",
+                                                       sourceProps.bounces,
+                                                       true)),
       bouncesZoom(
-          Props::enablePropIteratorSetter ? sourceProps.bouncesZoom
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "bouncesZoom",
-                                                sourceProps.bouncesZoom,
-                                                true)),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.bouncesZoom
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "bouncesZoom",
+                                                       sourceProps.bouncesZoom,
+                                                       true)),
       canCancelContentTouches(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.canCancelContentTouches
               : convertRawProp(
                     context,
@@ -65,15 +65,16 @@ ScrollViewProps::ScrollViewProps(
                     sourceProps.canCancelContentTouches,
                     true)),
       centerContent(
-          Props::enablePropIteratorSetter ? sourceProps.centerContent
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "centerContent",
-                                                sourceProps.centerContent,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.centerContent
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "centerContent",
+                    sourceProps.centerContent,
+                    {})),
       automaticallyAdjustContentInsets(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.automaticallyAdjustContentInsets
               : convertRawProp(
                     context,
@@ -82,7 +83,7 @@ ScrollViewProps::ScrollViewProps(
                     sourceProps.automaticallyAdjustContentInsets,
                     {})),
       automaticallyAdjustsScrollIndicatorInsets(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.automaticallyAdjustsScrollIndicatorInsets
               : convertRawProp(
                     context,
@@ -91,15 +92,16 @@ ScrollViewProps::ScrollViewProps(
                     sourceProps.automaticallyAdjustsScrollIndicatorInsets,
                     true)),
       decelerationRate(
-          Props::enablePropIteratorSetter ? sourceProps.decelerationRate
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "decelerationRate",
-                                                sourceProps.decelerationRate,
-                                                (Float)0.998)),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.decelerationRate
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "decelerationRate",
+                    sourceProps.decelerationRate,
+                    (Float)0.998)),
       directionalLockEnabled(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.directionalLockEnabled
               : convertRawProp(
                     context,
@@ -108,71 +110,78 @@ ScrollViewProps::ScrollViewProps(
                     sourceProps.directionalLockEnabled,
                     {})),
       indicatorStyle(
-          Props::enablePropIteratorSetter ? sourceProps.indicatorStyle
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "indicatorStyle",
-                                                sourceProps.indicatorStyle,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.indicatorStyle
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "indicatorStyle",
+                    sourceProps.indicatorStyle,
+                    {})),
       keyboardDismissMode(
-          Props::enablePropIteratorSetter ? sourceProps.keyboardDismissMode
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "keyboardDismissMode",
-                                                sourceProps.keyboardDismissMode,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.keyboardDismissMode
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "keyboardDismissMode",
+                    sourceProps.keyboardDismissMode,
+                    {})),
       maximumZoomScale(
-          Props::enablePropIteratorSetter ? sourceProps.maximumZoomScale
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "maximumZoomScale",
-                                                sourceProps.maximumZoomScale,
-                                                (Float)1.0)),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.maximumZoomScale
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "maximumZoomScale",
+                    sourceProps.maximumZoomScale,
+                    (Float)1.0)),
       minimumZoomScale(
-          Props::enablePropIteratorSetter ? sourceProps.minimumZoomScale
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "minimumZoomScale",
-                                                sourceProps.minimumZoomScale,
-                                                (Float)1.0)),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.minimumZoomScale
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "minimumZoomScale",
+                    sourceProps.minimumZoomScale,
+                    (Float)1.0)),
       scrollEnabled(
-          Props::enablePropIteratorSetter ? sourceProps.scrollEnabled
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "scrollEnabled",
-                                                sourceProps.scrollEnabled,
-                                                true)),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.scrollEnabled
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "scrollEnabled",
+                    sourceProps.scrollEnabled,
+                    true)),
       pagingEnabled(
-          Props::enablePropIteratorSetter ? sourceProps.pagingEnabled
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "pagingEnabled",
-                                                sourceProps.pagingEnabled,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.pagingEnabled
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "pagingEnabled",
+                    sourceProps.pagingEnabled,
+                    {})),
       pinchGestureEnabled(
-          Props::enablePropIteratorSetter ? sourceProps.pinchGestureEnabled
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "pinchGestureEnabled",
-                                                sourceProps.pinchGestureEnabled,
-                                                true)),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.pinchGestureEnabled
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "pinchGestureEnabled",
+                    sourceProps.pinchGestureEnabled,
+                    true)),
       scrollsToTop(
-          Props::enablePropIteratorSetter ? sourceProps.scrollsToTop
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "scrollsToTop",
-                                                sourceProps.scrollsToTop,
-                                                true)),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.scrollsToTop
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "scrollsToTop",
+                                                       sourceProps.scrollsToTop,
+                                                       true)),
       showsHorizontalScrollIndicator(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.showsHorizontalScrollIndicator
               : convertRawProp(
                     context,
@@ -181,7 +190,7 @@ ScrollViewProps::ScrollViewProps(
                     sourceProps.showsHorizontalScrollIndicator,
                     true)),
       showsVerticalScrollIndicator(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.showsVerticalScrollIndicator
               : convertRawProp(
                     context,
@@ -190,39 +199,41 @@ ScrollViewProps::ScrollViewProps(
                     sourceProps.showsVerticalScrollIndicator,
                     true)),
       scrollEventThrottle(
-          Props::enablePropIteratorSetter ? sourceProps.scrollEventThrottle
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "scrollEventThrottle",
-                                                sourceProps.scrollEventThrottle,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.scrollEventThrottle
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "scrollEventThrottle",
+                    sourceProps.scrollEventThrottle,
+                    {})),
       zoomScale(
-          Props::enablePropIteratorSetter ? sourceProps.zoomScale
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "zoomScale",
-                                                sourceProps.zoomScale,
-                                                (Float)1.0)),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.zoomScale
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "zoomScale",
+                                                       sourceProps.zoomScale,
+                                                       (Float)1.0)),
       contentInset(
-          Props::enablePropIteratorSetter ? sourceProps.contentInset
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "contentInset",
-                                                sourceProps.contentInset,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.contentInset
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "contentInset",
+                                                       sourceProps.contentInset,
+                                                       {})),
       contentOffset(
-          Props::enablePropIteratorSetter ? sourceProps.contentOffset
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "contentOffset",
-                                                sourceProps.contentOffset,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.contentOffset
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "contentOffset",
+                    sourceProps.contentOffset,
+                    {})),
       scrollIndicatorInsets(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.scrollIndicatorInsets
               : convertRawProp(
                     context,
@@ -231,23 +242,25 @@ ScrollViewProps::ScrollViewProps(
                     sourceProps.scrollIndicatorInsets,
                     {})),
       snapToInterval(
-          Props::enablePropIteratorSetter ? sourceProps.snapToInterval
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "snapToInterval",
-                                                sourceProps.snapToInterval,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.snapToInterval
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "snapToInterval",
+                    sourceProps.snapToInterval,
+                    {})),
       snapToAlignment(
-          Props::enablePropIteratorSetter ? sourceProps.snapToAlignment
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "snapToAlignment",
-                                                sourceProps.snapToAlignment,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.snapToAlignment
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "snapToAlignment",
+                    sourceProps.snapToAlignment,
+                    {})),
       disableIntervalMomentum(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.disableIntervalMomentum
               : convertRawProp(
                     context,
@@ -256,31 +269,32 @@ ScrollViewProps::ScrollViewProps(
                     sourceProps.disableIntervalMomentum,
                     {})),
       snapToOffsets(
-          Props::enablePropIteratorSetter ? sourceProps.snapToOffsets
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "snapToOffsets",
-                                                sourceProps.snapToOffsets,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.snapToOffsets
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "snapToOffsets",
+                    sourceProps.snapToOffsets,
+                    {})),
       snapToStart(
-          Props::enablePropIteratorSetter ? sourceProps.snapToStart
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "snapToStart",
-                                                sourceProps.snapToStart,
-                                                true)),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.snapToStart
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "snapToStart",
+                                                       sourceProps.snapToStart,
+                                                       true)),
       snapToEnd(
-          Props::enablePropIteratorSetter ? sourceProps.snapToEnd
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "snapToEnd",
-                                                sourceProps.snapToEnd,
-                                                true)),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.snapToEnd
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "snapToEnd",
+                                                       sourceProps.snapToEnd,
+                                                       true)),
       contentInsetAdjustmentBehavior(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.contentInsetAdjustmentBehavior
               : convertRawProp(
                     context,
@@ -289,7 +303,7 @@ ScrollViewProps::ScrollViewProps(
                     sourceProps.contentInsetAdjustmentBehavior,
                     {ContentInsetAdjustmentBehavior::Never})),
       scrollToOverflowEnabled(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.scrollToOverflowEnabled
               : convertRawProp(
                     context,
@@ -303,7 +317,11 @@ void ScrollViewProps::setProp(
     RawPropsPropNameHash hash,
     const char *propName,
     RawValue const &value) {
+  // All Props structs setProp methods must always, unconditionally,
+  // call all super::setProp methods, since multiple structs may
+  // reuse the same values.
   ViewProps::setProp(context, hash, propName, value);
+
   switch (hash) {
     RAW_SET_PROP_SWITCH_CASE_BASIC(alwaysBounceHorizontal, {});
     RAW_SET_PROP_SWITCH_CASE_BASIC(alwaysBounceVertical, {});
@@ -464,5 +482,4 @@ SharedDebugStringConvertibleList ScrollViewProps::getDebugProps() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp b/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp
index 41ddcdb4175f..f4d7a883b183 100644
--- a/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp
@@ -10,8 +10,7 @@
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/core/LayoutMetrics.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 const char ScrollViewComponentName[] = "ScrollView";
 
@@ -63,5 +62,4 @@ Point ScrollViewShadowNode::getContentOriginOffset() const {
   return {-contentOffset.x, -contentOffset.y + stateData.scrollAwayPaddingTop};
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/scrollview/ScrollViewState.cpp b/ReactCommon/react/renderer/components/scrollview/ScrollViewState.cpp
index 4bbfaa4a3e5c..ac184051d68c 100644
--- a/ReactCommon/react/renderer/components/scrollview/ScrollViewState.cpp
+++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewState.cpp
@@ -7,12 +7,10 @@
 
 #include "ScrollViewState.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 Size ScrollViewState::getContentSize() const {
   return contentBoundingRect.size;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/slider/BUCK b/ReactCommon/react/renderer/components/slider/BUCK
index 59bd982faeee..7cc3f2f6849f 100644
--- a/ReactCommon/react/renderer/components/slider/BUCK
+++ b/ReactCommon/react/renderer/components/slider/BUCK
@@ -33,8 +33,10 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/slider",
     ),
+    compiler_flags_pedantic = True,
     cxx_tests = [":tests"],
     fbandroid_deps = [
+        "//xplat/folly:dynamic",
         react_native_target("jni/react/jni:jni"),
         react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
     ],
@@ -69,7 +71,6 @@ rn_xplat_cxx_library(
     ),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
@@ -78,8 +79,6 @@ rn_xplat_cxx_library(
     ],
     visibility = ["PUBLIC"],
     deps = [
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:molly",
         YOGA_CXX_TARGET,
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/debug:debug"),
@@ -113,7 +112,6 @@ fb_xplat_cxx_test(
     ),
     deps = [
         ":slider",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )
diff --git a/ReactCommon/react/renderer/components/slider/CMakeLists.txt b/ReactCommon/react/renderer/components/slider/CMakeLists.txt
index 059ece7daded..e69b5146b92e 100644
--- a/ReactCommon/react/renderer/components/slider/CMakeLists.txt
+++ b/ReactCommon/react/renderer/components/slider/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB rrc_slider_SRC CONFIGURE_DEPENDS *.cpp platform/android/react/renderer/components/slider/*.cpp)
 add_library(rrc_slider STATIC ${rrc_slider_SRC})
@@ -31,7 +38,7 @@ target_link_libraries(rrc_slider
         react_render_imagemanager
         react_render_mapbuffer
         react_render_uimanager
-        reactnativeutilsjni
+        reactnativejni
         rrc_image
         rrc_view
         yoga
diff --git a/ReactCommon/react/renderer/components/slider/SliderShadowNode.cpp b/ReactCommon/react/renderer/components/slider/SliderShadowNode.cpp
index 094389801734..bb70718bf54b 100644
--- a/ReactCommon/react/renderer/components/slider/SliderShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/slider/SliderShadowNode.cpp
@@ -9,8 +9,7 @@
 
 #include <react/renderer/core/LayoutContext.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 extern const char SliderComponentName[] = "Slider";
 
@@ -84,7 +83,7 @@ ImageSource SliderShadowNode::getThumbImageSource() const {
 #pragma mark - LayoutableShadowNode
 
 Size SliderShadowNode::measureContent(
-    LayoutContext const &layoutContext,
+    LayoutContext const & /*layoutContext*/,
     LayoutConstraints const &layoutConstraints) const {
   if (SliderMeasurementsManager::shouldMeasureSlider()) {
     return measurementsManager_->measure(getSurfaceId(), layoutConstraints);
@@ -98,5 +97,4 @@ void SliderShadowNode::layout(LayoutContext layoutContext) {
   ConcreteViewShadowNode::layout(layoutContext);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/slider/SliderState.cpp b/ReactCommon/react/renderer/components/slider/SliderState.cpp
index c27e7139cd05..adce049789df 100644
--- a/ReactCommon/react/renderer/components/slider/SliderState.cpp
+++ b/ReactCommon/react/renderer/components/slider/SliderState.cpp
@@ -7,8 +7,7 @@
 
 #include "SliderState.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ImageSource SliderState::getTrackImageSource() const {
   return trackImageSource_;
@@ -42,5 +41,4 @@ ImageRequest const &SliderState::getThumbImageRequest() const {
   return *thumbImageRequest_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/slider/platform/android/react/renderer/components/slider/SliderMeasurementsManager.cpp b/ReactCommon/react/renderer/components/slider/platform/android/react/renderer/components/slider/SliderMeasurementsManager.cpp
index 07119bd68a31..2f161fec5c07 100644
--- a/ReactCommon/react/renderer/components/slider/platform/android/react/renderer/components/slider/SliderMeasurementsManager.cpp
+++ b/ReactCommon/react/renderer/components/slider/platform/android/react/renderer/components/slider/SliderMeasurementsManager.cpp
@@ -13,8 +13,7 @@
 
 using namespace facebook::jni;
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 Size SliderMeasurementsManager::measure(
     SurfaceId surfaceId,
@@ -70,5 +69,4 @@ Size SliderMeasurementsManager::measure(
   return measurement;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/switch/BUCK b/ReactCommon/react/renderer/components/switch/BUCK
index 33d4f9170377..881670fdbdab 100644
--- a/ReactCommon/react/renderer/components/switch/BUCK
+++ b/ReactCommon/react/renderer/components/switch/BUCK
@@ -3,7 +3,6 @@ load(
     "ANDROID",
     "APPLE",
     "CXX",
-    "YOGA_CXX_TARGET",
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
@@ -34,6 +33,7 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/androidswitch",
     ),
+    compiler_flags_pedantic = True,
     cxx_tests = [":tests"],
     fbandroid_deps = [
         react_native_target("jni/react/jni:jni"),
@@ -43,7 +43,6 @@ rn_xplat_cxx_library(
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
@@ -52,12 +51,6 @@ rn_xplat_cxx_library(
     ],
     visibility = ["PUBLIC"],
     deps = [
-        "//third-party/glog:glog",
-        "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
-        YOGA_CXX_TARGET,
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/graphics:graphics"),
@@ -89,7 +82,6 @@ fb_xplat_cxx_test(
     ),
     deps = [
         ":androidswitch",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )
diff --git a/ReactCommon/react/renderer/components/switch/CMakeLists.txt b/ReactCommon/react/renderer/components/switch/CMakeLists.txt
index f4a251343f97..b09fc0006444 100644
--- a/ReactCommon/react/renderer/components/switch/CMakeLists.txt
+++ b/ReactCommon/react/renderer/components/switch/CMakeLists.txt
@@ -28,7 +28,7 @@ target_link_libraries(
         react_render_debug
         react_render_graphics
         react_render_uimanager
-        reactnativeutilsjni
+        reactnativejni
         rrc_view
         yoga
 )
@@ -41,4 +41,6 @@ target_compile_options(
         -frtti
         -std=c++17
         -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
 )
diff --git a/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.cpp b/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.cpp
index 7a683eecc032..5f9033666bf0 100644
--- a/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.cpp
+++ b/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.cpp
@@ -13,8 +13,7 @@
 
 using namespace facebook::jni;
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 Size AndroidSwitchMeasurementsManager::measure(
     SurfaceId surfaceId,
@@ -64,5 +63,4 @@ Size AndroidSwitchMeasurementsManager::measure(
   return measurement;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchShadowNode.cpp b/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchShadowNode.cpp
index 4dca3fbda46d..63cfc616a4a0 100644
--- a/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchShadowNode.cpp
@@ -7,8 +7,7 @@
 
 #include "AndroidSwitchShadowNode.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 extern const char AndroidSwitchComponentName[] = "AndroidSwitch";
 
@@ -22,10 +21,9 @@ void AndroidSwitchShadowNode::setAndroidSwitchMeasurementsManager(
 #pragma mark - LayoutableShadowNode
 
 Size AndroidSwitchShadowNode::measureContent(
-    LayoutContext const &layoutContext,
+    LayoutContext const & /*layoutContext*/,
     LayoutConstraints const &layoutConstraints) const {
   return measurementsManager_->measure(getSurfaceId(), layoutConstraints);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/text/BUCK b/ReactCommon/react/renderer/components/text/BUCK
index 00e9e735d35c..27bc1edacc85 100644
--- a/ReactCommon/react/renderer/components/text/BUCK
+++ b/ReactCommon/react/renderer/components/text/BUCK
@@ -36,6 +36,7 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/text",
     ),
+    compiler_flags_pedantic = True,
     cxx_tests = [":tests"],
     fbandroid_deps = [
         react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
@@ -45,7 +46,6 @@ rn_xplat_cxx_library(
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
@@ -56,10 +56,6 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:container_evicting_cache_map",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
         YOGA_CXX_TARGET,
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/attributedstring:attributedstring"),
@@ -97,7 +93,6 @@ fb_xplat_cxx_test(
     ),
     deps = [
         ":text",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("react/debug:debug"),
     ],
diff --git a/ReactCommon/react/renderer/components/text/BaseTextProps.cpp b/ReactCommon/react/renderer/components/text/BaseTextProps.cpp
index e93c000d1b2c..e098e7beab24 100644
--- a/ReactCommon/react/renderer/components/text/BaseTextProps.cpp
+++ b/ReactCommon/react/renderer/components/text/BaseTextProps.cpp
@@ -8,30 +8,12 @@
 #include "BaseTextProps.h"
 
 #include <react/renderer/attributedstring/conversions.h>
+#include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/debug/DebugStringConvertibleItem.h>
 #include <react/renderer/graphics/conversions.h>
 
-#define GET_FIELD_VALUE(field, fieldName, defaultValue, rawValue) \
-  (rawValue.hasValue() ? ({                                       \
-    decltype(defaultValue) res;                                   \
-    fromRawValue(context, rawValue, res);                         \
-    res;                                                          \
-  })                                                              \
-                       : defaultValue)
-
-#define REBUILD_FIELD_SWITCH_CASE(                                   \
-    defaults, rawValue, property, field, fieldName)                  \
-  case CONSTEXPR_RAW_PROPS_KEY_HASH(fieldName): {                    \
-    property.field =                                                 \
-        GET_FIELD_VALUE(field, fieldName, defaults.field, rawValue); \
-    return;                                                          \
-  }
-
-namespace facebook {
-namespace react {
-
-bool BaseTextProps::enablePropIteratorSetter = false;
+namespace facebook::react {
 
 static TextAttributes convertRawProp(
     PropsParserContext const &context,
@@ -91,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,
@@ -123,6 +111,12 @@ static TextAttributes convertRawProp(
       "baseWritingDirection",
       sourceTextAttributes.baseWritingDirection,
       defaultTextAttributes.baseWritingDirection);
+  textAttributes.lineBreakStrategy = convertRawProp(
+      context,
+      rawProps,
+      "lineBreakStrategyIOS",
+      sourceTextAttributes.lineBreakStrategy,
+      defaultTextAttributes.lineBreakStrategy);
 
   // Decoration
   textAttributes.textDecorationColor = convertRawProp(
@@ -211,7 +205,7 @@ BaseTextProps::BaseTextProps(
     const BaseTextProps &sourceProps,
     const RawProps &rawProps)
     : textAttributes(
-          BaseTextProps::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.textAttributes
               : convertRawProp(
                     context,
@@ -222,7 +216,7 @@ BaseTextProps::BaseTextProps(
 void BaseTextProps::setProp(
     const PropsParserContext &context,
     RawPropsPropNameHash hash,
-    const char *propName,
+    const char * /*propName*/,
     RawValue const &value) {
   static auto defaults = TextAttributes{};
 
@@ -261,6 +255,12 @@ void BaseTextProps::setProp(
         textAttributes,
         baseWritingDirection,
         "baseWritingDirection");
+    REBUILD_FIELD_SWITCH_CASE(
+        defaults,
+        value,
+        textAttributes,
+        lineBreakStrategy,
+        "lineBreakStrategyIOS");
     REBUILD_FIELD_SWITCH_CASE(
         defaults,
         value,
@@ -308,5 +308,4 @@ SharedDebugStringConvertibleList BaseTextProps::getDebugProps() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/text/BaseTextProps.h b/ReactCommon/react/renderer/components/text/BaseTextProps.h
index 092ff27c9639..b2d4e0789f8b 100644
--- a/ReactCommon/react/renderer/components/text/BaseTextProps.h
+++ b/ReactCommon/react/renderer/components/text/BaseTextProps.h
@@ -34,8 +34,6 @@ class BaseTextProps {
       const char *propName,
       RawValue const &value);
 
-  static bool enablePropIteratorSetter;
-
 #pragma mark - Props
 
   TextAttributes textAttributes{};
diff --git a/ReactCommon/react/renderer/components/text/BaseTextShadowNode.cpp b/ReactCommon/react/renderer/components/text/BaseTextShadowNode.cpp
index 054bdeb14fbe..b0758dcd6e80 100644
--- a/ReactCommon/react/renderer/components/text/BaseTextShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/text/BaseTextShadowNode.cpp
@@ -13,8 +13,7 @@
 #include <react/renderer/components/text/TextShadowNode.h>
 #include <react/renderer/mounting/ShadowView.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 inline ShadowView shadowViewFromShadowNode(ShadowNode const &shadowNode) {
   auto shadowView = ShadowView{shadowNode};
@@ -34,7 +33,7 @@ void BaseTextShadowNode::buildAttributedString(
     // RawShadowNode
     auto rawTextShadowNode =
         traitCast<RawTextShadowNode const *>(childNode.get());
-    if (rawTextShadowNode) {
+    if (rawTextShadowNode != nullptr) {
       auto fragment = AttributedString::Fragment{};
       fragment.string = rawTextShadowNode->getConcreteProps().text;
       fragment.textAttributes = baseTextAttributes;
@@ -50,7 +49,7 @@ void BaseTextShadowNode::buildAttributedString(
 
     // TextShadowNode
     auto textShadowNode = traitCast<TextShadowNode const *>(childNode.get());
-    if (textShadowNode) {
+    if (textShadowNode != nullptr) {
       auto localTextAttributes = baseTextAttributes;
       localTextAttributes.apply(
           textShadowNode->getConcreteProps().textAttributes);
@@ -73,5 +72,4 @@ void BaseTextShadowNode::buildAttributedString(
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/text/CMakeLists.txt b/ReactCommon/react/renderer/components/text/CMakeLists.txt
index 392d76171b47..1866337440ff 100644
--- a/ReactCommon/react/renderer/components/text/CMakeLists.txt
+++ b/ReactCommon/react/renderer/components/text/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB rrc_text_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(rrc_text SHARED ${rrc_text_SRC})
diff --git a/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.cpp b/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.cpp
index 3ea125167594..3ae6e664598c 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.cpp
+++ b/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.cpp
@@ -7,8 +7,7 @@
 
 #include "ParagraphEventEmitter.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static jsi::Value linesMeasurementsPayload(
     jsi::Runtime &runtime,
@@ -51,5 +50,4 @@ void ParagraphEventEmitter::onTextLayout(
   });
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/text/ParagraphProps.cpp b/ReactCommon/react/renderer/components/text/ParagraphProps.cpp
index 0ecf15bab4f9..c666e5e2d86a 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphProps.cpp
+++ b/ReactCommon/react/renderer/components/text/ParagraphProps.cpp
@@ -9,13 +9,13 @@
 
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/attributedstring/primitives.h>
+#include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
 
 #include <glog/logging.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ParagraphProps::ParagraphProps(
     const PropsParserContext &context,
@@ -23,23 +23,30 @@ ParagraphProps::ParagraphProps(
     RawProps const &rawProps)
     : ViewProps(context, sourceProps, rawProps),
       BaseTextProps(context, sourceProps, rawProps),
-      paragraphAttributes(convertRawProp(
-          context,
-          rawProps,
-          sourceProps.paragraphAttributes,
-          {})),
-      isSelectable(convertRawProp(
-          context,
-          rawProps,
-          "selectable",
-          sourceProps.isSelectable,
-          false)),
-      onTextLayout(convertRawProp(
-          context,
-          rawProps,
-          "onTextLayout",
-          sourceProps.onTextLayout,
-          {})) {
+      paragraphAttributes(
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.paragraphAttributes
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    sourceProps.paragraphAttributes,
+                    {})),
+      isSelectable(
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.isSelectable
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "selectable",
+                                                       sourceProps.isSelectable,
+                                                       false)),
+      onTextLayout(
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.onTextLayout
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "onTextLayout",
+                                                       sourceProps.onTextLayout,
+                                                       {})) {
   /*
    * These props are applied to `View`, therefore they must not be a part of
    * base text attributes.
@@ -59,6 +66,63 @@ void ParagraphProps::setProp(
   ViewProps::setProp(context, hash, propName, value);
   BaseTextProps::setProp(context, hash, propName, value);
 
+  // ParagraphAttributes has its own switch statement - to keep all
+  // of these fields together, and because there are some collisions between
+  // propnames parsed here and outside of ParagraphAttributes.
+  // This code is also duplicated in AndroidTextInput.
+  static auto paDefaults = ParagraphAttributes{};
+  switch (hash) {
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults,
+        value,
+        paragraphAttributes,
+        maximumNumberOfLines,
+        "numberOfLines");
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults, value, paragraphAttributes, ellipsizeMode, "ellipsizeMode");
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults,
+        value,
+        paragraphAttributes,
+        textBreakStrategy,
+        "textBreakStrategy");
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults,
+        value,
+        paragraphAttributes,
+        adjustsFontSizeToFit,
+        "adjustsFontSizeToFit");
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults,
+        value,
+        paragraphAttributes,
+        minimumFontSize,
+        "minimumFontSize");
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults,
+        value,
+        paragraphAttributes,
+        maximumFontSize,
+        "maximumFontSize");
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults,
+        value,
+        paragraphAttributes,
+        includeFontPadding,
+        "includeFontPadding");
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults,
+        value,
+        paragraphAttributes,
+        android_hyphenationFrequency,
+        "android_hyphenationFrequency");
+  }
+
+  switch (hash) {
+    RAW_SET_PROP_SWITCH_CASE_BASIC(isSelectable, false);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(onTextLayout, {});
+  }
+
   /*
    * These props are applied to `View`, therefore they must not be a part of
    * base text attributes.
@@ -78,5 +142,4 @@ SharedDebugStringConvertibleList ParagraphProps::getDebugProps() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/text/ParagraphProps.h b/ReactCommon/react/renderer/components/text/ParagraphProps.h
index b73ad0f2a462..86a9224c3e19 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphProps.h
+++ b/ReactCommon/react/renderer/components/text/ParagraphProps.h
@@ -44,14 +44,14 @@ class ParagraphProps : public ViewProps, public BaseTextProps {
    * Contains all prop values that affect visual representation of the
    * paragraph.
    */
-  ParagraphAttributes const paragraphAttributes{};
+  ParagraphAttributes paragraphAttributes{};
 
   /*
    * Defines can the text be selected (and copied) or not.
    */
-  bool const isSelectable{};
+  bool isSelectable{};
 
-  bool const onTextLayout{};
+  bool onTextLayout{};
 
 #pragma mark - DebugStringConvertible
 
diff --git a/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
index 7c42ae7672e1..48b3a2128f74 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
@@ -18,8 +18,7 @@
 
 #include "ParagraphState.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 using Content = ParagraphShadowNode::Content;
 
@@ -70,7 +69,7 @@ Content ParagraphShadowNode::getContentWithMeasuredAttachments(
     auto laytableShadowNode =
         traitCast<LayoutableShadowNode const *>(attachment.shadowNode);
 
-    if (!laytableShadowNode) {
+    if (laytableShadowNode == nullptr) {
       continue;
     }
 
@@ -189,7 +188,8 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) {
   for (size_t i = 0; i < content.attachments.size(); i++) {
     auto &attachment = content.attachments.at(i);
 
-    if (!traitCast<LayoutableShadowNode const *>(attachment.shadowNode)) {
+    if (traitCast<LayoutableShadowNode const *>(attachment.shadowNode) ==
+        nullptr) {
       // Not a layoutable `ShadowNode`, no need to lay it out.
       continue;
     }
@@ -237,5 +237,4 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) {
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/text/ParagraphState.cpp b/ReactCommon/react/renderer/components/text/ParagraphState.cpp
index aa5ca1a8b393..559a1796d811 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphState.cpp
+++ b/ReactCommon/react/renderer/components/text/ParagraphState.cpp
@@ -10,8 +10,7 @@
 #include <react/renderer/components/text/conversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #ifdef ANDROID
 folly::dynamic ParagraphState::getDynamic() const {
@@ -23,5 +22,4 @@ MapBuffer ParagraphState::getMapBuffer() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/text/ParagraphState.h b/ReactCommon/react/renderer/components/text/ParagraphState.h
index 76dcbcf1cee0..24a8e1258e8b 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphState.h
+++ b/ReactCommon/react/renderer/components/text/ParagraphState.h
@@ -20,6 +20,15 @@
 namespace facebook {
 namespace react {
 
+#ifdef ANDROID
+// constants for Text State serialization
+constexpr static MapBuffer::Key TX_STATE_KEY_ATTRIBUTED_STRING = 0;
+constexpr static MapBuffer::Key TX_STATE_KEY_PARAGRAPH_ATTRIBUTES = 1;
+// Used for TextInput only
+constexpr static MapBuffer::Key TX_STATE_KEY_HASH = 2;
+constexpr static MapBuffer::Key TX_STATE_KEY_MOST_RECENT_EVENT_COUNT = 3;
+#endif
+
 /*
  * State for <Paragraph> component.
  * Represents what to render and how to render.
diff --git a/ReactCommon/react/renderer/components/text/RawTextProps.cpp b/ReactCommon/react/renderer/components/text/RawTextProps.cpp
index 40e49859d29a..92ddbf1e10b3 100644
--- a/ReactCommon/react/renderer/components/text/RawTextProps.cpp
+++ b/ReactCommon/react/renderer/components/text/RawTextProps.cpp
@@ -10,8 +10,7 @@
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 RawTextProps::RawTextProps(
     const PropsParserContext &context,
@@ -29,5 +28,4 @@ SharedDebugStringConvertibleList RawTextProps::getDebugProps() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/text/RawTextShadowNode.cpp b/ReactCommon/react/renderer/components/text/RawTextShadowNode.cpp
index 55ee95cc2a85..ed138a8f8476 100644
--- a/ReactCommon/react/renderer/components/text/RawTextShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/text/RawTextShadowNode.cpp
@@ -7,10 +7,8 @@
 
 #include "RawTextShadowNode.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 extern const char RawTextComponentName[] = "RawText";
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/text/TextProps.cpp b/ReactCommon/react/renderer/components/text/TextProps.cpp
index a8b83aa0b1b3..f88e75a029ef 100644
--- a/ReactCommon/react/renderer/components/text/TextProps.cpp
+++ b/ReactCommon/react/renderer/components/text/TextProps.cpp
@@ -7,8 +7,7 @@
 
 #include "TextProps.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 TextProps::TextProps(
     const PropsParserContext &context,
@@ -34,5 +33,4 @@ SharedDebugStringConvertibleList TextProps::getDebugProps() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/text/TextShadowNode.cpp b/ReactCommon/react/renderer/components/text/TextShadowNode.cpp
index 561ddcb9475e..f70fcd55ffb5 100644
--- a/ReactCommon/react/renderer/components/text/TextShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/text/TextShadowNode.cpp
@@ -7,10 +7,8 @@
 
 #include "TextShadowNode.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 extern const char TextComponentName[] = "Text";
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/text/conversions.h b/ReactCommon/react/renderer/components/text/conversions.h
index 712b8f2fde23..a4a90aa37c9e 100644
--- a/ReactCommon/react/renderer/components/text/conversions.h
+++ b/ReactCommon/react/renderer/components/text/conversions.h
@@ -26,21 +26,13 @@ inline folly::dynamic toDynamic(ParagraphState const &paragraphState) {
   return newState;
 }
 
-// constants for Text State serialization
-constexpr static MapBuffer::Key TX_STATE_KEY_ATTRIBUTED_STRING = 0;
-constexpr static MapBuffer::Key TX_STATE_KEY_PARAGRAPH_ATTRIBUTES = 1;
-// Used for TextInput
-constexpr static MapBuffer::Key TX_STATE_KEY_HASH = 2;
-constexpr static MapBuffer::Key TX_STATE_KEY_MOST_RECENT_EVENT_COUNT = 3;
-
 inline MapBuffer toMapBuffer(ParagraphState const &paragraphState) {
   auto builder = MapBufferBuilder();
   auto attStringMapBuffer = toMapBuffer(paragraphState.attributedString);
   builder.putMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING, attStringMapBuffer);
   auto paMapBuffer = toMapBuffer(paragraphState.paragraphAttributes);
   builder.putMapBuffer(TX_STATE_KEY_PARAGRAPH_ATTRIBUTES, paMapBuffer);
-  // TODO: Used for TextInput
-  builder.putInt(TX_STATE_KEY_HASH, 1234);
+  builder.putInt(TX_STATE_KEY_HASH, attStringMapBuffer.getInt(AS_KEY_HASH));
   return builder.build();
 }
 #endif
diff --git a/ReactCommon/react/renderer/components/textinput/BUCK b/ReactCommon/react/renderer/components/textinput/BUCK
index a6d1767b9182..c8e70cd050b5 100644
--- a/ReactCommon/react/renderer/components/textinput/BUCK
+++ b/ReactCommon/react/renderer/components/textinput/BUCK
@@ -33,6 +33,7 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/androidtextinput",
     ),
+    compiler_flags_pedantic = True,
     cxx_tests = [":tests"],
     fbandroid_deps = [
         react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
@@ -42,7 +43,6 @@ rn_xplat_cxx_library(
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
@@ -53,10 +53,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:container_evicting_cache_map",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
+        "//xplat/folly:dynamic",
         YOGA_CXX_TARGET,
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/attributedstring:attributedstring"),
@@ -95,7 +92,6 @@ fb_xplat_cxx_test(
     ),
     deps = [
         ":androidtextinput",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )
diff --git a/ReactCommon/react/renderer/components/textinput/CMakeLists.txt b/ReactCommon/react/renderer/components/textinput/CMakeLists.txt
index 84826c23d3f5..80eb0f5400e1 100644
--- a/ReactCommon/react/renderer/components/textinput/CMakeLists.txt
+++ b/ReactCommon/react/renderer/components/textinput/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB rrc_textinput_SRC CONFIGURE_DEPENDS androidtextinput/react/renderer/components/androidtextinput/*.cpp)
 add_library(rrc_textinput SHARED ${rrc_textinput_SRC})
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
index becfec590be7..c8eaf160ba1c 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
@@ -7,11 +7,11 @@
 
 #include "AndroidTextInputProps.h"
 #include <react/renderer/components/image/conversions.h>
+#include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/graphics/conversions.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static bool hasValue(
     const RawProps &rawProps,
@@ -42,219 +42,219 @@ AndroidTextInputProps::AndroidTextInputProps(
     const RawProps &rawProps)
     : ViewProps(context, sourceProps, rawProps),
       BaseTextProps(context, sourceProps, rawProps),
-      autoComplete(convertRawProp(
+      autoComplete(CoreFeatures::enablePropIteratorSetter? sourceProps.autoComplete : convertRawProp(
           context,
           rawProps,
           "autoComplete",
           sourceProps.autoComplete,
           {})),
-      returnKeyLabel(convertRawProp(context, rawProps,
+      returnKeyLabel(CoreFeatures::enablePropIteratorSetter? sourceProps.autoComplete : convertRawProp(context, rawProps,
           "returnKeyLabel",
           sourceProps.returnKeyLabel,
           {})),
-      numberOfLines(convertRawProp(context, rawProps,
+      numberOfLines(CoreFeatures::enablePropIteratorSetter? sourceProps.numberOfLines : convertRawProp(context, rawProps,
           "numberOfLines",
           sourceProps.numberOfLines,
           {0})),
-      disableFullscreenUI(convertRawProp(context, rawProps,
+      disableFullscreenUI(CoreFeatures::enablePropIteratorSetter? sourceProps.disableFullscreenUI : convertRawProp(context, rawProps,
           "disableFullscreenUI",
           sourceProps.disableFullscreenUI,
           {false})),
-      textBreakStrategy(convertRawProp(context, rawProps,
+      textBreakStrategy(CoreFeatures::enablePropIteratorSetter? sourceProps.textBreakStrategy : convertRawProp(context, rawProps,
           "textBreakStrategy",
           sourceProps.textBreakStrategy,
           {})),
-      underlineColorAndroid(convertRawProp(context, rawProps,
+      underlineColorAndroid(CoreFeatures::enablePropIteratorSetter? sourceProps.underlineColorAndroid : convertRawProp(context, rawProps,
           "underlineColorAndroid",
           sourceProps.underlineColorAndroid,
           {})),
-      inlineImageLeft(convertRawProp(context, rawProps,
+      inlineImageLeft(CoreFeatures::enablePropIteratorSetter? sourceProps.inlineImageLeft : convertRawProp(context, rawProps,
           "inlineImageLeft",
           sourceProps.inlineImageLeft,
           {})),
-      inlineImagePadding(convertRawProp(context, rawProps,
+      inlineImagePadding(CoreFeatures::enablePropIteratorSetter? sourceProps.inlineImagePadding : convertRawProp(context, rawProps,
           "inlineImagePadding",
           sourceProps.inlineImagePadding,
           {0})),
-      importantForAutofill(convertRawProp(context, rawProps,
+      importantForAutofill(CoreFeatures::enablePropIteratorSetter? sourceProps.importantForAutofill : convertRawProp(context, rawProps,
           "importantForAutofill",
           sourceProps.importantForAutofill,
           {})),
-      showSoftInputOnFocus(convertRawProp(context, rawProps,
+      showSoftInputOnFocus(CoreFeatures::enablePropIteratorSetter? sourceProps.showSoftInputOnFocus : convertRawProp(context, rawProps,
           "showSoftInputOnFocus",
           sourceProps.showSoftInputOnFocus,
           {false})),
-      autoCapitalize(convertRawProp(context, rawProps,
+      autoCapitalize(CoreFeatures::enablePropIteratorSetter? sourceProps.autoCapitalize : convertRawProp(context, rawProps,
           "autoCapitalize",
           sourceProps.autoCapitalize,
           {})),
-      autoCorrect(convertRawProp(context, rawProps,
+      autoCorrect(CoreFeatures::enablePropIteratorSetter? sourceProps.autoCorrect : convertRawProp(context, rawProps,
           "autoCorrect",
           sourceProps.autoCorrect,
           {false})),
-      autoFocus(convertRawProp(context, rawProps,
+      autoFocus(CoreFeatures::enablePropIteratorSetter? sourceProps.autoFocus : convertRawProp(context, rawProps,
           "autoFocus",
           sourceProps.autoFocus,
           {false})),
-      allowFontScaling(convertRawProp(context, rawProps,
+      allowFontScaling(CoreFeatures::enablePropIteratorSetter? sourceProps.allowFontScaling : convertRawProp(context, rawProps,
           "allowFontScaling",
           sourceProps.allowFontScaling,
           {false})),
-      maxFontSizeMultiplier(convertRawProp(context, rawProps,
+      maxFontSizeMultiplier(CoreFeatures::enablePropIteratorSetter? sourceProps.maxFontSizeMultiplier : convertRawProp(context, rawProps,
           "maxFontSizeMultiplier",
           sourceProps.maxFontSizeMultiplier,
           {0.0})),
-      editable(
+      editable(CoreFeatures::enablePropIteratorSetter? sourceProps.editable :
           convertRawProp(context, rawProps, "editable", sourceProps.editable, {false})),
-      keyboardType(convertRawProp(context, rawProps,
+      keyboardType(CoreFeatures::enablePropIteratorSetter? sourceProps.keyboardType : convertRawProp(context, rawProps,
           "keyboardType",
           sourceProps.keyboardType,
           {})),
-      returnKeyType(convertRawProp(context, rawProps,
+      returnKeyType(CoreFeatures::enablePropIteratorSetter? sourceProps.returnKeyType : convertRawProp(context, rawProps,
           "returnKeyType",
           sourceProps.returnKeyType,
           {})),
-      maxLength(
+      maxLength(CoreFeatures::enablePropIteratorSetter? sourceProps.maxLength :
           convertRawProp(context, rawProps, "maxLength", sourceProps.maxLength, {0})),
-      multiline(convertRawProp(context, rawProps,
+      multiline(CoreFeatures::enablePropIteratorSetter? sourceProps.multiline : convertRawProp(context, rawProps,
           "multiline",
           sourceProps.multiline,
           {false})),
-      placeholder(
+      placeholder(CoreFeatures::enablePropIteratorSetter? sourceProps.placeholder :
           convertRawProp(context, rawProps, "placeholder", sourceProps.placeholder, {})),
-      placeholderTextColor(convertRawProp(context, rawProps,
+      placeholderTextColor(CoreFeatures::enablePropIteratorSetter? sourceProps.placeholderTextColor : convertRawProp(context, rawProps,
           "placeholderTextColor",
           sourceProps.placeholderTextColor,
           {})),
-      secureTextEntry(convertRawProp(context, rawProps,
+      secureTextEntry(CoreFeatures::enablePropIteratorSetter? sourceProps.secureTextEntry : convertRawProp(context, rawProps,
           "secureTextEntry",
           sourceProps.secureTextEntry,
           {false})),
-      selectionColor(convertRawProp(context, rawProps,
+      selectionColor(CoreFeatures::enablePropIteratorSetter? sourceProps.selectionColor : convertRawProp(context, rawProps,
           "selectionColor",
           sourceProps.selectionColor,
           {})),
-      selection(
+      selection(CoreFeatures::enablePropIteratorSetter? sourceProps.selection :
           convertRawProp(context, rawProps, "selection", sourceProps.selection, {})),
-      value(convertRawProp(context, rawProps, "value", sourceProps.value, {})),
-      defaultValue(convertRawProp(context, rawProps,
+      value(CoreFeatures::enablePropIteratorSetter? sourceProps.value : convertRawProp(context, rawProps, "value", sourceProps.value, {})),
+      defaultValue(CoreFeatures::enablePropIteratorSetter? sourceProps.defaultValue : convertRawProp(context, rawProps,
           "defaultValue",
           sourceProps.defaultValue,
           {})),
-      selectTextOnFocus(convertRawProp(context, rawProps,
+      selectTextOnFocus(CoreFeatures::enablePropIteratorSetter? sourceProps.selectTextOnFocus : convertRawProp(context, rawProps,
           "selectTextOnFocus",
           sourceProps.selectTextOnFocus,
           {false})),
-      blurOnSubmit(convertRawProp(context, rawProps,
-          "blurOnSubmit",
-          sourceProps.blurOnSubmit,
-          {false})),
-      caretHidden(convertRawProp(context, rawProps,
+      submitBehavior(CoreFeatures::enablePropIteratorSetter? sourceProps.submitBehavior : convertRawProp(context, rawProps,
+           "submitBehavior",
+          sourceProps.submitBehavior,
+          {})),
+      caretHidden(CoreFeatures::enablePropIteratorSetter? sourceProps.caretHidden : convertRawProp(context, rawProps,
           "caretHidden",
           sourceProps.caretHidden,
           {false})),
-      contextMenuHidden(convertRawProp(context, rawProps,
+      contextMenuHidden(CoreFeatures::enablePropIteratorSetter? sourceProps.contextMenuHidden : convertRawProp(context, rawProps,
           "contextMenuHidden",
           sourceProps.contextMenuHidden,
           {false})),
-      textShadowColor(convertRawProp(context, rawProps,
+      textShadowColor(CoreFeatures::enablePropIteratorSetter? sourceProps.textShadowColor : convertRawProp(context, rawProps,
           "textShadowColor",
           sourceProps.textShadowColor,
           {})),
-      textShadowRadius(convertRawProp(context, rawProps,
+      textShadowRadius(CoreFeatures::enablePropIteratorSetter? sourceProps.textShadowRadius : convertRawProp(context, rawProps,
           "textShadowRadius",
           sourceProps.textShadowRadius,
           {0.0})),
-      textDecorationLine(convertRawProp(context, rawProps,
+      textDecorationLine(CoreFeatures::enablePropIteratorSetter? sourceProps.textDecorationLine : convertRawProp(context, rawProps,
           "textDecorationLine",
           sourceProps.textDecorationLine,
           {})),
-      fontStyle(
+      fontStyle(CoreFeatures::enablePropIteratorSetter? sourceProps.fontStyle :
           convertRawProp(context, rawProps, "fontStyle", sourceProps.fontStyle, {})),
-      textShadowOffset(convertRawProp(context, rawProps,
+      textShadowOffset(CoreFeatures::enablePropIteratorSetter? sourceProps.textShadowOffset : convertRawProp(context, rawProps,
           "textShadowOffset",
           sourceProps.textShadowOffset,
           {})),
-      lineHeight(convertRawProp(context, rawProps,
+      lineHeight(CoreFeatures::enablePropIteratorSetter? sourceProps.lineHeight : convertRawProp(context, rawProps,
           "lineHeight",
           sourceProps.lineHeight,
           {0.0})),
-      textTransform(convertRawProp(context, rawProps,
+      textTransform(CoreFeatures::enablePropIteratorSetter? sourceProps.textTransform : convertRawProp(context, rawProps,
           "textTransform",
           sourceProps.textTransform,
           {})),
       color(0 /*convertRawProp(context, rawProps, "color", sourceProps.color, {0})*/),
-      letterSpacing(convertRawProp(context, rawProps,
+      letterSpacing(CoreFeatures::enablePropIteratorSetter? sourceProps.letterSpacing : convertRawProp(context, rawProps,
           "letterSpacing",
           sourceProps.letterSpacing,
           {0.0})),
-      fontSize(
+      fontSize(CoreFeatures::enablePropIteratorSetter? sourceProps.fontSize :
           convertRawProp(context, rawProps, "fontSize", sourceProps.fontSize, {0.0})),
-      textAlign(
+      textAlign(CoreFeatures::enablePropIteratorSetter? sourceProps.textAlign :
           convertRawProp(context, rawProps, "textAlign", sourceProps.textAlign, {})),
-      includeFontPadding(convertRawProp(context, rawProps,
+      includeFontPadding(CoreFeatures::enablePropIteratorSetter? sourceProps.includeFontPadding : convertRawProp(context, rawProps,
           "includeFontPadding",
           sourceProps.includeFontPadding,
           {false})),
-      fontWeight(
+      fontWeight(CoreFeatures::enablePropIteratorSetter? sourceProps.fontWeight :
           convertRawProp(context, rawProps, "fontWeight", sourceProps.fontWeight, {})),
-      fontFamily(
+      fontFamily(CoreFeatures::enablePropIteratorSetter? sourceProps.fontFamily :
           convertRawProp(context, rawProps, "fontFamily", sourceProps.fontFamily, {})),
-      textAlignVertical(convertRawProp(context, rawProps,
+      textAlignVertical(CoreFeatures::enablePropIteratorSetter? sourceProps.textAlignVertical : convertRawProp(context, rawProps,
           "textAlignVertical",
           sourceProps.textAlignVertical,
           {})),
-      cursorColor(
+      cursorColor(CoreFeatures::enablePropIteratorSetter? sourceProps.cursorColor :
           convertRawProp(context, rawProps, "cursorColor", sourceProps.cursorColor, {})),
-      mostRecentEventCount(convertRawProp(context, rawProps,
+      mostRecentEventCount(CoreFeatures::enablePropIteratorSetter? sourceProps.mostRecentEventCount : convertRawProp(context, rawProps,
           "mostRecentEventCount",
           sourceProps.mostRecentEventCount,
           {0})),
-      text(convertRawProp(context, rawProps, "text", sourceProps.text, {})),
-      paragraphAttributes(
+      text(CoreFeatures::enablePropIteratorSetter? sourceProps.text : convertRawProp(context, rawProps, "text", sourceProps.text, {})),
+      paragraphAttributes(CoreFeatures::enablePropIteratorSetter? sourceProps.paragraphAttributes :
           convertRawProp(context, rawProps, sourceProps.paragraphAttributes, {})),
       // See AndroidTextInputComponentDescriptor for usage
       // TODO T63008435: can these, and this feature, be removed entirely?
-      hasPadding(hasValue(rawProps, sourceProps.hasPadding, "", "padding", "")),
-      hasPaddingHorizontal(hasValue(
+      hasPadding(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPadding : hasValue(rawProps, sourceProps.hasPadding, "", "padding", "")),
+      hasPaddingHorizontal(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingHorizontal : hasValue(
           rawProps,
           sourceProps.hasPaddingHorizontal,
           "Horizontal",
           "padding",
           "")),
-      hasPaddingVertical(hasValue(
+      hasPaddingVertical(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingVertical : hasValue(
           rawProps,
           sourceProps.hasPaddingVertical,
           "Vertical",
           "padding",
           "")),
-      hasPaddingLeft(hasValue(
+      hasPaddingLeft(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingLeft : hasValue(
           rawProps,
           sourceProps.hasPaddingLeft,
           "Left",
           "padding",
           "")),
-      hasPaddingTop(
+      hasPaddingTop(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingTop :
           hasValue(rawProps, sourceProps.hasPaddingTop, "Top", "padding", "")),
-      hasPaddingRight(hasValue(
+      hasPaddingRight(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingRight : hasValue(
           rawProps,
           sourceProps.hasPaddingRight,
           "Right",
           "padding",
           "")),
-      hasPaddingBottom(hasValue(
+      hasPaddingBottom(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingBottom : hasValue(
           rawProps,
           sourceProps.hasPaddingBottom,
           "Bottom",
           "padding",
           "")),
-      hasPaddingStart(hasValue(
+      hasPaddingStart(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingStart : hasValue(
           rawProps,
           sourceProps.hasPaddingStart,
           "Start",
           "padding",
           "")),
-      hasPaddingEnd(
+      hasPaddingEnd(CoreFeatures::enablePropIteratorSetter? sourceProps.hasPaddingEnd :
           hasValue(rawProps, sourceProps.hasPaddingEnd, "End", "padding", "")) {
 }
 
@@ -263,8 +263,157 @@ void AndroidTextInputProps::setProp(
     RawPropsPropNameHash hash,
     const char *propName,
     RawValue const &value) {
+  // All Props structs setProp methods must always, unconditionally,
+  // call all super::setProp methods, since multiple structs may
+  // reuse the same values.
   ViewProps::setProp(context, hash, propName, value);
   BaseTextProps::setProp(context, hash, propName, value);
+
+  // ParagraphAttributes has its own switch statement - to keep all
+  // of these fields together, and because there are some collisions between
+  // propnames parsed here and outside of ParagraphAttributes. For example,
+  // textBreakStrategy is duplicated.
+  // This code is also duplicated in ParagraphProps.
+  static auto paDefaults = ParagraphAttributes{};
+  switch (hash) {
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults,
+        value,
+        paragraphAttributes,
+        maximumNumberOfLines,
+        "numberOfLines");
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults, value, paragraphAttributes, ellipsizeMode, "ellipsizeMode");
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults,
+        value,
+        paragraphAttributes,
+        textBreakStrategy,
+        "textBreakStrategy");
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults,
+        value,
+        paragraphAttributes,
+        adjustsFontSizeToFit,
+        "adjustsFontSizeToFit");
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults,
+        value,
+        paragraphAttributes,
+        minimumFontSize,
+        "minimumFontSize");
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults,
+        value,
+        paragraphAttributes,
+        maximumFontSize,
+        "maximumFontSize");
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults,
+        value,
+        paragraphAttributes,
+        includeFontPadding,
+        "includeFontPadding");
+    REBUILD_FIELD_SWITCH_CASE(
+        paDefaults,
+        value,
+        paragraphAttributes,
+        android_hyphenationFrequency,
+        "android_hyphenationFrequency");
+  }
+
+  switch (hash) {
+    RAW_SET_PROP_SWITCH_CASE_BASIC(autoComplete, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(returnKeyLabel, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(numberOfLines, 0);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(disableFullscreenUI, false);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textBreakStrategy, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(underlineColorAndroid, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(inlineImageLeft, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(inlineImagePadding, 0);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(importantForAutofill, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(showSoftInputOnFocus, false);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(autoCapitalize, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(autoCorrect, false);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(autoFocus, false);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(allowFontScaling, false);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(maxFontSizeMultiplier, (Float)0.0);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(editable, false);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(keyboardType, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(returnKeyType, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(maxLength, 0);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(multiline, false);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(placeholder, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(placeholderTextColor, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(secureTextEntry, false);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(selectionColor, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(selection, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(this->value, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(defaultValue, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(selectTextOnFocus, false);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(submitBehavior, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(caretHidden, false);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(contextMenuHidden, false);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textShadowColor, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textShadowRadius, (Float)0.0);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textDecorationLine, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(fontStyle, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textShadowOffset, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(lineHeight, (Float)0.0);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textTransform, {});
+    // RAW_SET_PROP_SWITCH_CASE_BASIC(color, {0}); // currently not being parsed
+    RAW_SET_PROP_SWITCH_CASE_BASIC(letterSpacing, (Float)0.0);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(fontSize, (Float)0.0);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textAlign, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(includeFontPadding, false);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(fontWeight, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(fontFamily, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(textAlignVertical, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(cursorColor, {});
+    RAW_SET_PROP_SWITCH_CASE_BASIC(mostRecentEventCount, 0);
+    RAW_SET_PROP_SWITCH_CASE_BASIC(text, {});
+
+    // Paddings are not parsed at this level of the component (they're parsed in
+    // ViewProps) but we do need to know if they're present or not. See
+    // AndroidTextInputComponentDescriptor for usage
+    // TODO T63008435: can these, and this feature, be removed entirely?
+    case CONSTEXPR_RAW_PROPS_KEY_HASH("padding"): {
+      hasPadding = value.hasValue();
+      return;
+    }
+    case CONSTEXPR_RAW_PROPS_KEY_HASH("paddingHorizontal"): {
+      hasPaddingHorizontal = value.hasValue();
+      return;
+    }
+    case CONSTEXPR_RAW_PROPS_KEY_HASH("paddingVertical"): {
+      hasPaddingVertical = value.hasValue();
+      return;
+    }
+    case CONSTEXPR_RAW_PROPS_KEY_HASH("paddingLeft"): {
+      hasPaddingLeft = value.hasValue();
+      return;
+    }
+    case CONSTEXPR_RAW_PROPS_KEY_HASH("paddingRight"): {
+      hasPaddingRight = value.hasValue();
+      return;
+    }
+    case CONSTEXPR_RAW_PROPS_KEY_HASH("paddingTop"): {
+      hasPaddingTop = value.hasValue();
+      return;
+    }
+    case CONSTEXPR_RAW_PROPS_KEY_HASH("paddingBottom"): {
+      hasPaddingBottom = value.hasValue();
+      return;
+    }
+    case CONSTEXPR_RAW_PROPS_KEY_HASH("paddingStart"): {
+      hasPaddingStart = value.hasValue();
+      return;
+    }
+    case CONSTEXPR_RAW_PROPS_KEY_HASH("paddingEnd"): {
+      hasPaddingEnd = value.hasValue();
+      return;
+    }
+  }
 }
 
 // TODO T53300085: support this in codegen; this was hand-written
@@ -298,7 +447,7 @@ folly::dynamic AndroidTextInputProps::getDynamic() const {
   props["value"] = value;
   props["defaultValue"] = defaultValue;
   props["selectTextOnFocus"] = selectTextOnFocus;
-  props["blurOnSubmit"] = blurOnSubmit;
+  props["submitBehavior"] = submitBehavior;
   props["caretHidden"] = caretHidden;
   props["contextMenuHidden"] = contextMenuHidden;
   props["textShadowColor"] = toAndroidRepr(textShadowColor);
@@ -342,5 +491,4 @@ SharedDebugStringConvertibleList AndroidTextInputProps::getDebugProps() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h
index 6843425b1901..33b34adff991 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h
@@ -115,76 +115,76 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
 
 #pragma mark - Props
 
-  const std::string autoComplete{};
-  const std::string returnKeyLabel{};
-  const int numberOfLines{0};
-  const bool disableFullscreenUI{false};
-  const std::string textBreakStrategy{};
-  const SharedColor underlineColorAndroid{};
-  const std::string inlineImageLeft{};
-  const int inlineImagePadding{0};
-  const std::string importantForAutofill{};
-  const bool showSoftInputOnFocus{false};
-  const std::string autoCapitalize{};
-  const bool autoCorrect{false};
-  const bool autoFocus{false};
-  const bool allowFontScaling{false};
-  const Float maxFontSizeMultiplier{0.0};
-  const bool editable{false};
-  const std::string keyboardType{};
-  const std::string returnKeyType{};
-  const int maxLength{0};
-  const bool multiline{false};
-  const std::string placeholder{};
-  const SharedColor placeholderTextColor{};
-  const bool secureTextEntry{false};
-  const SharedColor selectionColor{};
-  const AndroidTextInputSelectionStruct selection{};
-  const std::string value{};
-  const std::string defaultValue{};
-  const bool selectTextOnFocus{false};
-  const bool blurOnSubmit{false};
-  const bool caretHidden{false};
-  const bool contextMenuHidden{false};
-  const SharedColor textShadowColor{};
-  const Float textShadowRadius{0.0};
-  const std::string textDecorationLine{};
-  const std::string fontStyle{};
-  const AndroidTextInputTextShadowOffsetStruct textShadowOffset{};
-  const Float lineHeight{0.0};
-  const std::string textTransform{};
-  const SharedColor color{0};
-  const Float letterSpacing{0.0};
-  const Float fontSize{0.0};
-  const std::string textAlign{};
-  const bool includeFontPadding{false};
-  const std::string fontWeight{};
-  const std::string fontFamily{};
-  const std::string textAlignVertical{};
-  const SharedColor cursorColor{};
-  const int mostRecentEventCount{0};
-  const std::string text{};
+  std::string autoComplete{};
+  std::string returnKeyLabel{};
+  int numberOfLines{0};
+  bool disableFullscreenUI{false};
+  std::string textBreakStrategy{};
+  SharedColor underlineColorAndroid{};
+  std::string inlineImageLeft{};
+  int inlineImagePadding{0};
+  std::string importantForAutofill{};
+  bool showSoftInputOnFocus{false};
+  std::string autoCapitalize{};
+  bool autoCorrect{false};
+  bool autoFocus{false};
+  bool allowFontScaling{false};
+  Float maxFontSizeMultiplier{0.0};
+  bool editable{false};
+  std::string keyboardType{};
+  std::string returnKeyType{};
+  int maxLength{0};
+  bool multiline{false};
+  std::string placeholder{};
+  SharedColor placeholderTextColor{};
+  bool secureTextEntry{false};
+  SharedColor selectionColor{};
+  AndroidTextInputSelectionStruct selection{};
+  std::string value{};
+  std::string defaultValue{};
+  bool selectTextOnFocus{false};
+  std::string submitBehavior{};
+  bool caretHidden{false};
+  bool contextMenuHidden{false};
+  SharedColor textShadowColor{};
+  Float textShadowRadius{0.0};
+  std::string textDecorationLine{};
+  std::string fontStyle{};
+  AndroidTextInputTextShadowOffsetStruct textShadowOffset{};
+  Float lineHeight{0.0};
+  std::string textTransform{};
+  SharedColor color{0};
+  Float letterSpacing{0.0};
+  Float fontSize{0.0};
+  std::string textAlign{};
+  bool includeFontPadding{false};
+  std::string fontWeight{};
+  std::string fontFamily{};
+  std::string textAlignVertical{};
+  SharedColor cursorColor{};
+  int mostRecentEventCount{0};
+  std::string text{};
 
   /*
    * Contains all prop values that affect visual representation of the
    * paragraph.
    */
-  ParagraphAttributes const paragraphAttributes{};
+  ParagraphAttributes paragraphAttributes{};
 
   /**
    * Auxiliary information to detect if these props are set or not.
    * See AndroidTextInputComponentDescriptor for usage.
    * TODO T63008435: can these, and this feature, be removed entirely?
    */
-  const bool hasPadding{};
-  const bool hasPaddingHorizontal{};
-  const bool hasPaddingVertical{};
-  const bool hasPaddingLeft{};
-  const bool hasPaddingTop{};
-  const bool hasPaddingRight{};
-  const bool hasPaddingBottom{};
-  const bool hasPaddingStart{};
-  const bool hasPaddingEnd{};
+  bool hasPadding{};
+  bool hasPaddingHorizontal{};
+  bool hasPaddingVertical{};
+  bool hasPaddingLeft{};
+  bool hasPaddingTop{};
+  bool hasPaddingRight{};
+  bool hasPaddingBottom{};
+  bool hasPaddingStart{};
+  bool hasPaddingEnd{};
 
 #if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const;
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
index fa497f2e13a6..2c9a4a58186b 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
@@ -21,8 +21,7 @@
 
 using namespace facebook::jni;
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 extern const char AndroidTextInputComponentName[] = "AndroidTextInput";
 
@@ -141,17 +140,17 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
   auto defaultTextAttributes = TextAttributes::defaultTextAttributes();
   defaultTextAttributes.apply(getConcreteProps().textAttributes);
 
-  auto newEventCount =
-      (state.reactTreeAttributedString == reactTreeAttributedString
-           ? 0
-           : getConcreteProps().mostRecentEventCount);
-  auto newAttributedString = getMostRecentAttributedString();
-
   // Even if we're here and updating state, it may be only to update the layout
   // manager If that is the case, make sure we don't update text: pass in the
   // current attributedString unchanged, and pass in zero for the "event count"
   // so no changes are applied There's no way to prevent a state update from
   // flowing to Java, so we just ensure it's a noop in those cases.
+  auto newEventCount =
+      state.reactTreeAttributedString.isContentEqual(reactTreeAttributedString)
+      ? 0
+      : getConcreteProps().mostRecentEventCount;
+  auto newAttributedString = getMostRecentAttributedString();
+
   setStateData(AndroidTextInputState{
       newEventCount,
       newAttributedString,
@@ -168,7 +167,7 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
 #pragma mark - LayoutableShadowNode
 
 Size AndroidTextInputShadowNode::measureContent(
-    LayoutContext const &layoutContext,
+    LayoutContext const & /*layoutContext*/,
     LayoutConstraints const &layoutConstraints) const {
   if (getStateData().cachedAttributedStringId != 0) {
     return textLayoutManager_
@@ -207,5 +206,4 @@ void AndroidTextInputShadowNode::layout(LayoutContext layoutContext) {
   ConcreteViewShadowNode::layout(layoutContext);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
index a2deb59db337..25363ae5c2ef 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
@@ -10,10 +10,14 @@
 #include <react/renderer/components/text/conversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
 
+#ifdef ANDROID
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 AndroidTextInputState::AndroidTextInputState(
     int64_t mostRecentEventCount,
@@ -89,7 +93,23 @@ folly::dynamic AndroidTextInputState::getDynamic() const {
   }
   return newState;
 }
+
+MapBuffer AndroidTextInputState::getMapBuffer() const {
+  auto builder = MapBufferBuilder();
+  // See comment in getDynamic block.
+  if (cachedAttributedStringId == 0) {
+    builder.putInt(TX_STATE_KEY_MOST_RECENT_EVENT_COUNT, mostRecentEventCount);
+
+    auto attStringMapBuffer = toMapBuffer(attributedString);
+    builder.putMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING, attStringMapBuffer);
+    auto paMapBuffer = toMapBuffer(paragraphAttributes);
+    builder.putMapBuffer(TX_STATE_KEY_PARAGRAPH_ATTRIBUTES, paMapBuffer);
+
+    builder.putInt(TX_STATE_KEY_HASH, attStringMapBuffer.getInt(AS_KEY_HASH));
+  }
+  return builder.build();
+}
+
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
index 4dc50ac94101..f46d6829e1af 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
@@ -94,9 +94,7 @@ class AndroidTextInputState final {
       AndroidTextInputState const &previousState,
       folly::dynamic const &data);
   folly::dynamic getDynamic() const;
-  MapBuffer getMapBuffer() const {
-    return MapBufferBuilder::EMPTY();
-  };
+  MapBuffer getMapBuffer() const;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK b/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK
index 548ad6ade821..28b6cf40d828 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK
@@ -3,7 +3,6 @@ load(
     "ANDROID",
     "APPLE",
     "CXX",
-    "YOGA_CXX_TARGET",
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
@@ -33,13 +32,16 @@ rn_xplat_cxx_library(
         # TODO(shergin) T26519801 Figure out better directories structure
         prefix = "react/renderer/components/iostextinput",
     ),
+    compiler_flags_pedantic = True,
     cxx_tests = [":tests"],
+    fbandroid_deps = [
+        "//xplat/folly:dynamic",
+    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
@@ -48,13 +50,6 @@ rn_xplat_cxx_library(
     ],
     visibility = ["PUBLIC"],
     deps = [
-        "//third-party/glog:glog",
-        "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:container_evicting_cache_map",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
-        YOGA_CXX_TARGET,
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/attributedstring:attributedstring"),
         react_native_xplat_target("react/renderer/core:core"),
@@ -92,7 +87,6 @@ fb_xplat_cxx_test(
     ),
     deps = [
         ":iostextinput",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.cpp
index 66e3c6e41f9b..494ab15d3962 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.cpp
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.cpp
@@ -7,8 +7,7 @@
 
 #include "TextInputEventEmitter.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static jsi::Value textInputMetricsPayload(
     jsi::Runtime &runtime,
@@ -138,5 +137,4 @@ void TextInputEventEmitter::dispatchTextInputEvent(
       priority);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.h b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.h
index a872f5f7ba6f..3dc1cefaff52 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.h
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.h
@@ -45,8 +45,8 @@ class TextInputEventEmitter : public ViewEventEmitter {
   void onSelectionChange(TextInputMetrics const &textInputMetrics) const;
   void onEndEditing(TextInputMetrics const &textInputMetrics) const;
   void onSubmitEditing(TextInputMetrics const &textInputMetrics) const;
-  void onKeyPress(KeyPressMetrics const &textInputMetrics) const;
-  void onKeyPressSync(KeyPressMetrics const &textInputMetrics) const;
+  void onKeyPress(KeyPressMetrics const &keyPressMetrics) const;
+  void onKeyPressSync(KeyPressMetrics const &keyPressMetrics) const;
   void onScroll(TextInputMetrics const &textInputMetrics) const;
 
  private:
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp
index 96d4d0c18492..dad0ea7f8ad8 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp
@@ -12,8 +12,7 @@
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/graphics/conversions.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 TextInputProps::TextInputProps(
     const PropsParserContext &context,
@@ -142,5 +141,4 @@ ParagraphAttributes TextInputProps::getEffectiveParagraphAttributes() const {
   return result;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.cpp
index 8910d21fb43d..b35b802f60fa 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.cpp
@@ -14,8 +14,7 @@
 #include <react/renderer/core/LayoutContext.h>
 #include <react/renderer/core/conversions.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 extern char const TextInputComponentName[] = "TextInput";
 
@@ -120,5 +119,4 @@ void TextInputShadowNode::layout(LayoutContext layoutContext) {
   ConcreteViewShadowNode::layout(layoutContext);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.cpp
index f4930a436e94..4c16ed793c60 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.cpp
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.cpp
@@ -7,13 +7,12 @@
 
 #include "TextInputState.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #ifdef ANDROID
 TextInputState::TextInputState(
-    TextInputState const &previousState,
-    folly::dynamic const &data){};
+    TextInputState const & /*previousState*/,
+    folly::dynamic const & /*data*/){};
 
 /*
  * Empty implementation for Android because it doesn't use this class.
@@ -30,5 +29,4 @@ MapBuffer TextInputState::getMapBuffer() const {
 };
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/conversions.h b/ReactCommon/react/renderer/components/textinput/iostextinput/conversions.h
index 98e44fd7c070..f8b16d24addb 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/conversions.h
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/conversions.h
@@ -126,6 +126,26 @@ inline void fromRawValue(
   abort();
 }
 
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    SubmitBehavior &result) {
+  auto string = (std::string)value;
+  if (string == "newline") {
+    result = SubmitBehavior::Newline;
+    return;
+  }
+  if (string == "submit") {
+    result = SubmitBehavior::Submit;
+    return;
+  }
+  if (string == "blurAndSubmit") {
+    result = SubmitBehavior::BlurAndSubmit;
+    return;
+  }
+  abort();
+}
+
 inline void fromRawValue(
     const PropsParserContext &context,
     const RawValue &value,
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/primitives.h b/ReactCommon/react/renderer/components/textinput/iostextinput/primitives.h
index 1747a98bf4cd..bbb56d26d9a4 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/primitives.h
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/primitives.h
@@ -48,6 +48,14 @@ enum class ReturnKeyType {
   Continue,
 };
 
+// iOS & Android.
+enum class SubmitBehavior {
+  Default,
+  Submit,
+  BlurAndSubmit,
+  Newline,
+};
+
 // iOS-only
 enum class TextInputAccessoryVisibilityMode {
   Never,
@@ -170,9 +178,9 @@ class TextInputTraits final {
 
   /*
    * iOS & Android
-   * Default value: `false`.
+   * Default value: `Default`.
    */
-  bool blurOnSubmit{false};
+  SubmitBehavior submitBehavior{SubmitBehavior::Default};
 
   /*
    * iOS-only (implemented only on iOS for now)
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/propsConversions.h b/ReactCommon/react/renderer/components/textinput/iostextinput/propsConversions.h
index 84c52eeace6c..15dc0004596d 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/propsConversions.h
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/propsConversions.h
@@ -93,12 +93,12 @@ static TextInputTraits convertRawProp(
       "secureTextEntry",
       sourceTraits.secureTextEntry,
       defaultTraits.secureTextEntry);
-  traits.blurOnSubmit = convertRawProp(
+  traits.submitBehavior = convertRawProp(
       context,
       rawProps,
-      "blurOnSubmit",
-      sourceTraits.blurOnSubmit,
-      defaultTraits.blurOnSubmit);
+      "submitBehavior",
+      sourceTraits.submitBehavior,
+      defaultTraits.submitBehavior);
   traits.clearTextOnFocus = convertRawProp(
       context,
       rawProps,
diff --git a/ReactCommon/react/renderer/components/unimplementedview/BUCK b/ReactCommon/react/renderer/components/unimplementedview/BUCK
index c90681d7ac4b..92e8fccb6c9d 100644
--- a/ReactCommon/react/renderer/components/unimplementedview/BUCK
+++ b/ReactCommon/react/renderer/components/unimplementedview/BUCK
@@ -3,7 +3,6 @@ load(
     "ANDROID",
     "APPLE",
     "CXX",
-    "YOGA_CXX_TARGET",
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
@@ -29,11 +28,11 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/unimplementedview",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -44,12 +43,6 @@ rn_xplat_cxx_library(
     tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
-        "//third-party/glog:glog",
-        "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
-        YOGA_CXX_TARGET,
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
@@ -71,7 +64,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":unimplementedview",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )
diff --git a/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt b/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt
index 7b128501bd81..5620fb7f757f 100644
--- a/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt
+++ b/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB rrc_unimplementedview_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(rrc_unimplementedview SHARED ${rrc_unimplementedview_SRC})
diff --git a/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp
index e58621a6c51b..5fd1a4ba9cb4 100644
--- a/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp
+++ b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp
@@ -7,8 +7,7 @@
 
 #include "UnimplementedViewComponentDescriptor.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ComponentHandle UnimplementedViewComponentDescriptor::getComponentHandle()
     const {
@@ -40,5 +39,4 @@ Props::Shared UnimplementedViewComponentDescriptor::cloneProps(
   return unimplementedViewProps;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.cpp b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.cpp
index 73aff6fd4e96..10686f9c6391 100644
--- a/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.cpp
+++ b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.cpp
@@ -7,8 +7,7 @@
 
 #include <react/renderer/components/unimplementedview/UnimplementedViewProps.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void UnimplementedViewProps::setComponentName(ComponentName componentName) {
   componentName_ = componentName;
@@ -18,5 +17,4 @@ ComponentName UnimplementedViewProps::getComponentName() const {
   return componentName_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewShadowNode.cpp b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewShadowNode.cpp
index 30cadf3a3f39..a30a006cd415 100644
--- a/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewShadowNode.cpp
@@ -7,10 +7,8 @@
 
 #include "UnimplementedViewShadowNode.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 const char UnimplementedViewComponentName[] = "UnimplementedView";
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp b/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp
index d3a91fdfa353..8ee8640c1894 100644
--- a/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp
+++ b/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp
@@ -9,100 +9,107 @@
 
 #include <react/renderer/components/view/accessibilityPropsConversions.h>
 #include <react/renderer/components/view/propsConversions.h>
+#include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
 
-namespace facebook {
-namespace react {
-
-bool AccessibilityProps::enablePropIteratorSetter = false;
+namespace facebook::react {
 
 AccessibilityProps::AccessibilityProps(
     const PropsParserContext &context,
     AccessibilityProps const &sourceProps,
     RawProps const &rawProps)
     : accessible(
-          enablePropIteratorSetter ? sourceProps.accessible
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "accessible",
-                                         sourceProps.accessible,
-                                         false)),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.accessible
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "accessible",
+                                                       sourceProps.accessible,
+                                                       false)),
       accessibilityState(
-          enablePropIteratorSetter ? sourceProps.accessibilityState
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "accessibilityState",
-                                         sourceProps.accessibilityState,
-                                         {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.accessibilityState
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "accessibilityState",
+                    sourceProps.accessibilityState,
+                    {})),
       accessibilityLabel(
-          enablePropIteratorSetter ? sourceProps.accessibilityLabel
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "accessibilityLabel",
-                                         sourceProps.accessibilityLabel,
-                                         "")),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.accessibilityLabel
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "accessibilityLabel",
+                    sourceProps.accessibilityLabel,
+                    "")),
       accessibilityLabelledBy(
-          enablePropIteratorSetter ? sourceProps.accessibilityLabelledBy
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "accessibilityLabelledBy",
-                                         sourceProps.accessibilityLabelledBy,
-                                         {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.accessibilityLabelledBy
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "accessibilityLabelledBy",
+                    sourceProps.accessibilityLabelledBy,
+                    {})),
       accessibilityLiveRegion(
-          enablePropIteratorSetter ? sourceProps.accessibilityLiveRegion
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "accessibilityLiveRegion",
-                                         sourceProps.accessibilityLiveRegion,
-                                         AccessibilityLiveRegion::None)),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.accessibilityLiveRegion
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "accessibilityLiveRegion",
+                    sourceProps.accessibilityLiveRegion,
+                    AccessibilityLiveRegion::None)),
       accessibilityHint(
-          enablePropIteratorSetter ? sourceProps.accessibilityHint
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "accessibilityHint",
-                                         sourceProps.accessibilityHint,
-                                         "")),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.accessibilityHint
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "accessibilityHint",
+                    sourceProps.accessibilityHint,
+                    "")),
       accessibilityLanguage(
-          enablePropIteratorSetter ? sourceProps.accessibilityLanguage
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "accessibilityLanguage",
-                                         sourceProps.accessibilityLanguage,
-                                         "")),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.accessibilityLanguage
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "accessibilityLanguage",
+                    sourceProps.accessibilityLanguage,
+                    "")),
       accessibilityValue(
-          enablePropIteratorSetter ? sourceProps.accessibilityValue
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "accessibilityValue",
-                                         sourceProps.accessibilityValue,
-                                         {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.accessibilityValue
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "accessibilityValue",
+                    sourceProps.accessibilityValue,
+                    {})),
       accessibilityActions(
-          enablePropIteratorSetter ? sourceProps.accessibilityActions
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "accessibilityActions",
-                                         sourceProps.accessibilityActions,
-                                         {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.accessibilityActions
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "accessibilityActions",
+                    sourceProps.accessibilityActions,
+                    {})),
       accessibilityViewIsModal(
-          enablePropIteratorSetter ? sourceProps.accessibilityViewIsModal
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "accessibilityViewIsModal",
-                                         sourceProps.accessibilityViewIsModal,
-                                         false)),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.accessibilityViewIsModal
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "accessibilityViewIsModal",
+                    sourceProps.accessibilityViewIsModal,
+                    false)),
       accessibilityElementsHidden(
-          enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.accessibilityElementsHidden
               : convertRawProp(
                     context,
@@ -111,7 +118,7 @@ AccessibilityProps::AccessibilityProps(
                     sourceProps.accessibilityElementsHidden,
                     false)),
       accessibilityIgnoresInvertColors(
-          enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.accessibilityIgnoresInvertColors
               : convertRawProp(
                     context,
@@ -120,53 +127,58 @@ AccessibilityProps::AccessibilityProps(
                     sourceProps.accessibilityIgnoresInvertColors,
                     false)),
       onAccessibilityTap(
-          enablePropIteratorSetter ? sourceProps.onAccessibilityTap
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "onAccessibilityTap",
-                                         sourceProps.onAccessibilityTap,
-                                         {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.onAccessibilityTap
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "onAccessibilityTap",
+                    sourceProps.onAccessibilityTap,
+                    {})),
       onAccessibilityMagicTap(
-          enablePropIteratorSetter ? sourceProps.onAccessibilityMagicTap
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "onAccessibilityMagicTap",
-                                         sourceProps.onAccessibilityMagicTap,
-                                         {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.onAccessibilityMagicTap
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "onAccessibilityMagicTap",
+                    sourceProps.onAccessibilityMagicTap,
+                    {})),
       onAccessibilityEscape(
-          enablePropIteratorSetter ? sourceProps.onAccessibilityEscape
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "onAccessibilityEscape",
-                                         sourceProps.onAccessibilityEscape,
-                                         {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.onAccessibilityEscape
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "onAccessibilityEscape",
+                    sourceProps.onAccessibilityEscape,
+                    {})),
       onAccessibilityAction(
-          enablePropIteratorSetter ? sourceProps.onAccessibilityAction
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "onAccessibilityAction",
-                                         sourceProps.onAccessibilityAction,
-                                         {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.onAccessibilityAction
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "onAccessibilityAction",
+                    sourceProps.onAccessibilityAction,
+                    {})),
       importantForAccessibility(
-          enablePropIteratorSetter ? sourceProps.importantForAccessibility
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "importantForAccessibility",
-                                         sourceProps.importantForAccessibility,
-                                         ImportantForAccessibility::Auto)),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.importantForAccessibility
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "importantForAccessibility",
+                    sourceProps.importantForAccessibility,
+                    ImportantForAccessibility::Auto)),
       testId(
-          enablePropIteratorSetter ? sourceProps.testId
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "testID",
-                                         sourceProps.testId,
-                                         "")) {
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.testId
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "testID",
+                                                       sourceProps.testId,
+                                                       "")) {
   // It is a (severe!) perf deoptimization to request props out-of-order.
   // Thus, since we need to request the same prop twice here
   // (accessibilityRole) we "must" do them subsequently here to prevent
@@ -174,7 +186,7 @@ AccessibilityProps::AccessibilityProps(
   // it probably can, but this is a fairly rare edge-case that (1) is easy-ish
   // to work around here, and (2) would require very careful work to address
   // this case and not regress the more common cases.
-  if (!enablePropIteratorSetter) {
+  if (!CoreFeatures::enablePropIteratorSetter) {
     const auto *rawPropValue =
         rawProps.at("accessibilityRole", nullptr, nullptr);
     AccessibilityTraits traits;
@@ -194,7 +206,7 @@ AccessibilityProps::AccessibilityProps(
 void AccessibilityProps::setProp(
     const PropsParserContext &context,
     RawPropsPropNameHash hash,
-    const char *propName,
+    const char * /*propName*/,
     RawValue const &value) {
   switch (hash) {
     RAW_SET_PROP_SWITCH_CASE_BASIC(accessible, false);
@@ -217,7 +229,7 @@ void AccessibilityProps::setProp(
     RAW_SET_PROP_SWITCH_CASE(testId, "testID", std::string{""});
     case CONSTEXPR_RAW_PROPS_KEY_HASH("accessibilityRole"): {
       AccessibilityTraits traits = AccessibilityTraits::None;
-      std::string roleString = "";
+      std::string roleString;
       if (value.hasValue()) {
         fromRawValue(context, value, traits);
         fromRawValue(context, value, roleString);
@@ -241,5 +253,4 @@ SharedDebugStringConvertibleList AccessibilityProps::getDebugProps() const {
 }
 #endif // RN_DEBUG_STRING_CONVERTIBLE
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/view/AccessibilityProps.h b/ReactCommon/react/renderer/components/view/AccessibilityProps.h
index e9e6aa7b3f09..630e7617b520 100644
--- a/ReactCommon/react/renderer/components/view/AccessibilityProps.h
+++ b/ReactCommon/react/renderer/components/view/AccessibilityProps.h
@@ -30,7 +30,10 @@ class AccessibilityProps {
       const char *propName,
       RawValue const &value);
 
-  static bool enablePropIteratorSetter;
+#ifdef ANDROID
+  void propsDiffMapBuffer(Props const *oldProps, MapBufferBuilder &builder)
+      const;
+#endif
 
 #pragma mark - Props
 
diff --git a/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.cpp b/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.cpp
new file mode 100644
index 000000000000..31f34b3e75b0
--- /dev/null
+++ b/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.cpp
@@ -0,0 +1,168 @@
+/*
+ * 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 "AccessibilityPropsMapBuffer.h"
+#include "AccessibilityProps.h"
+
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+
+namespace facebook {
+namespace react {
+
+#ifdef ANDROID
+
+static MapBuffer convertAccessibilityActions(
+    std::vector<AccessibilityAction> const &actions) {
+  MapBufferBuilder builder(actions.size());
+  for (auto i = 0; i < actions.size(); i++) {
+    auto const &action = actions[i];
+    MapBufferBuilder actionsBuilder(2);
+    actionsBuilder.putString(ACCESSIBILITY_ACTION_NAME, action.name);
+    if (action.label.has_value()) {
+      actionsBuilder.putString(
+          ACCESSIBILITY_ACTION_LABEL, action.label.value());
+    }
+    builder.putMapBuffer(i, actionsBuilder.build());
+  }
+  return builder.build();
+}
+
+static MapBuffer convertAccessibilityLabelledBy(
+    AccessibilityLabelledBy const &labelledBy) {
+  MapBufferBuilder builder(labelledBy.value.size());
+  for (auto i = 0; i < labelledBy.value.size(); i++) {
+    builder.putString(i, labelledBy.value[i]);
+  }
+  return builder.build();
+}
+
+// AccessibilityState values
+constexpr MapBuffer::Key ACCESSIBILITY_STATE_BUSY = 0;
+constexpr MapBuffer::Key ACCESSIBILITY_STATE_DISABLED = 1;
+constexpr MapBuffer::Key ACCESSIBILITY_STATE_EXPANDED = 2;
+constexpr MapBuffer::Key ACCESSIBILITY_STATE_SELECTED = 3;
+constexpr MapBuffer::Key ACCESSIBILITY_STATE_CHECKED = 4;
+
+MapBuffer convertAccessibilityState(AccessibilityState const &state) {
+  MapBufferBuilder builder(5);
+  builder.putBool(ACCESSIBILITY_STATE_BUSY, state.busy);
+  builder.putBool(ACCESSIBILITY_STATE_DISABLED, state.disabled);
+  builder.putBool(ACCESSIBILITY_STATE_EXPANDED, state.expanded);
+  builder.putBool(ACCESSIBILITY_STATE_SELECTED, state.selected);
+  int checked;
+  switch (state.checked) {
+    case AccessibilityState::Unchecked:
+      checked = 0;
+      break;
+    case AccessibilityState::Checked:
+      checked = 1;
+      break;
+    case AccessibilityState::Mixed:
+      checked = 2;
+      break;
+    case AccessibilityState::None:
+      checked = 3;
+      break;
+  }
+  builder.putInt(ACCESSIBILITY_STATE_CHECKED, checked);
+  return builder.build();
+}
+
+// TODO: Currently unsupported: nextFocusForward/Left/Up/Right/Down
+void AccessibilityProps::propsDiffMapBuffer(
+    Props const *oldPropsPtr,
+    MapBufferBuilder &builder) const {
+  // Call with default props if necessary
+  if (oldPropsPtr == nullptr) {
+    AccessibilityProps defaultProps{};
+    propsDiffMapBuffer(reinterpret_cast<Props *>(&defaultProps), builder);
+    return;
+  }
+
+  AccessibilityProps const &oldProps =
+      *(reinterpret_cast<const AccessibilityProps *>(oldPropsPtr));
+  AccessibilityProps const &newProps = *this;
+
+  if (oldProps.accessibilityActions != newProps.accessibilityActions) {
+    builder.putMapBuffer(
+        AP_ACCESSIBILITY_ACTIONS,
+        convertAccessibilityActions(newProps.accessibilityActions));
+  }
+
+  if (oldProps.accessibilityHint != newProps.accessibilityHint) {
+    builder.putString(AP_ACCESSIBILITY_HINT, newProps.accessibilityHint);
+  }
+
+  if (oldProps.accessibilityLabel != newProps.accessibilityLabel) {
+    builder.putString(AP_ACCESSIBILITY_LABEL, newProps.accessibilityLabel);
+  }
+
+  if (oldProps.accessibilityLabelledBy != newProps.accessibilityLabelledBy) {
+    builder.putMapBuffer(
+        AP_ACCESSIBILITY_LABELLED_BY,
+        convertAccessibilityLabelledBy(newProps.accessibilityLabelledBy));
+  }
+
+  if (oldProps.accessibilityLiveRegion != newProps.accessibilityLiveRegion) {
+    int value;
+    switch (newProps.accessibilityLiveRegion) {
+      case AccessibilityLiveRegion::None:
+        value = 0;
+        break;
+      case AccessibilityLiveRegion::Polite:
+        value = 1;
+        break;
+      case AccessibilityLiveRegion::Assertive:
+        value = 2;
+        break;
+    }
+    builder.putInt(AP_ACCESSIBILITY_LIVE_REGION, value);
+  }
+
+  if (oldProps.accessibilityRole != newProps.accessibilityRole) {
+    builder.putString(AP_ACCESSIBILITY_ROLE, newProps.accessibilityRole);
+  }
+
+  if (oldProps.accessibilityState != newProps.accessibilityState) {
+    builder.putMapBuffer(
+        AP_ACCESSIBILITY_STATE,
+        convertAccessibilityState(newProps.accessibilityState));
+  }
+
+  if (oldProps.accessibilityValue != newProps.accessibilityValue) {
+    builder.putString(
+        AP_ACCESSIBILITY_VALUE, newProps.accessibilityValue.text.value_or(""));
+  }
+
+  if (oldProps.accessible != newProps.accessible) {
+    builder.putBool(AP_ACCESSIBLE, newProps.accessible);
+  }
+
+  if (oldProps.importantForAccessibility !=
+      newProps.importantForAccessibility) {
+    int value;
+    switch (newProps.importantForAccessibility) {
+      case ImportantForAccessibility::Auto:
+        value = 0;
+        break;
+      case ImportantForAccessibility::Yes:
+        value = 1;
+        break;
+      case ImportantForAccessibility::No:
+        value = 2;
+        break;
+      case ImportantForAccessibility::NoHideDescendants:
+        value = 3;
+        break;
+    }
+    builder.putInt(AP_IMPORTANT_FOR_ACCESSIBILITY, value);
+  }
+}
+#endif
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.h b/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.h
new file mode 100644
index 000000000000..a4aa6c927ad4
--- /dev/null
+++ b/ReactCommon/react/renderer/components/view/AccessibilityPropsMapBuffer.h
@@ -0,0 +1,33 @@
+/*
+ * 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 <react/renderer/mapbuffer/MapBuffer.h>
+
+namespace facebook {
+namespace react {
+
+#ifdef ANDROID
+constexpr MapBuffer::Key AP_ACCESSIBILITY_ACTIONS = 0;
+constexpr MapBuffer::Key AP_ACCESSIBILITY_HINT = 1;
+constexpr MapBuffer::Key AP_ACCESSIBILITY_LABEL = 2;
+constexpr MapBuffer::Key AP_ACCESSIBILITY_LABELLED_BY = 3;
+constexpr MapBuffer::Key AP_ACCESSIBILITY_LIVE_REGION = 4;
+constexpr MapBuffer::Key AP_ACCESSIBILITY_ROLE = 5;
+constexpr MapBuffer::Key AP_ACCESSIBILITY_STATE = 6;
+constexpr MapBuffer::Key AP_ACCESSIBILITY_VALUE = 7;
+constexpr MapBuffer::Key AP_ACCESSIBLE = 8;
+constexpr MapBuffer::Key AP_IMPORTANT_FOR_ACCESSIBILITY = 19;
+
+// AccessibilityAction values
+constexpr MapBuffer::Key ACCESSIBILITY_ACTION_NAME = 0;
+constexpr MapBuffer::Key ACCESSIBILITY_ACTION_LABEL = 1;
+#endif
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/view/BUCK b/ReactCommon/react/renderer/components/view/BUCK
index 57552ca79fa1..069388740658 100644
--- a/ReactCommon/react/renderer/components/view/BUCK
+++ b/ReactCommon/react/renderer/components/view/BUCK
@@ -35,12 +35,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/view",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -53,9 +53,8 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
+        "//xplat/folly:conv",
+        "//xplat/folly:dynamic",
         YOGA_CXX_TARGET,
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
diff --git a/ReactCommon/react/renderer/components/view/CMakeLists.txt b/ReactCommon/react/renderer/components/view/CMakeLists.txt
index 6320bd0bdfb0..fb32b0b1873a 100644
--- a/ReactCommon/react/renderer/components/view/CMakeLists.txt
+++ b/ReactCommon/react/renderer/components/view/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB rrc_view_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(rrc_view SHARED ${rrc_view_SRC})
diff --git a/ReactCommon/react/renderer/components/view/PointerEvent.cpp b/ReactCommon/react/renderer/components/view/PointerEvent.cpp
index 0a74065db6ff..09fa5c9b0a6b 100644
--- a/ReactCommon/react/renderer/components/view/PointerEvent.cpp
+++ b/ReactCommon/react/renderer/components/view/PointerEvent.cpp
@@ -7,12 +7,11 @@
 
 #include "PointerEvent.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #if RN_DEBUG_STRING_CONVERTIBLE
 
-std::string getDebugName(PointerEvent const &pointerEvent) {
+std::string getDebugName(PointerEvent const & /*pointerEvent*/) {
   return "PointerEvent";
 }
 
@@ -35,10 +34,15 @@ std::vector<DebugStringConvertibleObject> getDebugProps(
       {"tangentialPressure",
        getDebugDescription(pointerEvent.tangentialPressure, options)},
       {"twist", getDebugDescription(pointerEvent.twist, options)},
+      {"ctrlKey", getDebugDescription(pointerEvent.ctrlKey, options)},
+      {"shiftKey", getDebugDescription(pointerEvent.shiftKey, options)},
+      {"altKey", getDebugDescription(pointerEvent.altKey, options)},
+      {"metaKey", getDebugDescription(pointerEvent.metaKey, options)},
+      {"isPrimary", getDebugDescription(pointerEvent.isPrimary, options)},
+      {"button", getDebugDescription(pointerEvent.button, options)},
   };
 }
 
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/view/PointerEvent.h b/ReactCommon/react/renderer/components/view/PointerEvent.h
index 1fc3f47d0b23..bc724c54e9be 100644
--- a/ReactCommon/react/renderer/components/view/PointerEvent.h
+++ b/ReactCommon/react/renderer/components/view/PointerEvent.h
@@ -84,6 +84,32 @@ struct PointerEvent {
    * axis in degrees, with a value in the range 0 to 359.
    */
   int twist;
+  /*
+   * Returns true if the control key was down when the event was fired.
+   */
+  bool ctrlKey;
+  /*
+   * Returns true if the shift key was down when the event was fired.
+   */
+  bool shiftKey;
+  /*
+   * Returns true if the alt key was down when the event was fired.
+   */
+  bool altKey;
+  /*
+   * Returns true if the meta key was down when the event was fired.
+   */
+  bool metaKey;
+  /*
+   * Indicates if the pointer represents the primary pointer of this pointer
+   * type.
+   */
+  bool isPrimary;
+  /*
+   * The button number that was pressed (if applicable) when the pointer event
+   * was fired.
+   */
+  int button;
 };
 
 #if RN_DEBUG_STRING_CONVERTIBLE
diff --git a/ReactCommon/react/renderer/components/view/Touch.cpp b/ReactCommon/react/renderer/components/view/Touch.cpp
index 15e5bfaaee55..ee3fc314e713 100644
--- a/ReactCommon/react/renderer/components/view/Touch.cpp
+++ b/ReactCommon/react/renderer/components/view/Touch.cpp
@@ -7,12 +7,11 @@
 
 #include "Touch.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #if RN_DEBUG_STRING_CONVERTIBLE
 
-std::string getDebugName(Touch const &touch) {
+std::string getDebugName(Touch const & /*touch*/) {
   return "Touch";
 }
 
@@ -32,5 +31,4 @@ std::vector<DebugStringConvertibleObject> getDebugProps(
 
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/view/Touch.h b/ReactCommon/react/renderer/components/view/Touch.h
index 13383a0e5bbc..415fdc499437 100644
--- a/ReactCommon/react/renderer/components/view/Touch.h
+++ b/ReactCommon/react/renderer/components/view/Touch.h
@@ -80,7 +80,7 @@ using Touches = std::unordered_set<Touch, Touch::Hasher, Touch::Comparator>;
 
 std::string getDebugName(Touch const &touch);
 std::vector<DebugStringConvertibleObject> getDebugProps(
-    Touch const &object,
+    Touch const &touch,
     DebugStringConvertibleOptions options);
 
 #endif
diff --git a/ReactCommon/react/renderer/components/view/TouchEvent.cpp b/ReactCommon/react/renderer/components/view/TouchEvent.cpp
index 7f8b9fda170c..cc5efbf309f3 100644
--- a/ReactCommon/react/renderer/components/view/TouchEvent.cpp
+++ b/ReactCommon/react/renderer/components/view/TouchEvent.cpp
@@ -7,12 +7,11 @@
 
 #include "TouchEvent.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #if RN_DEBUG_STRING_CONVERTIBLE
 
-std::string getDebugName(TouchEvent const &touchEvent) {
+std::string getDebugName(TouchEvent const & /*touchEvent*/) {
   return "TouchEvent";
 }
 
@@ -29,5 +28,4 @@ std::vector<DebugStringConvertibleObject> getDebugProps(
 
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp b/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp
index b6205781e5a4..475a8a612413 100644
--- a/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp
+++ b/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp
@@ -7,8 +7,7 @@
 
 #include "TouchEventEmitter.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #pragma mark - Touches
 
@@ -87,6 +86,12 @@ static jsi::Value pointerEventPayload(
   object.setProperty(runtime, "buttons", event.buttons);
   object.setProperty(runtime, "tangentialPressure", event.tangentialPressure);
   object.setProperty(runtime, "twist", event.twist);
+  object.setProperty(runtime, "ctrlKey", event.ctrlKey);
+  object.setProperty(runtime, "shiftKey", event.shiftKey);
+  object.setProperty(runtime, "altKey", event.altKey);
+  object.setProperty(runtime, "metaKey", event.metaKey);
+  object.setProperty(runtime, "isPrimary", event.isPrimary);
+  object.setProperty(runtime, "button", event.button);
   return object;
 }
 
@@ -210,5 +215,4 @@ void TouchEventEmitter::onPointerOut(const PointerEvent &event) const {
       RawEvent::Category::ContinuousStart);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp b/ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp
index 4e98daa58fea..d80e5a0d070c 100644
--- a/ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp
+++ b/ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp
@@ -7,8 +7,7 @@
 
 #include "ViewEventEmitter.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #pragma mark - Accessibility
 
@@ -115,5 +114,4 @@ void ViewEventEmitter::onLayout(const LayoutMetrics &layoutMetrics) const {
       EventPriority::AsynchronousUnbatched);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/view/ViewProps.cpp b/ReactCommon/react/renderer/components/view/ViewProps.cpp
index 5be4a80699e4..d4f024bcc779 100644
--- a/ReactCommon/react/renderer/components/view/ViewProps.cpp
+++ b/ReactCommon/react/renderer/components/view/ViewProps.cpp
@@ -11,12 +11,12 @@
 
 #include <react/renderer/components/view/conversions.h>
 #include <react/renderer/components/view/propsConversions.h>
+#include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
 #include <react/renderer/graphics/conversions.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ViewProps::ViewProps(
     const PropsParserContext &context,
@@ -26,158 +26,173 @@ ViewProps::ViewProps(
     : YogaStylableProps(context, sourceProps, rawProps, shouldSetRawProps),
       AccessibilityProps(context, sourceProps, rawProps),
       opacity(
-          Props::enablePropIteratorSetter ? sourceProps.opacity
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "opacity",
-                                                sourceProps.opacity,
-                                                (Float)1.0)),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.opacity
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "opacity",
+                                                       sourceProps.opacity,
+                                                       (Float)1.0)),
       foregroundColor(
-          Props::enablePropIteratorSetter ? sourceProps.foregroundColor
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "foregroundColor",
-                                                sourceProps.foregroundColor,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.foregroundColor
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "foregroundColor",
+                    sourceProps.foregroundColor,
+                    {})),
       backgroundColor(
-          Props::enablePropIteratorSetter ? sourceProps.backgroundColor
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "backgroundColor",
-                                                sourceProps.backgroundColor,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.backgroundColor
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "backgroundColor",
+                    sourceProps.backgroundColor,
+                    {})),
       borderRadii(
-          Props::enablePropIteratorSetter ? sourceProps.borderRadii
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "border",
-                                                "Radius",
-                                                sourceProps.borderRadii,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.borderRadii
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "border",
+                                                       "Radius",
+                                                       sourceProps.borderRadii,
+                                                       {})),
       borderColors(
-          Props::enablePropIteratorSetter ? sourceProps.borderColors
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "border",
-                                                "Color",
-                                                sourceProps.borderColors,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.borderColors
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "border",
+                                                       "Color",
+                                                       sourceProps.borderColors,
+                                                       {})),
+      borderCurves(
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.borderCurves
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "border",
+                                                       "Curve",
+                                                       sourceProps.borderCurves,
+                                                       {})),
       borderStyles(
-          Props::enablePropIteratorSetter ? sourceProps.borderStyles
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "border",
-                                                "Style",
-                                                sourceProps.borderStyles,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.borderStyles
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "border",
+                                                       "Style",
+                                                       sourceProps.borderStyles,
+                                                       {})),
       shadowColor(
-          Props::enablePropIteratorSetter ? sourceProps.shadowColor
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "shadowColor",
-                                                sourceProps.shadowColor,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.shadowColor
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "shadowColor",
+                                                       sourceProps.shadowColor,
+                                                       {})),
       shadowOffset(
-          Props::enablePropIteratorSetter ? sourceProps.shadowOffset
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "shadowOffset",
-                                                sourceProps.shadowOffset,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.shadowOffset
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "shadowOffset",
+                                                       sourceProps.shadowOffset,
+                                                       {})),
       shadowOpacity(
-          Props::enablePropIteratorSetter ? sourceProps.shadowOpacity
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "shadowOpacity",
-                                                sourceProps.shadowOpacity,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.shadowOpacity
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "shadowOpacity",
+                    sourceProps.shadowOpacity,
+                    {})),
       shadowRadius(
-          Props::enablePropIteratorSetter ? sourceProps.shadowRadius
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "shadowRadius",
-                                                sourceProps.shadowRadius,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.shadowRadius
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "shadowRadius",
+                                                       sourceProps.shadowRadius,
+                                                       {})),
       transform(
-          Props::enablePropIteratorSetter ? sourceProps.transform
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "transform",
-                                                sourceProps.transform,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.transform
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "transform",
+                                                       sourceProps.transform,
+                                                       {})),
       backfaceVisibility(
-          Props::enablePropIteratorSetter ? sourceProps.backfaceVisibility
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "backfaceVisibility",
-                                                sourceProps.backfaceVisibility,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.backfaceVisibility
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "backfaceVisibility",
+                    sourceProps.backfaceVisibility,
+                    {})),
       shouldRasterize(
-          Props::enablePropIteratorSetter ? sourceProps.shouldRasterize
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "shouldRasterize",
-                                                sourceProps.shouldRasterize,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.shouldRasterize
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "shouldRasterize",
+                    sourceProps.shouldRasterize,
+                    {})),
       zIndex(
-          Props::enablePropIteratorSetter ? sourceProps.zIndex
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "zIndex",
-                                                sourceProps.zIndex,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.zIndex
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "zIndex",
+                                                       sourceProps.zIndex,
+                                                       {})),
       pointerEvents(
-          Props::enablePropIteratorSetter ? sourceProps.pointerEvents
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "pointerEvents",
-                                                sourceProps.pointerEvents,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.pointerEvents
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "pointerEvents",
+                    sourceProps.pointerEvents,
+                    {})),
       hitSlop(
-          Props::enablePropIteratorSetter ? sourceProps.hitSlop
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "hitSlop",
-                                                sourceProps.hitSlop,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.hitSlop
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "hitSlop",
+                                                       sourceProps.hitSlop,
+                                                       {})),
       onLayout(
-          Props::enablePropIteratorSetter ? sourceProps.onLayout
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "onLayout",
-                                                sourceProps.onLayout,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.onLayout
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "onLayout",
+                                                       sourceProps.onLayout,
+                                                       {})),
       events(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.events
               : convertRawProp(context, rawProps, sourceProps.events, {})),
       collapsable(
-          Props::enablePropIteratorSetter ? sourceProps.collapsable
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "collapsable",
-                                                sourceProps.collapsable,
-                                                true)),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.collapsable
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "collapsable",
+                                                       sourceProps.collapsable,
+                                                       true)),
       removeClippedSubviews(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.removeClippedSubviews
               : convertRawProp(
                     context,
@@ -188,47 +203,50 @@ ViewProps::ViewProps(
 #ifdef ANDROID
       ,
       elevation(
-          Props::enablePropIteratorSetter ? sourceProps.elevation
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "elevation",
-                                                sourceProps.elevation,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.elevation
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "elevation",
+                                                       sourceProps.elevation,
+                                                       {})),
       nativeBackground(
-          Props::enablePropIteratorSetter ? sourceProps.nativeBackground
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "nativeBackgroundAndroid",
-                                                sourceProps.nativeBackground,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.nativeBackground
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "nativeBackgroundAndroid",
+                    sourceProps.nativeBackground,
+                    {})),
       nativeForeground(
-          Props::enablePropIteratorSetter ? sourceProps.nativeForeground
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "nativeForegroundAndroid",
-                                                sourceProps.nativeForeground,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.nativeForeground
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "nativeForegroundAndroid",
+                    sourceProps.nativeForeground,
+                    {})),
       focusable(
-          Props::enablePropIteratorSetter ? sourceProps.focusable
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "focusable",
-                                                sourceProps.focusable,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.focusable
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "focusable",
+                                                       sourceProps.focusable,
+                                                       {})),
       hasTVPreferredFocus(
-          Props::enablePropIteratorSetter ? sourceProps.hasTVPreferredFocus
-                                          : convertRawProp(
-                                                context,
-                                                rawProps,
-                                                "hasTVPreferredFocus",
-                                                sourceProps.hasTVPreferredFocus,
-                                                {})),
+          CoreFeatures::enablePropIteratorSetter
+              ? sourceProps.hasTVPreferredFocus
+              : convertRawProp(
+                    context,
+                    rawProps,
+                    "hasTVPreferredFocus",
+                    sourceProps.hasTVPreferredFocus,
+                    {})),
       needsOffscreenAlphaCompositing(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.needsOffscreenAlphaCompositing
               : convertRawProp(
                     context,
@@ -237,7 +255,7 @@ ViewProps::ViewProps(
                     sourceProps.needsOffscreenAlphaCompositing,
                     {})),
       renderToHardwareTextureAndroid(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.renderToHardwareTextureAndroid
               : convertRawProp(
                     context,
@@ -252,13 +270,11 @@ ViewProps::ViewProps(
 #define VIEW_EVENT_CASE(eventType, eventString)     \
   case CONSTEXPR_RAW_PROPS_KEY_HASH(eventString): { \
     ViewEvents defaultViewEvents{};                 \
-    events[eventType] = ({                          \
-      bool res = defaultViewEvents[eventType];      \
-      if (value.hasValue()) {                       \
-        fromRawValue(context, value, res);          \
-      }                                             \
-      res;                                          \
-    });                                             \
+    bool res = defaultViewEvents[eventType];        \
+    if (value.hasValue()) {                         \
+      fromRawValue(context, value, res);            \
+    }                                               \
+    events[eventType] = res;                        \
     return;                                         \
   }
 
@@ -412,6 +428,7 @@ BorderMetrics ViewProps::resolveBorderMetrics(
       /* .borderWidths = */ borderWidths.resolve(isRTL, 0),
       /* .borderRadii = */
       ensureNoOverlap(borderRadii.resolve(isRTL, 0), layoutMetrics.frame.size),
+      /* .borderCurves = */ borderCurves.resolve(isRTL, BorderCurve::Circular),
       /* .borderStyles = */ borderStyles.resolve(isRTL, BorderStyle::Solid),
   };
 }
@@ -451,5 +468,4 @@ SharedDebugStringConvertibleList ViewProps::getDebugProps() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/view/ViewProps.h b/ReactCommon/react/renderer/components/view/ViewProps.h
index 21a425dc73fe..ea08ea8defb8 100644
--- a/ReactCommon/react/renderer/components/view/ViewProps.h
+++ b/ReactCommon/react/renderer/components/view/ViewProps.h
@@ -41,6 +41,11 @@ class ViewProps : public YogaStylableProps, public AccessibilityProps {
       const char *propName,
       RawValue const &value);
 
+#ifdef ANDROID
+  void propsDiffMapBuffer(Props const *oldProps, MapBufferBuilder &builder)
+      const override;
+#endif
+
 #pragma mark - Props
 
   // Color
@@ -51,6 +56,7 @@ class ViewProps : public YogaStylableProps, public AccessibilityProps {
   // Borders
   CascadedBorderRadii borderRadii{};
   CascadedBorderColors borderColors{};
+  CascadedBorderCurves borderCurves{}; // iOS only?
   CascadedBorderStyles borderStyles{};
 
   // Shadow
diff --git a/ReactCommon/react/renderer/components/view/ViewPropsMapBuffer.cpp b/ReactCommon/react/renderer/components/view/ViewPropsMapBuffer.cpp
new file mode 100644
index 000000000000..4136842c3b85
--- /dev/null
+++ b/ReactCommon/react/renderer/components/view/ViewPropsMapBuffer.cpp
@@ -0,0 +1,202 @@
+/*
+ * 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.
+ */
+
+#ifdef ANDROID
+
+#include "ViewPropsMapBuffer.h"
+#include "ViewProps.h"
+
+#include "viewPropConversions.h"
+
+#include <react/renderer/graphics/conversions.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+
+namespace facebook {
+namespace react {
+
+// TODO: Currently unsupported: nextFocusForward/Left/Up/Right/Down
+void ViewProps::propsDiffMapBuffer(
+    Props const *oldPropsPtr,
+    MapBufferBuilder &builder) const {
+  // Call with default props if necessary
+  if (oldPropsPtr == nullptr) {
+    ViewProps defaultProps{};
+    propsDiffMapBuffer(&defaultProps, builder);
+    return;
+  }
+
+  // Delegate to base classes
+  YogaStylableProps::propsDiffMapBuffer(oldPropsPtr, builder);
+  AccessibilityProps::propsDiffMapBuffer(oldPropsPtr, builder);
+
+  ViewProps const &oldProps = *(static_cast<const ViewProps *>(oldPropsPtr));
+  ViewProps const &newProps = *this;
+
+  if (oldProps.backfaceVisibility != newProps.backfaceVisibility) {
+    int value;
+    switch (newProps.backfaceVisibility) {
+      case BackfaceVisibility::Auto:
+        value = 0;
+        break;
+      case BackfaceVisibility::Visible:
+        value = 1;
+        break;
+      case BackfaceVisibility::Hidden:
+        value = 2;
+        break;
+    }
+    builder.putInt(VP_BACKFACE_VISIBILITY, value);
+  }
+
+  if (oldProps.backgroundColor != newProps.backgroundColor) {
+    builder.putInt(VP_BG_COLOR, toAndroidRepr(newProps.backgroundColor));
+  }
+
+  if (oldProps.foregroundColor != newProps.foregroundColor) {
+    builder.putInt(VP_FG_COLOR, toAndroidRepr(newProps.foregroundColor));
+  }
+
+  if (oldProps.borderCurves != newProps.borderCurves) {
+    builder.putMapBuffer(
+        VP_BORDER_CURVES, convertCascadedCorners(newProps.borderCurves));
+  }
+
+  if (oldProps.borderColors != newProps.borderColors) {
+    builder.putMapBuffer(
+        VP_BORDER_COLOR, convertBorderColors(newProps.borderColors));
+  }
+
+  if (oldProps.borderRadii != newProps.borderRadii) {
+    builder.putMapBuffer(
+        VP_BORDER_RADII, convertCascadedCorners(newProps.borderRadii));
+  }
+
+  if (oldProps.borderStyles != newProps.borderStyles) {
+    builder.putMapBuffer(
+        VP_BORDER_STYLE, convertCascadedEdges(newProps.borderStyles));
+  }
+
+  if (oldProps.elevation != newProps.elevation) {
+    builder.putDouble(VP_ELEVATION, newProps.elevation);
+  }
+
+  if (oldProps.focusable != newProps.focusable) {
+    builder.putBool(VP_FOCUSABLE, newProps.focusable);
+  }
+
+  if (oldProps.hasTVPreferredFocus != newProps.hasTVPreferredFocus) {
+    builder.putBool(VP_HAS_TV_FOCUS, newProps.hasTVPreferredFocus);
+  }
+
+  if (oldProps.hitSlop != newProps.hitSlop) {
+    builder.putMapBuffer(VP_HIT_SLOP, convertEdgeInsets(newProps.hitSlop));
+  }
+
+  if (oldProps.nativeBackground != newProps.nativeBackground) {
+    builder.putMapBuffer(
+        VP_NATIVE_BACKGROUND,
+        convertNativeBackground(newProps.nativeBackground));
+  }
+
+  if (oldProps.nativeForeground != newProps.nativeForeground) {
+    builder.putMapBuffer(
+        VP_NATIVE_FOREGROUND,
+        convertNativeBackground(newProps.nativeForeground));
+  }
+
+  if (oldProps.needsOffscreenAlphaCompositing !=
+      newProps.needsOffscreenAlphaCompositing) {
+    builder.putBool(
+        VP_OFFSCREEN_ALPHA_COMPOSITING,
+        newProps.needsOffscreenAlphaCompositing);
+  }
+
+  if (oldProps.opacity != newProps.opacity) {
+    builder.putDouble(VP_OPACITY, newProps.opacity);
+  }
+
+  if (oldProps.pointerEvents != newProps.pointerEvents) {
+    int value;
+    switch (newProps.pointerEvents) {
+      case PointerEventsMode::Auto:
+        value = 0;
+        break;
+      case PointerEventsMode::None:
+        value = 1;
+        break;
+      case PointerEventsMode::BoxNone:
+        value = 2;
+        break;
+      case PointerEventsMode::BoxOnly:
+        value = 3;
+        break;
+    }
+
+    builder.putInt(VP_POINTER_EVENTS, value);
+  }
+
+  if (oldProps.events != newProps.events) {
+    builder.putBool(
+        VP_POINTER_ENTER, newProps.events[ViewEvents::Offset::PointerEnter]);
+    builder.putBool(
+        VP_POINTER_LEAVE, newProps.events[ViewEvents::Offset::PointerLeave]);
+    builder.putBool(
+        VP_POINTER_MOVE, newProps.events[ViewEvents::Offset::PointerMove]);
+
+    builder.putBool(
+        VP_POINTER_ENTER_CAPTURE,
+        newProps.events[ViewEvents::Offset::PointerEnterCapture]);
+    builder.putBool(
+        VP_POINTER_LEAVE_CAPTURE,
+        newProps.events[ViewEvents::Offset::PointerLeaveCapture]);
+    builder.putBool(
+        VP_POINTER_MOVE_CAPTURE,
+        newProps.events[ViewEvents::Offset::PointerMoveCapture]);
+    builder.putBool(
+        VP_POINTER_OVER, newProps.events[ViewEvents::Offset::PointerOver]);
+    builder.putBool(
+        VP_POINTER_OVER_CAPTURE,
+        newProps.events[ViewEvents::Offset::PointerOverCapture]);
+
+    builder.putBool(
+        VP_POINTER_OUT, newProps.events[ViewEvents::Offset::PointerOut]);
+    builder.putBool(
+        VP_POINTER_OUT_CAPTURE,
+        newProps.events[ViewEvents::Offset::PointerOutCapture]);
+  }
+
+  if (oldProps.removeClippedSubviews != newProps.removeClippedSubviews) {
+    builder.putBool(VP_REMOVE_CLIPPED_SUBVIEW, newProps.removeClippedSubviews);
+  }
+
+  if (oldProps.renderToHardwareTextureAndroid !=
+      newProps.renderToHardwareTextureAndroid) {
+    builder.putBool(
+        VP_RENDER_TO_HARDWARE_TEXTURE, newProps.renderToHardwareTextureAndroid);
+  }
+
+  if (oldProps.shadowColor != newProps.shadowColor) {
+    builder.putInt(VP_SHADOW_COLOR, toAndroidRepr(newProps.shadowColor));
+  }
+
+  if (oldProps.testId != newProps.testId) {
+    builder.putString(VP_TEST_ID, newProps.testId);
+  }
+
+  if (oldProps.transform != newProps.transform) {
+    builder.putMapBuffer(VP_TRANSFORM, convertTransform(newProps.transform));
+  }
+
+  if (oldProps.zIndex != newProps.zIndex) {
+    builder.putInt(VP_ZINDEX, newProps.zIndex.value_or(0));
+  }
+}
+
+} // namespace react
+} // namespace facebook
+
+#endif
diff --git a/ReactCommon/react/renderer/components/view/ViewPropsMapBuffer.h b/ReactCommon/react/renderer/components/view/ViewPropsMapBuffer.h
new file mode 100644
index 000000000000..45a583575ae2
--- /dev/null
+++ b/ReactCommon/react/renderer/components/view/ViewPropsMapBuffer.h
@@ -0,0 +1,56 @@
+/*
+ * 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 <react/renderer/mapbuffer/MapBuffer.h>
+
+namespace facebook {
+namespace react {
+
+#ifdef ANDROID
+constexpr MapBuffer::Key VP_BACKFACE_VISIBILITY = 9;
+constexpr MapBuffer::Key VP_BG_COLOR = 10;
+constexpr MapBuffer::Key VP_BORDER_COLOR = 11;
+constexpr MapBuffer::Key VP_BORDER_RADII = 12;
+constexpr MapBuffer::Key VP_BORDER_STYLE = 13;
+constexpr MapBuffer::Key VP_COLLAPSABLE = 14;
+constexpr MapBuffer::Key VP_ELEVATION = 15;
+constexpr MapBuffer::Key VP_FOCUSABLE = 16;
+constexpr MapBuffer::Key VP_HAS_TV_FOCUS = 17;
+constexpr MapBuffer::Key VP_HIT_SLOP = 18;
+constexpr MapBuffer::Key VP_NATIVE_BACKGROUND = 20;
+constexpr MapBuffer::Key VP_NATIVE_FOREGROUND = 21;
+constexpr MapBuffer::Key VP_OFFSCREEN_ALPHA_COMPOSITING = 23;
+constexpr MapBuffer::Key VP_OPACITY = 24;
+constexpr MapBuffer::Key VP_POINTER_EVENTS = 25;
+constexpr MapBuffer::Key VP_POINTER_ENTER = 26;
+constexpr MapBuffer::Key VP_POINTER_LEAVE = 27;
+constexpr MapBuffer::Key VP_POINTER_MOVE = 28;
+constexpr MapBuffer::Key VP_REMOVE_CLIPPED_SUBVIEW = 29;
+constexpr MapBuffer::Key VP_RENDER_TO_HARDWARE_TEXTURE = 30;
+constexpr MapBuffer::Key VP_SHADOW_COLOR = 31;
+constexpr MapBuffer::Key VP_TEST_ID = 32;
+constexpr MapBuffer::Key VP_TRANSFORM = 33;
+constexpr MapBuffer::Key VP_ZINDEX = 34;
+constexpr MapBuffer::Key VP_POINTER_ENTER_CAPTURE = 38;
+constexpr MapBuffer::Key VP_POINTER_LEAVE_CAPTURE = 39;
+constexpr MapBuffer::Key VP_POINTER_MOVE_CAPTURE = 40;
+constexpr MapBuffer::Key VP_POINTER_OVER = 41;
+constexpr MapBuffer::Key VP_POINTER_OVER_CAPTURE = 42;
+constexpr MapBuffer::Key VP_POINTER_OUT = 43;
+constexpr MapBuffer::Key VP_POINTER_OUT_CAPTURE = 44;
+constexpr MapBuffer::Key VP_BORDER_CURVES = 45;
+constexpr MapBuffer::Key VP_FG_COLOR = 46;
+
+// Yoga values
+constexpr MapBuffer::Key YG_BORDER_WIDTH = 100;
+constexpr MapBuffer::Key YG_OVERFLOW = 101;
+#endif
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp b/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp
index 61661c1af416..1edfb71a5e7e 100644
--- a/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp
@@ -8,33 +8,12 @@
 #include "ViewShadowNode.h"
 #include <react/config/ReactNativeConfig.h>
 #include <react/renderer/components/view/primitives.h>
+#include <react/renderer/core/CoreFeatures.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 char const ViewComponentName[] = "View";
 
-static inline bool keepRawValuesInViewProps(PropsParserContext const &context) {
-  static bool shouldUseRawProps = true;
-
-#ifdef ANDROID
-  static bool initialized = false;
-
-  if (!initialized) {
-    auto config =
-        context.contextContainer.find<std::shared_ptr<const ReactNativeConfig>>(
-            "ReactNativeConfig");
-    if (config.has_value()) {
-      initialized = true;
-      shouldUseRawProps = !config.value()->getBool(
-          "react_native_new_architecture:use_mapbuffer_for_viewprops");
-    }
-  }
-#endif
-
-  return shouldUseRawProps;
-}
-
 ViewShadowNodeProps::ViewShadowNodeProps(
     PropsParserContext const &context,
     ViewShadowNodeProps const &sourceProps,
@@ -43,7 +22,7 @@ ViewShadowNodeProps::ViewShadowNodeProps(
           context,
           sourceProps,
           rawProps,
-          keepRawValuesInViewProps(context)){};
+          !CoreFeatures::enableMapBuffer){};
 
 ViewShadowNode::ViewShadowNode(
     ShadowNodeFragment const &fragment,
@@ -106,7 +85,10 @@ void ViewShadowNode::initialize() noexcept {
   } else {
     traits_.unset(ShadowNodeTraits::Trait::FormsStackingContext);
   }
+
+#ifdef ANDROID
+  traits_.set(ShadowNodeTraits::Trait::AndroidMapBufferPropsSupported);
+#endif
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp b/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp
index 29ef3edf2e87..a034734a213a 100644
--- a/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp
@@ -20,12 +20,11 @@
 #include <limits>
 #include <memory>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static int FabricDefaultYogaLog(
-    const YGConfigRef,
-    const YGNodeRef,
+    const YGConfigRef /*unused*/,
+    const YGNodeRef /*unused*/,
     YGLogLevel level,
     const char *format,
     va_list args) {
@@ -250,7 +249,7 @@ void YogaLayoutableShadowNode::appendChild(
   // (e.g. RCTRawText). This used to throw an error, but we are ignoring it
   // because we want core library components to be fault-tolerant and degrade
   // gracefully. A soft error will be emitted from JavaScript.
-  if (traitCast<YogaLayoutableShadowNode const *>(childNode.get())) {
+  if (traitCast<YogaLayoutableShadowNode const *>(childNode.get()) != nullptr) {
     // Appending the Yoga node.
     appendYogaChild(*childNode);
 
@@ -507,7 +506,7 @@ void YogaLayoutableShadowNode::layout(LayoutContext layoutContext) {
       // `newLayoutMetrics.frame` with `childNode.getLayoutMetrics().frame` to
       // detect if layout has not changed is not advised, please refer to
       // D22999891 for details.
-      if (layoutContext.affectedNodes) {
+      if (layoutContext.affectedNodes != nullptr) {
         layoutContext.affectedNodes->push_back(&childNode);
       }
 
@@ -646,7 +645,8 @@ void YogaLayoutableShadowNode::swapLeftAndRightInTree(
   for (auto &child : shadowNode.getChildren()) {
     auto const yogaLayoutableChild =
         traitCast<YogaLayoutableShadowNode const *>(child.get());
-    if (yogaLayoutableChild && !yogaLayoutableChild->doesOwn(shadowNode)) {
+    if ((yogaLayoutableChild != nullptr) &&
+        !yogaLayoutableChild->doesOwn(shadowNode)) {
       swapLeftAndRightInTree(*yogaLayoutableChild);
     }
   }
@@ -822,5 +822,4 @@ void YogaLayoutableShadowNode::ensureYogaChildrenAlighment() const {
 #endif
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp b/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp
index d021d03611c2..f03dc21c55fb 100644
--- a/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp
+++ b/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp
@@ -9,6 +9,7 @@
 
 #include <react/renderer/components/view/conversions.h>
 #include <react/renderer/components/view/propsConversions.h>
+#include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
 #include <yoga/YGNode.h>
@@ -16,8 +17,7 @@
 
 #include "conversions.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 YogaStylableProps::YogaStylableProps(
     const PropsParserContext &context,
@@ -26,7 +26,7 @@ YogaStylableProps::YogaStylableProps(
     bool shouldSetRawProps)
     : Props(context, sourceProps, rawProps, shouldSetRawProps),
       yogaStyle(
-          Props::enablePropIteratorSetter
+          CoreFeatures::enablePropIteratorSetter
               ? sourceProps.yogaStyle
               : convertRawProp(context, rawProps, sourceProps.yogaStyle)){};
 
@@ -50,7 +50,8 @@ static inline T const getFieldValue(
     return;                                                              \
   }
 
-#define REBUILD_FIELD_SWITCH_CASE(field) \
+// @lint-ignore CLANGTIDY cppcoreguidelines-macro-usage
+#define REBUILD_FIELD_SWITCH_CASE_YSP(field) \
   REBUILD_FIELD_SWITCH_CASE2(field, #field)
 
 #define REBUILD_YG_FIELD_SWITCH_CASE_INDEXED(field, index, fieldName) \
@@ -64,6 +65,11 @@ static inline T const getFieldValue(
   REBUILD_YG_FIELD_SWITCH_CASE_INDEXED(field, YGDimensionWidth, widthStr); \
   REBUILD_YG_FIELD_SWITCH_CASE_INDEXED(field, YGDimensionHeight, heightStr);
 
+#define REBUILD_FIELD_YG_GUTTER(field, rowGapStr, columnGapStr, gapStr)      \
+  REBUILD_YG_FIELD_SWITCH_CASE_INDEXED(field, YGGutterRow, rowGapStr);       \
+  REBUILD_YG_FIELD_SWITCH_CASE_INDEXED(field, YGGutterColumn, columnGapStr); \
+  REBUILD_YG_FIELD_SWITCH_CASE_INDEXED(field, YGGutterAll, gapStr);
+
 #define REBUILD_FIELD_YG_EDGES(field, prefix, suffix)                          \
   REBUILD_YG_FIELD_SWITCH_CASE_INDEXED(                                        \
       field, YGEdgeLeft, prefix "Left" suffix);                                \
@@ -99,21 +105,22 @@ void YogaStylableProps::setProp(
   Props::setProp(context, hash, propName, value);
 
   switch (hash) {
-    REBUILD_FIELD_SWITCH_CASE(direction);
-    REBUILD_FIELD_SWITCH_CASE(flexDirection);
-    REBUILD_FIELD_SWITCH_CASE(justifyContent);
-    REBUILD_FIELD_SWITCH_CASE(alignContent);
-    REBUILD_FIELD_SWITCH_CASE(alignItems);
-    REBUILD_FIELD_SWITCH_CASE(alignSelf);
-    REBUILD_FIELD_SWITCH_CASE(flexWrap);
-    REBUILD_FIELD_SWITCH_CASE(overflow);
-    REBUILD_FIELD_SWITCH_CASE(display);
-    REBUILD_FIELD_SWITCH_CASE(flex);
-    REBUILD_FIELD_SWITCH_CASE(flexGrow);
-    REBUILD_FIELD_SWITCH_CASE(flexShrink);
-    REBUILD_FIELD_SWITCH_CASE(flexBasis);
+    REBUILD_FIELD_SWITCH_CASE_YSP(direction);
+    REBUILD_FIELD_SWITCH_CASE_YSP(flexDirection);
+    REBUILD_FIELD_SWITCH_CASE_YSP(justifyContent);
+    REBUILD_FIELD_SWITCH_CASE_YSP(alignContent);
+    REBUILD_FIELD_SWITCH_CASE_YSP(alignItems);
+    REBUILD_FIELD_SWITCH_CASE_YSP(alignSelf);
+    REBUILD_FIELD_SWITCH_CASE_YSP(flexWrap);
+    REBUILD_FIELD_SWITCH_CASE_YSP(overflow);
+    REBUILD_FIELD_SWITCH_CASE_YSP(display);
+    REBUILD_FIELD_SWITCH_CASE_YSP(flex);
+    REBUILD_FIELD_SWITCH_CASE_YSP(flexGrow);
+    REBUILD_FIELD_SWITCH_CASE_YSP(flexShrink);
+    REBUILD_FIELD_SWITCH_CASE_YSP(flexBasis);
     REBUILD_FIELD_SWITCH_CASE2(positionType, "position");
-    REBUILD_FIELD_SWITCH_CASE(aspectRatio);
+    REBUILD_FIELD_YG_GUTTER(gap, "rowGap", "columnGap", "gap");
+    REBUILD_FIELD_SWITCH_CASE_YSP(aspectRatio);
     REBUILD_FIELD_YG_DIMENSION(dimensions, "width", "height");
     REBUILD_FIELD_YG_DIMENSION(minDimensions, "minWidth", "minHeight");
     REBUILD_FIELD_YG_DIMENSION(maxDimensions, "maxWidth", "maxHeight");
@@ -162,6 +169,18 @@ SharedDebugStringConvertibleList YogaStylableProps::getDebugProps() const {
           "flex", yogaStyle.flex(), defaultYogaStyle.flex()),
       debugStringConvertibleItem(
           "flexGrow", yogaStyle.flexGrow(), defaultYogaStyle.flexGrow()),
+      debugStringConvertibleItem(
+          "rowGap",
+          yogaStyle.gap()[YGGutterRow],
+          defaultYogaStyle.gap()[YGGutterRow]),
+      debugStringConvertibleItem(
+          "columnGap",
+          yogaStyle.gap()[YGGutterColumn],
+          defaultYogaStyle.gap()[YGGutterColumn]),
+      debugStringConvertibleItem(
+          "gap",
+          yogaStyle.gap()[YGGutterAll],
+          defaultYogaStyle.gap()[YGGutterAll]),
       debugStringConvertibleItem(
           "flexShrink", yogaStyle.flexShrink(), defaultYogaStyle.flexShrink()),
       debugStringConvertibleItem(
@@ -192,5 +211,4 @@ SharedDebugStringConvertibleList YogaStylableProps::getDebugProps() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/view/YogaStylableProps.h b/ReactCommon/react/renderer/components/view/YogaStylableProps.h
index 86cf60e81be2..b19a90df2f0f 100644
--- a/ReactCommon/react/renderer/components/view/YogaStylableProps.h
+++ b/ReactCommon/react/renderer/components/view/YogaStylableProps.h
@@ -31,6 +31,11 @@ class YogaStylableProps : public Props {
       const char *propName,
       RawValue const &value);
 
+#ifdef ANDROID
+  void propsDiffMapBuffer(Props const *oldProps, MapBufferBuilder &builder)
+      const override;
+#endif
+
 #pragma mark - Props
 
   YGStyle yogaStyle{};
@@ -39,7 +44,7 @@ class YogaStylableProps : public Props {
 
 #pragma mark - DebugStringConvertible (Partial)
 
-  SharedDebugStringConvertibleList getDebugProps() const;
+  SharedDebugStringConvertibleList getDebugProps() const override;
 
 #endif
 };
diff --git a/ReactCommon/react/renderer/components/view/YogaStylablePropsMapBuffer.cpp b/ReactCommon/react/renderer/components/view/YogaStylablePropsMapBuffer.cpp
new file mode 100644
index 000000000000..ac8a3c2ad55d
--- /dev/null
+++ b/ReactCommon/react/renderer/components/view/YogaStylablePropsMapBuffer.cpp
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+#ifdef ANDROID
+
+#include "ViewProps.h"
+#include "ViewPropsMapBuffer.h"
+
+#include "viewPropConversions.h"
+
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+
+namespace facebook {
+namespace react {
+
+MapBuffer convertBorderWidths(YGStyle::Edges const &border) {
+  MapBufferBuilder builder(7);
+  putOptionalFloat(
+      builder, EDGE_TOP, optionalFloatFromYogaValue(border[YGEdgeTop]));
+  putOptionalFloat(
+      builder, EDGE_RIGHT, optionalFloatFromYogaValue(border[YGEdgeRight]));
+  putOptionalFloat(
+      builder, EDGE_BOTTOM, optionalFloatFromYogaValue(border[YGEdgeBottom]));
+  putOptionalFloat(
+      builder, EDGE_LEFT, optionalFloatFromYogaValue(border[YGEdgeLeft]));
+  putOptionalFloat(
+      builder, EDGE_START, optionalFloatFromYogaValue(border[YGEdgeStart]));
+  putOptionalFloat(
+      builder, EDGE_END, optionalFloatFromYogaValue(border[YGEdgeEnd]));
+  putOptionalFloat(
+      builder, EDGE_ALL, optionalFloatFromYogaValue(border[YGEdgeAll]));
+  return builder.build();
+}
+
+// TODO: Currently unsupported: nextFocusForward/Left/Up/Right/Down
+void YogaStylableProps::propsDiffMapBuffer(
+    Props const *oldPropsPtr,
+    MapBufferBuilder &builder) const {
+  // Call with default props if necessary
+  if (oldPropsPtr == nullptr) {
+    YogaStylableProps defaultProps{};
+    propsDiffMapBuffer(&defaultProps, builder);
+    return;
+  }
+
+  // Delegate to base classes
+  Props::propsDiffMapBuffer(oldPropsPtr, builder);
+
+  YogaStylableProps const &oldProps =
+      *(static_cast<const YogaStylableProps *>(oldPropsPtr));
+  YogaStylableProps const &newProps = *this;
+
+  if (oldProps.yogaStyle != newProps.yogaStyle) {
+    auto const &oldStyle = oldProps.yogaStyle;
+    auto const &newStyle = newProps.yogaStyle;
+
+    if (!(oldStyle.border() == newStyle.border())) {
+      builder.putMapBuffer(
+          YG_BORDER_WIDTH, convertBorderWidths(newStyle.border()));
+    }
+
+    if (oldStyle.overflow() != newStyle.overflow()) {
+      int value;
+      switch (newStyle.overflow()) {
+        case YGOverflowVisible:
+          value = 0;
+          break;
+        case YGOverflowHidden:
+          value = 1;
+          break;
+        case YGOverflowScroll:
+          value = 2;
+          break;
+      }
+      builder.putInt(YG_OVERFLOW, value);
+    }
+  }
+}
+
+} // namespace react
+} // namespace facebook
+
+#endif
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.h b/ReactCommon/react/renderer/components/view/YogaStylablePropsMapBuffer.h
similarity index 57%
rename from packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.h
rename to ReactCommon/react/renderer/components/view/YogaStylablePropsMapBuffer.h
index 033031c495bd..69b0e419b717 100644
--- a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.h
+++ b/ReactCommon/react/renderer/components/view/YogaStylablePropsMapBuffer.h
@@ -7,17 +7,18 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
+#ifdef ANDROID
 
-#include <ReactCommon/JavaTurboModule.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
 
 namespace facebook {
 namespace react {
 
-std::shared_ptr<TurboModule> RNTesterAppModuleProvider(
-    const std::string &moduleName,
-    const JavaTurboModule::InitParams &params);
+// Yoga values
+constexpr MapBuffer::Key YG_BORDER_WIDTH = 100;
+constexpr MapBuffer::Key YG_OVERFLOW = 101;
 
 } // namespace react
 } // namespace facebook
+
+#endif
diff --git a/ReactCommon/react/renderer/components/view/conversions.h b/ReactCommon/react/renderer/components/view/conversions.h
index f70c9f9b9b00..8a8a30295e51 100644
--- a/ReactCommon/react/renderer/components/view/conversions.h
+++ b/ReactCommon/react/renderer/components/view/conversions.h
@@ -563,6 +563,24 @@ inline void fromRawValue(
   react_native_assert(false);
 }
 
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    BorderCurve &result) {
+  react_native_assert(value.hasType<std::string>());
+  auto stringValue = (std::string)value;
+  if (stringValue == "circular") {
+    result = BorderCurve::Circular;
+    return;
+  }
+  if (stringValue == "continuous") {
+    result = BorderCurve::Continuous;
+    return;
+  }
+  LOG(FATAL) << "Could not parse BorderCurve:" << stringValue;
+  react_native_assert(false);
+}
+
 inline void fromRawValue(
     const PropsParserContext &context,
     const RawValue &value,
diff --git a/ReactCommon/react/renderer/components/view/primitives.h b/ReactCommon/react/renderer/components/view/primitives.h
index 16b02c2dd8c8..1ecf44156269 100644
--- a/ReactCommon/react/renderer/components/view/primitives.h
+++ b/ReactCommon/react/renderer/components/view/primitives.h
@@ -56,6 +56,9 @@ struct ViewEvents {
     PointerMoveCapture = 25,
     PointerOver = 26,
     PointerOut = 27,
+    PointerOverCapture = 28,
+    PointerOutCapture = 29,
+
   };
 
   constexpr bool operator[](const Offset offset) const {
@@ -77,6 +80,8 @@ inline static bool operator!=(ViewEvents const &lhs, ViewEvents const &rhs) {
 
 enum class BackfaceVisibility { Auto, Visible, Hidden };
 
+enum class BorderCurve { Circular, Continuous };
+
 enum class BorderStyle { Solid, Dotted, Dashed };
 
 template <typename T>
@@ -202,11 +207,13 @@ struct CascadedRectangleCorners {
 };
 
 using BorderWidths = RectangleEdges<Float>;
+using BorderCurves = RectangleCorners<BorderCurve>;
 using BorderStyles = RectangleEdges<BorderStyle>;
 using BorderColors = RectangleEdges<SharedColor>;
 using BorderRadii = RectangleCorners<Float>;
 
 using CascadedBorderWidths = CascadedRectangleEdges<Float>;
+using CascadedBorderCurves = CascadedRectangleCorners<BorderCurve>;
 using CascadedBorderStyles = CascadedRectangleEdges<BorderStyle>;
 using CascadedBorderColors = CascadedRectangleEdges<SharedColor>;
 using CascadedBorderRadii = CascadedRectangleCorners<Float>;
@@ -215,6 +222,7 @@ struct BorderMetrics {
   BorderColors borderColors{};
   BorderWidths borderWidths{};
   BorderRadii borderRadii{};
+  BorderCurves borderCurves{};
   BorderStyles borderStyles{};
 
   bool operator==(const BorderMetrics &rhs) const {
@@ -222,11 +230,13 @@ struct BorderMetrics {
                this->borderColors,
                this->borderWidths,
                this->borderRadii,
+               this->borderCurves,
                this->borderStyles) ==
         std::tie(
                rhs.borderColors,
                rhs.borderWidths,
                rhs.borderRadii,
+               rhs.borderCurves,
                rhs.borderStyles);
   }
 
diff --git a/ReactCommon/react/renderer/components/view/propsConversions.h b/ReactCommon/react/renderer/components/view/propsConversions.h
index f045dd3b9bc6..3973637eaec9 100644
--- a/ReactCommon/react/renderer/components/view/propsConversions.h
+++ b/ReactCommon/react/renderer/components/view/propsConversions.h
@@ -266,6 +266,28 @@ static inline YGStyle convertRawProp(
       "",
       sourceValue.padding(),
       yogaStyle.padding());
+
+  yogaStyle.gap()[YGGutterRow] = convertRawProp(
+      context,
+      rawProps,
+      "rowGap",
+      sourceValue.gap()[YGGutterRow],
+      yogaStyle.gap()[YGGutterRow]);
+
+  yogaStyle.gap()[YGGutterColumn] = convertRawProp(
+      context,
+      rawProps,
+      "columnGap",
+      sourceValue.gap()[YGGutterColumn],
+      yogaStyle.gap()[YGGutterColumn]);
+
+  yogaStyle.gap()[YGGutterAll] = convertRawProp(
+      context,
+      rawProps,
+      "gap",
+      sourceValue.gap()[YGGutterAll],
+      yogaStyle.gap()[YGGutterAll]);
+
   yogaStyle.border() = convertRawProp(
       context,
       rawProps,
@@ -657,8 +679,8 @@ static inline void fromRawValue(
         attrIterator->second.hasType<std::string>());
 
     result = NativeDrawable{
-        .kind = NativeDrawable::Kind::ThemeAttr,
-        .themeAttr = (std::string)attrIterator->second,
+        NativeDrawable::Kind::ThemeAttr,
+        (std::string)attrIterator->second,
     };
   } else if (type == "RippleAndroid") {
     auto color = map.find("color");
@@ -666,21 +688,19 @@ static inline void fromRawValue(
     auto rippleRadius = map.find("rippleRadius");
 
     result = NativeDrawable{
-        .kind = NativeDrawable::Kind::Ripple,
-        .ripple =
-            NativeDrawable::Ripple{
-                .color = color != map.end() && color->second.hasType<int32_t>()
-                    ? (int32_t)color->second
-                    : std::optional<int32_t>{},
-                .borderless = borderless != map.end() &&
-                        borderless->second.hasType<bool>()
-                    ? (bool)borderless->second
-                    : false,
-                .rippleRadius = rippleRadius != map.end() &&
-                        rippleRadius->second.hasType<Float>()
-                    ? (Float)rippleRadius->second
-                    : std::optional<Float>{},
-            },
+        NativeDrawable::Kind::Ripple,
+        std::string{},
+        NativeDrawable::Ripple{
+            color != map.end() && color->second.hasType<int32_t>()
+                ? (int32_t)color->second
+                : std::optional<int32_t>{},
+            borderless != map.end() && borderless->second.hasType<bool>()
+                ? (bool)borderless->second
+                : false,
+            rippleRadius != map.end() && rippleRadius->second.hasType<Float>()
+                ? (Float)rippleRadius->second
+                : std::optional<Float>{},
+        },
     };
   } else {
     LOG(ERROR) << "Unknown native drawable type: " << type;
diff --git a/ReactCommon/react/renderer/components/view/tests/LayoutTest.cpp b/ReactCommon/react/renderer/components/view/tests/LayoutTest.cpp
index 691fb5b6bec9..5891c2764798 100644
--- a/ReactCommon/react/renderer/components/view/tests/LayoutTest.cpp
+++ b/ReactCommon/react/renderer/components/view/tests/LayoutTest.cpp
@@ -14,8 +14,7 @@
 #include <react/renderer/element/Element.h>
 #include <react/renderer/element/testUtils.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 // Note: the (x, y) origin is always relative to the parent node. You may use
 // P482342650 to re-create this test case in playground.
@@ -359,5 +358,4 @@ TEST_F(LayoutTest, overflowInsetTransformScaleTest) {
   EXPECT_EQ(layoutMetricsABC.overflowInset.bottom, 0);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp b/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp
index 67c7eda979a1..f4f1c590c32a 100644
--- a/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp
+++ b/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp
@@ -20,8 +20,7 @@
 #include <react/renderer/element/Element.h>
 #include <react/renderer/element/testUtils.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class YogaDirtyFlagTest : public ::testing::Test {
  protected:
@@ -227,5 +226,4 @@ TEST_F(YogaDirtyFlagTest, updatingStateForScrollViewMistNotDirtyYogaNode) {
       static_cast<RootShadowNode &>(*newRootShadowNode).layoutIfNeeded());
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/components/view/viewPropConversions.h b/ReactCommon/react/renderer/components/view/viewPropConversions.h
new file mode 100644
index 000000000000..6a672aef01ad
--- /dev/null
+++ b/ReactCommon/react/renderer/components/view/viewPropConversions.h
@@ -0,0 +1,198 @@
+/*
+ * 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 <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/components/view/ViewPropsMapBuffer.h>
+#include <react/renderer/components/view/conversions.h>
+#include <react/renderer/graphics/conversions.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+
+#include <optional>
+
+namespace facebook {
+namespace react {
+
+namespace {
+
+constexpr MapBuffer::Key EDGE_TOP = 0;
+constexpr MapBuffer::Key EDGE_LEFT = 1;
+constexpr MapBuffer::Key EDGE_RIGHT = 2;
+constexpr MapBuffer::Key EDGE_BOTTOM = 3;
+constexpr MapBuffer::Key EDGE_START = 4;
+constexpr MapBuffer::Key EDGE_END = 5;
+constexpr MapBuffer::Key EDGE_ALL = 6;
+
+constexpr MapBuffer::Key CORNER_TOP_LEFT = 0;
+constexpr MapBuffer::Key CORNER_TOP_RIGHT = 1;
+constexpr MapBuffer::Key CORNER_BOTTOM_RIGHT = 2;
+constexpr MapBuffer::Key CORNER_BOTTOM_LEFT = 3;
+constexpr MapBuffer::Key CORNER_TOP_START = 4;
+constexpr MapBuffer::Key CORNER_TOP_END = 5;
+constexpr MapBuffer::Key CORNER_BOTTOM_END = 6;
+constexpr MapBuffer::Key CORNER_BOTTOM_START = 7;
+constexpr MapBuffer::Key CORNER_ALL = 8;
+
+inline void putOptionalFloat(
+    MapBufferBuilder &builder,
+    MapBuffer::Key key,
+    std::optional<Float> const &value) {
+  builder.putDouble(key, value.value_or(NAN));
+}
+
+inline std::optional<Float> optionalFromValue(
+    std::optional<BorderCurve> const &value) {
+  if (!value) {
+    return {};
+  }
+
+  return {value.value() == BorderCurve::Circular ? 1 : 2};
+}
+
+inline std::optional<Float> optionalFromValue(
+    std::optional<Float> const &value) {
+  return value;
+}
+
+inline std::optional<Float> optionalFromValue(
+    std::optional<BorderStyle> const &value) {
+  if (!value) {
+    return {};
+  }
+
+  int intValue = -1;
+  switch (value.value()) {
+    case BorderStyle::Solid:
+      intValue = 0;
+      break;
+    case BorderStyle::Dotted:
+      intValue = 1;
+      break;
+    case BorderStyle::Dashed:
+      intValue = 2;
+      break;
+  }
+
+  return {intValue};
+}
+
+inline void putOptionalColor(
+    MapBufferBuilder &builder,
+    MapBuffer::Key key,
+    std::optional<SharedColor> const &color) {
+  builder.putInt(key, color.has_value() ? toAndroidRepr(color.value()) : -1);
+}
+
+inline MapBuffer convertBorderColors(CascadedBorderColors const &colors) {
+  MapBufferBuilder builder(7);
+  putOptionalColor(builder, EDGE_TOP, colors.top);
+  putOptionalColor(builder, EDGE_RIGHT, colors.right);
+  putOptionalColor(builder, EDGE_BOTTOM, colors.bottom);
+  putOptionalColor(builder, EDGE_LEFT, colors.left);
+  putOptionalColor(builder, EDGE_START, colors.start);
+  putOptionalColor(builder, EDGE_END, colors.end);
+  putOptionalColor(builder, EDGE_ALL, colors.all);
+  return builder.build();
+}
+
+template <typename T>
+MapBuffer convertCascadedEdges(CascadedRectangleEdges<T> const &edges) {
+  MapBufferBuilder builder(7);
+  putOptionalFloat(builder, EDGE_TOP, optionalFromValue(edges.top));
+  putOptionalFloat(builder, EDGE_RIGHT, optionalFromValue(edges.right));
+  putOptionalFloat(builder, EDGE_BOTTOM, optionalFromValue(edges.bottom));
+  putOptionalFloat(builder, EDGE_LEFT, optionalFromValue(edges.left));
+  putOptionalFloat(builder, EDGE_START, optionalFromValue(edges.start));
+  putOptionalFloat(builder, EDGE_END, optionalFromValue(edges.end));
+  putOptionalFloat(builder, EDGE_ALL, optionalFromValue(edges.all));
+  return builder.build();
+}
+
+template <typename T>
+MapBuffer convertCascadedCorners(CascadedRectangleCorners<T> const &corners) {
+  MapBufferBuilder builder(9);
+  putOptionalFloat(
+      builder, CORNER_TOP_LEFT, optionalFromValue(corners.topLeft));
+  putOptionalFloat(
+      builder, CORNER_TOP_RIGHT, optionalFromValue(corners.topRight));
+  putOptionalFloat(
+      builder, CORNER_BOTTOM_RIGHT, optionalFromValue(corners.bottomRight));
+  putOptionalFloat(
+      builder, CORNER_BOTTOM_LEFT, optionalFromValue(corners.bottomLeft));
+  putOptionalFloat(
+      builder, CORNER_TOP_START, optionalFromValue(corners.topStart));
+  putOptionalFloat(builder, CORNER_TOP_END, optionalFromValue(corners.topEnd));
+  putOptionalFloat(
+      builder, CORNER_BOTTOM_END, optionalFromValue(corners.bottomEnd));
+  putOptionalFloat(
+      builder, CORNER_BOTTOM_START, optionalFromValue(corners.bottomStart));
+  putOptionalFloat(builder, CORNER_ALL, optionalFromValue(corners.all));
+  return builder.build();
+}
+
+inline MapBuffer convertEdgeInsets(EdgeInsets const &insets) {
+  MapBufferBuilder builder(4);
+  builder.putDouble(EDGE_TOP, insets.top);
+  builder.putDouble(EDGE_RIGHT, insets.right);
+  builder.putDouble(EDGE_BOTTOM, insets.bottom);
+  builder.putDouble(EDGE_LEFT, insets.left);
+  return builder.build();
+}
+
+#ifdef ANDROID
+
+constexpr MapBuffer::Key NATIVE_DRAWABLE_KIND = 0;
+constexpr MapBuffer::Key NATIVE_DRAWABLE_ATTRIBUTE = 1;
+constexpr MapBuffer::Key NATIVE_DRAWABLE_COLOR = 2;
+constexpr MapBuffer::Key NATIVE_DRAWABLE_BORDERLESS = 3;
+constexpr MapBuffer::Key NATIVE_DRAWABLE_RIPPLE_RADIUS = 4;
+
+inline MapBuffer convertNativeBackground(
+    std::optional<NativeDrawable> const &value) {
+  if (!value.has_value()) {
+    return MapBufferBuilder::EMPTY();
+  }
+
+  auto const &drawable = value.value();
+  MapBufferBuilder builder(4);
+  switch (drawable.kind) {
+    case NativeDrawable::Kind::ThemeAttr:
+      builder.putInt(NATIVE_DRAWABLE_KIND, 0);
+      builder.putString(NATIVE_DRAWABLE_ATTRIBUTE, drawable.themeAttr);
+      break;
+    case NativeDrawable::Kind::Ripple:
+      builder.putInt(NATIVE_DRAWABLE_KIND, 1);
+      if (drawable.ripple.color.has_value()) {
+        builder.putInt(NATIVE_DRAWABLE_COLOR, drawable.ripple.color.value());
+      }
+
+      builder.putBool(NATIVE_DRAWABLE_BORDERLESS, drawable.ripple.borderless);
+      if (drawable.ripple.rippleRadius.has_value()) {
+        builder.putDouble(
+            NATIVE_DRAWABLE_RIPPLE_RADIUS,
+            drawable.ripple.rippleRadius.value());
+      }
+      break;
+  }
+  return builder.build();
+}
+
+#endif
+
+inline MapBuffer convertTransform(Transform const &transform) {
+  MapBufferBuilder builder(16);
+  for (int32_t i = 0; i < transform.matrix.size(); i++) {
+    builder.putDouble(i, transform.matrix[i]);
+  }
+  return builder.build();
+}
+} // namespace
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/core/BUCK b/ReactCommon/react/renderer/core/BUCK
index 0e079897c475..d6c1b356f717 100644
--- a/ReactCommon/react/renderer/core/BUCK
+++ b/ReactCommon/react/renderer/core/BUCK
@@ -32,12 +32,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/core",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -50,9 +50,9 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
+        "//xplat/folly:dynamic",
+        "//xplat/folly:hash",
+        "//xplat/folly:likely",
         "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
         react_native_xplat_target("react/debug:debug"),
@@ -75,16 +75,15 @@ fb_xplat_cxx_test(
     contacts = ["oncall+react_native@xmail.facebook.com"],
     platforms = (ANDROID, APPLE, CXX),
     deps = [
-        "//xplat/folly:molly",
-        "//xplat/js/react-native-github/ReactCommon/react/renderer/element:element",
+        ":core",
+        "//xplat/hermes/API:HermesAPI",
+        "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/components/view:view"),
         react_native_xplat_target("react/renderer/components/scrollview:scrollview"),
         react_native_xplat_target("react/renderer/components/text:text"),
-        "//xplat/third-party/gmock:gtest",
+        react_native_xplat_target("react/renderer/element:element"),
         react_native_xplat_target("react/renderer/components/view:view"),
-        ":core",
-        "//xplat/hermes/API:HermesAPI",
     ],
 )
 
diff --git a/ReactCommon/react/renderer/core/BatchedEventQueue.cpp b/ReactCommon/react/renderer/core/BatchedEventQueue.cpp
index 87a59051a890..0a9467eb5540 100644
--- a/ReactCommon/react/renderer/core/BatchedEventQueue.cpp
+++ b/ReactCommon/react/renderer/core/BatchedEventQueue.cpp
@@ -7,8 +7,7 @@
 
 #include "BatchedEventQueue.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 BatchedEventQueue::BatchedEventQueue(
     EventQueueProcessor eventProcessor,
@@ -18,5 +17,4 @@ BatchedEventQueue::BatchedEventQueue(
 void BatchedEventQueue::onEnqueue() const {
   eventBeat_->request();
 }
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/CMakeLists.txt b/ReactCommon/react/renderer/core/CMakeLists.txt
index 890e6e68c8d5..d776881dda16 100644
--- a/ReactCommon/react/renderer/core/CMakeLists.txt
+++ b/ReactCommon/react/renderer/core/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_core_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_core SHARED ${react_render_core_SRC})
@@ -19,4 +26,5 @@ target_link_libraries(react_render_core
         react_debug
         react_render_debug
         react_render_graphics
+        react_render_mapbuffer
         react_utils)
diff --git a/ReactCommon/react/renderer/core/ComponentDescriptor.cpp b/ReactCommon/react/renderer/core/ComponentDescriptor.cpp
index 9afdf8788605..77529f42fda3 100644
--- a/ReactCommon/react/renderer/core/ComponentDescriptor.cpp
+++ b/ReactCommon/react/renderer/core/ComponentDescriptor.cpp
@@ -7,8 +7,7 @@
 
 #include "ComponentDescriptor.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ComponentDescriptor::ComponentDescriptor(
     ComponentDescriptorParameters const &parameters)
@@ -21,5 +20,4 @@ ContextContainer::Shared const &ComponentDescriptor::getContextContainer()
   return contextContainer_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h b/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h
index 77c60b0a1356..fb44c8dbb49a 100644
--- a/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h
+++ b/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h
@@ -13,6 +13,7 @@
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/components/view/ViewPropsInterpolation.h>
 #include <react/renderer/core/ComponentDescriptor.h>
+#include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/core/EventDispatcher.h>
 #include <react/renderer/core/Props.h>
 #include <react/renderer/core/PropsParserContext.h>
@@ -115,7 +116,7 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
     // Use the new-style iterator
     // Note that we just check if `Props` has this flag set, no matter
     // the type of ShadowNode; it acts as the single global flag.
-    if (Props::enablePropIteratorSetter) {
+    if (CoreFeatures::enablePropIteratorSetter) {
       rawProps.iterateOverValues([&](RawPropsPropNameHash hash,
                                      const char *propName,
                                      RawValue const &fn) {
diff --git a/ReactCommon/react/renderer/core/CoreFeatures.cpp b/ReactCommon/react/renderer/core/CoreFeatures.cpp
new file mode 100644
index 000000000000..75153ff17e27
--- /dev/null
+++ b/ReactCommon/react/renderer/core/CoreFeatures.cpp
@@ -0,0 +1,17 @@
+/*
+ * 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 "CoreFeatures.h"
+
+namespace facebook {
+namespace react {
+
+bool CoreFeatures::enablePropIteratorSetter = false;
+bool CoreFeatures::enableMapBuffer = false;
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/core/CoreFeatures.h b/ReactCommon/react/renderer/core/CoreFeatures.h
new file mode 100644
index 000000000000..43330d47d92b
--- /dev/null
+++ b/ReactCommon/react/renderer/core/CoreFeatures.h
@@ -0,0 +1,31 @@
+/*
+ * 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
+
+namespace facebook {
+namespace react {
+
+/*
+ * Contains the set of feature flags for the renderer core.
+ * Some of them are temporary and may be eventualy phased out
+ * as soon as the feature is fully implemented.
+ */
+class CoreFeatures {
+ public:
+  // Specifies whether the iterator-style prop parsing is enabled.
+  static bool enablePropIteratorSetter;
+
+  // This is used as a feature flag for *all* PropsX structs.
+  // For MapBuffer to be used for a particular component instance,
+  // its ShadowNode traits must set the MapBuffer trait; and this
+  // must be set to "true" globally.
+  static bool enableMapBuffer;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/core/DynamicPropsUtilities.cpp b/ReactCommon/react/renderer/core/DynamicPropsUtilities.cpp
index f4e03a822d59..116a0a418f09 100644
--- a/ReactCommon/react/renderer/core/DynamicPropsUtilities.cpp
+++ b/ReactCommon/react/renderer/core/DynamicPropsUtilities.cpp
@@ -7,8 +7,7 @@
 
 #include "DynamicPropsUtilities.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 folly::dynamic mergeDynamicProps(
     folly::dynamic const &source,
     folly::dynamic const &patch) {
@@ -31,5 +30,4 @@ folly::dynamic mergeDynamicProps(
   return result;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/EventBeat.cpp b/ReactCommon/react/renderer/core/EventBeat.cpp
index 6675fb0e43ac..f55120661b41 100644
--- a/ReactCommon/react/renderer/core/EventBeat.cpp
+++ b/ReactCommon/react/renderer/core/EventBeat.cpp
@@ -9,8 +9,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 EventBeat::EventBeat(SharedOwnerBox ownerBox)
     : ownerBox_(std::move(ownerBox)) {}
@@ -39,5 +38,4 @@ void EventBeat::setBeatCallback(BeatCallback beatCallback) {
   beatCallback_ = std::move(beatCallback);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/EventDispatcher.cpp b/ReactCommon/react/renderer/core/EventDispatcher.cpp
index 34f68f4bf3b8..5152c263eb32 100644
--- a/ReactCommon/react/renderer/core/EventDispatcher.cpp
+++ b/ReactCommon/react/renderer/core/EventDispatcher.cpp
@@ -13,8 +13,7 @@
 #include "RawEvent.h"
 #include "UnbatchedEventQueue.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 EventDispatcher::EventDispatcher(
     EventQueueProcessor const &eventProcessor,
@@ -83,5 +82,4 @@ void EventDispatcher::removeListener(
   eventListeners_.removeListener(listener);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/EventEmitter.cpp b/ReactCommon/react/renderer/core/EventEmitter.cpp
index 894ddf8eddd2..282b25f8d678 100644
--- a/ReactCommon/react/renderer/core/EventEmitter.cpp
+++ b/ReactCommon/react/renderer/core/EventEmitter.cpp
@@ -14,8 +14,7 @@
 
 #include "RawEvent.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 // TODO(T29874519): Get rid of "top" prefix once and for all.
 /*
@@ -44,7 +43,7 @@ ValueFactory EventEmitter::defaultPayloadFactory() {
 
 EventEmitter::EventEmitter(
     SharedEventTarget eventTarget,
-    Tag tag,
+    Tag /*tag*/,
     EventDispatcher::Weak eventDispatcher)
     : eventTarget_(std::move(eventTarget)),
       eventDispatcher_(std::move(eventDispatcher)) {}
@@ -132,5 +131,4 @@ void EventEmitter::setEnabled(bool enabled) const {
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/EventQueue.cpp b/ReactCommon/react/renderer/core/EventQueue.cpp
index ef111d4b56d2..41df3b330bf7 100644
--- a/ReactCommon/react/renderer/core/EventQueue.cpp
+++ b/ReactCommon/react/renderer/core/EventQueue.cpp
@@ -10,8 +10,7 @@
 #include "EventEmitter.h"
 #include "ShadowNodeFamily.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 EventQueue::EventQueue(
     EventQueueProcessor eventProcessor,
@@ -87,7 +86,7 @@ void EventQueue::flushEvents(jsi::Runtime &runtime) const {
   {
     std::lock_guard<std::mutex> lock(queueMutex_);
 
-    if (eventQueue_.size() == 0) {
+    if (eventQueue_.empty()) {
       return;
     }
 
@@ -115,5 +114,4 @@ void EventQueue::flushStateUpdates() const {
   eventProcessor_.flushStateUpdates(std::move(stateUpdateQueue));
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/EventQueueProcessor.cpp b/ReactCommon/react/renderer/core/EventQueueProcessor.cpp
index 59ea4506a8f7..1b92d530b96a 100644
--- a/ReactCommon/react/renderer/core/EventQueueProcessor.cpp
+++ b/ReactCommon/react/renderer/core/EventQueueProcessor.cpp
@@ -10,8 +10,7 @@
 #include "EventEmitter.h"
 #include "ShadowNodeFamily.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 EventQueueProcessor::EventQueueProcessor(
     EventPipe eventPipe,
@@ -78,5 +77,4 @@ void EventQueueProcessor::flushStateUpdates(
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/EventTarget.cpp b/ReactCommon/react/renderer/core/EventTarget.cpp
index 9a6d115b2728..38e78e500f84 100644
--- a/ReactCommon/react/renderer/core/EventTarget.cpp
+++ b/ReactCommon/react/renderer/core/EventTarget.cpp
@@ -9,8 +9,7 @@
 
 #include <react/debug/react_native_assert.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 using Tag = EventTarget::Tag;
 
@@ -46,7 +45,7 @@ void EventTarget::retain(jsi::Runtime &runtime) const {
   // react_native_assert(!strongInstanceHandle_.isUndefined());
 }
 
-void EventTarget::release(jsi::Runtime &runtime) const {
+void EventTarget::release(jsi::Runtime & /*runtime*/) const {
   // The method does not use `jsi::Runtime` reference.
   // It takes it only to ensure thread-safety (if the caller has the reference,
   // we are on a proper thread).
@@ -66,5 +65,4 @@ Tag EventTarget::getTag() const {
   return tag_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/LayoutConstraints.cpp b/ReactCommon/react/renderer/core/LayoutConstraints.cpp
index db92606051df..c64cac4d0ca1 100644
--- a/ReactCommon/react/renderer/core/LayoutConstraints.cpp
+++ b/ReactCommon/react/renderer/core/LayoutConstraints.cpp
@@ -9,8 +9,7 @@
 
 #include <algorithm>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 Size LayoutConstraints::clamp(const Size &size) const {
   return {
@@ -18,5 +17,4 @@ Size LayoutConstraints::clamp(const Size &size) const {
       std::max(minimumSize.height, std::min(maximumSize.height, size.height))};
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/LayoutMetrics.cpp b/ReactCommon/react/renderer/core/LayoutMetrics.cpp
index 8e92f2f07a13..0e0e75e3b1ff 100644
--- a/ReactCommon/react/renderer/core/LayoutMetrics.cpp
+++ b/ReactCommon/react/renderer/core/LayoutMetrics.cpp
@@ -10,12 +10,11 @@
 
 #include "LayoutMetrics.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #if RN_DEBUG_STRING_CONVERTIBLE
 
-std::string getDebugName(LayoutMetrics const &object) {
+std::string getDebugName(LayoutMetrics const & /*object*/) {
   return "LayoutMetrics";
 }
 
@@ -61,5 +60,4 @@ std::vector<DebugStringConvertibleObject> getDebugProps(
 
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp b/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp
index c56846922579..0f785759e9be 100644
--- a/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp
+++ b/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp
@@ -14,8 +14,61 @@
 #include <react/renderer/debug/DebugStringConvertibleItem.h>
 #include <react/renderer/graphics/conversions.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
+
+template <class T>
+using LayoutableSmallVector = butter::small_vector<T, 16>;
+
+static LayoutableSmallVector<Rect> calculateTransformedFrames(
+    LayoutableSmallVector<ShadowNode const *> const &shadowNodeList,
+    LayoutableShadowNode::LayoutInspectingPolicy policy) {
+  auto size = shadowNodeList.size();
+  auto transformedFrames = LayoutableSmallVector<Rect>{size};
+  auto transformation = Transform::Identity();
+
+  for (auto i = size; i > 0; --i) {
+    auto currentShadowNode =
+        traitCast<LayoutableShadowNode const *>(shadowNodeList.at(i - 1));
+    auto currentFrame = currentShadowNode->getLayoutMetrics().frame;
+
+    if (policy.includeTransform) {
+      if (Transform::isVerticalInversion(transformation)) {
+        auto parentShadowNode =
+            traitCast<LayoutableShadowNode const *>(shadowNodeList.at(i));
+        currentFrame.origin.y =
+            parentShadowNode->getLayoutMetrics().frame.size.height -
+            currentFrame.size.height - currentFrame.origin.y;
+      }
+
+      if (Transform::isHorizontalInversion(transformation)) {
+        auto parentShadowNode =
+            traitCast<LayoutableShadowNode const *>(shadowNodeList.at(i));
+        currentFrame.origin.x =
+            parentShadowNode->getLayoutMetrics().frame.size.width -
+            currentFrame.size.width - currentFrame.origin.x;
+      }
+
+      if (i != size) {
+        auto parentShadowNode =
+            traitCast<LayoutableShadowNode const *>(shadowNodeList.at(i));
+        auto contentOritinOffset = parentShadowNode->getContentOriginOffset();
+        if (Transform::isVerticalInversion(transformation)) {
+          contentOritinOffset.y = -contentOritinOffset.y;
+        }
+        if (Transform::isHorizontalInversion(transformation)) {
+          contentOritinOffset.x = -contentOritinOffset.x;
+        }
+        currentFrame.origin += contentOritinOffset;
+      }
+
+      transformation = transformation * currentShadowNode->getTransform();
+    }
+
+    transformedFrames[i - 1] = currentFrame;
+  }
+
+  return transformedFrames;
+}
 
 LayoutableShadowNode::LayoutableShadowNode(
     ShadowNodeFragment const &fragment,
@@ -34,6 +87,8 @@ LayoutMetrics LayoutableShadowNode::computeRelativeLayoutMetrics(
     ShadowNodeFamily const &descendantNodeFamily,
     LayoutableShadowNode const &ancestorNode,
     LayoutInspectingPolicy policy) {
+  // Prelude.
+
   if (&descendantNodeFamily == &ancestorNode.getFamily()) {
     // Layout metrics of a node computed relatively to the same node are equal
     // to `transform`-ed layout metrics of the node with zero `origin`.
@@ -47,16 +102,18 @@ LayoutMetrics LayoutableShadowNode::computeRelativeLayoutMetrics(
 
   auto ancestors = descendantNodeFamily.getAncestors(ancestorNode);
 
-  if (ancestors.size() == 0) {
+  if (ancestors.empty()) {
     // Specified nodes do not form an ancestor-descender relationship
     // in the same tree. Aborting.
     return EmptyLayoutMetrics;
   }
 
+  // ------------------------------
+
   // Step 1.
   // Creating a list of nodes that form a chain from the descender node to
   // ancestor node inclusively.
-  auto shadowNodeList = butter::small_vector<ShadowNode const *, 16>{};
+  auto shadowNodeList = LayoutableSmallVector<ShadowNode const *>{};
 
   // Finding the measured node.
   // The last element in the `AncestorList` is a pair of a parent of the node
@@ -81,15 +138,33 @@ LayoutMetrics LayoutableShadowNode::computeRelativeLayoutMetrics(
     }
   }
 
+  // ------------------------------
+
   // Step 2.
   // Computing the initial size of the measured node.
   auto descendantLayoutableNode =
       traitCast<LayoutableShadowNode const *>(descendantNode);
 
-  if (!descendantLayoutableNode) {
+  if (descendantLayoutableNode == nullptr) {
     return EmptyLayoutMetrics;
   }
 
+  // ------------------------------
+  // TODO: T127619309 remove after validating that T127619309 is fixed
+  auto optionalCalculateTransformedFrames =
+      descendantNode->getContextContainer()
+      ? descendantNode->getContextContainer()->find<bool>(
+            "CalculateTransformedFramesEnabled")
+      : std::optional<bool>(false);
+
+  bool shouldCalculateTransformedFrames =
+      optionalCalculateTransformedFrames.has_value()
+      ? optionalCalculateTransformedFrames.value()
+      : false;
+
+  auto transformedFrames = shouldCalculateTransformedFrames
+      ? calculateTransformedFrames(shadowNodeList, policy)
+      : LayoutableSmallVector<Rect>();
   auto layoutMetrics = descendantLayoutableNode->getLayoutMetrics();
   auto &resultFrame = layoutMetrics.frame;
   resultFrame.origin = {0, 0};
@@ -101,11 +176,13 @@ LayoutMetrics LayoutableShadowNode::computeRelativeLayoutMetrics(
     auto currentShadowNode =
         traitCast<LayoutableShadowNode const *>(shadowNodeList.at(i));
 
-    if (!currentShadowNode) {
+    if (currentShadowNode == nullptr) {
       return EmptyLayoutMetrics;
     }
 
-    auto currentFrame = currentShadowNode->getLayoutMetrics().frame;
+    auto currentFrame = shouldCalculateTransformedFrames
+        ? transformedFrames[i]
+        : currentShadowNode->getLayoutMetrics().frame;
     if (i == size - 1) {
       // If it's the last element, its origin is irrelevant.
       currentFrame.origin = {0, 0};
@@ -122,12 +199,14 @@ LayoutMetrics LayoutableShadowNode::computeRelativeLayoutMetrics(
     }
 
     resultFrame.origin += currentFrame.origin;
-
-    if (i != 0 && policy.includeTransform) {
+    if (!shouldCalculateTransformedFrames && i != 0 &&
+        policy.includeTransform) {
       resultFrame.origin += currentShadowNode->getContentOriginOffset();
     }
   }
 
+  // ------------------------------
+
   return layoutMetrics;
 }
 
@@ -165,7 +244,7 @@ LayoutableShadowNode::getLayoutableChildNodes() const {
   for (const auto &childShadowNode : getChildren()) {
     auto layoutableChildShadowNode =
         traitCast<LayoutableShadowNode const *>(childShadowNode.get());
-    if (layoutableChildShadowNode) {
+    if (layoutableChildShadowNode != nullptr) {
       layoutableChildren.push_back(
           const_cast<LayoutableShadowNode *>(layoutableChildShadowNode));
     }
@@ -174,9 +253,9 @@ LayoutableShadowNode::getLayoutableChildNodes() const {
 }
 
 Size LayoutableShadowNode::measureContent(
-    LayoutContext const &layoutContext,
-    LayoutConstraints const &layoutConstraints) const {
-  return Size();
+    LayoutContext const & /*layoutContext*/,
+    LayoutConstraints const & /*layoutConstraints*/) const {
+  return {};
 }
 
 Size LayoutableShadowNode::measure(
@@ -194,11 +273,11 @@ Size LayoutableShadowNode::measure(
   return layoutableShadowNode.getLayoutMetrics().frame.size;
 }
 
-Float LayoutableShadowNode::firstBaseline(Size size) const {
+Float LayoutableShadowNode::firstBaseline(Size /*size*/) const {
   return 0;
 }
 
-Float LayoutableShadowNode::lastBaseline(Size size) const {
+Float LayoutableShadowNode::lastBaseline(Size /*size*/) const {
   return 0;
 }
 
@@ -208,7 +287,7 @@ ShadowNode::Shared LayoutableShadowNode::findNodeAtPoint(
   auto layoutableShadowNode =
       traitCast<const LayoutableShadowNode *>(node.get());
 
-  if (!layoutableShadowNode) {
+  if (layoutableShadowNode == nullptr) {
     return nullptr;
   }
   auto frame = layoutableShadowNode->getLayoutMetrics().frame;
@@ -276,5 +355,4 @@ SharedDebugStringConvertibleList LayoutableShadowNode::getDebugProps() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/Props.cpp b/ReactCommon/react/renderer/core/Props.cpp
index ad1c01c5c285..c52951b66ab1 100644
--- a/ReactCommon/react/renderer/core/Props.cpp
+++ b/ReactCommon/react/renderer/core/Props.cpp
@@ -6,14 +6,13 @@
  */
 
 #include "Props.h"
+#include "PropsMapBuffer.h"
 
 #include <folly/dynamic.h>
+#include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/core/propsConversions.h>
 
-namespace facebook {
-namespace react {
-
-bool Props::enablePropIteratorSetter = false;
+namespace facebook::react {
 
 Props::Props(
     const PropsParserContext &context,
@@ -21,14 +20,13 @@ Props::Props(
     const RawProps &rawProps,
     const bool shouldSetRawProps)
     : nativeId(
-          enablePropIteratorSetter ? sourceProps.nativeId
-                                   : convertRawProp(
-                                         context,
-                                         rawProps,
-                                         "nativeID",
-                                         sourceProps.nativeId,
-                                         {})),
-      revision(sourceProps.revision + 1)
+          CoreFeatures::enablePropIteratorSetter ? sourceProps.nativeId
+                                                 : convertRawProp(
+                                                       context,
+                                                       rawProps,
+                                                       "nativeID",
+                                                       sourceProps.nativeId,
+                                                       {}))
 #ifdef ANDROID
       ,
       rawProps(
@@ -41,7 +39,7 @@ Props::Props(
 void Props::setProp(
     const PropsParserContext &context,
     RawPropsPropNameHash hash,
-    const char *propName,
+    const char * /*propName*/,
     RawValue const &value) {
   switch (hash) {
     case CONSTEXPR_RAW_PROPS_KEY_HASH("nativeID"):
@@ -50,5 +48,4 @@ void Props::setProp(
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/Props.h b/ReactCommon/react/renderer/core/Props.h
index 9c0735695069..91b3e7ab5676 100644
--- a/ReactCommon/react/renderer/core/Props.h
+++ b/ReactCommon/react/renderer/core/Props.h
@@ -16,6 +16,10 @@
 #include <react/renderer/core/Sealable.h>
 #include <react/renderer/debug/DebugStringConvertible.h>
 
+#ifdef ANDROID
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
 namespace facebook {
 namespace react {
 
@@ -34,8 +38,6 @@ class Props : public virtual Sealable, public virtual DebugStringConvertible {
       bool shouldSetRawProps = true);
   virtual ~Props() = default;
 
-  static bool enablePropIteratorSetter;
-
   /**
    * Set a prop value via iteration (see enableIterator above).
    * If setProp is defined for a particular props struct, it /must/
@@ -54,17 +56,12 @@ class Props : public virtual Sealable, public virtual DebugStringConvertible {
 
   std::string nativeId;
 
-  /*
-   * Special value that represents generation number of `Props` object, which
-   * increases when the object was constructed with some source `Props` object.
-   * Default props objects (that was constructed using default constructor) have
-   * revision equals `0`.
-   * The value might be used for optimization purposes.
-   */
-  int const revision{0};
-
 #ifdef ANDROID
   folly::dynamic rawProps = folly::dynamic::object();
+
+  virtual void propsDiffMapBuffer(
+      Props const *oldProps,
+      MapBufferBuilder &builder) const;
 #endif
 };
 
diff --git a/ReactCommon/react/renderer/core/PropsMacros.h b/ReactCommon/react/renderer/core/PropsMacros.h
index 1e7a6c51a14c..519c1307f018 100644
--- a/ReactCommon/react/renderer/core/PropsMacros.h
+++ b/ReactCommon/react/renderer/core/PropsMacros.h
@@ -19,14 +19,12 @@
 
 // Get hash at compile-time. sizeof(str) - 1 == strlen
 #define CONSTEXPR_RAW_PROPS_KEY_HASH(s)                   \
-  ({                                                      \
+  ([]() constexpr->RawPropsPropNameHash {                 \
     CLANG_PRAGMA("clang diagnostic push")                 \
     CLANG_PRAGMA("clang diagnostic ignored \"-Wshadow\"") \
-    constexpr RawPropsPropNameHash propNameHash =         \
-        folly::hash::fnv32_buf(s, sizeof(s) - 1);         \
-    propNameHash;                                         \
+    return folly::hash::fnv32_buf(s, sizeof(s) - 1);      \
     CLANG_PRAGMA("clang diagnostic pop")                  \
-  })
+  }())
 
 #define RAW_PROPS_KEY_HASH(s) folly::hash::fnv32_buf(s, std::strlen(s))
 
@@ -71,7 +69,9 @@
   CASE_STATEMENT_SET_FIELD_VALUE_INDEXED(                                \
       struct, bottomStart, prefix "BottomStart" suffix, rawValue)        \
   CASE_STATEMENT_SET_FIELD_VALUE_INDEXED(                                \
-      struct, bottomEnd, prefix "BottomEnd" suffix, rawValue)
+      struct, bottomEnd, prefix "BottomEnd" suffix, rawValue)            \
+  CASE_STATEMENT_SET_FIELD_VALUE_INDEXED(                                \
+      struct, all, prefix "" suffix, rawValue)
 
 #define SET_CASCADED_RECTANGLE_EDGES(struct, prefix, suffix, rawValue) \
   CASE_STATEMENT_SET_FIELD_VALUE_INDEXED(                              \
@@ -92,3 +92,17 @@
       struct, vertical, prefix "Vertical" suffix, rawValue)            \
   CASE_STATEMENT_SET_FIELD_VALUE_INDEXED(                              \
       struct, all, prefix "" suffix, rawValue)
+
+// Rebuild a type that contains multiple fields from a single field value
+#define REBUILD_FIELD_SWITCH_CASE(                  \
+    defaults, rawValue, property, field, fieldName) \
+  case CONSTEXPR_RAW_PROPS_KEY_HASH(fieldName): {   \
+    if ((rawValue).hasValue()) {                    \
+      decltype((defaults).field) res;               \
+      fromRawValue(context, rawValue, res);         \
+      (property).field = res;                       \
+    } else {                                        \
+      (property).field = (defaults).field;          \
+    }                                               \
+    return;                                         \
+  }
diff --git a/ReactCommon/react/renderer/core/PropsMapBuffer.cpp b/ReactCommon/react/renderer/core/PropsMapBuffer.cpp
new file mode 100644
index 000000000000..6ce2241ef468
--- /dev/null
+++ b/ReactCommon/react/renderer/core/PropsMapBuffer.cpp
@@ -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.
+ */
+
+#include "PropsMapBuffer.h"
+#include "Props.h"
+
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+
+namespace facebook {
+namespace react {
+
+#ifdef ANDROID
+void Props::propsDiffMapBuffer(
+    Props const *oldPropsPtr,
+    MapBufferBuilder &builder) const {
+  // Call with default props if necessary
+  if (oldPropsPtr == nullptr) {
+    Props defaultProps{};
+    propsDiffMapBuffer(&defaultProps, builder);
+    return;
+  }
+
+  Props const &oldProps = *oldPropsPtr;
+  Props const &newProps = *this;
+
+  if (oldProps.nativeId != newProps.nativeId) {
+    builder.putString(PROPS_NATIVE_ID, nativeId);
+  }
+}
+#endif
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/hermes/inspector/chrome/AutoAttachUtils.h b/ReactCommon/react/renderer/core/PropsMapBuffer.h
similarity index 51%
rename from ReactCommon/hermes/inspector/chrome/AutoAttachUtils.h
rename to ReactCommon/react/renderer/core/PropsMapBuffer.h
index 8fe0710380b2..ad6b9bd08df4 100644
--- a/ReactCommon/hermes/inspector/chrome/AutoAttachUtils.h
+++ b/ReactCommon/react/renderer/core/PropsMapBuffer.h
@@ -7,18 +7,17 @@
 
 #pragma once
 
-#include <string>
+#ifdef ANDROID
+
+#include <react/renderer/mapbuffer/MapBuffer.h>
 
 namespace facebook {
-namespace hermes {
-namespace inspector {
-namespace chrome {
+namespace react {
+
+constexpr MapBuffer::Key PROPS_MAX = 1;
+constexpr MapBuffer::Key PROPS_NATIVE_ID = 1;
 
-bool isNetworkInspected(
-    const std::string &owner,
-    const std::string &app,
-    const std::string &device);
-}
-} // namespace inspector
-} // namespace hermes
+} // namespace react
 } // namespace facebook
+
+#endif
diff --git a/ReactCommon/react/renderer/core/RawEvent.cpp b/ReactCommon/react/renderer/core/RawEvent.cpp
index 1c7c5b8dc3e9..646ce4aea3ad 100644
--- a/ReactCommon/react/renderer/core/RawEvent.cpp
+++ b/ReactCommon/react/renderer/core/RawEvent.cpp
@@ -7,8 +7,7 @@
 
 #include "RawEvent.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 RawEvent::RawEvent(
     std::string type,
@@ -20,5 +19,4 @@ RawEvent::RawEvent(
       eventTarget(std::move(eventTarget)),
       category(category) {}
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/RawProps.cpp b/ReactCommon/react/renderer/core/RawProps.cpp
index 454e2bed3042..428e22ab0e47 100644
--- a/ReactCommon/react/renderer/core/RawProps.cpp
+++ b/ReactCommon/react/renderer/core/RawProps.cpp
@@ -11,8 +11,7 @@
 #include <react/renderer/core/RawPropsKey.h>
 #include <react/renderer/core/RawPropsParser.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 RawProps::RawProps() {
   mode_ = Mode::Empty;
@@ -48,8 +47,9 @@ RawProps::RawProps(folly::dynamic const &dynamic) noexcept {
   dynamic_ = dynamic;
 }
 
-void RawProps::parse(RawPropsParser const &parser, const PropsParserContext &)
-    const noexcept {
+void RawProps::parse(
+    RawPropsParser const &parser,
+    const PropsParserContext & /*unused*/) const noexcept {
   react_native_assert(parser_ == nullptr && "A parser was already assigned.");
   parser_ = &parser;
   parser.preparse(*this);
@@ -100,5 +100,4 @@ void RawProps::iterateOverValues(
   return parser_->iterateOverValues(*this, fn);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/RawProps.h b/ReactCommon/react/renderer/core/RawProps.h
index 4e86e289cc1c..08cdcdd5d034 100644
--- a/ReactCommon/react/renderer/core/RawProps.h
+++ b/ReactCommon/react/renderer/core/RawProps.h
@@ -118,7 +118,7 @@ class RawProps final {
   mutable Mode mode_;
 
   // Case 1: Source data is represented as `jsi::Object`.
-  jsi::Runtime *runtime_;
+  jsi::Runtime *runtime_{};
   jsi::Value value_;
 
   // Case 2: Source data is represented as `folly::dynamic`.
diff --git a/ReactCommon/react/renderer/core/RawPropsKey.cpp b/ReactCommon/react/renderer/core/RawPropsKey.cpp
index de7820dc7baa..0f752b45845d 100644
--- a/ReactCommon/react/renderer/core/RawPropsKey.cpp
+++ b/ReactCommon/react/renderer/core/RawPropsKey.cpp
@@ -14,15 +14,14 @@
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/core/RawPropsPrimitives.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void RawPropsKey::render(char *buffer, RawPropsPropNameLength *length)
     const noexcept {
   *length = 0;
 
   // Prefix
-  if (prefix) {
+  if (prefix != nullptr) {
     auto prefixLength =
         static_cast<RawPropsPropNameLength>(std::strlen(prefix));
     std::memcpy(buffer, prefix, prefixLength);
@@ -35,7 +34,7 @@ void RawPropsKey::render(char *buffer, RawPropsPropNameLength *length)
   *length += nameLength;
 
   // Suffix
-  if (suffix) {
+  if (suffix != nullptr) {
     auto suffixLength =
         static_cast<RawPropsPropNameLength>(std::strlen(suffix));
     std::memcpy(buffer + *length, suffix, suffixLength);
@@ -70,5 +69,4 @@ bool operator!=(RawPropsKey const &lhs, RawPropsKey const &rhs) noexcept {
   return !(lhs == rhs);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp b/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp
index d978bf4eed7f..d4a8d78e2288 100644
--- a/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp
+++ b/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp
@@ -14,8 +14,7 @@
 #include <cstdlib>
 #include <cstring>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 bool RawPropsKeyMap::hasSameName(Item const &lhs, Item const &rhs) noexcept {
   return lhs.length == rhs.length &&
@@ -104,5 +103,4 @@ RawPropsValueIndex RawPropsKeyMap::at(
   return kRawPropsValueIndexEmpty;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/RawPropsParser.cpp b/ReactCommon/react/renderer/core/RawPropsParser.cpp
index 882a4a935a57..d78f83ce125d 100644
--- a/ReactCommon/react/renderer/core/RawPropsParser.cpp
+++ b/ReactCommon/react/renderer/core/RawPropsParser.cpp
@@ -7,15 +7,14 @@
 
 #include "RawPropsParser.h"
 
+#include <folly/Hash.h>
 #include <folly/Likely.h>
-#include <folly/hash/Hash.h>
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/core/RawProps.h>
 
 #include <glog/logging.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 // During parser initialization, Props structs are used to parse
 // "fake"/empty objects, and `at` is called repeatedly which tells us
@@ -221,5 +220,4 @@ void RawPropsParser::iterateOverValues(
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/RawPropsParser.h b/ReactCommon/react/renderer/core/RawPropsParser.h
index c112f6247cbd..0ea961232b56 100644
--- a/ReactCommon/react/renderer/core/RawPropsParser.h
+++ b/ReactCommon/react/renderer/core/RawPropsParser.h
@@ -82,8 +82,8 @@ class RawPropsParser final {
   void iterateOverValues(
       RawProps const &rawProps,
       std::function<
-          void(RawPropsPropNameHash, const char *, RawValue const &)> const &fn)
-      const;
+          void(RawPropsPropNameHash, const char *, RawValue const &)> const
+          &visit) const;
 
   mutable butter::small_vector<RawPropsKey, kNumberOfPropsPerComponentSoftCap>
       keys_{};
diff --git a/ReactCommon/react/renderer/core/RawPropsPrimitives.h b/ReactCommon/react/renderer/core/RawPropsPrimitives.h
index 355496cc27fd..cb2d9d1c1961 100644
--- a/ReactCommon/react/renderer/core/RawPropsPrimitives.h
+++ b/ReactCommon/react/renderer/core/RawPropsPrimitives.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <folly/hash/Hash.h>
+#include <folly/Hash.h>
 #include <limits>
 
 namespace facebook {
diff --git a/ReactCommon/react/renderer/core/RawValue.h b/ReactCommon/react/renderer/core/RawValue.h
index d541f11a16ed..c69f9e43ceac 100644
--- a/ReactCommon/react/renderer/core/RawValue.h
+++ b/ReactCommon/react/renderer/core/RawValue.h
@@ -96,7 +96,7 @@ class RawValue {
    * Casts the value to a specified type.
    */
   template <typename T>
-  explicit operator T() const noexcept {
+  explicit operator T() const {
     return castValue(dynamic_, (T *)nullptr);
   }
 
@@ -212,40 +212,36 @@ class RawValue {
     return RawValue(dynamic);
   }
 
-  static bool castValue(const folly::dynamic &dynamic, bool *type) noexcept {
+  static bool castValue(const folly::dynamic &dynamic, bool *type) {
     return dynamic.getBool();
   }
 
-  static int castValue(const folly::dynamic &dynamic, int *type) noexcept {
+  static int castValue(const folly::dynamic &dynamic, int *type) {
     return static_cast<int>(dynamic.asInt());
   }
 
-  static int64_t castValue(
-      const folly::dynamic &dynamic,
-      int64_t *type) noexcept {
+  static int64_t castValue(const folly::dynamic &dynamic, int64_t *type) {
     return dynamic.asInt();
   }
 
-  static float castValue(const folly::dynamic &dynamic, float *type) noexcept {
+  static float castValue(const folly::dynamic &dynamic, float *type) {
     return static_cast<float>(dynamic.asDouble());
   }
 
-  static double castValue(
-      const folly::dynamic &dynamic,
-      double *type) noexcept {
+  static double castValue(const folly::dynamic &dynamic, double *type) {
     return dynamic.asDouble();
   }
 
   static std::string castValue(
       const folly::dynamic &dynamic,
-      std::string *type) noexcept {
+      std::string *type) {
     return dynamic.getString();
   }
 
   template <typename T>
   static std::vector<T> castValue(
       const folly::dynamic &dynamic,
-      std::vector<T> *type) noexcept {
+      std::vector<T> *type) {
     react_native_assert(dynamic.isArray());
     auto result = std::vector<T>{};
     result.reserve(dynamic.size());
@@ -258,7 +254,7 @@ class RawValue {
   template <typename T>
   static std::vector<std::vector<T>> castValue(
       const folly::dynamic &dynamic,
-      std::vector<std::vector<T>> *type) noexcept {
+      std::vector<std::vector<T>> *type) {
     react_native_assert(dynamic.isArray());
     auto result = std::vector<std::vector<T>>{};
     result.reserve(dynamic.size());
@@ -271,7 +267,7 @@ class RawValue {
   template <typename T>
   static butter::map<std::string, T> castValue(
       const folly::dynamic &dynamic,
-      butter::map<std::string, T> *type) noexcept {
+      butter::map<std::string, T> *type) {
     react_native_assert(dynamic.isObject());
     auto result = butter::map<std::string, T>{};
     for (const auto &item : dynamic.items()) {
diff --git a/ReactCommon/react/renderer/core/Sealable.cpp b/ReactCommon/react/renderer/core/Sealable.cpp
index abb839c8ea65..202c37988be8 100644
--- a/ReactCommon/react/renderer/core/Sealable.cpp
+++ b/ReactCommon/react/renderer/core/Sealable.cpp
@@ -10,8 +10,7 @@
 #include <react/debug/flags.h>
 #include <react/debug/react_native_assert.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 /*
  * Note:
@@ -29,7 +28,7 @@ namespace react {
 
 Sealable::Sealable() : sealed_(false) {}
 
-Sealable::Sealable(const Sealable &other) : sealed_(false){};
+Sealable::Sealable(const Sealable & /*other*/) : sealed_(false){};
 
 Sealable::Sealable(Sealable &&other) noexcept : sealed_(false) {
   other.ensureUnsealed();
@@ -37,7 +36,7 @@ Sealable::Sealable(Sealable &&other) noexcept : sealed_(false) {
 
 Sealable::~Sealable() noexcept = default;
 
-Sealable &Sealable::operator=(const Sealable &other) {
+Sealable &Sealable::operator=(const Sealable & /*other*/) {
   ensureUnsealed();
   return *this;
 }
@@ -62,5 +61,4 @@ void Sealable::ensureUnsealed() const {
 
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/ShadowNode.cpp b/ReactCommon/react/renderer/core/ShadowNode.cpp
index 203d86e95b0b..9317ff644e44 100644
--- a/ReactCommon/react/renderer/core/ShadowNode.cpp
+++ b/ReactCommon/react/renderer/core/ShadowNode.cpp
@@ -19,8 +19,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ShadowNode::SharedListOfShared ShadowNode::emptySharedShadowNodeSharedList() {
   static const auto emptySharedShadowNodeSharedList =
@@ -121,6 +120,10 @@ ShadowNode::Unshared ShadowNode::clone(
   return family_->componentDescriptor_.cloneShadowNode(*this, fragment);
 }
 
+ContextContainer::Shared ShadowNode::getContextContainer() const {
+  return family_->componentDescriptor_.getContextContainer();
+}
+
 #pragma mark - Getters
 
 ComponentName ShadowNode::getComponentName() const {
@@ -326,5 +329,4 @@ SharedDebugStringConvertibleList ShadowNode::getDebugProps() const {
 }
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/ShadowNode.h b/ReactCommon/react/renderer/core/ShadowNode.h
index 8264065ffb2e..a190a0906c6c 100644
--- a/ReactCommon/react/renderer/core/ShadowNode.h
+++ b/ReactCommon/react/renderer/core/ShadowNode.h
@@ -129,6 +129,11 @@ class ShadowNode : public Sealable, public DebugStringConvertible {
    */
   const ComponentDescriptor &getComponentDescriptor() const;
 
+  /*
+   * Returns the `ContextContainer` used by this ShadowNode.
+   */
+  ContextContainer::Shared getContextContainer() const;
+
   /*
    * Returns a state associated with the particular node.
    */
diff --git a/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp b/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp
index 73d022bf2efb..361a51b75ed8 100644
--- a/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp
+++ b/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp
@@ -14,8 +14,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 using AncestorList = ShadowNode::AncestorList;
 
@@ -63,7 +62,7 @@ AncestorList ShadowNodeFamily::getAncestors(
   auto ancestorFamily = ancestorShadowNode.family_.get();
 
   auto family = this;
-  while (family && family != ancestorFamily) {
+  while ((family != nullptr) && family != ancestorFamily) {
     families.push_back(family);
     family = family->parent_.lock().get();
   }
@@ -142,5 +141,4 @@ void ShadowNodeFamily::dispatchRawState(
   eventDispatcher->dispatchStateUpdate(std::move(stateUpdate), priority);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/ShadowNodeFamilyFragment.cpp b/ReactCommon/react/renderer/core/ShadowNodeFamilyFragment.cpp
index c744700c3fd7..3f27ab9bfefe 100644
--- a/ReactCommon/react/renderer/core/ShadowNodeFamilyFragment.cpp
+++ b/ReactCommon/react/renderer/core/ShadowNodeFamilyFragment.cpp
@@ -9,8 +9,7 @@
 
 #include <react/renderer/core/ShadowNodeFamily.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ShadowNodeFamilyFragment ShadowNodeFamilyFragment::build(
     ShadowNodeFamily const &family) {
@@ -32,5 +31,4 @@ Value::operator ShadowNodeFamilyFragment() const {
   return ShadowNodeFamilyFragment{tag, surfaceId, eventEmitter};
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/ShadowNodeFragment.cpp b/ReactCommon/react/renderer/core/ShadowNodeFragment.cpp
index 02793cc12450..bca4126c2382 100644
--- a/ReactCommon/react/renderer/core/ShadowNodeFragment.cpp
+++ b/ReactCommon/react/renderer/core/ShadowNodeFragment.cpp
@@ -7,8 +7,7 @@
 
 #include "ShadowNodeFragment.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 Props::Shared const &ShadowNodeFragment::propsPlaceholder() {
   static auto &instance = *new Props::Shared();
@@ -37,5 +36,4 @@ Value::operator ShadowNodeFragment() const {
   return ShadowNodeFragment{props, children, state};
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/ShadowNodeTraits.cpp b/ReactCommon/react/renderer/core/ShadowNodeTraits.cpp
index 999581dd1d9b..2ead01cb13eb 100644
--- a/ReactCommon/react/renderer/core/ShadowNodeTraits.cpp
+++ b/ReactCommon/react/renderer/core/ShadowNodeTraits.cpp
@@ -7,6 +7,4 @@
 
 #include "ShadowNodeTraits.h"
 
-namespace facebook {
-namespace react {} // namespace react
-} // namespace facebook
+namespace facebook::react {} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/ShadowNodeTraits.h b/ReactCommon/react/renderer/core/ShadowNodeTraits.h
index d222f74d8962..d4f78368cb9f 100644
--- a/ReactCommon/react/renderer/core/ShadowNodeTraits.h
+++ b/ReactCommon/react/renderer/core/ShadowNodeTraits.h
@@ -59,42 +59,47 @@ class ShadowNodeTraits {
     // Yoga styles in the constructor (or later) *after* the `ShadowNode`
     // is cloned must set this trait.
     // Any Yoga node (not only Leaf ones) can have this trait.
-    DirtyYogaNode = 1 << 9,
+    DirtyYogaNode = 1 << 7,
 
     // Inherits `YogaLayoutableShadowNode` and enforces that the `YGNode` is a
     // leaf.
-    LeafYogaNode = 1 << 10,
+    LeafYogaNode = 1 << 8,
 
     // Inherits `YogaLayoutableShadowNode` and has a custom measure function.
     // Only Leaf nodes can have this trait.
-    MeasurableYogaNode = 1 << 11,
+    MeasurableYogaNode = 1 << 9,
 
     // Indicates that the `ShadowNode` must form a stacking context.
     // A Stacking Context forms a level of a `ShadowView` hierarchy (in contrast
     // with a level of a `ShadowNode` hierarchy).
     // See W3C standard for more details: https://www.w3.org/TR/CSS2/zindex.html
-    FormsStackingContext = 1 << 13,
+    FormsStackingContext = 1 << 10,
 
     // Indicates that the node must form a `ShadowView`.
-    FormsView = 1 << 14,
+    FormsView = 1 << 11,
 
     // Internal to `ShadowNode`; do not use it outside.
     // Indicates that `children` list is shared between nodes and need
     // to be cloned before the first mutation.
-    ChildrenAreShared = 1 << 15,
+    ChildrenAreShared = 1 << 12,
 
     // Inherits 'RawTextShadowNode'
-    RawText = 1 << 16,
+    RawText = 1 << 13,
 
     // Inherits 'TextShadowNode'
-    Text = 1 << 17,
+    Text = 1 << 14,
+
+    // Temporary (?) to indicate MapBuffer support on Android
+    AndroidMapBufferPropsSupported = 1 << 15,
 
     // Reserved
-    ReservedTrait1 = 1 << 18,
-    ReservedTrait2 = 1 << 19,
-    ReservedTrait3 = 1 << 20,
-    ReservedTrait4 = 1 << 21,
-    ReservedTrait5 = 1 << 22,
+    ReservedTrait0 = 1 << 16,
+    ReservedTrait1 = 1 << 17,
+    ReservedTrait2 = 1 << 18,
+    ReservedTrait3 = 1 << 19,
+    ReservedTrait4 = 1 << 20,
+    ReservedTrait5 = 1 << 21,
+    ReservedTrait6 = 1 << 22,
 
     // Unserved - alias these for local usage
     UnreservedTrait1 = 1 << 23
diff --git a/ReactCommon/react/renderer/core/State.cpp b/ReactCommon/react/renderer/core/State.cpp
index 85c07a13fa19..e24b87f84c25 100644
--- a/ReactCommon/react/renderer/core/State.cpp
+++ b/ReactCommon/react/renderer/core/State.cpp
@@ -14,8 +14,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 State::State(StateData::Shared data, State const &state)
     : family_(state.family_),
@@ -49,5 +48,4 @@ size_t State::getRevision() const {
   return revision_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/UnbatchedEventQueue.cpp b/ReactCommon/react/renderer/core/UnbatchedEventQueue.cpp
index acdcfdcbf383..604122a6ce41 100644
--- a/ReactCommon/react/renderer/core/UnbatchedEventQueue.cpp
+++ b/ReactCommon/react/renderer/core/UnbatchedEventQueue.cpp
@@ -7,13 +7,11 @@
 
 #include "UnbatchedEventQueue.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void UnbatchedEventQueue::onEnqueue() const {
   eventBeat_->request();
   eventBeat_->induce();
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/propsConversions.h b/ReactCommon/react/renderer/core/propsConversions.h
index adbc07860736..c4221f977567 100644
--- a/ReactCommon/react/renderer/core/propsConversions.h
+++ b/ReactCommon/react/renderer/core/propsConversions.h
@@ -10,9 +10,9 @@
 #include <optional>
 
 #include <folly/Likely.h>
-#include <folly/dynamic.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/RawProps.h>
+#include <react/renderer/core/RawPropsKey.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Geometry.h>
 #include <react/renderer/graphics/conversions.h>
@@ -43,18 +43,18 @@ template <typename T>
 void fromRawValue(
     const PropsParserContext &context,
     RawValue const &rawValue,
-    std::optional<T> &result) {
-  T res{};
-  fromRawValue(context, rawValue, res);
-  result = std::optional<T>(res);
+    T &result) {
+  result = (T)rawValue;
 }
 
 template <typename T>
 void fromRawValue(
     const PropsParserContext &context,
     RawValue const &rawValue,
-    T &result) {
-  result = (T)rawValue;
+    std::optional<T> &result) {
+  T resultValue;
+  fromRawValue(context, rawValue, resultValue);
+  result = std::optional<T>{std::move(resultValue)};
 }
 
 template <typename T>
@@ -119,7 +119,6 @@ T convertRawProp(
     char const *namePrefix = nullptr,
     char const *nameSuffix = nullptr) {
   const auto *rawValue = rawProps.at(name, namePrefix, nameSuffix);
-
   if (LIKELY(rawValue == nullptr)) {
     return sourceValue;
   }
@@ -130,35 +129,18 @@ T convertRawProp(
     return defaultValue;
   }
 
-  T result;
-  fromRawValue(context, *rawValue, result);
-  return result;
-}
-
-template <typename T>
-static std::optional<T> convertRawProp(
-    const PropsParserContext &context,
-    RawProps const &rawProps,
-    char const *name,
-    std::optional<T> const &sourceValue,
-    std::optional<T> const &defaultValue,
-    char const *namePrefix = nullptr,
-    char const *nameSuffix = nullptr) {
-  const auto *rawValue = rawProps.at(name, namePrefix, nameSuffix);
-
-  if (LIKELY(rawValue == nullptr)) {
-    return sourceValue;
-  }
-
-  // Special case: `null` always means `the prop was removed, use default
-  // value`.
-  if (UNLIKELY(!rawValue->hasValue())) {
+  try {
+    T result;
+    fromRawValue(context, *rawValue, result);
+    return result;
+  } catch (const std::exception &e) {
+    // In case of errors, log the error and fall back to the default
+    RawPropsKey key{namePrefix, name, nameSuffix};
+    // TODO: report this using ErrorUtils so it's more visible to the user
+    LOG(ERROR) << "Error while converting prop '"
+               << static_cast<std::string>(key) << "': " << e.what();
     return defaultValue;
   }
-
-  T result;
-  fromRawValue(context, *rawValue, result);
-  return std::optional<T>{result};
 }
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/core/tests/EventQueueProcessorTest.cpp b/ReactCommon/react/renderer/core/tests/EventQueueProcessorTest.cpp
index feb6c16973a9..28d85cef6d69 100644
--- a/ReactCommon/react/renderer/core/tests/EventQueueProcessorTest.cpp
+++ b/ReactCommon/react/renderer/core/tests/EventQueueProcessorTest.cpp
@@ -22,11 +22,11 @@ class EventQueueProcessorTest : public testing::Test {
     runtime_ = facebook::hermes::makeHermesRuntime();
 
     auto eventPipe = [this](
-                         jsi::Runtime &runtime,
-                         const EventTarget *eventTarget,
+                         jsi::Runtime & /*runtime*/,
+                         const EventTarget * /*eventTarget*/,
                          const std::string &type,
                          ReactEventPriority priority,
-                         const ValueFactory &payloadFactory) {
+                         const ValueFactory & /*payloadFactory*/) {
       eventTypes_.push_back(type);
       eventPriorities_.push_back(priority);
     };
diff --git a/ReactCommon/react/renderer/core/tests/LayoutableShadowNodeTest.cpp b/ReactCommon/react/renderer/core/tests/LayoutableShadowNodeTest.cpp
index 55c761c95424..f8b0789e48b9 100644
--- a/ReactCommon/react/renderer/core/tests/LayoutableShadowNodeTest.cpp
+++ b/ReactCommon/react/renderer/core/tests/LayoutableShadowNodeTest.cpp
@@ -13,6 +13,9 @@
 
 using namespace facebook::react;
 
+// TODO: T127619309 re-enable CalculateTransformedFrames
+bool enableCalculateTransformedFrames = false;
+
 /*
  * ┌────────┐
  * │<View>  │
@@ -431,3 +434,372 @@ TEST(LayoutableShadowNodeTest, includeViewportOffset) {
   EXPECT_EQ(layoutMetrics.frame.origin.x, 10);
   EXPECT_EQ(layoutMetrics.frame.origin.y, 20);
 }
+
+/*
+ * ┌───────────────────────────────┐
+ * │ <View verticallyInverted>     │
+ * │                               │
+ * │┌─────────────────────────────┐│
+ * ││<View childShadowNode1>      ││
+ * ││                             ││
+ * │└─────────────────────────────┘│
+ * │┌─────────────────────────────┐│
+ * ││<View childShadowNode2>      ││
+ * ││                             ││
+ * │└─────────────────────────────┘│
+ * └───────────────────────────────┘
+ */
+TEST(LayoutableShadowNodeTest, invertedVerticalView) {
+  auto builder = simpleComponentBuilder();
+  auto childShadowNode1 = std::shared_ptr<ViewShadowNode>{};
+  auto childShadowNode2 = std::shared_ptr<ViewShadowNode>{};
+
+  if (!enableCalculateTransformedFrames) {
+    return;
+  }
+
+  // clang-format off
+  auto element =
+        Element<ViewShadowNode>()
+          .props([] {
+            auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+            sharedProps->transform = Transform::VerticalInversion(); // Inverted <ScrollView>
+            return sharedProps;
+          })
+            .finalize([](ViewShadowNode &shadowNode){
+              auto layoutMetrics = EmptyLayoutMetrics;
+              layoutMetrics.frame.size = {200, 200};
+              shadowNode.setLayoutMetrics(layoutMetrics);
+            }).children({
+                Element<ViewShadowNode>()
+                  .reference(childShadowNode1)
+                  .finalize([](ViewShadowNode &shadowNode){
+                    auto layoutMetrics = EmptyLayoutMetrics;
+                    layoutMetrics.frame.origin = {0, 0};
+                    layoutMetrics.frame.size = {100, 100};
+                    shadowNode.setLayoutMetrics(layoutMetrics);
+                  }),
+                Element<ViewShadowNode>()
+                  .reference(childShadowNode2)
+                  .finalize([](ViewShadowNode &shadowNode){
+                    auto layoutMetrics = EmptyLayoutMetrics;
+                    layoutMetrics.frame.origin = {0, 100};
+                    layoutMetrics.frame.size = {100, 100};
+                    shadowNode.setLayoutMetrics(layoutMetrics);
+                  })
+        });
+  // clang-format on
+
+  auto scrollShadowNode = builder.build(element);
+
+  auto firstItemRelativeLayoutMetrics =
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          childShadowNode1->getFamily(), *scrollShadowNode, {});
+
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.origin.x, 0);
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.origin.y, 100);
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.size.width, 100);
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.size.height, 100);
+
+  auto secondItemRelativeLayoutMetrics =
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          childShadowNode2->getFamily(), *scrollShadowNode, {});
+
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.origin.x, 0);
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.origin.y, 0);
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.size.width, 100);
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.size.height, 100);
+}
+
+/*
+ * ┌────────────────────────────────────┐
+ * │ <View verticallyInverted>          │
+ * │                                    │
+ * │ ┌───────────────────────────────┐  │
+ * │ │ <View>                        │  │
+ * │ │                               │  │
+ * │ │┌─────────────────────────────┐│  │
+ * │ ││<View childShadowNode1>      ││  │
+ * │ ││                             ││  │
+ * │ │└─────────────────────────────┘│  │
+ * │ │┌─────────────────────────────┐│  │
+ * │ ││<View childShadowNode2>      ││  │
+ * │ ││                             ││  │
+ * │ │└─────────────────────────────┘│  │
+ * │ └───────────────────────────────┘  │
+ * └────────────────────────────────────┘
+ */
+TEST(LayoutableShadowNodeTest, nestedInvertedVerticalView) {
+  auto builder = simpleComponentBuilder();
+  auto childShadowNode1 = std::shared_ptr<ViewShadowNode>{};
+  auto childShadowNode2 = std::shared_ptr<ViewShadowNode>{};
+
+  if (!enableCalculateTransformedFrames) {
+    return;
+  }
+
+  // clang-format off
+  auto element =
+    Element<ViewShadowNode>()
+      .props([] {
+        auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+        sharedProps->transform = Transform::VerticalInversion(); // Inverted <ScrollView>
+        return sharedProps;
+      })
+      .finalize([](ViewShadowNode &shadowNode){
+        auto layoutMetrics = EmptyLayoutMetrics;
+        layoutMetrics.frame.size = {400, 400};
+        shadowNode.setLayoutMetrics(layoutMetrics);
+    })
+      .children({
+        Element<ViewShadowNode>()
+              .finalize([](ViewShadowNode &shadowNode){
+                auto layoutMetrics = EmptyLayoutMetrics;
+                layoutMetrics.frame.origin = {100, 50};
+                layoutMetrics.frame.size = {200, 200};
+                shadowNode.setLayoutMetrics(layoutMetrics);
+              }).children({
+                Element<ViewShadowNode>()
+                  .reference(childShadowNode1)
+                  .finalize([](ViewShadowNode &shadowNode){
+                    auto layoutMetrics = EmptyLayoutMetrics;
+                    layoutMetrics.frame.origin = {0, 0};
+                    layoutMetrics.frame.size = {100, 100};
+                    shadowNode.setLayoutMetrics(layoutMetrics);
+                  }),
+                Element<ViewShadowNode>()
+                  .reference(childShadowNode2)
+                  .finalize([](ViewShadowNode &shadowNode){
+                    auto layoutMetrics = EmptyLayoutMetrics;
+                    layoutMetrics.frame.origin = {0, 100};
+                    layoutMetrics.frame.size = {100, 100};
+                    shadowNode.setLayoutMetrics(layoutMetrics);
+                  })
+        })
+      });
+  // clang-format on
+
+  auto scrollShadowNode = builder.build(element);
+
+  auto firstItemRelativeLayoutMetrics =
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          childShadowNode1->getFamily(), *scrollShadowNode, {});
+
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.origin.x, 100);
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.origin.y, 250);
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.size.width, 100);
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.size.height, 100);
+
+  auto secondItemRelativeLayoutMetrics =
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          childShadowNode2->getFamily(), *scrollShadowNode, {});
+
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.origin.x, 100);
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.origin.y, 150);
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.size.width, 100);
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.size.height, 100);
+}
+
+/*
+ * ┌──────────────────────────────────────┐
+ * │ <View horizontallyInverted>          │
+ * │                                      │
+ * │┌─────────────────┐┌─────────────────┐│
+ * ││ <View>          ││ <View>          ││
+ * ││                 ││                 ││
+ * │└─────────────────┘└─────────────────┘│
+ * └──────────────────────────────────────┘
+ */
+TEST(LayoutableShadowNodeTest, invertedHorizontalView) {
+  auto builder = simpleComponentBuilder();
+  auto childShadowNode1 = std::shared_ptr<ViewShadowNode>{};
+  auto childShadowNode2 = std::shared_ptr<ViewShadowNode>{};
+
+  if (!enableCalculateTransformedFrames) {
+    return;
+  }
+
+  // clang-format off
+  auto element =
+        Element<ViewShadowNode>()
+          .props([] {
+            auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+            sharedProps->transform = Transform::HorizontalInversion(); // Inverted <ScrollView>
+            return sharedProps;
+          })
+            .finalize([](ViewShadowNode &shadowNode){
+              auto layoutMetrics = EmptyLayoutMetrics;
+              layoutMetrics.frame.size = {200, 200};
+              shadowNode.setLayoutMetrics(layoutMetrics);
+            }).children({
+                Element<ViewShadowNode>()
+                  .reference(childShadowNode1)
+                  .finalize([](ViewShadowNode &shadowNode){
+                    auto layoutMetrics = EmptyLayoutMetrics;
+                    layoutMetrics.frame.origin = {0, 0};
+                    layoutMetrics.frame.size = {100, 100};
+                    shadowNode.setLayoutMetrics(layoutMetrics);
+                  }),
+                Element<ViewShadowNode>()
+                  .reference(childShadowNode2)
+                  .finalize([](ViewShadowNode &shadowNode){
+                    auto layoutMetrics = EmptyLayoutMetrics;
+                    layoutMetrics.frame.origin = {100, 0};
+                    layoutMetrics.frame.size = {100, 100};
+                    shadowNode.setLayoutMetrics(layoutMetrics);
+                  })
+        });
+  // clang-format on
+
+  auto scrollShadowNode = builder.build(element);
+
+  auto firstItemRelativeLayoutMetrics =
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          childShadowNode1->getFamily(), *scrollShadowNode, {});
+
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.origin.x, 100);
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.origin.y, 0);
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.size.width, 100);
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.size.height, 100);
+
+  auto secondItemRelativeLayoutMetrics =
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          childShadowNode2->getFamily(), *scrollShadowNode, {});
+
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.origin.x, 0);
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.origin.y, 0);
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.size.width, 100);
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.size.height, 100);
+}
+
+/*
+ * ┌──────────────────────────────────────────┐
+ * │ <View horizontallyInverted>              │
+ * │                                          │
+ * │ ┌──────────────────────────────────────┐ │
+ * │ │ <View>                               │ │
+ * │ │                                      │ │
+ * │ │┌─────────────────┐┌─────────────────┐│ │
+ * │ ││ <View>          ││ <View>          ││ │
+ * │ ││                 ││                 ││ │
+ * │ │└─────────────────┘└─────────────────┘│ │
+ * │ └──────────────────────────────────────┘ │
+ * └──────────────────────────────────────────┘
+ */
+TEST(LayoutableShadowNodeTest, nestedInvertedHorizontalView) {
+  auto builder = simpleComponentBuilder();
+  auto childShadowNode1 = std::shared_ptr<ViewShadowNode>{};
+  auto childShadowNode2 = std::shared_ptr<ViewShadowNode>{};
+
+  if (!enableCalculateTransformedFrames) {
+    return;
+  }
+
+  // clang-format off
+  auto element =
+    Element<ViewShadowNode>()
+      .props([] {
+        auto sharedProps = std::make_shared<ViewShadowNodeProps>();
+        sharedProps->transform = Transform::HorizontalInversion(); // Inverted <ScrollView>
+        return sharedProps;
+      })
+      .finalize([](ViewShadowNode &shadowNode){
+        auto layoutMetrics = EmptyLayoutMetrics;
+        layoutMetrics.frame.size = {400, 400};
+        shadowNode.setLayoutMetrics(layoutMetrics);
+    })
+      .children({
+        Element<ViewShadowNode>()
+              .finalize([](ViewShadowNode &shadowNode){
+                auto layoutMetrics = EmptyLayoutMetrics;
+                layoutMetrics.frame.origin = {50, 100};
+                layoutMetrics.frame.size = {200, 200};
+                shadowNode.setLayoutMetrics(layoutMetrics);
+              }).children({
+                Element<ViewShadowNode>()
+                  .reference(childShadowNode1)
+                  .finalize([](ViewShadowNode &shadowNode){
+                    auto layoutMetrics = EmptyLayoutMetrics;
+                    layoutMetrics.frame.origin = {0, 0};
+                    layoutMetrics.frame.size = {100, 100};
+                    shadowNode.setLayoutMetrics(layoutMetrics);
+                  }),
+                Element<ViewShadowNode>()
+                  .reference(childShadowNode2)
+                  .finalize([](ViewShadowNode &shadowNode){
+                    auto layoutMetrics = EmptyLayoutMetrics;
+                    layoutMetrics.frame.origin = {100, 0};
+                    layoutMetrics.frame.size = {100, 100};
+                    shadowNode.setLayoutMetrics(layoutMetrics);
+                  })
+        })
+      });
+  // clang-format on
+
+  auto scrollShadowNode = builder.build(element);
+
+  auto firstItemRelativeLayoutMetrics =
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          childShadowNode1->getFamily(), *scrollShadowNode, {});
+
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.origin.x, 250);
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.origin.y, 100);
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.size.width, 100);
+  EXPECT_EQ(firstItemRelativeLayoutMetrics.frame.size.height, 100);
+
+  auto secondItemRelativeLayoutMetrics =
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          childShadowNode2->getFamily(), *scrollShadowNode, {});
+
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.origin.x, 150);
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.origin.y, 100);
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.size.width, 100);
+  EXPECT_EQ(secondItemRelativeLayoutMetrics.frame.size.height, 100);
+}
+
+TEST(LayoutableShadowNodeTest, inversedContentOriginOffset) {
+  auto builder = simpleComponentBuilder();
+
+  auto childShadowNode = std::shared_ptr<ViewShadowNode>{};
+
+  if (!enableCalculateTransformedFrames) {
+    return;
+  }
+
+  // clang-format off
+  auto element =
+    Element<ScrollViewShadowNode>()
+      .props([] {
+        auto sharedProps = std::make_shared<ScrollViewProps>();
+        sharedProps->transform = Transform::HorizontalInversion() * Transform::VerticalInversion();
+        return sharedProps;
+      })
+      .finalize([](ScrollViewShadowNode &shadowNode){
+        auto layoutMetrics = EmptyLayoutMetrics;
+        layoutMetrics.frame.size = {300, 350};
+        shadowNode.setLayoutMetrics(layoutMetrics);
+      })
+      .stateData([](ScrollViewState &data) {
+        data.contentOffset = {10, 20};
+      })
+      .children({
+        Element<ViewShadowNode>()
+        .finalize([](ViewShadowNode &shadowNode){
+          auto layoutMetrics = EmptyLayoutMetrics;
+          layoutMetrics.frame.origin = {30, 40};
+          layoutMetrics.frame.size = {100, 200};
+          shadowNode.setLayoutMetrics(layoutMetrics);
+        })
+        .reference(childShadowNode)
+    });
+  // clang-format on
+
+  auto parentShadowNode = builder.build(element);
+
+  auto relativeLayoutMetrics =
+      LayoutableShadowNode::computeRelativeLayoutMetrics(
+          childShadowNode->getFamily(), *parentShadowNode, {});
+
+  EXPECT_EQ(relativeLayoutMetrics.frame.origin.x, 180);
+  EXPECT_EQ(relativeLayoutMetrics.frame.origin.y, 130);
+}
diff --git a/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp b/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp
index fe9080069657..a620d3c96dc1 100644
--- a/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp
+++ b/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp
@@ -188,7 +188,7 @@ TEST(RawPropsTest, handleRawPropsSingleFloat) {
   parser.prepare<PropsSingleFloat>();
   raw.parse(parser, parserContext);
 
-  float value = (float)*raw.at("floatValue", nullptr, nullptr);
+  auto value = (float)*raw.at("floatValue", nullptr, nullptr);
 
   EXPECT_NEAR(value, 42.42, 0.00001);
 }
@@ -203,7 +203,7 @@ TEST(RawPropsTest, handleRawPropsSingleDouble) {
   parser.prepare<PropsSingleDouble>();
   raw.parse(parser, parserContext);
 
-  double value = (double)*raw.at("doubleValue", nullptr, nullptr);
+  auto value = (double)*raw.at("doubleValue", nullptr, nullptr);
 
   EXPECT_NEAR(value, 42.42, 0.00001);
 }
diff --git a/ReactCommon/react/renderer/core/tests/TestComponent.h b/ReactCommon/react/renderer/core/tests/TestComponent.h
index 0e9931cc46ae..a0c97b9c320b 100644
--- a/ReactCommon/react/renderer/core/tests/TestComponent.h
+++ b/ReactCommon/react/renderer/core/tests/TestComponent.h
@@ -18,13 +18,13 @@
 #include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/ShadowNode.h>
 
-using namespace facebook::react;
-
 /**
  * This defines a set of TestComponent classes: Props, ShadowNode,
  * ComponentDescriptor. To be used for testing purpose.
  */
 
+namespace facebook::react {
+
 class TestState {
  public:
   int number;
@@ -75,3 +75,5 @@ class TestComponentDescriptor
  public:
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
 };
+
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/core/tests/benchmarks/RawPropsBenchmark.cpp b/ReactCommon/react/renderer/core/tests/benchmarks/RawPropsBenchmark.cpp
index 30e186ed7c4e..c0905a471845 100644
--- a/ReactCommon/react/renderer/core/tests/benchmarks/RawPropsBenchmark.cpp
+++ b/ReactCommon/react/renderer/core/tests/benchmarks/RawPropsBenchmark.cpp
@@ -15,8 +15,7 @@
 #include <exception>
 #include <string>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 auto contextContainer = std::make_shared<ContextContainer const>();
 auto eventDispatcher = std::shared_ptr<EventDispatcher>{nullptr};
@@ -83,7 +82,6 @@ static void propParsingRegularRawPropsWithNoSourceProps(
 }
 BENCHMARK(propParsingRegularRawPropsWithNoSourceProps);
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 
 BENCHMARK_MAIN();
diff --git a/ReactCommon/react/renderer/debug/BUCK b/ReactCommon/react/renderer/debug/BUCK
index d103d00f3b6a..91c09316a92a 100644
--- a/ReactCommon/react/renderer/debug/BUCK
+++ b/ReactCommon/react/renderer/debug/BUCK
@@ -33,12 +33,12 @@ rn_xplat_cxx_library(
     ),
     compiler_flags_enable_exceptions = True,
     compiler_flags_enable_rtti = True,  # DebugStringConvertible
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -50,9 +50,7 @@ rn_xplat_cxx_library(
     visibility = ["PUBLIC"],
     deps = [
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
         "//xplat/folly:memory",
-        "//xplat/folly:molly",
         react_native_xplat_target("butter:butter"),
         react_native_xplat_target("react/debug:debug"),
     ],
@@ -72,7 +70,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":debug",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )
diff --git a/ReactCommon/react/renderer/debug/CMakeLists.txt b/ReactCommon/react/renderer/debug/CMakeLists.txt
index 44c5fd4c92de..23dfd98e46ec 100644
--- a/ReactCommon/react/renderer/debug/CMakeLists.txt
+++ b/ReactCommon/react/renderer/debug/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_debug_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_debug SHARED ${react_render_debug_SRC})
diff --git a/ReactCommon/react/renderer/debug/DebugStringConvertible.cpp b/ReactCommon/react/renderer/debug/DebugStringConvertible.cpp
index fde19f4163a2..e94cb4c579e7 100644
--- a/ReactCommon/react/renderer/debug/DebugStringConvertible.cpp
+++ b/ReactCommon/react/renderer/debug/DebugStringConvertible.cpp
@@ -10,8 +10,7 @@
 #include <folly/Conv.h>
 #include <folly/Format.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #if RN_DEBUG_STRING_CONVERTIBLE
 
@@ -24,7 +23,7 @@ std::string DebugStringConvertible::getDebugChildrenDescription(
   options.depth++;
 
   auto trailing = options.format ? std::string{"\n"} : std::string{""};
-  auto childrenString = std::string{""};
+  std::string childrenString;
 
   for (auto const &child : getDebugChildren()) {
     if (!child) {
@@ -50,7 +49,7 @@ std::string DebugStringConvertible::getDebugPropsDescription(
 
   options.depth++;
 
-  auto propsString = std::string{""};
+  std::string propsString;
 
   for (auto const &prop : getDebugProps()) {
     if (!prop) {
@@ -116,11 +115,11 @@ std::string DebugStringConvertible::getDebugValue() const {
 
 SharedDebugStringConvertibleList DebugStringConvertible::getDebugChildren()
     const {
-  return SharedDebugStringConvertibleList();
+  return {};
 }
 
 SharedDebugStringConvertibleList DebugStringConvertible::getDebugProps() const {
-  return SharedDebugStringConvertibleList();
+  return {};
 }
 
 /*
@@ -150,5 +149,4 @@ std::string toString(void const *value) {
 
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/debug/DebugStringConvertibleItem.cpp b/ReactCommon/react/renderer/debug/DebugStringConvertibleItem.cpp
index 9f074600c74e..1f183d51f141 100644
--- a/ReactCommon/react/renderer/debug/DebugStringConvertibleItem.cpp
+++ b/ReactCommon/react/renderer/debug/DebugStringConvertibleItem.cpp
@@ -9,8 +9,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #if RN_DEBUG_STRING_CONVERTIBLE
 
@@ -44,5 +43,4 @@ SharedDebugStringConvertibleList DebugStringConvertibleItem::getDebugChildren()
 
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/element/BUCK b/ReactCommon/react/renderer/element/BUCK
index 860b323355b8..bcca6e10b910 100644
--- a/ReactCommon/react/renderer/element/BUCK
+++ b/ReactCommon/react/renderer/element/BUCK
@@ -31,12 +31,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/element",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
diff --git a/ReactCommon/react/renderer/element/ComponentBuilder.cpp b/ReactCommon/react/renderer/element/ComponentBuilder.cpp
index e6e1dd300bea..d588b8737735 100644
--- a/ReactCommon/react/renderer/element/ComponentBuilder.cpp
+++ b/ReactCommon/react/renderer/element/ComponentBuilder.cpp
@@ -9,8 +9,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ComponentBuilder::ComponentBuilder(
     ComponentDescriptorRegistry::Shared componentDescriptorRegistry)
@@ -66,5 +65,4 @@ ShadowNode::Unshared ComponentBuilder::build(
   return shadowNode;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/graphics/BUCK b/ReactCommon/react/renderer/graphics/BUCK
index 11617a7c884d..275235d888c8 100644
--- a/ReactCommon/react/renderer/graphics/BUCK
+++ b/ReactCommon/react/renderer/graphics/BUCK
@@ -36,6 +36,7 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/graphics",
     ),
+    compiler_flags_pedantic = True,
     cxx_exported_headers = subdir_glob(
         [
             ("platform/cxx/react/renderer/graphics", "**/*.h"),
@@ -93,7 +94,6 @@ rn_xplat_cxx_library(
     ),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -108,9 +108,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("butter:butter"),
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
+        "//xplat/folly:hash",
     ],
 )
 
@@ -128,7 +126,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":graphics",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )
diff --git a/ReactCommon/react/renderer/graphics/CMakeLists.txt b/ReactCommon/react/renderer/graphics/CMakeLists.txt
index a52ce0bfe1fd..a977c4080733 100644
--- a/ReactCommon/react/renderer/graphics/CMakeLists.txt
+++ b/ReactCommon/react/renderer/graphics/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_graphics_SRC CONFIGURE_DEPENDS
         *.cpp
diff --git a/ReactCommon/react/renderer/graphics/React-graphics.podspec b/ReactCommon/react/renderer/graphics/React-graphics.podspec
index 3f7ff0da5be7..8c297d76b43e 100644
--- a/ReactCommon/react/renderer/graphics/React-graphics.podspec
+++ b/ReactCommon/react/renderer/graphics/React-graphics.podspec
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "12.4", :tvos => "12.4" }
+  s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.source_files           = "**/*.{m,mm,cpp,h}"
diff --git a/ReactCommon/react/renderer/graphics/Transform.cpp b/ReactCommon/react/renderer/graphics/Transform.cpp
index d34246fa17eb..d9669ea34979 100644
--- a/ReactCommon/react/renderer/graphics/Transform.cpp
+++ b/ReactCommon/react/renderer/graphics/Transform.cpp
@@ -12,8 +12,7 @@
 #include <glog/logging.h>
 #include <react/debug/react_native_assert.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #ifdef RN_DEBUG_STRING_CONVERTIBLE
 void Transform::print(Transform const &t, std::string prefix) {
@@ -32,6 +31,14 @@ Transform Transform::Identity() {
   return {};
 }
 
+Transform Transform::VerticalInversion() {
+  return Transform::Scale(1, -1, 1);
+}
+
+Transform Transform::HorizontalInversion() {
+  return Transform::Scale(-1, 1, 1);
+}
+
 Transform Transform::Perspective(Float perspective) {
   auto transform = Transform{};
   transform.operations.push_back(TransformOperation{
@@ -241,6 +248,14 @@ Transform Transform::Interpolate(
   return result;
 }
 
+bool Transform::isVerticalInversion(Transform const &transform) {
+  return transform.at(1, 1) == -1;
+}
+
+bool Transform::isHorizontalInversion(Transform const &transform) {
+  return transform.at(0, 0) == -1;
+}
+
 bool Transform::operator==(Transform const &rhs) const {
   for (auto i = 0; i < 16; i++) {
     if (matrix[i] != rhs.matrix[i]) {
@@ -263,28 +278,40 @@ Transform Transform::operator*(Transform const &rhs) const {
   auto result = Transform{};
   for (const auto &op : this->operations) {
     if (op.type == TransformOperationType::Identity &&
-        result.operations.size() > 0) {
+        !result.operations.empty()) {
       continue;
     }
     result.operations.push_back(op);
   }
   for (const auto &op : rhs.operations) {
     if (op.type == TransformOperationType::Identity &&
-        result.operations.size() > 0) {
+        !result.operations.empty()) {
       continue;
     }
     result.operations.push_back(op);
   }
 
-  auto lhs00 = lhs.matrix[0], lhs01 = lhs.matrix[1], lhs02 = lhs.matrix[2],
-       lhs03 = lhs.matrix[3], lhs10 = lhs.matrix[4], lhs11 = lhs.matrix[5],
-       lhs12 = lhs.matrix[6], lhs13 = lhs.matrix[7], lhs20 = lhs.matrix[8],
-       lhs21 = lhs.matrix[9], lhs22 = lhs.matrix[10], lhs23 = lhs.matrix[11],
-       lhs30 = lhs.matrix[12], lhs31 = lhs.matrix[13], lhs32 = lhs.matrix[14],
-       lhs33 = lhs.matrix[15];
-
-  auto rhs0 = rhs.matrix[0], rhs1 = rhs.matrix[1], rhs2 = rhs.matrix[2],
-       rhs3 = rhs.matrix[3];
+  auto lhs00 = lhs.matrix[0];
+  auto lhs01 = lhs.matrix[1];
+  auto lhs02 = lhs.matrix[2];
+  auto lhs03 = lhs.matrix[3];
+  auto lhs10 = lhs.matrix[4];
+  auto lhs11 = lhs.matrix[5];
+  auto lhs12 = lhs.matrix[6];
+  auto lhs13 = lhs.matrix[7];
+  auto lhs20 = lhs.matrix[8];
+  auto lhs21 = lhs.matrix[9];
+  auto lhs22 = lhs.matrix[10];
+  auto lhs23 = lhs.matrix[11];
+  auto lhs30 = lhs.matrix[12];
+  auto lhs31 = lhs.matrix[13];
+  auto lhs32 = lhs.matrix[14];
+  auto lhs33 = lhs.matrix[15];
+
+  auto rhs0 = rhs.matrix[0];
+  auto rhs1 = rhs.matrix[1];
+  auto rhs2 = rhs.matrix[2];
+  auto rhs3 = rhs.matrix[3];
   result.matrix[0] = rhs0 * lhs00 + rhs1 * lhs10 + rhs2 * lhs20 + rhs3 * lhs30;
   result.matrix[1] = rhs0 * lhs01 + rhs1 * lhs11 + rhs2 * lhs21 + rhs3 * lhs31;
   result.matrix[2] = rhs0 * lhs02 + rhs1 * lhs12 + rhs2 * lhs22 + rhs3 * lhs32;
@@ -387,11 +414,10 @@ Size operator*(Size const &size, Transform const &transform) {
   }
 
   auto result = Size{};
-  result.width = transform.at(0, 0) * size.width;
-  result.height = transform.at(1, 1) * size.height;
+  result.width = std::abs(transform.at(0, 0) * size.width);
+  result.height = std::abs(transform.at(1, 1) * size.height);
 
   return result;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/graphics/Transform.h b/ReactCommon/react/renderer/graphics/Transform.h
index a275afb19441..50a70161207d 100644
--- a/ReactCommon/react/renderer/graphics/Transform.h
+++ b/ReactCommon/react/renderer/graphics/Transform.h
@@ -77,6 +77,18 @@ struct Transform {
    */
   static Transform Identity();
 
+  /*
+   * Returns the vertival inversion transform (`[1 0 0 0; 0 -1 0 0; 0 0 1 0; 0 0
+   * 0 1]`).
+   */
+  static Transform VerticalInversion();
+
+  /*
+   * Returns the horizontal inversion transform (`[-1 0 0 0; 0 1 0 0; 0 0 1 0; 0
+   * 0 0 1]`).
+   */
+  static Transform HorizontalInversion();
+
   /*
    * Returns a Perspective transform.
    */
@@ -100,9 +112,9 @@ struct Transform {
   /*
    * Returns a transform that rotates by `angle` radians along the given axis.
    */
-  static Transform RotateX(Float angle);
-  static Transform RotateY(Float angle);
-  static Transform RotateZ(Float angle);
+  static Transform RotateX(Float radians);
+  static Transform RotateY(Float radians);
+  static Transform RotateZ(Float radians);
   static Transform Rotate(Float angleX, Float angleY, Float angleZ);
 
   /**
@@ -121,6 +133,9 @@ struct Transform {
       Transform const &lhs,
       Transform const &rhs);
 
+  static bool isVerticalInversion(Transform const &transform);
+  static bool isHorizontalInversion(Transform const &transform);
+
   /*
    * Equality operators.
    */
@@ -130,8 +145,8 @@ struct Transform {
   /*
    * Matrix subscript.
    */
-  Float &at(int x, int y);
-  Float const &at(int x, int y) const;
+  Float &at(int i, int j);
+  Float const &at(int i, int j) const;
 
   /*
    * Concatenates (multiplies) transform matrices.
diff --git a/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/Color.cpp b/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/Color.cpp
index 02c6bf82d4ab..a56c5460d9eb 100644
--- a/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/Color.cpp
+++ b/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/Color.cpp
@@ -7,8 +7,7 @@
 
 #include "Color.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 bool isColorMeaningful(SharedColor const &color) noexcept {
   if (!color) {
@@ -20,11 +19,11 @@ bool isColorMeaningful(SharedColor const &color) noexcept {
 
 SharedColor colorFromComponents(ColorComponents components) {
   float ratio = 255;
-  return SharedColor(
+  return {
       ((int)round(components.alpha * ratio) & 0xff) << 24 |
       ((int)round(components.red * ratio) & 0xff) << 16 |
       ((int)round(components.green * ratio) & 0xff) << 8 |
-      ((int)round(components.blue * ratio) & 0xff));
+      ((int)round(components.blue * ratio) & 0xff)};
 }
 
 ColorComponents colorComponentsFromColor(SharedColor const &sharedColor) {
@@ -52,5 +51,4 @@ SharedColor whiteColor() {
   return color;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/graphics/tests/TransformTest.cpp b/ReactCommon/react/renderer/graphics/tests/TransformTest.cpp
index bcd0641d62f9..70c232ecd019 100644
--- a/ReactCommon/react/renderer/graphics/tests/TransformTest.cpp
+++ b/ReactCommon/react/renderer/graphics/tests/TransformTest.cpp
@@ -41,6 +41,13 @@ TEST(TransformTest, scalingRect) {
   EXPECT_EQ(transformedRect.size.height, 200);
 }
 
+TEST(TransformTest, invertingSize) {
+  auto size = facebook::react::Size{300, 400};
+  auto transformedSize = size * Transform::VerticalInversion();
+  EXPECT_EQ(transformedSize.width, 300);
+  EXPECT_EQ(transformedSize.height, 400);
+}
+
 TEST(TransformTest, rotatingRect) {
   auto point = facebook::react::Point{10, 10};
   auto size = facebook::react::Size{10, 10};
diff --git a/ReactCommon/react/renderer/imagemanager/BUCK b/ReactCommon/react/renderer/imagemanager/BUCK
index bba253a74f9e..fa5c067f08d5 100644
--- a/ReactCommon/react/renderer/imagemanager/BUCK
+++ b/ReactCommon/react/renderer/imagemanager/BUCK
@@ -30,6 +30,7 @@ rn_xplat_cxx_library(
         [("", "*.h")],
         prefix = "react/renderer/imagemanager",
     ),
+    compiler_flags_pedantic = True,
     contacts = ["oncall+react_native@xmail.facebook.com"],
     cxx_srcs = glob(["platform/cxx/**/*.cpp"]),
     # FIXME: android relies on stubs implemented for the cxx platform
@@ -72,7 +73,6 @@ rn_xplat_cxx_library(
     ),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -83,8 +83,6 @@ rn_xplat_cxx_library(
     tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:molly",
         YOGA_CXX_TARGET,
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
@@ -108,7 +106,6 @@ fb_xplat_cxx_test(
     platforms = (APPLE, CXX),
     deps = [
         ":imagemanager",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )
diff --git a/ReactCommon/react/renderer/imagemanager/CMakeLists.txt b/ReactCommon/react/renderer/imagemanager/CMakeLists.txt
index c27b11febcc3..e4fd71c8c93f 100644
--- a/ReactCommon/react/renderer/imagemanager/CMakeLists.txt
+++ b/ReactCommon/react/renderer/imagemanager/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_imagemanager_SRC CONFIGURE_DEPENDS
         *.cpp
diff --git a/ReactCommon/react/renderer/imagemanager/ImageManager.h b/ReactCommon/react/renderer/imagemanager/ImageManager.h
index f76912bf778d..42117ac7f77c 100644
--- a/ReactCommon/react/renderer/imagemanager/ImageManager.h
+++ b/ReactCommon/react/renderer/imagemanager/ImageManager.h
@@ -33,7 +33,7 @@ class ImageManager {
       const;
 
  private:
-  void *self_;
+  void *self_{};
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/imagemanager/ImageResponse.cpp b/ReactCommon/react/renderer/imagemanager/ImageResponse.cpp
index cde6adeb67bd..9abddca0fd75 100644
--- a/ReactCommon/react/renderer/imagemanager/ImageResponse.cpp
+++ b/ReactCommon/react/renderer/imagemanager/ImageResponse.cpp
@@ -9,8 +9,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ImageResponse::ImageResponse(
     std::shared_ptr<void> image,
@@ -25,5 +24,4 @@ std::shared_ptr<void> ImageResponse::getMetadata() const {
   return metadata_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp b/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp
index 46dea634105c..290487c0e894 100644
--- a/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp
+++ b/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp
@@ -11,8 +11,7 @@
 
 #include <react/debug/react_native_assert.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void ImageResponseObserverCoordinator::addObserver(
     ImageResponseObserver const &observer) const {
@@ -88,5 +87,4 @@ void ImageResponseObserverCoordinator::nativeImageResponseFailed() const {
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/imagemanager/ImageTelemetry.cpp b/ReactCommon/react/renderer/imagemanager/ImageTelemetry.cpp
index 3373ce8b7939..3e7c68b40a8b 100644
--- a/ReactCommon/react/renderer/imagemanager/ImageTelemetry.cpp
+++ b/ReactCommon/react/renderer/imagemanager/ImageTelemetry.cpp
@@ -7,8 +7,7 @@
 
 #include "ImageTelemetry.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 SurfaceId ImageTelemetry::getSurfaceId() const {
   return surfaceId_;
@@ -18,5 +17,4 @@ TelemetryTimePoint ImageTelemetry::getWillRequestUrlTime() const {
   return willRequestUrlTime_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageManager.cpp b/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageManager.cpp
index b7f1274e351c..30bc153fc0d4 100644
--- a/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageManager.cpp
+++ b/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageManager.cpp
@@ -7,10 +7,10 @@
 
 #include "ImageManager.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
-ImageManager::ImageManager(ContextContainer::Shared const &contextContainer) {
+ImageManager::ImageManager(
+    ContextContainer::Shared const & /*contextContainer*/) {
   // Silence unused-private-field warning.
   (void)self_;
   // Not implemented.
@@ -22,10 +22,9 @@ ImageManager::~ImageManager() {
 
 ImageRequest ImageManager::requestImage(
     const ImageSource &imageSource,
-    SurfaceId surfaceId) const {
+    SurfaceId /*surfaceId*/) const {
   // Not implemented.
-  return ImageRequest(imageSource, nullptr);
+  return {imageSource, nullptr};
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp b/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp
index c270971dd277..ce53a1b65cab 100644
--- a/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp
+++ b/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp
@@ -9,8 +9,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ImageRequest::ImageRequest(
     ImageSource imageSource,
@@ -42,5 +41,4 @@ const std::shared_ptr<const ImageResponseObserverCoordinator>
   abort();
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
index d72e61c63f0a..b5f61f8a4eed 100644
--- a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
+++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
@@ -10,43 +10,41 @@
 #import <React/RCTImageLoader.h>
 #import <react/renderer/imagemanager/primitives.h>
 
-using namespace facebook::react;
-
-inline static UIViewContentMode RCTContentModeFromImageResizeMode(ImageResizeMode imageResizeMode)
+inline static UIViewContentMode RCTContentModeFromImageResizeMode(facebook::react::ImageResizeMode imageResizeMode)
 {
   switch (imageResizeMode) {
-    case ImageResizeMode::Cover:
+    case facebook::react::ImageResizeMode::Cover:
       return UIViewContentModeScaleAspectFill;
-    case ImageResizeMode::Contain:
+    case facebook::react::ImageResizeMode::Contain:
       return UIViewContentModeScaleAspectFit;
-    case ImageResizeMode::Stretch:
+    case facebook::react::ImageResizeMode::Stretch:
       return UIViewContentModeScaleToFill;
-    case ImageResizeMode::Center:
+    case facebook::react::ImageResizeMode::Center:
       return UIViewContentModeCenter;
-    case ImageResizeMode::Repeat:
+    case facebook::react::ImageResizeMode::Repeat:
       // Repeat resize mode is handled by the UIImage. Use scale to fill
       // so the repeated image fills the UIImageView.
       return UIViewContentModeScaleToFill;
   }
 }
 
-inline std::string toString(const ImageResizeMode &value)
+inline std::string toString(const facebook::react::ImageResizeMode &value)
 {
   switch (value) {
-    case ImageResizeMode::Cover:
+    case facebook::react::ImageResizeMode::Cover:
       return "cover";
-    case ImageResizeMode::Contain:
+    case facebook::react::ImageResizeMode::Contain:
       return "contain";
-    case ImageResizeMode::Stretch:
+    case facebook::react::ImageResizeMode::Stretch:
       return "stretch";
-    case ImageResizeMode::Center:
+    case facebook::react::ImageResizeMode::Center:
       return "center";
-    case ImageResizeMode::Repeat:
+    case facebook::react::ImageResizeMode::Repeat:
       return "repeat";
   }
 }
 
-inline static NSURL *NSURLFromImageSource(const ImageSource &imageSource)
+inline static NSURL *NSURLFromImageSource(const facebook::react::ImageSource &imageSource)
 {
   // `NSURL` has a history of crashing with bad input, so let's be safe.
   @try {
@@ -92,7 +90,7 @@ inline static NSURL *NSURLFromImageSource(const ImageSource &imageSource)
   }
 }
 
-inline static NSURLRequest *NSURLRequestFromImageSource(const ImageSource &imageSource)
+inline static NSURLRequest *NSURLRequestFromImageSource(const facebook::react::ImageSource &imageSource)
 {
   NSURL *url = NSURLFromImageSource(imageSource);
 
diff --git a/ReactCommon/react/renderer/leakchecker/BUCK b/ReactCommon/react/renderer/leakchecker/BUCK
index a43bcc961c9d..826a1b8d6f1d 100644
--- a/ReactCommon/react/renderer/leakchecker/BUCK
+++ b/ReactCommon/react/renderer/leakchecker/BUCK
@@ -30,12 +30,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/leakchecker",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
diff --git a/ReactCommon/react/renderer/leakchecker/CMakeLists.txt b/ReactCommon/react/renderer/leakchecker/CMakeLists.txt
index d7657198d942..e8508fd5593e 100644
--- a/ReactCommon/react/renderer/leakchecker/CMakeLists.txt
+++ b/ReactCommon/react/renderer/leakchecker/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_leakchecker_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_leakchecker SHARED ${react_render_leakchecker_SRC})
diff --git a/ReactCommon/react/renderer/leakchecker/LeakChecker.cpp b/ReactCommon/react/renderer/leakchecker/LeakChecker.cpp
index b0ef65609a17..fa7909e88e2e 100644
--- a/ReactCommon/react/renderer/leakchecker/LeakChecker.cpp
+++ b/ReactCommon/react/renderer/leakchecker/LeakChecker.cpp
@@ -12,8 +12,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 LeakChecker::LeakChecker(RuntimeExecutor runtimeExecutor)
     : runtimeExecutor_(std::move(runtimeExecutor)) {}
@@ -27,14 +26,14 @@ void LeakChecker::stopSurface(SurfaceId surfaceId) {
   if (previouslyStoppedSurface_ > 0) {
     // Dispatch the check onto JavaScript thread to make sure all other
     // cleanup code has had chance to run.
-    runtimeExecutor_([previouslySoppedSurface = previouslyStoppedSurface_,
+    runtimeExecutor_([previouslyStoppedSurface = previouslyStoppedSurface_,
                       this](jsi::Runtime &runtime) {
       runtime.instrumentation().collectGarbage("LeakChecker");
       // For now check the previous surface because React uses double
       // buffering which keeps the surface that was just stopped in
       // memory. This is a documented problem in the last point of
       // https://github.com/facebook/react/issues/16087
-      checkSurfaceForLeaks(previouslySoppedSurface);
+      checkSurfaceForLeaks(previouslyStoppedSurface);
     });
   }
 
@@ -58,5 +57,4 @@ void LeakChecker::checkSurfaceForLeaks(SurfaceId surfaceId) const {
   registry_.removeFamiliesWithSurfaceId(surfaceId);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/leakchecker/LeakChecker.h b/ReactCommon/react/renderer/leakchecker/LeakChecker.h
index c88b34a5e1a2..c568b190fdd9 100644
--- a/ReactCommon/react/renderer/leakchecker/LeakChecker.h
+++ b/ReactCommon/react/renderer/leakchecker/LeakChecker.h
@@ -32,7 +32,7 @@ class LeakChecker final {
   RuntimeExecutor const runtimeExecutor_{};
 
   WeakFamilyRegistry registry_{};
-  SurfaceId previouslyStoppedSurface_;
+  SurfaceId previouslyStoppedSurface_{};
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.cpp b/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.cpp
index a2279a5ed626..4f1d97561e09 100644
--- a/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.cpp
+++ b/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.cpp
@@ -7,8 +7,7 @@
 
 #include "WeakFamilyRegistry.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void WeakFamilyRegistry::add(
     ShadowNodeFamily::Shared const &shadowNodeFamily) const {
@@ -28,10 +27,8 @@ WeakFamilyRegistry::WeakFamilies WeakFamilyRegistry::weakFamiliesForSurfaceId(
   std::lock_guard<std::mutex> lock(familiesMutex_);
   if (families_.find(surfaceId) != families_.end()) {
     return families_[surfaceId];
-  } else {
-    return {};
   }
+  return {};
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mapbuffer/BUCK b/ReactCommon/react/renderer/mapbuffer/BUCK
index a20926efa587..ab5c02e1a28c 100644
--- a/ReactCommon/react/renderer/mapbuffer/BUCK
+++ b/ReactCommon/react/renderer/mapbuffer/BUCK
@@ -1,6 +1,8 @@
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
+    "APPLE",
+    "CXX",
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
@@ -29,15 +31,15 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/mapbuffer",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
-    platforms = ANDROID,
+    platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
@@ -47,8 +49,6 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
         react_native_xplat_target("react/debug:debug"),
     ],
 )
@@ -64,9 +64,8 @@ fb_xplat_cxx_test(
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
-    platforms = ANDROID,
+    platforms = (ANDROID, APPLE, CXX),
     deps = [
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
diff --git a/ReactCommon/react/renderer/mapbuffer/CMakeLists.txt b/ReactCommon/react/renderer/mapbuffer/CMakeLists.txt
index fe3648152f51..1d2ce40117a0 100644
--- a/ReactCommon/react/renderer/mapbuffer/CMakeLists.txt
+++ b/ReactCommon/react/renderer/mapbuffer/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_mapbuffer_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_mapbuffer SHARED ${react_render_mapbuffer_SRC})
diff --git a/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp b/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp
index 94d8c87bd323..9e1c5404a3b1 100644
--- a/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp
+++ b/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp
@@ -9,8 +9,7 @@
 
 using namespace facebook::react;
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static inline int32_t bucketOffset(int32_t index) {
   return sizeof(MapBuffer::Header) + sizeof(MapBuffer::Bucket) * index;
@@ -90,7 +89,7 @@ std::string MapBuffer::getString(Key key) const {
   uint8_t const *stringPtr =
       bytes_.data() + dynamicDataOffset + offset + sizeof(int);
 
-  return std::string(stringPtr, stringPtr + stringLength);
+  return {stringPtr, stringPtr + stringLength};
 }
 
 MapBuffer MapBuffer::getMapBuffer(Key key) const {
@@ -112,6 +111,31 @@ MapBuffer MapBuffer::getMapBuffer(Key key) const {
   return MapBuffer(std::move(value));
 }
 
+std::vector<MapBuffer> MapBuffer::getMapBufferList(MapBuffer::Key key) const {
+  std::vector<MapBuffer> mapBufferList;
+
+  int32_t dynamicDataOffset = getDynamicDataOffset();
+  int32_t offset = getInt(key);
+  int32_t mapBufferListLength = *reinterpret_cast<int32_t const *>(
+      bytes_.data() + dynamicDataOffset + offset);
+  offset = offset + sizeof(uint32_t);
+
+  int32_t curLen = 0;
+  while (curLen < mapBufferListLength) {
+    int32_t mapBufferLength = *reinterpret_cast<int32_t const *>(
+        bytes_.data() + dynamicDataOffset + offset + curLen);
+    curLen = curLen + sizeof(uint32_t);
+    std::vector<uint8_t> value(mapBufferLength);
+    memcpy(
+        value.data(),
+        bytes_.data() + dynamicDataOffset + offset + curLen,
+        mapBufferLength);
+    mapBufferList.emplace_back(std::move(value));
+    curLen = curLen + mapBufferLength;
+  }
+  return mapBufferList;
+}
+
 size_t MapBuffer::size() const {
   return bytes_.size();
 }
@@ -124,5 +148,4 @@ uint16_t MapBuffer::count() const {
   return count_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mapbuffer/MapBuffer.h b/ReactCommon/react/renderer/mapbuffer/MapBuffer.h
index dcfa25ec703a..b4088f1631ee 100644
--- a/ReactCommon/react/renderer/mapbuffer/MapBuffer.h
+++ b/ReactCommon/react/renderer/mapbuffer/MapBuffer.h
@@ -126,6 +126,8 @@ class MapBuffer {
   // TODO T83483191: review this declaration
   MapBuffer getMapBuffer(MapBuffer::Key key) const;
 
+  std::vector<MapBuffer> getMapBufferList(MapBuffer::Key key) const;
+
   size_t size() const;
 
   uint8_t const *data() const;
diff --git a/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp b/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp
index 93883437012b..92d5ff8bcf73 100644
--- a/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp
+++ b/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp
@@ -10,8 +10,7 @@
 
 using namespace facebook::react;
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 constexpr uint32_t INT_SIZE = sizeof(uint32_t);
 constexpr uint32_t DOUBLE_SIZE = sizeof(double);
@@ -114,6 +113,39 @@ void MapBufferBuilder::putMapBuffer(MapBuffer::Key key, MapBuffer const &map) {
       INT_SIZE);
 }
 
+void MapBufferBuilder::putMapBufferList(
+    MapBuffer::Key key,
+    const std::vector<MapBuffer> &mapBufferList) {
+  int32_t offset = dynamicData_.size();
+  int32_t dataSize = 0;
+  for (const MapBuffer &mapBuffer : mapBufferList) {
+    dataSize = dataSize + INT_SIZE + mapBuffer.size();
+  }
+
+  dynamicData_.resize(offset + INT_SIZE, 0);
+  memcpy(dynamicData_.data() + offset, &dataSize, INT_SIZE);
+
+  for (const MapBuffer &mapBuffer : mapBufferList) {
+    int32_t mapBufferSize = mapBuffer.size();
+    int32_t dynamicDataSize = dynamicData_.size();
+    dynamicData_.resize(dynamicDataSize + INT_SIZE + mapBufferSize, 0);
+    // format [length of buffer (int)] + [bytes of MapBuffer]
+    memcpy(dynamicData_.data() + dynamicDataSize, &mapBufferSize, INT_SIZE);
+    // Copy the content of the map into dynamicData_
+    memcpy(
+        dynamicData_.data() + dynamicDataSize + INT_SIZE,
+        mapBuffer.data(),
+        mapBufferSize);
+  }
+
+  // Store Key and pointer to the string
+  storeKeyValue(
+      key,
+      MapBuffer::DataType::Map,
+      reinterpret_cast<uint8_t const *>(&offset),
+      INT_SIZE);
+}
+
 static inline bool compareBuckets(
     MapBuffer::Bucket const &a,
     MapBuffer::Bucket const &b) {
@@ -145,5 +177,4 @@ MapBuffer MapBufferBuilder::build() {
   return MapBuffer(std::move(buffer));
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h b/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h
index aa8ae8794074..8f54bfd12543 100644
--- a/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h
+++ b/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h
@@ -9,6 +9,7 @@
 
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
+#include <vector>
 
 namespace facebook {
 namespace react {
@@ -35,6 +36,10 @@ class MapBufferBuilder {
 
   void putMapBuffer(MapBuffer::Key key, MapBuffer const &map);
 
+  void putMapBufferList(
+      MapBuffer::Key key,
+      const std::vector<MapBuffer> &mapBufferList);
+
   MapBuffer build();
 
  private:
diff --git a/ReactCommon/react/renderer/mapbuffer/tests/MapBufferTest.cpp b/ReactCommon/react/renderer/mapbuffer/tests/MapBufferTest.cpp
index f0d5c737541a..8f3baaaf59fd 100644
--- a/ReactCommon/react/renderer/mapbuffer/tests/MapBufferTest.cpp
+++ b/ReactCommon/react/renderer/mapbuffer/tests/MapBufferTest.cpp
@@ -6,6 +6,7 @@
  */
 
 #include <memory>
+#include <vector>
 
 #include <gtest/gtest.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
@@ -150,6 +151,30 @@ TEST(MapBufferTest, testMapEntries) {
   EXPECT_EQ(readMap2.getInt(1), 1234);
 }
 
+TEST(MapBufferTest, testMapListEntries) {
+  std::vector<MapBuffer> mapBufferList;
+  auto builder = MapBufferBuilder();
+  builder.putString(0, "This is a test");
+  builder.putInt(1, 1234);
+  mapBufferList.push_back(builder.build());
+
+  auto builder2 = MapBufferBuilder();
+  builder2.putInt(2, 4321);
+  builder2.putDouble(3, 908.1);
+  mapBufferList.push_back(builder2.build());
+
+  auto builder3 = MapBufferBuilder();
+  builder3.putMapBufferList(5, mapBufferList);
+  auto map = builder3.build();
+
+  std::vector<MapBuffer> mapBufferList2 = map.getMapBufferList(5);
+
+  EXPECT_EQ(mapBufferList2.size(), 2);
+  EXPECT_EQ(mapBufferList2[0].getString(0), "This is a test");
+  EXPECT_EQ(mapBufferList2[0].getInt(1), 1234);
+  EXPECT_EQ(mapBufferList2[1].getDouble(3), 908.1);
+}
+
 TEST(MapBufferTest, testMapRandomAccess) {
   auto builder = MapBufferBuilder();
   builder.putInt(1234, 4321);
diff --git a/ReactCommon/react/renderer/mounting/BUCK b/ReactCommon/react/renderer/mounting/BUCK
index 67e926a93d2e..44c89fef0595 100644
--- a/ReactCommon/react/renderer/mounting/BUCK
+++ b/ReactCommon/react/renderer/mounting/BUCK
@@ -32,12 +32,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/mounting",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -50,9 +50,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
+        "//xplat/folly:hash",
         react_native_xplat_target("butter:butter"),
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/renderer/components/root:root"),
@@ -79,7 +77,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":mounting",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("react/renderer/element:element"),
         react_native_xplat_target("react/renderer/components/root:root"),
diff --git a/ReactCommon/react/renderer/mounting/CMakeLists.txt b/ReactCommon/react/renderer/mounting/CMakeLists.txt
index 58b312436240..e369ae904fe3 100644
--- a/ReactCommon/react/renderer/mounting/CMakeLists.txt
+++ b/ReactCommon/react/renderer/mounting/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_mounting_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_mounting SHARED ${react_render_mounting_SRC})
diff --git a/ReactCommon/react/renderer/mounting/Differentiator.cpp b/ReactCommon/react/renderer/mounting/Differentiator.cpp
index 41d4de1e8e53..aae725347063 100644
--- a/ReactCommon/react/renderer/mounting/Differentiator.cpp
+++ b/ReactCommon/react/renderer/mounting/Differentiator.cpp
@@ -38,8 +38,7 @@ enum class NoBreadcrumb {};
   {}
 #endif
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 /*
  * Extremely simple and naive implementation of a map.
@@ -336,7 +335,6 @@ static_assert(
     "`ShadowViewNodePair::NonOwningList` must be `move assignable`.");
 
 static void calculateShadowViewMutationsV2(
-    BREADCRUMB_TYPE breadcrumb,
     ViewNodePairScope &scope,
     ShadowViewMutation::List &mutations,
     ShadowView const &parentShadowView,
@@ -355,18 +353,15 @@ struct OrderedMutationInstructionContainer {
 };
 
 static void updateMatchedPairSubtrees(
-    BREADCRUMB_TYPE breadcrumb,
     ViewNodePairScope &scope,
     OrderedMutationInstructionContainer &mutationContainer,
     TinyMap<Tag, ShadowViewNodePair *> &newRemainingPairs,
     ShadowViewNodePair::NonOwningList &oldChildPairs,
-    ShadowViewNodePair::NonOwningList &newChildPairs,
     ShadowView const &parentShadowView,
     ShadowViewNodePair const &oldPair,
     ShadowViewNodePair const &newPair);
 
 static void updateMatchedPair(
-    BREADCRUMB_TYPE breadcrumb,
     OrderedMutationInstructionContainer &mutationContainer,
     bool oldNodeFoundInOrder,
     bool newNodeFoundInOrder,
@@ -375,12 +370,11 @@ static void updateMatchedPair(
     ShadowViewNodePair const &newPair);
 
 static void calculateShadowViewMutationsFlattener(
-    BREADCRUMB_TYPE breadcrumb,
     ViewNodePairScope &scope,
     ReparentMode reparentMode,
     OrderedMutationInstructionContainer &mutationContainer,
     ShadowView const &parentShadowView,
-    TinyMap<Tag, ShadowViewNodePair *> &unvisitedFlattenedNodes,
+    TinyMap<Tag, ShadowViewNodePair *> &unvisitedOtherNodes,
     ShadowViewNodePair const &node,
     TinyMap<Tag, ShadowViewNodePair *> *parentSubVisitedOtherNewNodes = nullptr,
     TinyMap<Tag, ShadowViewNodePair *> *parentSubVisitedOtherOldNodes =
@@ -395,12 +389,10 @@ static void calculateShadowViewMutationsFlattener(
  * the ViewNodePairScope used within.
  */
 static void updateMatchedPairSubtrees(
-    BREADCRUMB_TYPE breadcrumb,
     ViewNodePairScope &scope,
     OrderedMutationInstructionContainer &mutationContainer,
     TinyMap<Tag, ShadowViewNodePair *> &newRemainingPairs,
     ShadowViewNodePair::NonOwningList &oldChildPairs,
-    ShadowViewNodePair::NonOwningList &newChildPairs,
     ShadowView const &parentShadowView,
     ShadowViewNodePair const &oldPair,
     ShadowViewNodePair const &newPair) {
@@ -427,9 +419,6 @@ static void updateMatchedPairSubtrees(
       // children are visited, so we reuse the `newRemainingPairs`
       // map.
       calculateShadowViewMutationsFlattener(
-          DIFF_BREADCRUMB(
-              "Flatten tree " + std::to_string(parentShadowView.tag) +
-              " into list " + std::to_string(oldPair.shadowView.tag)),
           scope,
           ReparentMode::Flatten,
           mutationContainer,
@@ -460,9 +449,6 @@ static void updateMatchedPairSubtrees(
 
       // Unflatten old list into new tree
       calculateShadowViewMutationsFlattener(
-          DIFF_BREADCRUMB(
-              "Unflatten old list " + std::to_string(parentShadowView.tag) +
-              " into new tree " + std::to_string(newPair.shadowView.tag)),
           scope,
           ReparentMode::Unflatten,
           mutationContainer,
@@ -502,8 +488,6 @@ static void updateMatchedPairSubtrees(
     auto newGrandChildPairs =
         sliceChildShadowNodeViewPairsFromViewNodePair(newPair, innerScope);
     calculateShadowViewMutationsV2(
-        DIFF_BREADCRUMB(
-            "Non-trivial update " + std::to_string(oldPair.shadowView.tag)),
         innerScope,
         *(newGrandChildPairs.size()
               ? &mutationContainer.downwardMutations
@@ -523,7 +507,6 @@ static void updateMatchedPairSubtrees(
  * correct ordering of INSERT and REMOVE mutations.
  */
 static void updateMatchedPair(
-    BREADCRUMB_TYPE breadcrumb,
     OrderedMutationInstructionContainer &mutationContainer,
     bool oldNodeFoundInOrder,
     bool newNodeFoundInOrder,
@@ -574,7 +557,7 @@ static void updateMatchedPair(
     if (oldPair.shadowView != newPair.shadowView) {
       mutationContainer.updateMutations.push_back(
           ShadowViewMutation::UpdateMutation(
-              oldPair.shadowView, newPair.shadowView));
+              oldPair.shadowView, newPair.shadowView, parentShadowView));
     }
   }
 }
@@ -618,7 +601,6 @@ static void updateMatchedPair(
  *    **after this function is called**, by the caller.
  */
 static void calculateShadowViewMutationsFlattener(
-    BREADCRUMB_TYPE breadcrumb,
     ViewNodePairScope &scope,
     ReparentMode reparentMode,
     OrderedMutationInstructionContainer &mutationContainer,
@@ -835,7 +817,9 @@ static void calculateShadowViewMutationsFlattener(
           newTreeNodePair.isConcreteView && oldTreeNodePair.isConcreteView) {
         mutationContainer.updateMutations.push_back(
             ShadowViewMutation::UpdateMutation(
-                oldTreeNodePair.shadowView, newTreeNodePair.shadowView));
+                oldTreeNodePair.shadowView,
+                newTreeNodePair.shadowView,
+                node.shadowView));
       }
 
       // Update children if appropriate.
@@ -843,9 +827,6 @@ static void calculateShadowViewMutationsFlattener(
         if (oldTreeNodePair.shadowNode != newTreeNodePair.shadowNode) {
           ViewNodePairScope innerScope{};
           calculateShadowViewMutationsV2(
-              DIFF_BREADCRUMB(
-                  "(Un)Flattener trivial update of " +
-                  std::to_string(newTreeNodePair.shadowView.tag)),
               innerScope,
               mutationContainer.downwardMutations,
               newTreeNodePair.shadowView,
@@ -865,17 +846,6 @@ static void calculateShadowViewMutationsFlattener(
         // This is a flatten-flatten, or unflatten-unflatten.
         if (childReparentMode == reparentMode) {
           calculateShadowViewMutationsFlattener(
-              DIFF_BREADCRUMB(
-                  std::string(
-                      reparentMode == ReparentMode::Flatten
-                          ? "Flatten-Flatten"
-                          : "Unflatten-Unflatten") +
-                  " new:" +
-                  std::to_string(
-                      reparentMode == ReparentMode::Flatten
-                          ? parentShadowView.tag
-                          : newTreeNodePair.shadowView.tag) +
-                  " old:" + std::to_string(treeChildPair.shadowView.tag)),
               scope,
               childReparentMode,
               mutationContainer,
@@ -917,13 +887,6 @@ static void calculateShadowViewMutationsFlattener(
             // At the end of this loop we still want to know which of these
             // children are visited, so we reuse the `newRemainingPairs` map.
             calculateShadowViewMutationsFlattener(
-                DIFF_BREADCRUMB(
-                    std::string("Flatten old tree into new list; new:") +
-                    std::to_string(
-                        reparentMode == ReparentMode::Flatten
-                            ? parentShadowView.tag
-                            : newTreeNodePair.shadowView.tag) +
-                    " old:" + std::to_string(oldTreeNodePair.shadowView.tag)),
                 scope,
                 ReparentMode::Flatten,
                 mutationContainer,
@@ -939,13 +902,6 @@ static void calculateShadowViewMutationsFlattener(
           else {
             // Unflatten old list into new tree
             calculateShadowViewMutationsFlattener(
-                DIFF_BREADCRUMB(
-                    "Unflatten old list into new tree; old:" +
-                    std::to_string(
-                        reparentMode == ReparentMode::Flatten
-                            ? parentShadowView.tag
-                            : newTreeNodePair.shadowView.tag) +
-                    " new:" + std::to_string(newTreeNodePair.shadowView.tag)),
                 scope,
                 ReparentMode::Unflatten,
                 mutationContainer,
@@ -1047,9 +1003,6 @@ static void calculateShadowViewMutationsFlattener(
       if (!treeChildPair.flattened) {
         ViewNodePairScope innerScope{};
         calculateShadowViewMutationsV2(
-            DIFF_BREADCRUMB(
-                "Recursively delete tree child pair (flatten case): " +
-                std::to_string(treeChildPair.shadowView.tag)),
             innerScope,
             mutationContainer.destructiveDownwardMutations,
             treeChildPair.shadowView,
@@ -1064,9 +1017,6 @@ static void calculateShadowViewMutationsFlattener(
       if (!treeChildPair.flattened) {
         ViewNodePairScope innerScope{};
         calculateShadowViewMutationsV2(
-            DIFF_BREADCRUMB(
-                "Recursively delete tree child pair (unflatten case): " +
-                std::to_string(treeChildPair.shadowView.tag)),
             innerScope,
             mutationContainer.downwardMutations,
             treeChildPair.shadowView,
@@ -1079,7 +1029,6 @@ static void calculateShadowViewMutationsFlattener(
 }
 
 static void calculateShadowViewMutationsV2(
-    BREADCRUMB_TYPE breadcrumb,
     ViewNodePairScope &scope,
     ShadowViewMutation::List &mutations,
     ShadowView const &parentShadowView,
@@ -1161,7 +1110,9 @@ static void calculateShadowViewMutationsV2(
         oldChildPair.shadowView != newChildPair.shadowView) {
       mutationContainer.updateMutations.push_back(
           ShadowViewMutation::UpdateMutation(
-              oldChildPair.shadowView, newChildPair.shadowView));
+              oldChildPair.shadowView,
+              newChildPair.shadowView,
+              parentShadowView));
     }
 
     // Recursively update tree if ShadowNode pointers are not equal
@@ -1173,9 +1124,6 @@ static void calculateShadowViewMutationsV2(
       auto newGrandChildPairs = sliceChildShadowNodeViewPairsFromViewNodePair(
           newChildPair, innerScope);
       calculateShadowViewMutationsV2(
-          DIFF_BREADCRUMB(
-              "Stage 1: Recurse on " +
-              std::to_string(oldChildPair.shadowView.tag)),
           innerScope,
           *(newGrandChildPairs.size()
                 ? &mutationContainer.downwardMutations
@@ -1242,8 +1190,6 @@ static void calculateShadowViewMutationsV2(
       // subtree starting from the removed view.
       ViewNodePairScope innerScope{};
       calculateShadowViewMutationsV2(
-          DIFF_BREADCRUMB(
-              "Trivial delete " + std::to_string(oldChildPair.shadowView.tag)),
           innerScope,
           mutationContainer.destructiveDownwardMutations,
           oldChildPair.shadowView,
@@ -1278,8 +1224,6 @@ static void calculateShadowViewMutationsV2(
 
       ViewNodePairScope innerScope{};
       calculateShadowViewMutationsV2(
-          DIFF_BREADCRUMB(
-              "Trivial create " + std::to_string(newChildPair.shadowView.tag)),
           innerScope,
           mutationContainer.downwardMutations,
           newChildPair.shadowView,
@@ -1300,9 +1244,10 @@ static void calculateShadowViewMutationsV2(
     // Walk through both lists at the same time
     // We will perform updates, create+insert, remove+delete, remove+insert
     // (move) here.
-    size_t oldIndex = lastIndexAfterFirstStage,
-           newIndex = lastIndexAfterFirstStage, newSize = newChildPairs.size(),
-           oldSize = oldChildPairs.size();
+    size_t oldIndex = lastIndexAfterFirstStage;
+    size_t newIndex = lastIndexAfterFirstStage;
+    size_t newSize = newChildPairs.size();
+    size_t oldSize = oldChildPairs.size();
     while (newIndex < newSize || oldIndex < oldSize) {
       bool haveNewPair = newIndex < newSize;
       bool haveOldPair = oldIndex < oldSize;
@@ -1329,9 +1274,6 @@ static void calculateShadowViewMutationsV2(
           });
 
           updateMatchedPair(
-              DIFF_BREADCRUMB(
-                  "Update Matched Pairs (1): " +
-                  std::to_string(oldChildPair.shadowView.tag)),
               mutationContainer,
               true,
               true,
@@ -1340,14 +1282,10 @@ static void calculateShadowViewMutationsV2(
               newChildPair);
 
           updateMatchedPairSubtrees(
-              DIFF_BREADCRUMB(
-                  "Update Matched Pair Subtrees (1): " +
-                  std::to_string(oldChildPair.shadowView.tag)),
               scope,
               mutationContainer,
               newRemainingPairs,
               oldChildPairs,
-              newChildPairs,
               parentShadowView,
               oldChildPair,
               newChildPair);
@@ -1374,9 +1312,6 @@ static void calculateShadowViewMutationsV2(
           auto const &newChildPair = *insertedIt->second;
 
           updateMatchedPair(
-              DIFF_BREADCRUMB(
-                  "Update Matched Pairs (2): " +
-                  std::to_string(oldChildPair.shadowView.tag)),
               mutationContainer,
               true,
               false,
@@ -1385,14 +1320,10 @@ static void calculateShadowViewMutationsV2(
               newChildPair);
 
           updateMatchedPairSubtrees(
-              DIFF_BREADCRUMB(
-                  "Update Matched Pair Subtrees (2): " +
-                  std::to_string(oldChildPair.shadowView.tag)),
               scope,
               mutationContainer,
               newRemainingPairs,
               oldChildPairs,
-              newChildPairs,
               parentShadowView,
               oldChildPair,
               newChildPair);
@@ -1530,9 +1461,6 @@ static void calculateShadowViewMutationsV2(
         // entire subtree starting from the removed view.
         ViewNodePairScope innerScope{};
         calculateShadowViewMutationsV2(
-            DIFF_BREADCRUMB(
-                "Non-trivial delete " +
-                std::to_string(oldChildPair.shadowView.tag)),
             innerScope,
             mutationContainer.destructiveDownwardMutations,
             oldChildPair.shadowView,
@@ -1577,9 +1505,6 @@ static void calculateShadowViewMutationsV2(
 
       ViewNodePairScope innerScope{};
       calculateShadowViewMutationsV2(
-          DIFF_BREADCRUMB(
-              "Non-trivial create " +
-              std::to_string(newChildPair.shadowView.tag)),
           innerScope,
           mutationContainer.downwardMutations,
           newChildPair.shadowView,
@@ -1699,11 +1624,10 @@ ShadowViewMutation::List calculateShadowViewMutations(
 
   if (oldRootShadowView != newRootShadowView) {
     mutations.push_back(ShadowViewMutation::UpdateMutation(
-        oldRootShadowView, newRootShadowView));
+        oldRootShadowView, newRootShadowView, {}));
   }
 
   calculateShadowViewMutationsV2(
-      CREATE_DIFF_BREADCRUMB(oldRootShadowView.tag),
       innerViewNodePairScope,
       mutations,
       ShadowView(oldRootShadowNode),
@@ -1713,5 +1637,4 @@ ShadowViewMutation::List calculateShadowViewMutations(
   return mutations;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp b/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
index 8dc8f97ca606..bbd02b4cdc98 100644
--- a/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
+++ b/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
@@ -17,10 +17,9 @@
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
-MountingCoordinator::MountingCoordinator(ShadowTreeRevision baseRevision)
+MountingCoordinator::MountingCoordinator(const ShadowTreeRevision &baseRevision)
     : surfaceId_(baseRevision.rootShadowNode->getSurfaceId()),
       baseRevision_(baseRevision),
       telemetryController_(*this) {
@@ -68,7 +67,7 @@ bool MountingCoordinator::waitForTransaction(
 
 void MountingCoordinator::updateBaseRevision(
     ShadowTreeRevision const &baseRevision) const {
-  baseRevision_ = std::move(baseRevision);
+  baseRevision_ = baseRevision;
 }
 
 void MountingCoordinator::resetLatestRevision() const {
@@ -186,5 +185,4 @@ void MountingCoordinator::setMountingOverrideDelegate(
   mountingOverrideDelegate_ = std::move(delegate);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mounting/MountingCoordinator.h b/ReactCommon/react/renderer/mounting/MountingCoordinator.h
index ba66f6a11dc2..d2685185660a 100644
--- a/ReactCommon/react/renderer/mounting/MountingCoordinator.h
+++ b/ReactCommon/react/renderer/mounting/MountingCoordinator.h
@@ -40,7 +40,7 @@ class MountingCoordinator final {
    * The constructor is meant to be used only inside `ShadowTree`, and it's
    * `public` only to enable using with `std::make_shared<>`.
    */
-  MountingCoordinator(ShadowTreeRevision baseRevision);
+  MountingCoordinator(const ShadowTreeRevision &baseRevision);
 
   /*
    * Returns the id of the surface that the coordinator belongs to.
diff --git a/ReactCommon/react/renderer/mounting/MountingTransaction.cpp b/ReactCommon/react/renderer/mounting/MountingTransaction.cpp
index 8c3e2c374729..ed25ea574649 100644
--- a/ReactCommon/react/renderer/mounting/MountingTransaction.cpp
+++ b/ReactCommon/react/renderer/mounting/MountingTransaction.cpp
@@ -7,8 +7,7 @@
 
 #include "MountingTransaction.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 using Number = MountingTransaction::Number;
 
@@ -42,5 +41,4 @@ Number MountingTransaction::getNumber() const {
   return number_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mounting/ShadowTree.cpp b/ReactCommon/react/renderer/mounting/ShadowTree.cpp
index e68b88f8529b..908b9bcbf994 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTree.cpp
+++ b/ReactCommon/react/renderer/mounting/ShadowTree.cpp
@@ -19,8 +19,7 @@
 
 #include "ShadowTreeDelegate.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 using CommitStatus = ShadowTree::CommitStatus;
 using CommitMode = ShadowTree::CommitMode;
@@ -296,8 +295,8 @@ MountingCoordinator::Shared ShadowTree::getMountingCoordinator() const {
 }
 
 CommitStatus ShadowTree::commit(
-    ShadowTreeCommitTransaction transaction,
-    CommitOptions commitOptions) const {
+    const ShadowTreeCommitTransaction &transaction,
+    const CommitOptions &commitOptions) const {
   SystraceSection s("ShadowTree::commit");
 
   int attempts = 0;
@@ -317,8 +316,8 @@ CommitStatus ShadowTree::commit(
 }
 
 CommitStatus ShadowTree::tryCommit(
-    ShadowTreeCommitTransaction transaction,
-    CommitOptions commitOptions) const {
+    const ShadowTreeCommitTransaction &transaction,
+    const CommitOptions &commitOptions) const {
   SystraceSection s("ShadowTree::tryCommit");
 
   auto telemetry = TransactionTelemetry{};
@@ -461,5 +460,4 @@ void ShadowTree::notifyDelegatesOfUpdates() const {
   delegate_.shadowTreeDidFinishTransaction(*this, mountingCoordinator_);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mounting/ShadowTree.h b/ReactCommon/react/renderer/mounting/ShadowTree.h
index 248ce4daa10f..5951c20d1a87 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTree.h
+++ b/ReactCommon/react/renderer/mounting/ShadowTree.h
@@ -95,15 +95,15 @@ class ShadowTree final {
    * The `transaction` function can cancel commit returning `nullptr`.
    */
   CommitStatus tryCommit(
-      ShadowTreeCommitTransaction transaction,
-      CommitOptions commitOptions = {false}) const;
+      const ShadowTreeCommitTransaction &transaction,
+      const CommitOptions &commitOptions = {false}) const;
 
   /*
    * Calls `tryCommit` in a loop until it finishes successfully.
    */
   CommitStatus commit(
-      ShadowTreeCommitTransaction transaction,
-      CommitOptions commitOptions = {false}) const;
+      const ShadowTreeCommitTransaction &transaction,
+      const CommitOptions &commitOptions = {false}) const;
 
   /*
    * Returns a `ShadowTreeRevision` representing the momentary state of
diff --git a/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.cpp b/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.cpp
index 2b0c6927edf4..53bc6f9f2fd6 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.cpp
+++ b/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.cpp
@@ -9,8 +9,7 @@
 
 #include <react/debug/react_native_assert.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 ShadowTreeRegistry::~ShadowTreeRegistry() {
   react_native_assert(
@@ -60,5 +59,4 @@ void ShadowTreeRegistry::enumerate(
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mounting/ShadowView.cpp b/ReactCommon/react/renderer/mounting/ShadowView.cpp
index a521baf785c8..c7769bd5d906 100644
--- a/ReactCommon/react/renderer/mounting/ShadowView.cpp
+++ b/ReactCommon/react/renderer/mounting/ShadowView.cpp
@@ -10,14 +10,14 @@
 #include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/LayoutableShadowNode.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static LayoutMetrics layoutMetricsFromShadowNode(ShadowNode const &shadowNode) {
   auto layoutableShadowNode =
       traitCast<LayoutableShadowNode const *>(&shadowNode);
-  return layoutableShadowNode ? layoutableShadowNode->getLayoutMetrics()
-                              : EmptyLayoutMetrics;
+  return layoutableShadowNode != nullptr
+      ? layoutableShadowNode->getLayoutMetrics()
+      : EmptyLayoutMetrics;
 }
 
 ShadowView::ShadowView(const ShadowNode &shadowNode)
@@ -95,5 +95,4 @@ bool ShadowViewNodePairLegacy::operator!=(
   return !(*this == rhs);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp b/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp
index 2873f06e4da2..5321e5e19672 100644
--- a/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp
+++ b/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp
@@ -9,8 +9,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 /**
  * Initialize static feature flags for this module.
@@ -84,10 +83,11 @@ ShadowViewMutation ShadowViewMutation::RemoveDeleteTreeMutation(
 
 ShadowViewMutation ShadowViewMutation::UpdateMutation(
     ShadowView oldChildShadowView,
-    ShadowView newChildShadowView) {
+    ShadowView newChildShadowView,
+    ShadowView parentShadowView) {
   return {
       /* .type = */ Update,
-      /* .parentShadowView = */ {},
+      /* .parentShadowView = */ std::move(parentShadowView),
       /* .oldChildShadowView = */ std::move(oldChildShadowView),
       /* .newChildShadowView = */ std::move(newChildShadowView),
       /* .index = */ -1,
@@ -147,19 +147,19 @@ std::vector<DebugStringConvertibleObject> getDebugProps(
     ShadowViewMutation const &mutation,
     DebugStringConvertibleOptions options) {
   return {
-      mutation.oldChildShadowView.componentHandle
+      mutation.oldChildShadowView.componentHandle != 0
           ? DebugStringConvertibleObject{"oldChild",
                                          getDebugDescription(
                                              mutation.oldChildShadowView,
                                              options)}
           : DebugStringConvertibleObject{},
-      mutation.newChildShadowView.componentHandle
+      mutation.newChildShadowView.componentHandle != 0
           ? DebugStringConvertibleObject{"newChild",
                                          getDebugDescription(
                                              mutation.newChildShadowView,
                                              options)}
           : DebugStringConvertibleObject{},
-      mutation.parentShadowView.componentHandle
+      mutation.parentShadowView.componentHandle != 0
           ? DebugStringConvertibleObject{"parent",
                                          getDebugDescription(
                                              mutation.parentShadowView,
@@ -175,5 +175,4 @@ std::vector<DebugStringConvertibleObject> getDebugProps(
 
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mounting/ShadowViewMutation.h b/ReactCommon/react/renderer/mounting/ShadowViewMutation.h
index 7beba76b25eb..cc76e261d641 100644
--- a/ReactCommon/react/renderer/mounting/ShadowViewMutation.h
+++ b/ReactCommon/react/renderer/mounting/ShadowViewMutation.h
@@ -76,7 +76,8 @@ struct ShadowViewMutation final {
    */
   static ShadowViewMutation UpdateMutation(
       ShadowView oldChildShadowView,
-      ShadowView newChildShadowView);
+      ShadowView newChildShadowView,
+      ShadowView parentShadowView);
 
 #pragma mark - Type
 
@@ -124,9 +125,9 @@ using ShadowViewMutationList = std::vector<ShadowViewMutation>;
 
 #if RN_DEBUG_STRING_CONVERTIBLE
 
-std::string getDebugName(ShadowViewMutation const &object);
+std::string getDebugName(ShadowViewMutation const &mutation);
 std::vector<DebugStringConvertibleObject> getDebugProps(
-    ShadowViewMutation const &object,
+    ShadowViewMutation const &mutation,
     DebugStringConvertibleOptions options);
 
 #endif
diff --git a/ReactCommon/react/renderer/mounting/StubView.cpp b/ReactCommon/react/renderer/mounting/StubView.cpp
index 0d490dc65725..b446b5bf9ef6 100644
--- a/ReactCommon/react/renderer/mounting/StubView.cpp
+++ b/ReactCommon/react/renderer/mounting/StubView.cpp
@@ -11,8 +11,7 @@
 #include <glog/logging.h>
 #endif
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 StubView::operator ShadowView() const {
   auto shadowView = ShadowView{};
@@ -67,7 +66,7 @@ bool operator!=(StubView const &lhs, StubView const &rhs) {
 std::string getDebugName(StubView const &stubView) {
   return std::string{"Stub"} +
       std::string{
-          stubView.componentHandle ? stubView.componentName : "[invalid]"};
+          stubView.componentHandle != 0 ? stubView.componentName : "[invalid]"};
 }
 
 std::vector<DebugStringConvertibleObject> getDebugProps(
@@ -85,7 +84,7 @@ std::vector<DebugStringConvertibleObject> getDebugProps(
 
 std::vector<StubView> getDebugChildren(
     StubView const &stubView,
-    DebugStringConvertibleOptions options) {
+    DebugStringConvertibleOptions /*options*/) {
   std::vector<StubView> result;
   for (auto const &child : stubView.children) {
     result.push_back(*child);
@@ -95,5 +94,4 @@ std::vector<StubView> getDebugChildren(
 
 #endif
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mounting/StubViewTree.cpp b/ReactCommon/react/renderer/mounting/StubViewTree.cpp
index fb1fc8e1ac9e..7a5afeaa0083 100644
--- a/ReactCommon/react/renderer/mounting/StubViewTree.cpp
+++ b/ReactCommon/react/renderer/mounting/StubViewTree.cpp
@@ -16,8 +16,7 @@
 #define STUB_VIEW_LOG(code)
 #endif
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 StubViewTree::StubViewTree(ShadowView const &shadowView) {
   auto view = std::make_shared<StubView>();
@@ -311,5 +310,4 @@ bool operator!=(StubViewTree const &lhs, StubViewTree const &rhs) {
   return !(lhs == rhs);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mounting/TelemetryController.cpp b/ReactCommon/react/renderer/mounting/TelemetryController.cpp
index 25ef9bee6509..2ae6dd7782e8 100644
--- a/ReactCommon/react/renderer/mounting/TelemetryController.cpp
+++ b/ReactCommon/react/renderer/mounting/TelemetryController.cpp
@@ -9,8 +9,7 @@
 
 #include <react/renderer/mounting/MountingCoordinator.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 TelemetryController::TelemetryController(
     MountingCoordinator const &mountingCoordinator) noexcept
@@ -51,5 +50,4 @@ bool TelemetryController::pullTransaction(
   return true;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mounting/stubs.cpp b/ReactCommon/react/renderer/mounting/stubs.cpp
index 71ff672ecc7f..11f9aad65301 100644
--- a/ReactCommon/react/renderer/mounting/stubs.cpp
+++ b/ReactCommon/react/renderer/mounting/stubs.cpp
@@ -11,8 +11,7 @@
 #include <react/renderer/core/ShadowNodeFragment.h>
 #include <react/renderer/mounting/Differentiator.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 /*
  * Sorting comparator for `reorderInPlaceIfNeeded`.
@@ -96,5 +95,4 @@ StubViewTree buildStubViewTreeUsingDifferentiator(
   return stubViewTree;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mounting/tests/MountingTest.cpp b/ReactCommon/react/renderer/mounting/tests/MountingTest.cpp
index 5c98724a79b2..c3dae1de96e6 100644
--- a/ReactCommon/react/renderer/mounting/tests/MountingTest.cpp
+++ b/ReactCommon/react/renderer/mounting/tests/MountingTest.cpp
@@ -18,8 +18,7 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static SharedViewProps nonFlattenedDefaultProps(
     ComponentDescriptor const &componentDescriptor) {
@@ -705,5 +704,4 @@ TEST(MountingTest, testViewReparentingInstructionGeneration) {
   EXPECT_EQ(mutations4[8].newChildShadowView.tag, 2000);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp b/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
index 1afd71e2b79a..9d6c2ddbdfce 100644
--- a/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
+++ b/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
@@ -24,8 +24,7 @@
 // #include <algorithm>
 // #include <random>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static void testShadowNodeTreeLifeCycle(
     uint_fast32_t seed,
@@ -328,8 +327,7 @@ static void testShadowNodeTreeLifeCycleExtensiveFlatteningUnflattening(
   SUCCEED();
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 
 using namespace facebook::react;
 
diff --git a/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp b/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp
index 6d2cc0a19005..45b59ffd092b 100644
--- a/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp
+++ b/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp
@@ -21,8 +21,7 @@
 #include <react/renderer/mounting/ShadowViewMutation.h>
 #include <react/renderer/mounting/stubs.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class StackingContextTest : public ::testing::Test {
  protected:
@@ -783,5 +782,4 @@ TEST_F(StackingContextTest, zIndexAndFlattenedNodes) {
   });
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp b/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp
index ffa54f0dd97d..670692558686 100644
--- a/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp
+++ b/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp
@@ -25,8 +25,8 @@ using namespace facebook::react;
 class DummyShadowTreeDelegate : public ShadowTreeDelegate {
  public:
   RootShadowNode::Unshared shadowTreeWillCommit(
-      ShadowTree const &shadowTree,
-      RootShadowNode::Shared const &oldRootShadowNode,
+      ShadowTree const & /*shadowTree*/,
+      RootShadowNode::Shared const & /*oldRootShadowNode*/,
       RootShadowNode::Unshared const &newRootShadowNode) const override {
     return newRootShadowNode;
   };
@@ -108,7 +108,7 @@ TEST(StateReconciliationTest, testStateReconciliation) {
       contextContainer};
 
   shadowTree.commit(
-      [&](RootShadowNode const &oldRootShadowNode) {
+      [&](RootShadowNode const & /*oldRootShadowNode*/) {
         return std::static_pointer_cast<RootShadowNode>(rootShadowNodeState1);
       },
       {true});
@@ -133,7 +133,7 @@ TEST(StateReconciliationTest, testStateReconciliation) {
       findDescendantNode(*rootShadowNodeState2, family)->getState(), state2);
 
   shadowTree.commit(
-      [&](RootShadowNode const &oldRootShadowNode) {
+      [&](RootShadowNode const & /*oldRootShadowNode*/) {
         return std::static_pointer_cast<RootShadowNode>(rootShadowNodeState2);
       },
       {true});
@@ -156,7 +156,7 @@ TEST(StateReconciliationTest, testStateReconciliation) {
       findDescendantNode(*rootShadowNodeState3, family)->getState(), state3);
 
   shadowTree.commit(
-      [&](RootShadowNode const &oldRootShadowNode) {
+      [&](RootShadowNode const & /*oldRootShadowNode*/) {
         return std::static_pointer_cast<RootShadowNode>(rootShadowNodeState3);
       },
       {true});
@@ -171,7 +171,7 @@ TEST(StateReconciliationTest, testStateReconciliation) {
   // Here we commit the old tree but we expect that the state associated with
   // the node will stay the same (newer that the old tree has).
   shadowTree.commit(
-      [&](RootShadowNode const &oldRootShadowNode) {
+      [&](RootShadowNode const & /*oldRootShadowNode*/) {
         return std::static_pointer_cast<RootShadowNode>(rootShadowNodeState2);
       },
       {true});
diff --git a/ReactCommon/react/renderer/runtimescheduler/BUCK b/ReactCommon/react/renderer/runtimescheduler/BUCK
index 7db6aa11bbf8..4a90c584e3fd 100644
--- a/ReactCommon/react/renderer/runtimescheduler/BUCK
+++ b/ReactCommon/react/renderer/runtimescheduler/BUCK
@@ -31,12 +31,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/runtimescheduler",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -47,6 +47,7 @@ rn_xplat_cxx_library(
     tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
+        "//xplat/folly:dynamic",
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("butter:butter"),
diff --git a/ReactCommon/react/renderer/runtimescheduler/CMakeLists.txt b/ReactCommon/react/renderer/runtimescheduler/CMakeLists.txt
index 5a18fb85c09a..c11429d3812f 100644
--- a/ReactCommon/react/renderer/runtimescheduler/CMakeLists.txt
+++ b/ReactCommon/react/renderer/runtimescheduler/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_runtimescheduler_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_runtimescheduler SHARED ${react_render_runtimescheduler_SRC})
diff --git a/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp b/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp
index fd041aca8a4c..4927b22ef7df 100644
--- a/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp
+++ b/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp
@@ -10,8 +10,7 @@
 #include <utility>
 #include "ErrorUtils.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 #pragma mark - Public
 
@@ -23,6 +22,7 @@ RuntimeScheduler::RuntimeScheduler(
 void RuntimeScheduler::scheduleWork(
     std::function<void(jsi::Runtime &)> callback) const {
   runtimeAccessRequests_ += 1;
+
   runtimeExecutor_(
       [this, callback = std::move(callback)](jsi::Runtime &runtime) {
         runtimeAccessRequests_ -= 1;
@@ -95,7 +95,7 @@ void RuntimeScheduler::callExpiredTasks(jsi::Runtime &runtime) {
       }
 
       currentPriority_ = topPriorityTask->priority;
-      auto result = topPriorityTask->execute(runtime);
+      auto result = topPriorityTask->execute(runtime, didUserCallbackTimeout);
 
       if (result.isObject() && result.getObject(runtime).isFunction(runtime)) {
         topPriorityTask->callback =
@@ -140,7 +140,7 @@ void RuntimeScheduler::startWorkLoop(jsi::Runtime &runtime) const {
       }
 
       currentPriority_ = topPriorityTask->priority;
-      auto result = topPriorityTask->execute(runtime);
+      auto result = topPriorityTask->execute(runtime, didUserCallbackTimeout);
 
       if (result.isObject() && result.getObject(runtime).isFunction(runtime)) {
         topPriorityTask->callback =
@@ -159,5 +159,4 @@ void RuntimeScheduler::startWorkLoop(jsi::Runtime &runtime) const {
   isPerformingWork_ = false;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp
index c04d842f8e61..1226160f33ba 100644
--- a/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp
+++ b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp
@@ -14,8 +14,7 @@
 #include <memory>
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 std::shared_ptr<RuntimeSchedulerBinding>
 RuntimeSchedulerBinding::createAndInstallIfNeeded(
@@ -116,7 +115,7 @@ jsi::Value RuntimeSchedulerBinding::get(
             jsi::Value const *,
             size_t) noexcept -> jsi::Value {
           auto shouldYield = runtimeScheduler_->getShouldYield();
-          return jsi::Value(shouldYield);
+          return {shouldYield};
         });
   }
 
@@ -148,7 +147,7 @@ jsi::Value RuntimeSchedulerBinding::get(
           auto asDouble =
               std::chrono::duration<double, std::milli>(now.time_since_epoch())
                   .count();
-          return jsi::Value(asDouble);
+          return {asDouble};
         });
   }
 
@@ -201,5 +200,4 @@ jsi::Value RuntimeSchedulerBinding::get(
 #endif
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.cpp b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.cpp
index 3f8b3be7ae4f..50cea4deee58 100644
--- a/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.cpp
+++ b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.cpp
@@ -9,8 +9,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 RuntimeSchedulerCallInvoker::RuntimeSchedulerCallInvoker(
     std::weak_ptr<RuntimeScheduler> runtimeScheduler)
@@ -30,5 +29,4 @@ void RuntimeSchedulerCallInvoker::invokeSync(std::function<void()> &&func) {
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/runtimescheduler/Task.cpp b/ReactCommon/react/renderer/runtimescheduler/Task.cpp
index bed71bb4b032..34cb857806b1 100644
--- a/ReactCommon/react/renderer/runtimescheduler/Task.cpp
+++ b/ReactCommon/react/renderer/runtimescheduler/Task.cpp
@@ -7,8 +7,7 @@
 
 #include "RuntimeScheduler.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 Task::Task(
     SchedulerPriority priority,
@@ -18,14 +17,14 @@ Task::Task(
       callback(std::move(callback)),
       expirationTime(expirationTime) {}
 
-jsi::Value Task::execute(jsi::Runtime &runtime) {
+jsi::Value Task::execute(jsi::Runtime &runtime, bool didUserCallbackTimeout) {
   auto result = jsi::Value::undefined();
   // Cancelled task doesn't have a callback.
   if (callback) {
     // Callback in JavaScript is expecting a single bool parameter.
-    // React team plans to remove it and it is safe to pass in
-    // hardcoded false value.
-    result = callback.value().call(runtime, {false});
+    // React team plans to remove it in the future when a scheduler bug on web
+    // is resolved.
+    result = callback.value().call(runtime, {didUserCallbackTimeout});
 
     // Destroying callback to prevent calling it twice.
     callback.reset();
@@ -33,5 +32,4 @@ jsi::Value Task::execute(jsi::Runtime &runtime) {
   return result;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/runtimescheduler/Task.h b/ReactCommon/react/renderer/runtimescheduler/Task.h
index 76c52a9ff5e9..a8b8a69c64ca 100644
--- a/ReactCommon/react/renderer/runtimescheduler/Task.h
+++ b/ReactCommon/react/renderer/runtimescheduler/Task.h
@@ -33,7 +33,7 @@ struct Task final {
   std::optional<jsi::Function> callback;
   RuntimeSchedulerClock::time_point expirationTime;
 
-  jsi::Value execute(jsi::Runtime &runtime);
+  jsi::Value execute(jsi::Runtime &runtime, bool didUserCallbackTimeout);
 };
 
 class TaskPriorityComparer {
diff --git a/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp b/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp
index 7c274bcf3935..ed43bab9a250 100644
--- a/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp
+++ b/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp
@@ -52,17 +52,17 @@ class RuntimeSchedulerTest : public testing::Test {
         jsi::PropNameID::forUtf8(*runtime_, ""),
         3,
         [this, callback = std::move(callback)](
-            jsi::Runtime &,
-            jsi::Value const &,
+            jsi::Runtime & /*unused*/,
+            jsi::Value const & /*unused*/,
             jsi::Value const *arguments,
-            size_t) -> jsi::Value {
+            size_t /*unused*/) -> jsi::Value {
           ++hostFunctionCallCount_;
           auto didUserCallbackTimeout = arguments[0].getBool();
           return callback(didUserCallbackTimeout);
         });
   }
 
-  uint hostFunctionCallCount_;
+  uint hostFunctionCallCount_{};
 
   std::unique_ptr<facebook::hermes::HermesRuntime> runtime_;
   std::unique_ptr<StubClock> stubClock_;
@@ -116,7 +116,7 @@ TEST_F(RuntimeSchedulerTest, scheduleImmediatePriorityTask) {
   auto callback =
       createHostFunctionFromLambda([&didRunTask](bool didUserCallbackTimeout) {
         didRunTask = true;
-        EXPECT_FALSE(didUserCallbackTimeout);
+        EXPECT_TRUE(didUserCallbackTimeout);
         return jsi::Value::undefined();
       });
 
@@ -137,9 +137,7 @@ TEST_F(RuntimeSchedulerTest, taskExpiration) {
   auto callback =
       createHostFunctionFromLambda([&didRunTask](bool didUserCallbackTimeout) {
         didRunTask = true;
-        // Task has timed out but the parameter is deprecated and `false` is
-        // hardcoded.
-        EXPECT_FALSE(didUserCallbackTimeout);
+        EXPECT_TRUE(didUserCallbackTimeout);
         return jsi::Value::undefined();
       });
 
@@ -160,8 +158,8 @@ TEST_F(RuntimeSchedulerTest, taskExpiration) {
 
 TEST_F(RuntimeSchedulerTest, scheduleTwoTasksWithSamePriority) {
   uint firstTaskCallOrder = 0;
-  auto callbackOne =
-      createHostFunctionFromLambda([this, &firstTaskCallOrder](bool) {
+  auto callbackOne = createHostFunctionFromLambda(
+      [this, &firstTaskCallOrder](bool /*unused*/) {
         firstTaskCallOrder = hostFunctionCallCount_;
         return jsi::Value::undefined();
       });
@@ -170,8 +168,8 @@ TEST_F(RuntimeSchedulerTest, scheduleTwoTasksWithSamePriority) {
       SchedulerPriority::NormalPriority, std::move(callbackOne));
 
   uint secondTaskCallOrder;
-  auto callbackTwo =
-      createHostFunctionFromLambda([this, &secondTaskCallOrder](bool) {
+  auto callbackTwo = createHostFunctionFromLambda(
+      [this, &secondTaskCallOrder](bool /*unused*/) {
         secondTaskCallOrder = hostFunctionCallCount_;
         return jsi::Value::undefined();
       });
@@ -193,8 +191,8 @@ TEST_F(RuntimeSchedulerTest, scheduleTwoTasksWithSamePriority) {
 
 TEST_F(RuntimeSchedulerTest, scheduleTwoTasksWithDifferentPriorities) {
   uint lowPriorityTaskCallOrder = 0;
-  auto callbackOne =
-      createHostFunctionFromLambda([this, &lowPriorityTaskCallOrder](bool) {
+  auto callbackOne = createHostFunctionFromLambda(
+      [this, &lowPriorityTaskCallOrder](bool /*unused*/) {
         lowPriorityTaskCallOrder = hostFunctionCallCount_;
         return jsi::Value::undefined();
       });
@@ -204,7 +202,7 @@ TEST_F(RuntimeSchedulerTest, scheduleTwoTasksWithDifferentPriorities) {
 
   uint userBlockingPriorityTaskCallOrder;
   auto callbackTwo = createHostFunctionFromLambda(
-      [this, &userBlockingPriorityTaskCallOrder](bool) {
+      [this, &userBlockingPriorityTaskCallOrder](bool /*unused*/) {
         userBlockingPriorityTaskCallOrder = hostFunctionCallCount_;
         return jsi::Value::undefined();
       });
@@ -226,7 +224,7 @@ TEST_F(RuntimeSchedulerTest, scheduleTwoTasksWithDifferentPriorities) {
 
 TEST_F(RuntimeSchedulerTest, cancelTask) {
   bool didRunTask = false;
-  auto callback = createHostFunctionFromLambda([&didRunTask](bool) {
+  auto callback = createHostFunctionFromLambda([&didRunTask](bool /*unused*/) {
     didRunTask = true;
     return jsi::Value::undefined();
   });
@@ -249,16 +247,16 @@ TEST_F(RuntimeSchedulerTest, continuationTask) {
   bool didRunTask = false;
   bool didContinuationTask = false;
 
-  auto callback = createHostFunctionFromLambda([&](bool) {
+  auto callback = createHostFunctionFromLambda([&](bool /*unused*/) {
     didRunTask = true;
     return jsi::Function::createFromHostFunction(
         *runtime_,
         jsi::PropNameID::forUtf8(*runtime_, ""),
         1,
-        [&](jsi::Runtime &runtime,
-            jsi::Value const &,
-            jsi::Value const *arguments,
-            size_t) noexcept -> jsi::Value {
+        [&](jsi::Runtime & /*runtime*/,
+            jsi::Value const & /*unused*/,
+            jsi::Value const * /*arguments*/,
+            size_t /*unused*/) noexcept -> jsi::Value {
           didContinuationTask = true;
           return jsi::Value::undefined();
         });
@@ -279,7 +277,7 @@ TEST_F(RuntimeSchedulerTest, continuationTask) {
 
 TEST_F(RuntimeSchedulerTest, getCurrentPriorityLevel) {
   auto callback =
-      createHostFunctionFromLambda([this](bool didUserCallbackTimeout) {
+      createHostFunctionFromLambda([this](bool /*didUserCallbackTimeout*/) {
         EXPECT_EQ(
             runtimeScheduler_->getCurrentPriorityLevel(),
             SchedulerPriority::ImmediatePriority);
@@ -299,12 +297,13 @@ TEST_F(RuntimeSchedulerTest, getCurrentPriorityLevel) {
       runtimeScheduler_->getCurrentPriorityLevel(),
       SchedulerPriority::NormalPriority);
 
-  callback = createHostFunctionFromLambda([this](bool didUserCallbackTimeout) {
-    EXPECT_EQ(
-        runtimeScheduler_->getCurrentPriorityLevel(),
-        SchedulerPriority::IdlePriority);
-    return jsi::Value::undefined();
-  });
+  callback =
+      createHostFunctionFromLambda([this](bool /*didUserCallbackTimeout*/) {
+        EXPECT_EQ(
+            runtimeScheduler_->getCurrentPriorityLevel(),
+            SchedulerPriority::IdlePriority);
+        return jsi::Value::undefined();
+      });
 
   runtimeScheduler_->scheduleTask(
       SchedulerPriority::IdlePriority, std::move(callback));
@@ -319,7 +318,7 @@ TEST_F(RuntimeSchedulerTest, getCurrentPriorityLevel) {
 TEST_F(RuntimeSchedulerTest, scheduleWorkWithYielding) {
   bool wasCalled = false;
   runtimeScheduler_->scheduleWork(
-      [&](jsi::Runtime const &) { wasCalled = true; });
+      [&](jsi::Runtime const & /*unused*/) { wasCalled = true; });
 
   EXPECT_FALSE(wasCalled);
 
@@ -338,7 +337,7 @@ TEST_F(RuntimeSchedulerTest, normalTaskYieldsToPlatformEvent) {
   bool didRunJavaScriptTask = false;
   bool didRunPlatformWork = false;
 
-  auto callback = createHostFunctionFromLambda([&](bool) {
+  auto callback = createHostFunctionFromLambda([&](bool /*unused*/) {
     didRunJavaScriptTask = true;
     EXPECT_TRUE(didRunPlatformWork);
     return jsi::Value::undefined();
@@ -347,7 +346,7 @@ TEST_F(RuntimeSchedulerTest, normalTaskYieldsToPlatformEvent) {
   runtimeScheduler_->scheduleTask(
       SchedulerPriority::NormalPriority, std::move(callback));
 
-  runtimeScheduler_->scheduleWork([&](jsi::Runtime const &) {
+  runtimeScheduler_->scheduleWork([&](jsi::Runtime const & /*unused*/) {
     didRunPlatformWork = true;
     EXPECT_FALSE(didRunJavaScriptTask);
     EXPECT_FALSE(runtimeScheduler_->getShouldYield());
@@ -365,7 +364,7 @@ TEST_F(RuntimeSchedulerTest, expiredTaskDoesntYieldToPlatformEvent) {
   bool didRunJavaScriptTask = false;
   bool didRunPlatformWork = false;
 
-  auto callback = createHostFunctionFromLambda([&](bool) {
+  auto callback = createHostFunctionFromLambda([&](bool /*unused*/) {
     didRunJavaScriptTask = true;
     EXPECT_FALSE(didRunPlatformWork);
     return jsi::Value::undefined();
@@ -374,7 +373,7 @@ TEST_F(RuntimeSchedulerTest, expiredTaskDoesntYieldToPlatformEvent) {
   runtimeScheduler_->scheduleTask(
       SchedulerPriority::NormalPriority, std::move(callback));
 
-  runtimeScheduler_->scheduleWork([&](jsi::Runtime const &) {
+  runtimeScheduler_->scheduleWork([&](jsi::Runtime const & /*unused*/) {
     didRunPlatformWork = true;
     EXPECT_TRUE(didRunJavaScriptTask);
   });
@@ -393,7 +392,7 @@ TEST_F(RuntimeSchedulerTest, immediateTaskDoesntYieldToPlatformEvent) {
   bool didRunJavaScriptTask = false;
   bool didRunPlatformWork = false;
 
-  auto callback = createHostFunctionFromLambda([&](bool) {
+  auto callback = createHostFunctionFromLambda([&](bool /*unused*/) {
     didRunJavaScriptTask = true;
     EXPECT_FALSE(didRunPlatformWork);
     return jsi::Value::undefined();
@@ -402,7 +401,7 @@ TEST_F(RuntimeSchedulerTest, immediateTaskDoesntYieldToPlatformEvent) {
   runtimeScheduler_->scheduleTask(
       SchedulerPriority::ImmediatePriority, std::move(callback));
 
-  runtimeScheduler_->scheduleWork([&](jsi::Runtime const &) {
+  runtimeScheduler_->scheduleWork([&](jsi::Runtime const & /*unused*/) {
     didRunPlatformWork = true;
     EXPECT_TRUE(didRunJavaScriptTask);
   });
@@ -426,7 +425,7 @@ TEST_F(RuntimeSchedulerTest, scheduleTaskFromTask) {
         auto secondCallback = createHostFunctionFromLambda(
             [&didRunSecondTask](bool didUserCallbackTimeout) {
               didRunSecondTask = true;
-              EXPECT_FALSE(didUserCallbackTimeout);
+              EXPECT_TRUE(didUserCallbackTimeout);
               return jsi::Value::undefined();
             });
 
@@ -451,11 +450,12 @@ TEST_F(RuntimeSchedulerTest, scheduleTaskFromTask) {
 
 TEST_F(RuntimeSchedulerTest, handlingError) {
   bool didRunTask = false;
-  auto firstCallback = createHostFunctionFromLambda([this, &didRunTask](bool) {
-    didRunTask = true;
-    throw jsi::JSError(*runtime_, "Test error");
-    return jsi::Value::undefined();
-  });
+  auto firstCallback =
+      createHostFunctionFromLambda([this, &didRunTask](bool /*unused*/) {
+        didRunTask = true;
+        throw jsi::JSError(*runtime_, "Test error");
+        return jsi::Value::undefined();
+      });
 
   runtimeScheduler_->scheduleTask(
       SchedulerPriority::NormalPriority, std::move(firstCallback));
@@ -474,7 +474,7 @@ TEST_F(RuntimeSchedulerTest, basicSameThreadExecution) {
   bool didRunSynchronousTask = false;
   std::thread t1([this, &didRunSynchronousTask]() {
     runtimeScheduler_->executeNowOnTheSameThread(
-        [this, &didRunSynchronousTask](jsi::Runtime &rt) {
+        [this, &didRunSynchronousTask](jsi::Runtime & /*rt*/) {
           EXPECT_TRUE(runtimeScheduler_->getIsSynchronous());
           didRunSynchronousTask = true;
         });
@@ -506,7 +506,7 @@ TEST_F(RuntimeSchedulerTest, sameThreadTaskCreatesImmediatePriorityTask) {
           auto callback = createHostFunctionFromLambda(
               [&didRunSubsequentTask](bool didUserCallbackTimeout) {
                 didRunSubsequentTask = true;
-                EXPECT_FALSE(didUserCallbackTimeout);
+                EXPECT_TRUE(didUserCallbackTimeout);
                 return jsi::Value::undefined();
               });
 
@@ -584,11 +584,11 @@ TEST_F(RuntimeSchedulerTest, twoThreadsRequestAccessToTheRuntime) {
   bool didRunWork = false;
 
   runtimeScheduler_->scheduleWork(
-      [&didRunWork](jsi::Runtime &) { didRunWork = true; });
+      [&didRunWork](jsi::Runtime & /*unused*/) { didRunWork = true; });
 
   std::thread t1([this, &didRunSynchronousTask]() {
     runtimeScheduler_->executeNowOnTheSameThread(
-        [&didRunSynchronousTask](jsi::Runtime &runtime) {
+        [&didRunSynchronousTask](jsi::Runtime & /*runtime*/) {
           didRunSynchronousTask = true;
         });
   });
diff --git a/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.cpp b/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.cpp
index 543be6cf5c70..35ec8cdb17aa 100644
--- a/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.cpp
+++ b/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.cpp
@@ -23,7 +23,7 @@ AsynchronousEventBeat::AsynchronousEventBeat(
 
 void AsynchronousEventBeat::activityDidChange(
     RunLoopObserver::Delegate const *delegate,
-    RunLoopObserver::Activity) const noexcept {
+    RunLoopObserver::Activity /*activity*/) const noexcept {
   react_native_assert(delegate == this);
   induce();
 }
diff --git a/ReactCommon/react/renderer/scheduler/BUCK b/ReactCommon/react/renderer/scheduler/BUCK
index 2d10b223f875..bdd608946051 100644
--- a/ReactCommon/react/renderer/scheduler/BUCK
+++ b/ReactCommon/react/renderer/scheduler/BUCK
@@ -30,12 +30,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/scheduler",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -47,10 +47,6 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
-        "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
         react_native_xplat_target("react/config:config"),
         react_native_xplat_target("react/debug:debug"),
diff --git a/ReactCommon/react/renderer/scheduler/CMakeLists.txt b/ReactCommon/react/renderer/scheduler/CMakeLists.txt
index 3823b9d3c1e1..62e979c97194 100644
--- a/ReactCommon/react/renderer/scheduler/CMakeLists.txt
+++ b/ReactCommon/react/renderer/scheduler/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_scheduler_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_scheduler SHARED ${react_render_scheduler_SRC})
diff --git a/ReactCommon/react/renderer/scheduler/Scheduler.cpp b/ReactCommon/react/renderer/scheduler/Scheduler.cpp
index 53a7fe6bf340..fc0a1641ed6f 100644
--- a/ReactCommon/react/renderer/scheduler/Scheduler.cpp
+++ b/ReactCommon/react/renderer/scheduler/Scheduler.cpp
@@ -27,8 +27,7 @@
 #include <iostream>
 #endif
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 Scheduler::Scheduler(
     SchedulerToolbox const &schedulerToolbox,
@@ -49,19 +48,10 @@ Scheduler::Scheduler(
   auto eventOwnerBox = std::make_shared<EventBeat::OwnerBox>();
   eventOwnerBox->owner = eventDispatcher_;
 
-#ifdef ANDROID
-  auto enableCallImmediates = reactNativeConfig_->getBool(
-      "react_native_new_architecture:enable_call_immediates_android");
-#else
-  auto enableCallImmediates = reactNativeConfig_->getBool(
-      "react_native_new_architecture:enable_call_immediates_ios");
-#endif
-
   auto weakRuntimeScheduler =
       contextContainer_->find<std::weak_ptr<RuntimeScheduler>>(
           "RuntimeScheduler");
-  auto runtimeScheduler =
-      (enableCallImmediates && weakRuntimeScheduler.has_value())
+  auto runtimeScheduler = weakRuntimeScheduler.has_value()
       ? weakRuntimeScheduler.value().lock()
       : nullptr;
 
@@ -77,7 +67,7 @@ Scheduler::Scheduler(
               runtime, eventTarget, type, priority, payloadFactory);
         },
         runtime);
-    if (runtimeScheduler) {
+    if (runtimeScheduler != nullptr) {
       runtimeScheduler->callExpiredTasks(runtime);
     }
   };
@@ -104,11 +94,13 @@ Scheduler::Scheduler(
   uiManager->setDelegate(this);
   uiManager->setComponentDescriptorRegistry(componentDescriptorRegistry_);
 
-  runtimeExecutor_(
-      [uiManager, runtimeExecutor = runtimeExecutor_](jsi::Runtime &runtime) {
-        UIManagerBinding::createAndInstallIfNeeded(
-            runtime, runtimeExecutor, uiManager);
-      });
+  auto bindingsExecutor =
+      schedulerToolbox.bridgelessBindingsExecutor.has_value()
+      ? schedulerToolbox.bridgelessBindingsExecutor.value()
+      : runtimeExecutor_;
+  bindingsExecutor([uiManager](jsi::Runtime &runtime) {
+    UIManagerBinding::createAndInstallIfNeeded(runtime, uiManager);
+  });
 
   auto componentDescriptorRegistryKey =
       "ComponentDescriptorRegistry_DO_NOT_USE_PRETTY_PLEASE";
@@ -304,37 +296,26 @@ void Scheduler::uiManagerDidFinishTransaction(
     MountingCoordinator::Shared const &mountingCoordinator) {
   SystraceSection s("Scheduler::uiManagerDidFinishTransaction");
 
-  if (delegate_) {
+  if (delegate_ != nullptr) {
     delegate_->schedulerDidFinishTransaction(mountingCoordinator);
   }
 }
 void Scheduler::uiManagerDidCreateShadowNode(const ShadowNode &shadowNode) {
   SystraceSection s("Scheduler::uiManagerDidCreateShadowNode");
 
-  if (delegate_) {
+  if (delegate_ != nullptr) {
     delegate_->schedulerDidRequestPreliminaryViewAllocation(
         shadowNode.getSurfaceId(), shadowNode);
   }
 }
 
-void Scheduler::uiManagerDidCloneShadowNode(
-    const ShadowNode &oldShadowNode,
-    const ShadowNode &newShadowNode) {
-  SystraceSection s("Scheduler::uiManagerDidCloneShadowNode");
-
-  if (delegate_) {
-    delegate_->schedulerDidCloneShadowNode(
-        newShadowNode.getSurfaceId(), oldShadowNode, newShadowNode);
-  }
-}
-
 void Scheduler::uiManagerDidDispatchCommand(
     const ShadowNode::Shared &shadowNode,
     std::string const &commandName,
     folly::dynamic const &args) {
   SystraceSection s("Scheduler::uiManagerDispatchCommand");
 
-  if (delegate_) {
+  if (delegate_ != nullptr) {
     auto shadowView = ShadowView(*shadowNode);
     delegate_->schedulerDidDispatchCommand(shadowView, commandName, args);
   }
@@ -345,7 +326,7 @@ void Scheduler::uiManagerDidSendAccessibilityEvent(
     std::string const &eventType) {
   SystraceSection s("Scheduler::uiManagerDidSendAccessibilityEvent");
 
-  if (delegate_) {
+  if (delegate_ != nullptr) {
     auto shadowView = ShadowView(*shadowNode);
     delegate_->schedulerDidSendAccessibilityEvent(shadowView, eventType);
   }
@@ -358,7 +339,7 @@ void Scheduler::uiManagerDidSetIsJSResponder(
     ShadowNode::Shared const &shadowNode,
     bool isJSResponder,
     bool blockNativeResponder) {
-  if (delegate_) {
+  if (delegate_ != nullptr) {
     delegate_->schedulerDidSetIsJSResponder(
         ShadowView(*shadowNode), isJSResponder, blockNativeResponder);
   }
@@ -386,5 +367,4 @@ void Scheduler::removeEventListener(
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/scheduler/Scheduler.h b/ReactCommon/react/renderer/scheduler/Scheduler.h
index 626572a073f2..d42bfe802bb0 100644
--- a/ReactCommon/react/renderer/scheduler/Scheduler.h
+++ b/ReactCommon/react/renderer/scheduler/Scheduler.h
@@ -90,9 +90,6 @@ class Scheduler final : public UIManagerDelegate {
   void uiManagerDidFinishTransaction(
       MountingCoordinator::Shared const &mountingCoordinator) override;
   void uiManagerDidCreateShadowNode(const ShadowNode &shadowNode) override;
-  void uiManagerDidCloneShadowNode(
-      const ShadowNode &oldShadowNode,
-      const ShadowNode &newShadowNode) override;
   void uiManagerDidDispatchCommand(
       const ShadowNode::Shared &shadowNode,
       std::string const &commandName,
@@ -101,7 +98,7 @@ class Scheduler final : public UIManagerDelegate {
       const ShadowNode::Shared &shadowNode,
       std::string const &eventType) override;
   void uiManagerDidSetIsJSResponder(
-      ShadowNode::Shared const &shadowView,
+      ShadowNode::Shared const &shadowNode,
       bool isJSResponder,
       bool blockNativeResponder) override;
 
diff --git a/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h b/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h
index e1bf4fda5bb4..db36d2c04098 100644
--- a/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h
+++ b/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h
@@ -36,14 +36,6 @@ class SchedulerDelegate {
       SurfaceId surfaceId,
       const ShadowNode &shadowView) = 0;
 
-  /*
-   * Called right after a ShadowNode is cloned.
-   */
-  virtual void schedulerDidCloneShadowNode(
-      SurfaceId surfaceId,
-      const ShadowNode &oldShadowNode,
-      const ShadowNode &newShadowNode) = 0;
-
   virtual void schedulerDidDispatchCommand(
       const ShadowView &shadowView,
       std::string const &commandName,
diff --git a/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h b/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h
index 6903b86e4531..0e3b677720cb 100644
--- a/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h
+++ b/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h
@@ -40,6 +40,13 @@ struct SchedulerToolbox final {
 
   /*
    * Represents running JavaScript VM and associated execution queue.
+   * Can execute lambdas before main bundle has loaded.
+   */
+  std::optional<RuntimeExecutor> bridgelessBindingsExecutor;
+
+  /*
+   * Represents running JavaScript VM and associated execution queue.
+   * Executes lambdas after main bundle has loaded.
    */
   RuntimeExecutor runtimeExecutor;
 
diff --git a/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp b/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp
index b68e2f617a15..1ee4505c59a2 100644
--- a/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp
+++ b/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp
@@ -12,8 +12,7 @@
 #include <react/renderer/scheduler/Scheduler.h>
 #include <react/renderer/uimanager/UIManager.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 using Status = SurfaceHandler::Status;
 
@@ -283,10 +282,12 @@ void SurfaceHandler::applyDisplayMode(DisplayMode displayMode) const noexcept {
       link_.shadowTree->setCommitMode(ShadowTree::CommitMode::Suspended);
       // Committing the current revision back. It will be mounted only when
       // `DisplayMode` is changed back to `Normal`.
-      link_.shadowTree->commit([&](RootShadowNode const &oldRootShadowNode) {
-        return std::static_pointer_cast<RootShadowNode>(
-            revision.rootShadowNode->ShadowNode::clone(ShadowNodeFragment{}));
-      });
+      link_.shadowTree->commit(
+          [&](RootShadowNode const & /*oldRootShadowNode*/) {
+            return std::static_pointer_cast<RootShadowNode>(
+                revision.rootShadowNode->ShadowNode::clone(
+                    ShadowNodeFragment{}));
+          });
       break;
   }
 }
@@ -302,7 +303,8 @@ void SurfaceHandler::setUIManager(UIManager const *uiManager) const noexcept {
   }
 
   link_.uiManager = uiManager;
-  link_.status = uiManager ? Status::Registered : Status::Unregistered;
+  link_.status =
+      uiManager != nullptr ? Status::Registered : Status::Unregistered;
 }
 
 SurfaceHandler::~SurfaceHandler() noexcept {
@@ -313,5 +315,4 @@ SurfaceHandler::~SurfaceHandler() noexcept {
   //      deallocation.");
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/scheduler/SurfaceHandler.h b/ReactCommon/react/renderer/scheduler/SurfaceHandler.h
index babf534da3a3..f550e709f59f 100644
--- a/ReactCommon/react/renderer/scheduler/SurfaceHandler.h
+++ b/ReactCommon/react/renderer/scheduler/SurfaceHandler.h
@@ -67,7 +67,7 @@ class SurfaceHandler {
   /*
    * Movable-only.
    */
-  SurfaceHandler(SurfaceHandler &&SurfaceHandler) noexcept;
+  SurfaceHandler(SurfaceHandler &&other) noexcept;
   SurfaceHandler(SurfaceHandler const &SurfaceHandler) noexcept = delete;
   SurfaceHandler &operator=(SurfaceHandler &&other) noexcept;
   SurfaceHandler &operator=(SurfaceHandler const &other) noexcept = delete;
diff --git a/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp b/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp
index faa9c2c12822..e663b68f4c1e 100644
--- a/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp
+++ b/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp
@@ -9,8 +9,7 @@
 
 #include <react/renderer/scheduler/Scheduler.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 SurfaceManager::SurfaceManager(Scheduler const &scheduler) noexcept
     : scheduler_(scheduler) {}
@@ -100,5 +99,4 @@ void SurfaceManager::visit(
   callback(iterator->second);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.cpp b/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.cpp
index fc9a406629c0..73b18946ff4c 100644
--- a/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.cpp
+++ b/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.cpp
@@ -11,8 +11,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 SynchronousEventBeat::SynchronousEventBeat(
     RunLoopObserver::Unique uiRunLoopObserver,
@@ -28,7 +27,7 @@ SynchronousEventBeat::SynchronousEventBeat(
 
 void SynchronousEventBeat::activityDidChange(
     RunLoopObserver::Delegate const *delegate,
-    RunLoopObserver::Activity activity) const noexcept {
+    RunLoopObserver::Activity /*activity*/) const noexcept {
   react_native_assert(delegate == this);
   lockExecutorAndBeat();
 }
@@ -57,5 +56,4 @@ void SynchronousEventBeat::lockExecutorAndBeat() const {
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/telemetry/BUCK b/ReactCommon/react/renderer/telemetry/BUCK
index d1a1da1f3139..f650a8c89903 100644
--- a/ReactCommon/react/renderer/telemetry/BUCK
+++ b/ReactCommon/react/renderer/telemetry/BUCK
@@ -32,12 +32,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/telemetry",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -50,9 +50,6 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
         react_native_xplat_target("butter:butter"),
         react_native_xplat_target("react/debug:debug"),
         react_native_xplat_target("react/utils:utils"),
@@ -74,7 +71,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":telemetry",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("react/test_utils:test_utils"),
     ],
diff --git a/ReactCommon/react/renderer/telemetry/CMakeLists.txt b/ReactCommon/react/renderer/telemetry/CMakeLists.txt
index cad8f9e81cd3..aae37e0c19d2 100644
--- a/ReactCommon/react/renderer/telemetry/CMakeLists.txt
+++ b/ReactCommon/react/renderer/telemetry/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_telemetry_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_telemetry SHARED ${react_render_telemetry_SRC})
diff --git a/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.cpp b/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.cpp
index d982e26d6ee7..2fc097e74a82 100644
--- a/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.cpp
+++ b/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.cpp
@@ -9,8 +9,7 @@
 
 #include <algorithm>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 void SurfaceTelemetry::incorporate(
     TransactionTelemetry const &telemetry,
@@ -81,5 +80,4 @@ SurfaceTelemetry::getRecentTransactionTelemetries() const {
   return result;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/telemetry/TransactionTelemetry.cpp b/ReactCommon/react/renderer/telemetry/TransactionTelemetry.cpp
index 79c2f71b55af..cd23b4d12d86 100644
--- a/ReactCommon/react/renderer/telemetry/TransactionTelemetry.cpp
+++ b/ReactCommon/react/renderer/telemetry/TransactionTelemetry.cpp
@@ -11,8 +11,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 thread_local TransactionTelemetry *threadLocalTransactionTelemetry = nullptr;
 
@@ -161,5 +160,4 @@ int TransactionTelemetry::getRevisionNumber() const {
   return revisionNumber_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/templateprocessor/BUCK b/ReactCommon/react/renderer/templateprocessor/BUCK
index eefba5b9e749..df5d13dd5ba3 100644
--- a/ReactCommon/react/renderer/templateprocessor/BUCK
+++ b/ReactCommon/react/renderer/templateprocessor/BUCK
@@ -31,12 +31,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/templateprocessor",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -49,9 +49,8 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
+        "//xplat/folly:dynamic",
+        "//xplat/folly:json",
         "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
         react_native_xplat_target("react/renderer/core:core"),
@@ -77,7 +76,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":templateprocessor",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("react/config:config"),
         react_native_xplat_target("react/renderer/components/image:image"),
diff --git a/ReactCommon/react/renderer/templateprocessor/CMakeLists.txt b/ReactCommon/react/renderer/templateprocessor/CMakeLists.txt
index 2aeaa6d101f4..c8bac1961879 100644
--- a/ReactCommon/react/renderer/templateprocessor/CMakeLists.txt
+++ b/ReactCommon/react/renderer/templateprocessor/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_templateprocessor_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_templateprocessor SHARED ${react_render_templateprocessor_SRC})
diff --git a/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp b/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp
index a198134b350e..d988d1e79a37 100644
--- a/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp
+++ b/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp
@@ -18,8 +18,7 @@
 #include <react/renderer/debug/DebugStringConvertible.h>
 #include <react/renderer/debug/DebugStringConvertibleItem.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 bool constexpr DEBUG_FLY = false;
 
@@ -151,5 +150,4 @@ ShadowNode::Shared UITemplateProcessor::buildShadowTree(
   return ShadowNode::Shared{};
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.h b/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.h
index a95339e58b91..81416defac27 100644
--- a/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.h
+++ b/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.h
@@ -46,7 +46,7 @@ class UITemplateProcessor {
  public:
   static ShadowNode::Shared buildShadowTree(
       const std::string &jsonStr,
-      int rootTag,
+      int surfaceId,
       const folly::dynamic &params,
       const ComponentDescriptorRegistry &componentDescriptorRegistry,
       const NativeModuleRegistry &nativeModuleRegistry,
@@ -55,7 +55,7 @@ class UITemplateProcessor {
  private:
   static ShadowNode::Shared runCommand(
       const folly::dynamic &command,
-      Tag rootTag,
+      Tag surfaceId,
       std::vector<ShadowNode::Shared> &nodes,
       std::vector<folly::dynamic> &registers,
       const ComponentDescriptorRegistry &componentDescriptorRegistry,
diff --git a/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp b/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp
index fc672ef606bf..66de70df621b 100644
--- a/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp
+++ b/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp
@@ -23,8 +23,7 @@ using namespace facebook::react;
 #include <react/renderer/components/view/ViewComponentDescriptor.h>
 #include <react/utils/ContextContainer.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static ComponentRegistryFactory getComponentRegistryFactory() {
   return [](const EventDispatcher::Weak &eventDispatcher,
@@ -48,7 +47,8 @@ NativeModuleRegistry buildNativeModuleRegistry();
 NativeModuleRegistry buildNativeModuleRegistry() {
   NativeModuleRegistry nMR;
   nMR.registerModule(
-      "MobileConfig", [&](const std::string &, const folly::dynamic &) {
+      "MobileConfig",
+      [&](const std::string & /*unused*/, const folly::dynamic & /*unused*/) {
         return mockSimpleTestValue_;
       });
   return nMR;
@@ -57,19 +57,19 @@ NativeModuleRegistry buildNativeModuleRegistry() {
 class MockReactNativeConfig : public ReactNativeConfig {
  public:
   MockReactNativeConfig() = default;
-  bool getBool(const std::string &param) const override {
+  bool getBool(const std::string & /*param*/) const override {
     return mockSimpleTestValue_;
   }
 
-  std::string getString(const std::string &) const override {
+  std::string getString(const std::string & /*param*/) const override {
     return "";
   }
 
-  int64_t getInt64(const std::string &) const override {
+  int64_t getInt64(const std::string & /*param*/) const override {
     return 0;
   }
 
-  double getDouble(const std::string &) const override {
+  double getDouble(const std::string & /*param*/) const override {
     return 0.0;
   }
 };
@@ -77,8 +77,7 @@ class MockReactNativeConfig : public ReactNativeConfig {
 std::shared_ptr<const ReactNativeConfig> mockReactNativeConfig_ =
     std::make_shared<const MockReactNativeConfig>();
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 
 TEST(UITemplateProcessorTest, testSimpleBytecode) {
   auto surfaceId = 11;
diff --git a/ReactCommon/react/renderer/textlayoutmanager/BUCK b/ReactCommon/react/renderer/textlayoutmanager/BUCK
index ae63b1e7a1c1..c4e3be0d401a 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/BUCK
+++ b/ReactCommon/react/renderer/textlayoutmanager/BUCK
@@ -36,6 +36,7 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/textlayoutmanager",
     ),
+    compiler_flags_pedantic = True,
     cxx_exported_headers = subdir_glob(
         [
             ("platform/cxx", "*.h"),
@@ -105,7 +106,6 @@ rn_xplat_cxx_library(
     ),
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -117,9 +117,6 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
         YOGA_CXX_TARGET,
         react_native_xplat_target("react/renderer/attributedstring:attributedstring"),
         react_native_xplat_target("react/renderer/core:core"),
@@ -151,7 +148,6 @@ fb_xplat_cxx_test(
     ),
     deps = [
         ":textlayoutmanager",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )
diff --git a/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt b/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt
index cb12805f3c54..8027f57c47d5 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt
+++ b/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_textlayourmanager_SRC CONFIGURE_DEPENDS
         *.cpp
@@ -40,6 +47,6 @@ target_link_libraries(react_render_textlayoutmanager
         react_render_telemetry
         react_render_uimanager
         react_utils
-        reactnativeutilsjni
+        reactnativejni
         yoga
 )
diff --git a/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp
index 6275bd8c442c..03558aad5422 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp
+++ b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp
@@ -9,8 +9,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 static Rect rectFromDynamic(folly::dynamic const &data) {
   Point origin;
@@ -66,5 +65,4 @@ bool LineMeasurement::operator==(LineMeasurement const &rhs) const {
              rhs.xHeight);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h
index 013796ba53de..23486173c680 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h
+++ b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h
@@ -71,7 +71,7 @@ class TextMeasureCacheKey final {
  * The number was empirically chosen based on approximation of an average amount
  * of meaningful measures per surface.
  */
-constexpr auto kSimpleThreadSafeCacheSizeCap = size_t{256};
+constexpr auto kSimpleThreadSafeCacheSizeCap = size_t{1024};
 
 /*
  * Thread-safe, evicting hash table designed to store text measurement
@@ -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);
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp
index c4c5bfce9b1e..fa51c0a92c28 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp
+++ b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp
@@ -19,8 +19,7 @@
 
 using namespace facebook::jni;
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 Size measureAndroidComponent(
     ContextContainer::Shared const &contextContainer,
@@ -147,12 +146,7 @@ Size measureAndroidComponentMapBuffer(
 TextLayoutManager::TextLayoutManager(
     const ContextContainer::Shared &contextContainer)
     : contextContainer_(contextContainer),
-      mapBufferSerializationEnabled_(
-          contextContainer->at<bool>("MapBufferSerializationEnabled")),
-      measureCache_(
-          contextContainer->at<bool>("EnableLargeTextMeasureCache")
-              ? 1024
-              : kSimpleThreadSafeCacheSizeCap) {}
+      measureCache_(kSimpleThreadSafeCacheSizeCap) {}
 
 void *TextLayoutManager::getNativeTextLayoutManager() const {
   return self_;
@@ -166,19 +160,16 @@ TextMeasurement TextLayoutManager::measure(
 
   auto measurement = measureCache_.get(
       {attributedString, paragraphAttributes, layoutConstraints},
-      [&](TextMeasureCacheKey const &key) {
+      [&](TextMeasureCacheKey const & /*key*/) {
         auto telemetry = TransactionTelemetry::threadLocalTelemetry();
-        if (telemetry) {
+        if (telemetry != nullptr) {
           telemetry->willMeasureText();
         }
 
-        auto measurement = mapBufferSerializationEnabled_
-            ? doMeasureMapBuffer(
-                  attributedString, paragraphAttributes, layoutConstraints)
-            : doMeasure(
-                  attributedString, paragraphAttributes, layoutConstraints);
+        auto measurement = doMeasureMapBuffer(
+            attributedString, paragraphAttributes, layoutConstraints);
 
-        if (telemetry) {
+        if (telemetry != nullptr) {
           telemetry->didMeasureText();
         }
 
@@ -228,60 +219,6 @@ LinesMeasurements TextLayoutManager::measureLines(
     AttributedString const &attributedString,
     ParagraphAttributes const &paragraphAttributes,
     Size size) const {
-  if (mapBufferSerializationEnabled_) {
-    return measureLinesMapBuffer(attributedString, paragraphAttributes, size);
-  }
-
-  const jni::global_ref<jobject> &fabricUIManager =
-      contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
-  static auto measureLines =
-      jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-          ->getMethod<NativeArray::javaobject(
-              ReadableMap::javaobject,
-              ReadableMap::javaobject,
-              jfloat,
-              jfloat)>("measureLines");
-
-  auto serializedAttributedString = toDynamic(attributedString);
-
-  local_ref<ReadableNativeMap::javaobject> attributedStringRNM =
-      ReadableNativeMap::newObjectCxxArgs(serializedAttributedString);
-  local_ref<ReadableNativeMap::javaobject> paragraphAttributesRNM =
-      ReadableNativeMap::newObjectCxxArgs(toDynamic(paragraphAttributes));
-
-  local_ref<ReadableMap::javaobject> attributedStringRM = make_local(
-      reinterpret_cast<ReadableMap::javaobject>(attributedStringRNM.get()));
-  local_ref<ReadableMap::javaobject> paragraphAttributesRM = make_local(
-      reinterpret_cast<ReadableMap::javaobject>(paragraphAttributesRNM.get()));
-
-  auto array = measureLines(
-      fabricUIManager,
-      attributedStringRM.get(),
-      paragraphAttributesRM.get(),
-      size.width,
-      size.height);
-
-  auto dynamicArray = cthis(array)->consume();
-  LinesMeasurements lineMeasurements;
-  lineMeasurements.reserve(dynamicArray.size());
-
-  for (auto const &data : dynamicArray) {
-    lineMeasurements.push_back(LineMeasurement(data));
-  }
-
-  // Explicitly release smart pointers to free up space faster in JNI tables
-  attributedStringRM.reset();
-  attributedStringRNM.reset();
-  paragraphAttributesRM.reset();
-  paragraphAttributesRNM.reset();
-
-  return lineMeasurements;
-}
-
-LinesMeasurements TextLayoutManager::measureLinesMapBuffer(
-    AttributedString const &attributedString,
-    ParagraphAttributes const &paragraphAttributes,
-    Size size) const {
   const jni::global_ref<jobject> &fabricUIManager =
       contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
   static auto measureLines =
@@ -446,5 +383,4 @@ TextMeasurement TextLayoutManager::doMeasureMapBuffer(
   return TextMeasurement{size, attachments};
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h
index ad3483b3eb8d..63694bc1bbc6 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h
+++ b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h
@@ -88,9 +88,8 @@ class TextLayoutManager {
       ParagraphAttributes const &paragraphAttributes,
       Size size) const;
 
-  void *self_;
+  void *self_{};
   ContextContainer::Shared contextContainer_;
-  bool mapBufferSerializationEnabled_;
   TextMeasureCache measureCache_;
 };
 
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm
index 0a5828ab7f5d..dca3ab892c8d 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm
+++ b/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,18 +148,11 @@ inline static UIFontWeight RCTUIFontWeightFromInteger(NSInteger fontWeight)
   fontProperties.weight = textAttributes.fontWeight.has_value()
       ? RCTUIFontWeightFromInteger((NSInteger)textAttributes.fontWeight.value())
       : NAN;
-  fontProperties.sizeMultiplier = textAttributes.fontSizeMultiplier;
+  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];
@@ -156,6 +226,12 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
     isParagraphStyleUsed = YES;
   }
 
+  if (textAttributes.lineBreakStrategy.has_value()) {
+    paragraphStyle.lineBreakStrategy =
+        RCTNSLineBreakStrategyFromLineBreakStrategy(textAttributes.lineBreakStrategy.value());
+    isParagraphStyleUsed = YES;
+  }
+
   if (!isnan(textAttributes.lineHeight)) {
     CGFloat lineHeight = textAttributes.lineHeight * RCTEffectiveFontSizeMultiplierFromTextAttributes(textAttributes);
     paragraphStyle.minimumLineHeight = lineHeight;
@@ -305,6 +381,50 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
   return [attributes copy];
 }
 
+static void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)
+{
+  __block CGFloat maximumLineHeight = 0;
+
+  [attributedText enumerateAttribute:NSParagraphStyleAttributeName
+                             inRange:NSMakeRange(0, attributedText.length)
+                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
+                          usingBlock:^(NSParagraphStyle *paragraphStyle, __unused NSRange range, __unused BOOL *stop) {
+                            if (!paragraphStyle) {
+                              return;
+                            }
+
+                            maximumLineHeight = MAX(paragraphStyle.maximumLineHeight, maximumLineHeight);
+                          }];
+
+  if (maximumLineHeight == 0) {
+    // `lineHeight` was not specified, nothing to do.
+    return;
+  }
+
+  __block CGFloat maximumFontLineHeight = 0;
+
+  [attributedText enumerateAttribute:NSFontAttributeName
+                             inRange:NSMakeRange(0, attributedText.length)
+                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
+                          usingBlock:^(UIFont *font, NSRange range, __unused BOOL *stop) {
+                            if (!font) {
+                              return;
+                            }
+
+                            maximumFontLineHeight = MAX(font.lineHeight, maximumFontLineHeight);
+                          }];
+
+  if (maximumLineHeight < maximumFontLineHeight) {
+    return;
+  }
+
+  CGFloat baseLineOffset = (maximumLineHeight - maximumFontLineHeight) / 2.0;
+
+  [attributedText addAttribute:NSBaselineOffsetAttributeName
+                         value:@(baseLineOffset)
+                         range:NSMakeRange(0, attributedText.length)];
+}
+
 NSAttributedString *RCTNSAttributedStringFromAttributedString(const AttributedString &attributedString)
 {
   static UIImage *placeholderImage;
@@ -357,7 +477,7 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
 
     [nsAttributedString appendAttributedString:nsAttributedStringFragment];
   }
-
+  RCTApplyBaselineOffset(nsAttributedString);
   [nsAttributedString endEditing];
 
   return nsAttributedString;
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h
index 235137bde0c1..1921d1ca1cff 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h
+++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h
@@ -10,68 +10,91 @@
 #include <react/renderer/textlayoutmanager/RCTFontProperties.h>
 #include <react/renderer/textlayoutmanager/RCTFontUtils.h>
 
-using namespace facebook::react;
-
-inline static NSTextAlignment RCTNSTextAlignmentFromTextAlignment(TextAlignment textAlignment)
+inline static NSTextAlignment RCTNSTextAlignmentFromTextAlignment(facebook::react::TextAlignment textAlignment)
 {
   switch (textAlignment) {
-    case TextAlignment::Natural:
+    case facebook::react::TextAlignment::Natural:
       return NSTextAlignmentNatural;
-    case TextAlignment::Left:
+    case facebook::react::TextAlignment::Left:
       return NSTextAlignmentLeft;
-    case TextAlignment::Right:
+    case facebook::react::TextAlignment::Right:
       return NSTextAlignmentRight;
-    case TextAlignment::Center:
+    case facebook::react::TextAlignment::Center:
       return NSTextAlignmentCenter;
-    case TextAlignment::Justified:
+    case facebook::react::TextAlignment::Justified:
       return NSTextAlignmentJustified;
   }
 }
 
-inline static NSWritingDirection RCTNSWritingDirectionFromWritingDirection(WritingDirection writingDirection)
+inline static NSWritingDirection RCTNSWritingDirectionFromWritingDirection(
+    facebook::react::WritingDirection writingDirection)
 {
   switch (writingDirection) {
-    case WritingDirection::Natural:
+    case facebook::react::WritingDirection::Natural:
       return NSWritingDirectionNatural;
-    case WritingDirection::LeftToRight:
+    case facebook::react::WritingDirection::LeftToRight:
       return NSWritingDirectionLeftToRight;
-    case WritingDirection::RightToLeft:
+    case facebook::react::WritingDirection::RightToLeft:
       return NSWritingDirectionRightToLeft;
   }
 }
 
-inline static RCTFontStyle RCTFontStyleFromFontStyle(FontStyle fontStyle)
+inline static NSLineBreakStrategy RCTNSLineBreakStrategyFromLineBreakStrategy(
+    facebook::react::LineBreakStrategy lineBreakStrategy)
+{
+  switch (lineBreakStrategy) {
+    case facebook::react::LineBreakStrategy::None:
+      return NSLineBreakStrategyNone;
+    case facebook::react::LineBreakStrategy::PushOut:
+      return NSLineBreakStrategyPushOut;
+    case facebook::react::LineBreakStrategy::HangulWordPriority:
+      if (@available(iOS 14.0, *)) {
+        return NSLineBreakStrategyHangulWordPriority;
+      } else {
+        return NSLineBreakStrategyNone;
+      }
+    case facebook::react::LineBreakStrategy::Standard:
+      if (@available(iOS 14.0, *)) {
+        return NSLineBreakStrategyStandard;
+      } else {
+        return NSLineBreakStrategyNone;
+      }
+  }
+}
+
+inline static RCTFontStyle RCTFontStyleFromFontStyle(facebook::react::FontStyle fontStyle)
 {
   switch (fontStyle) {
-    case FontStyle::Normal:
+    case facebook::react::FontStyle::Normal:
       return RCTFontStyleNormal;
-    case FontStyle::Italic:
+    case facebook::react::FontStyle::Italic:
       return RCTFontStyleItalic;
-    case FontStyle::Oblique:
+    case facebook::react::FontStyle::Oblique:
       return RCTFontStyleOblique;
   }
 }
 
-inline static RCTFontVariant RCTFontVariantFromFontVariant(FontVariant fontVariant)
+inline static RCTFontVariant RCTFontVariantFromFontVariant(facebook::react::FontVariant fontVariant)
 {
   return (RCTFontVariant)fontVariant;
 }
 
-inline static NSUnderlineStyle RCTNSUnderlineStyleFromTextDecorationStyle(TextDecorationStyle textDecorationStyle)
+inline static NSUnderlineStyle RCTNSUnderlineStyleFromTextDecorationStyle(
+    facebook::react::TextDecorationStyle textDecorationStyle)
 {
   switch (textDecorationStyle) {
-    case TextDecorationStyle::Solid:
+    case facebook::react::TextDecorationStyle::Solid:
       return NSUnderlineStyleSingle;
-    case TextDecorationStyle::Double:
+    case facebook::react::TextDecorationStyle::Double:
       return NSUnderlineStyleDouble;
-    case TextDecorationStyle::Dashed:
+    case facebook::react::TextDecorationStyle::Dashed:
       return NSUnderlinePatternDash | NSUnderlineStyleSingle;
-    case TextDecorationStyle::Dotted:
+    case facebook::react::TextDecorationStyle::Dotted:
       return NSUnderlinePatternDot | NSUnderlineStyleSingle;
   }
 }
 
-inline static UIColor *RCTUIColorFromSharedColor(const SharedColor &sharedColor)
+inline static UIColor *RCTUIColorFromSharedColor(const facebook::react::SharedColor &sharedColor)
 {
   if (!sharedColor) {
     return nil;
diff --git a/ReactCommon/react/renderer/timeline/BUCK b/ReactCommon/react/renderer/timeline/BUCK
index a5d5e7f79839..513baf236425 100644
--- a/ReactCommon/react/renderer/timeline/BUCK
+++ b/ReactCommon/react/renderer/timeline/BUCK
@@ -31,8 +31,9 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/timeline",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
-    fbobjc_labels = ["supermodule:ios/isolation/infra.react_native"],
+    fbobjc_labels = [],
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     macosx_tests_override = [],
@@ -46,9 +47,6 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
         react_native_xplat_target("react/utils:utils"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/core:core"),
@@ -72,7 +70,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":timeline",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
     ],
 )
diff --git a/ReactCommon/react/renderer/timeline/Timeline.cpp b/ReactCommon/react/renderer/timeline/Timeline.cpp
index ea569370e8d2..5fb3bab39482 100644
--- a/ReactCommon/react/renderer/timeline/Timeline.cpp
+++ b/ReactCommon/react/renderer/timeline/Timeline.cpp
@@ -9,8 +9,7 @@
 
 #include <react/renderer/uimanager/UIManager.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 Timeline::Timeline(ShadowTree const &shadowTree) : shadowTree_(&shadowTree) {
   record(shadowTree.getCurrentRevision().rootShadowNode);
@@ -31,7 +30,7 @@ void Timeline::pause() const noexcept {
 void Timeline::resume() const noexcept {
   std::lock_guard<std::recursive_mutex> lock(mutex_);
 
-  if (snapshots_.size() > 0) {
+  if (!snapshots_.empty()) {
     rewind(snapshots_.at(snapshots_.size() - 1));
   }
 
@@ -66,8 +65,8 @@ void Timeline::rewind(TimelineFrame const &frame) const noexcept {
 }
 
 RootShadowNode::Unshared Timeline::shadowTreeWillCommit(
-    ShadowTree const &shadowTree,
-    RootShadowNode::Shared const &oldRootShadowNode,
+    ShadowTree const & /*shadowTree*/,
+    RootShadowNode::Shared const & /*oldRootShadowNode*/,
     RootShadowNode::Unshared const &newRootShadowNode) const noexcept {
   std::lock_guard<std::recursive_mutex> lock(mutex_);
 
@@ -107,7 +106,8 @@ void Timeline::rewind(TimelineSnapshot const &snapshot) const noexcept {
   auto rootShadowNode = snapshot.getRootShadowNode();
 
   shadowTree_->commit(
-      [&](RootShadowNode const &oldRootShadowNode) -> RootShadowNode::Unshared {
+      [&](RootShadowNode const & /*oldRootShadowNode*/)
+          -> RootShadowNode::Unshared {
         return std::static_pointer_cast<RootShadowNode>(
             rootShadowNode->ShadowNode::clone({}));
       });
@@ -116,5 +116,4 @@ void Timeline::rewind(TimelineSnapshot const &snapshot) const noexcept {
   rewinding_ = false;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/timeline/TimelineController.cpp b/ReactCommon/react/renderer/timeline/TimelineController.cpp
index 01e716741f76..82f31db63dbc 100644
--- a/ReactCommon/react/renderer/timeline/TimelineController.cpp
+++ b/ReactCommon/react/renderer/timeline/TimelineController.cpp
@@ -10,8 +10,7 @@
 #include <react/renderer/mounting/ShadowTree.h>
 #include <react/renderer/uimanager/UIManager.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 TimelineHandler TimelineController::enable(SurfaceId surfaceId) const {
   assert(uiManager_);
@@ -49,7 +48,7 @@ void TimelineController::commitHookWasRegistered(
 }
 
 void TimelineController::commitHookWasUnregistered(
-    UIManager const &uiManager) const noexcept {
+    UIManager const & /*uiManager*/) const noexcept {
   uiManager_ = nullptr;
 }
 
@@ -73,5 +72,4 @@ RootShadowNode::Unshared TimelineController::shadowTreeWillCommit(
       shadowTree, oldRootShadowNode, newRootShadowNode);
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/timeline/TimelineFrame.cpp b/ReactCommon/react/renderer/timeline/TimelineFrame.cpp
index b23e160cce15..d1aa4ac2e11e 100644
--- a/ReactCommon/react/renderer/timeline/TimelineFrame.cpp
+++ b/ReactCommon/react/renderer/timeline/TimelineFrame.cpp
@@ -7,8 +7,7 @@
 
 #include "TimelineFrame.h"
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 TimelineFrame::TimelineFrame(int index, TelemetryTimePoint timePoint) noexcept
     : index_(index), timePoint_(timePoint) {}
@@ -21,5 +20,4 @@ TelemetryTimePoint TimelineFrame::getTimePoint() const noexcept {
   return timePoint_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/timeline/TimelineHandler.cpp b/ReactCommon/react/renderer/timeline/TimelineHandler.cpp
index 3deef099f739..dc42ec8f5171 100644
--- a/ReactCommon/react/renderer/timeline/TimelineHandler.cpp
+++ b/ReactCommon/react/renderer/timeline/TimelineHandler.cpp
@@ -11,8 +11,7 @@
 
 #include <react/renderer/timeline/Timeline.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 TimelineHandler::TimelineHandler(Timeline const &timeline) noexcept
     : timeline_(&timeline) {}
@@ -88,10 +87,9 @@ void TimelineHandler::release() noexcept {
 }
 
 void TimelineHandler::ensureNotEmpty() const noexcept {
-  if (!timeline_) {
+  if (timeline_ == nullptr) {
     abort();
   }
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/timeline/TimelineHandler.h b/ReactCommon/react/renderer/timeline/TimelineHandler.h
index 61fa45f3ce8a..3615d76eba76 100644
--- a/ReactCommon/react/renderer/timeline/TimelineHandler.h
+++ b/ReactCommon/react/renderer/timeline/TimelineHandler.h
@@ -23,7 +23,7 @@ class TimelineHandler final {
   /*
    * Movable, not copyable.
    */
-  TimelineHandler(TimelineHandler &&timelineHandler) noexcept;
+  TimelineHandler(TimelineHandler &&other) noexcept;
   TimelineHandler(TimelineHandler const &timelineHandler) = delete;
   TimelineHandler &operator=(TimelineHandler &&other) noexcept;
   TimelineHandler &operator=(TimelineHandler const &other) = delete;
@@ -73,7 +73,7 @@ class TimelineHandler final {
 
   void ensureNotEmpty() const noexcept;
 
-  Timeline const *timeline_;
+  Timeline const *timeline_{};
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/timeline/TimelineSnapshot.cpp b/ReactCommon/react/renderer/timeline/TimelineSnapshot.cpp
index 08d40bd1214c..1500caebe92a 100644
--- a/ReactCommon/react/renderer/timeline/TimelineSnapshot.cpp
+++ b/ReactCommon/react/renderer/timeline/TimelineSnapshot.cpp
@@ -11,8 +11,7 @@
 
 #include <utility>
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 TimelineSnapshot::TimelineSnapshot(
     RootShadowNode::Shared rootShadowNode,
@@ -28,5 +27,4 @@ TimelineFrame TimelineSnapshot::getFrame() const noexcept {
   return frame_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/BUCK b/ReactCommon/react/renderer/uimanager/BUCK
index b701dbdb57e2..a049cd0663e1 100644
--- a/ReactCommon/react/renderer/uimanager/BUCK
+++ b/ReactCommon/react/renderer/uimanager/BUCK
@@ -31,12 +31,12 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/uimanager",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -49,9 +49,7 @@ rn_xplat_cxx_library(
     deps = [
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
+        "//xplat/folly:dynamic",
         "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
         react_native_xplat_target("react/config:config"),
@@ -81,7 +79,6 @@ fb_xplat_cxx_test(
     platforms = (ANDROID, APPLE, CXX),
     deps = [
         ":uimanager",
-        "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("react/config:config"),
         react_native_xplat_target("react/renderer/components/image:image"),
diff --git a/ReactCommon/react/renderer/uimanager/CMakeLists.txt b/ReactCommon/react/renderer/uimanager/CMakeLists.txt
index 0d9f7403b05b..5545fb0405e6 100644
--- a/ReactCommon/react/renderer/uimanager/CMakeLists.txt
+++ b/ReactCommon/react/renderer/uimanager/CMakeLists.txt
@@ -6,7 +6,14 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_render_uimanager_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(react_render_uimanager SHARED ${react_render_uimanager_SRC})
diff --git a/ReactCommon/react/renderer/uimanager/UIManager.cpp b/ReactCommon/react/renderer/uimanager/UIManager.cpp
index cd2d3267dafa..44692eeab261 100644
--- a/ReactCommon/react/renderer/uimanager/UIManager.cpp
+++ b/ReactCommon/react/renderer/uimanager/UIManager.cpp
@@ -90,7 +90,7 @@ ShadowNode::Shared UIManager::createNode(
       },
       family);
 
-  if (delegate_) {
+  if (delegate_ != nullptr) {
     delegate_->uiManagerDidCreateShadowNode(*shadowNode);
   }
   if (leakChecker_) {
@@ -114,16 +114,13 @@ ShadowNode::Shared UIManager::cloneNode(
       shadowNode,
       {
           /* .props = */
-          rawProps ? componentDescriptor.cloneProps(
-                         propsParserContext, shadowNode.getProps(), *rawProps)
-                   : ShadowNodeFragment::propsPlaceholder(),
+          rawProps != nullptr
+              ? componentDescriptor.cloneProps(
+                    propsParserContext, shadowNode.getProps(), *rawProps)
+              : ShadowNodeFragment::propsPlaceholder(),
           /* .children = */ children,
       });
 
-  if (delegate_) {
-    delegate_->uiManagerDidCloneShadowNode(shadowNode, *clonedShadowNode);
-  }
-
   return clonedShadowNode;
 }
 
@@ -160,7 +157,7 @@ void UIManager::setIsJSResponder(
     ShadowNode::Shared const &shadowNode,
     bool isJSResponder,
     bool blockNativeResponder) const {
-  if (delegate_) {
+  if (delegate_ != nullptr) {
     delegate_->uiManagerDidSetIsJSResponder(
         shadowNode, isJSResponder, blockNativeResponder);
   }
@@ -260,7 +257,7 @@ LayoutMetrics UIManager::getRelativeLayoutMetrics(
   // that the node is not deallocated during method execution lifetime.
   auto owningAncestorShadowNode = ShadowNode::Shared{};
 
-  if (!ancestorShadowNode) {
+  if (ancestorShadowNode == nullptr) {
     shadowTreeRegistry_.visit(
         shadowNode.getSurfaceId(), [&](ShadowTree const &shadowTree) {
           owningAncestorShadowNode =
@@ -278,7 +275,7 @@ LayoutMetrics UIManager::getRelativeLayoutMetrics(
   auto layoutableAncestorShadowNode =
       traitCast<LayoutableShadowNode const *>(ancestorShadowNode);
 
-  if (!layoutableAncestorShadowNode) {
+  if (layoutableAncestorShadowNode == nullptr) {
     return EmptyLayoutMetrics;
   }
 
@@ -328,7 +325,7 @@ void UIManager::dispatchCommand(
     const ShadowNode::Shared &shadowNode,
     std::string const &commandName,
     folly::dynamic const &args) const {
-  if (delegate_) {
+  if (delegate_ != nullptr) {
     delegate_->uiManagerDidDispatchCommand(shadowNode, commandName, args);
   }
 }
@@ -336,7 +333,7 @@ void UIManager::dispatchCommand(
 void UIManager::sendAccessibilityEvent(
     const ShadowNode::Shared &shadowNode,
     std::string const &eventType) {
-  if (delegate_) {
+  if (delegate_ != nullptr) {
     delegate_->uiManagerDidSendAccessibilityEvent(shadowNode, eventType);
   }
 }
@@ -346,7 +343,7 @@ void UIManager::configureNextLayoutAnimation(
     RawValue const &config,
     jsi::Value const &successCallback,
     jsi::Value const &failureCallback) const {
-  if (animationDelegate_) {
+  if (animationDelegate_ != nullptr) {
     animationDelegate_->uiManagerDidConfigureNextLayoutAnimation(
         runtime,
         config,
@@ -420,11 +417,11 @@ RootShadowNode::Unshared UIManager::shadowTreeWillCommit(
 }
 
 void UIManager::shadowTreeDidFinishTransaction(
-    ShadowTree const &shadowTree,
+    ShadowTree const & /*shadowTree*/,
     MountingCoordinator::Shared const &mountingCoordinator) const {
   SystraceSection s("UIManager::shadowTreeDidFinishTransaction");
 
-  if (delegate_) {
+  if (delegate_ != nullptr) {
     delegate_->uiManagerDidFinishTransaction(mountingCoordinator);
   }
 }
diff --git a/ReactCommon/react/renderer/uimanager/UIManager.h b/ReactCommon/react/renderer/uimanager/UIManager.h
index a30a594becfb..e0ba886c9725 100644
--- a/ReactCommon/react/renderer/uimanager/UIManager.h
+++ b/ReactCommon/react/renderer/uimanager/UIManager.h
@@ -184,7 +184,7 @@ class UIManager final : public ShadowTreeDelegate {
       jsi::Value const &failureCallback) const;
 
   SharedComponentDescriptorRegistry componentDescriptorRegistry_;
-  UIManagerDelegate *delegate_;
+  UIManagerDelegate *delegate_{};
   UIManagerAnimationDelegate *animationDelegate_{nullptr};
   RuntimeExecutor const runtimeExecutor_{};
   ShadowTreeRegistry shadowTreeRegistry_{};
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
index 9393ba512f67..2e31a722444b 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
+++ b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
@@ -23,7 +23,6 @@ namespace facebook::react {
 
 void UIManagerBinding::createAndInstallIfNeeded(
     jsi::Runtime &runtime,
-    RuntimeExecutor const &runtimeExecutor,
     std::shared_ptr<UIManager> const &uiManager) {
   auto uiManagerModuleName = "nativeFabricUIManager";
 
@@ -32,8 +31,7 @@ void UIManagerBinding::createAndInstallIfNeeded(
   if (uiManagerValue.isUndefined()) {
     // The global namespace does not have an instance of the binding;
     // we need to create, install and return it.
-    auto uiManagerBinding =
-        std::make_shared<UIManagerBinding>(uiManager, runtimeExecutor);
+    auto uiManagerBinding = std::make_shared<UIManagerBinding>(uiManager);
     auto object = jsi::Object::createFromHostObject(runtime, uiManagerBinding);
     runtime.global().setProperty(
         runtime, uiManagerModuleName, std::move(object));
@@ -54,11 +52,8 @@ std::shared_ptr<UIManagerBinding> UIManagerBinding::getBinding(
   return uiManagerObject.getHostObject<UIManagerBinding>(runtime);
 }
 
-UIManagerBinding::UIManagerBinding(
-    std::shared_ptr<UIManager> uiManager,
-    RuntimeExecutor runtimeExecutor)
-    : uiManager_(std::move(uiManager)),
-      runtimeExecutor_(std::move(runtimeExecutor)) {}
+UIManagerBinding::UIManagerBinding(std::shared_ptr<UIManager> uiManager)
+    : uiManager_(std::move(uiManager)) {}
 
 UIManagerBinding::~UIManagerBinding() {
   LOG(WARNING) << "UIManagerBinding::~UIManagerBinding() was called (address: "
@@ -107,7 +102,7 @@ void UIManagerBinding::dispatchEvent(
     return;
   }
 
-  auto instanceHandle = eventTarget
+  auto instanceHandle = eventTarget != nullptr
     ? [&]() {
       auto instanceHandle = eventTarget->getInstanceHandle(runtime);
       if (instanceHandle.isUndefined()) {
@@ -187,9 +182,9 @@ jsi::Value UIManagerBinding::get(
         5,
         [uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           auto eventTarget =
               eventTargetFromValue(runtime, arguments[4], arguments[0]);
           if (!eventTarget) {
@@ -215,9 +210,9 @@ jsi::Value UIManagerBinding::get(
         1,
         [uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           return valueFromShadowNode(
               runtime,
               uiManager->cloneNode(
@@ -232,9 +227,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           uiManager->setIsJSResponder(
               shadowNodeFromValue(runtime, arguments[0]),
               arguments[1].getBool(),
@@ -251,9 +246,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           auto node = shadowNodeFromValue(runtime, arguments[0]);
           auto locationX = (Float)arguments[1].getNumber();
           auto locationY = (Float)arguments[2].getNumber();
@@ -282,9 +277,9 @@ jsi::Value UIManagerBinding::get(
         1,
         [uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           return valueFromShadowNode(
               runtime,
               uiManager->cloneNode(
@@ -301,9 +296,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           auto const &rawProps = RawProps(runtime, arguments[1]);
           return valueFromShadowNode(
               runtime,
@@ -322,9 +317,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           auto const &rawProps = RawProps(runtime, arguments[1]);
           return valueFromShadowNode(
               runtime,
@@ -342,9 +337,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           uiManager->appendChild(
               shadowNodeFromValue(runtime, arguments[0]),
               shadowNodeFromValue(runtime, arguments[1]));
@@ -358,9 +353,9 @@ jsi::Value UIManagerBinding::get(
         name,
         1,
         [](jsi::Runtime &runtime,
-           jsi::Value const &thisValue,
-           jsi::Value const *arguments,
-           size_t count) noexcept -> jsi::Value {
+           jsi::Value const & /*thisValue*/,
+           jsi::Value const * /*arguments*/,
+           size_t /*count*/) noexcept -> jsi::Value {
           auto shadowNodeList = std::make_shared<ShadowNode::ListOfShared>(
               ShadowNode::ListOfShared({}));
           return valueFromShadowNodeList(runtime, shadowNodeList);
@@ -373,9 +368,9 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [](jsi::Runtime &runtime,
-           jsi::Value const &thisValue,
+           jsi::Value const & /*thisValue*/,
            jsi::Value const *arguments,
-           size_t count) noexcept -> jsi::Value {
+           size_t /*count*/) noexcept -> jsi::Value {
           auto shadowNodeList = shadowNodeListFromValue(runtime, arguments[0]);
           auto shadowNode = shadowNodeFromValue(runtime, arguments[1]);
           shadowNodeList->push_back(shadowNode);
@@ -393,15 +388,16 @@ jsi::Value UIManagerBinding::get(
         2,
         [weakUIManager, uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           auto runtimeSchedulerBinding =
               RuntimeSchedulerBinding::getBinding(runtime);
           auto surfaceId = surfaceIdFromValue(runtime, arguments[0]);
 
-          if (runtimeSchedulerBinding &&
-              runtimeSchedulerBinding->getIsSynchronous()) {
+          if (!uiManager->backgroundExecutor_ ||
+              (runtimeSchedulerBinding &&
+               runtimeSchedulerBinding->getIsSynchronous())) {
             auto weakShadowNodeList =
                 weakShadowNodeListFromValue(runtime, arguments[1]);
             auto shadowNodeList =
@@ -449,9 +445,9 @@ jsi::Value UIManagerBinding::get(
         1,
         [this](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           auto eventHandler =
               arguments[0].getObject(runtime).getFunction(runtime);
           eventHandler_ =
@@ -467,9 +463,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
               *shadowNodeFromValue(runtime, arguments[0]),
               shadowNodeFromValue(runtime, arguments[1]).get(),
@@ -491,9 +487,9 @@ jsi::Value UIManagerBinding::get(
         3,
         [uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           auto shadowNode = shadowNodeFromValue(runtime, arguments[0]);
           if (shadowNode) {
             uiManager->dispatchCommand(
@@ -513,9 +509,9 @@ jsi::Value UIManagerBinding::get(
         4,
         [uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
               *shadowNodeFromValue(runtime, arguments[0]),
               shadowNodeFromValue(runtime, arguments[1]).get(),
@@ -549,9 +545,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           auto shadowNode = shadowNodeFromValue(runtime, arguments[0]);
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
               *shadowNode, nullptr, {/* .includeTransform = */ true});
@@ -567,7 +563,7 @@ jsi::Value UIManagerBinding::get(
 
           auto layoutableShadowNode = traitCast<LayoutableShadowNode const *>(
               newestCloneOfShadowNode.get());
-          Point originRelativeToParent = layoutableShadowNode
+          Point originRelativeToParent = layoutableShadowNode != nullptr
               ? layoutableShadowNode->getLayoutMetrics().frame.origin
               : Point();
 
@@ -591,9 +587,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
               *shadowNodeFromValue(runtime, arguments[0]),
               nullptr,
@@ -626,9 +622,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           uiManager->sendAccessibilityEvent(
               shadowNodeFromValue(runtime, arguments[0]),
               stringFromValue(runtime, arguments[1]));
@@ -644,9 +640,9 @@ jsi::Value UIManagerBinding::get(
         3,
         [uiManager](
             jsi::Runtime &runtime,
-            jsi::Value const &thisValue,
+            jsi::Value const & /*thisValue*/,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t /*count*/) noexcept -> jsi::Value {
           uiManager->configureNextLayoutAnimation(
               runtime,
               // TODO: pass in JSI value instead of folly::dynamic to RawValue
@@ -667,16 +663,16 @@ jsi::Value UIManagerBinding::get(
             jsi::Value const &,
             jsi::Value const *,
             size_t) noexcept -> jsi::Value {
-          return jsi::Value(serialize(currentEventPriority_));
+          return {serialize(currentEventPriority_)};
         });
   }
 
   if (methodName == "unstable_DefaultEventPriority") {
-    return jsi::Value(serialize(ReactEventPriority::Default));
+    return {serialize(ReactEventPriority::Default)};
   }
 
   if (methodName == "unstable_DiscreteEventPriority") {
-    return jsi::Value(serialize(ReactEventPriority::Discrete));
+    return {serialize(ReactEventPriority::Discrete)};
   }
 
   return jsi::Value::undefined();
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerBinding.h b/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
index 9ddd53d77e22..f929ba54760f 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
+++ b/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <ReactCommon/RuntimeExecutor.h>
 #include <folly/dynamic.h>
 #include <jsi/jsi.h>
 #include <react/renderer/core/RawValue.h>
@@ -28,7 +27,6 @@ class UIManagerBinding : public jsi::HostObject {
    */
   static void createAndInstallIfNeeded(
       jsi::Runtime &runtime,
-      RuntimeExecutor const &runtimeExecutor,
       std::shared_ptr<UIManager> const &uiManager);
 
   /*
@@ -37,9 +35,7 @@ class UIManagerBinding : public jsi::HostObject {
    */
   static std::shared_ptr<UIManagerBinding> getBinding(jsi::Runtime &runtime);
 
-  UIManagerBinding(
-      std::shared_ptr<UIManager> uiManager,
-      RuntimeExecutor runtimeExecutor);
+  UIManagerBinding(std::shared_ptr<UIManager> uiManager);
 
   ~UIManagerBinding();
 
@@ -76,8 +72,6 @@ class UIManagerBinding : public jsi::HostObject {
   std::shared_ptr<UIManager> uiManager_;
   std::unique_ptr<EventHandler const> eventHandler_;
   mutable ReactEventPriority currentEventPriority_;
-
-  RuntimeExecutor runtimeExecutor_;
 };
 
 } // namespace facebook::react
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h b/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
index a36feaed21cd..77f1e4e3b62b 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
+++ b/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h
@@ -32,15 +32,6 @@ class UIManagerDelegate {
    */
   virtual void uiManagerDidCreateShadowNode(const ShadowNode &shadowNode) = 0;
 
-  /*
-   * Called each time when UIManager clones a Shadow Node. Receiver
-   * might use this to optimistically allocate a new native view
-   * instances.
-   */
-  virtual void uiManagerDidCloneShadowNode(
-      const ShadowNode &oldShadowNode,
-      const ShadowNode &newShadowNode) = 0;
-
   /*
    * Called when UIManager wants to dispatch a command to the mounting layer.
    */
diff --git a/ReactCommon/react/test_utils/BUCK b/ReactCommon/react/test_utils/BUCK
index 7c520f97297c..3a2521ae60e3 100644
--- a/ReactCommon/react/test_utils/BUCK
+++ b/ReactCommon/react/test_utils/BUCK
@@ -27,13 +27,13 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/test_utils",
     ),
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_frameworks = ["Foundation"],
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
diff --git a/ReactCommon/react/test_utils/shadowTreeGeneration.h b/ReactCommon/react/test_utils/shadowTreeGeneration.h
index 63f037b9b493..0734c6e0bed9 100644
--- a/ReactCommon/react/test_utils/shadowTreeGeneration.h
+++ b/ReactCommon/react/test_utils/shadowTreeGeneration.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <glog/logging.h>
+#include <gtest/gtest.h>
 #include <algorithm>
 #include <iostream>
 #include <memory>
@@ -233,6 +234,11 @@ static inline ShadowNode::Unshared messWithYogaStyles(
       "maxWidth",     "maxHeight",     "minWidth",    "minHeight",
   };
 
+  // It is not safe to add new Yoga properties to this list. Unit tests
+  // validate specific seeds, and what they test may change and cause unrelated
+  // failures if the size of properties also changes.
+  EXPECT_EQ(properties.size(), 20);
+
   for (auto const &property : properties) {
     if (entropy.random<bool>(0.1)) {
       dynamic[property] = entropy.random<int>(0, 1024);
diff --git a/ReactCommon/react/utils/BUCK b/ReactCommon/react/utils/BUCK
index 3132286ad155..e29248a92859 100644
--- a/ReactCommon/react/utils/BUCK
+++ b/ReactCommon/react/utils/BUCK
@@ -34,8 +34,9 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/utils",
     ),
+    compiler_flags_pedantic = True,
     fbandroid_deps = [
-        react_native_target("java/com/facebook/react/common/mapbuffer/jni:jni"),
+        react_native_target("jni/react/mapbuffer:jni"),
         react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
@@ -44,7 +45,6 @@ rn_xplat_cxx_library(
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
@@ -55,11 +55,7 @@ rn_xplat_cxx_library(
     tests = [],
     visibility = ["PUBLIC"],
     deps = [
-        "//third-party/glog:glog",
         "//xplat/folly:container_evicting_cache_map",
-        "//xplat/folly:headers_only_do_not_use",
-        "//xplat/folly:memory",
-        "//xplat/folly:molly",
         "//xplat/jsi:jsi",
         react_native_xplat_target("butter:butter"),
         react_native_xplat_target("react/debug:debug"),
diff --git a/ReactCommon/react/utils/CMakeLists.txt b/ReactCommon/react/utils/CMakeLists.txt
index 335ebf9c365e..8c63c41500c5 100644
--- a/ReactCommon/react/utils/CMakeLists.txt
+++ b/ReactCommon/react/utils/CMakeLists.txt
@@ -11,6 +11,8 @@ add_compile_options(
         -frtti
         -std=c++17
         -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
         -DLOG_TAG=\"Fabric\")
 
 file(GLOB react_utils_SRC CONFIGURE_DEPENDS *.cpp *.mm)
diff --git a/ReactCommon/react/utils/ManagedObjectWrapper.h b/ReactCommon/react/utils/ManagedObjectWrapper.h
index 727499abd6bd..3af8b158eb66 100644
--- a/ReactCommon/react/utils/ManagedObjectWrapper.h
+++ b/ReactCommon/react/utils/ManagedObjectWrapper.h
@@ -14,7 +14,7 @@
 #endif
 
 #if defined(__OBJC__) && defined(__cplusplus)
-#if TARGET_OS_MAC && TARGET_OS_IPHONE
+#if TARGET_OS_MAC
 
 #include <memory>
 
diff --git a/ReactCommon/react/utils/ManagedObjectWrapper.mm b/ReactCommon/react/utils/ManagedObjectWrapper.mm
index 69bde90f422c..44e4241f4846 100644
--- a/ReactCommon/react/utils/ManagedObjectWrapper.mm
+++ b/ReactCommon/react/utils/ManagedObjectWrapper.mm
@@ -7,8 +7,7 @@
 
 #include "ManagedObjectWrapper.h"
 
-#if defined(__OBJC__) && defined(__cplusplus)
-#if TARGET_OS_MAC && TARGET_OS_IPHONE
+#if TARGET_OS_MAC
 
 namespace facebook {
 namespace react {
@@ -35,4 +34,3 @@ @implementation RCTInternalGenericWeakWrapper
 @end
 
 #endif
-#endif
diff --git a/ReactCommon/reactperflogger/BUCK b/ReactCommon/reactperflogger/BUCK
index 2adcfa47635e..554de6133701 100644
--- a/ReactCommon/reactperflogger/BUCK
+++ b/ReactCommon/reactperflogger/BUCK
@@ -11,9 +11,9 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-Wno-global-constructors",
     ],
+    compiler_flags_pedantic = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     platforms = (ANDROID, APPLE, CXX),
     preferred_linkage = "static",
diff --git a/ReactCommon/reactperflogger/CMakeLists.txt b/ReactCommon/reactperflogger/CMakeLists.txt
index 5c18745cc57c..41fe1face06b 100644
--- a/ReactCommon/reactperflogger/CMakeLists.txt
+++ b/ReactCommon/reactperflogger/CMakeLists.txt
@@ -6,7 +6,13 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall)
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments)
 
 file(GLOB reactperflogger_SRC CONFIGURE_DEPENDS reactperflogger/*.cpp)
 add_library(reactperflogger STATIC ${reactperflogger_SRC})
diff --git a/ReactCommon/runtimeexecutor/BUCK b/ReactCommon/runtimeexecutor/BUCK
index e6342f31dbae..caec10316e6e 100644
--- a/ReactCommon/runtimeexecutor/BUCK
+++ b/ReactCommon/runtimeexecutor/BUCK
@@ -28,13 +28,13 @@ rn_xplat_cxx_library(
     exported_headers = {
         "ReactCommon/RuntimeExecutor.h": "ReactCommon/RuntimeExecutor.h",
     },
+    compiler_flags_pedantic = True,
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_frameworks = ["Foundation"],
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
diff --git a/ReactCommon/runtimeexecutor/CMakeLists.txt b/ReactCommon/runtimeexecutor/CMakeLists.txt
index b07e6b636253..f33e7068ccb4 100644
--- a/ReactCommon/runtimeexecutor/CMakeLists.txt
+++ b/ReactCommon/runtimeexecutor/CMakeLists.txt
@@ -6,7 +6,13 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -std=c++17 -Wall)
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments)
 
 file(GLOB_RECURSE runtimeexecutor_SRC CONFIGURE_DEPENDS *.cpp *.h)
 
diff --git a/ReactCommon/yoga/CMakeLists.txt b/ReactCommon/yoga/CMakeLists.txt
index c7e6cd4fd23c..ff370aa76ebd 100644
--- a/ReactCommon/yoga/CMakeLists.txt
+++ b/ReactCommon/yoga/CMakeLists.txt
@@ -6,7 +6,13 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(-fexceptions -frtti -O3 -Wall)
+add_compile_options(
+        -fexceptions
+        -frtti
+        -O3
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments)
 
 file(GLOB_RECURSE yogacore_SRC CONFIGURE_DEPENDS yoga/*.cpp)
 add_library(yogacore STATIC ${yogacore_SRC})
diff --git a/ReactCommon/yoga/yoga/CompactValue.h b/ReactCommon/yoga/yoga/CompactValue.h
index 1f03cf721aaf..6568c48ad2c1 100644
--- a/ReactCommon/yoga/yoga/CompactValue.h
+++ b/ReactCommon/yoga/yoga/CompactValue.h
@@ -9,6 +9,11 @@
 
 #ifdef __cplusplus
 
+#ifdef __cpp_lib_bit_cast
+#include <bit>
+#else
+#include <cstring>
+#endif
 #include "YGValue.h"
 #include "YGMacros.h"
 #include <cmath>
@@ -55,7 +60,7 @@ class YOGA_EXPORT CompactValue {
     if (value == 0.0f || (value < LOWER_BOUND && value > -LOWER_BOUND)) {
       constexpr auto zero =
           Unit == YGUnitPercent ? ZERO_BITS_PERCENT : ZERO_BITS_POINT;
-      return {Payload{zero}};
+      return {zero};
     }
 
     constexpr auto upperBound =
@@ -65,9 +70,9 @@ class YOGA_EXPORT CompactValue {
     }
 
     uint32_t unitBit = Unit == YGUnitPercent ? PERCENT_BIT : 0;
-    auto data = Payload{value};
-    data.repr -= BIAS;
-    data.repr |= unitBit;
+    auto data = asU32(value);
+    data -= BIAS;
+    data |= unitBit;
     return {data};
   }
 
@@ -78,7 +83,7 @@ class YOGA_EXPORT CompactValue {
   }
 
   static constexpr CompactValue ofZero() noexcept {
-    return CompactValue{Payload{ZERO_BITS_POINT}};
+    return CompactValue{ZERO_BITS_POINT};
   }
 
   static constexpr CompactValue ofUndefined() noexcept {
@@ -86,13 +91,12 @@ class YOGA_EXPORT CompactValue {
   }
 
   static constexpr CompactValue ofAuto() noexcept {
-    return CompactValue{Payload{AUTO_BITS}};
+    return CompactValue{AUTO_BITS};
   }
 
-  constexpr CompactValue() noexcept
-      : payload_(std::numeric_limits<float>::quiet_NaN()) {}
+  constexpr CompactValue() noexcept : repr_(0x7FC00000) {}
 
-  CompactValue(const YGValue& x) noexcept : payload_(uint32_t{0}) {
+  CompactValue(const YGValue& x) noexcept : repr_(uint32_t{0}) {
     switch (x.unit) {
       case YGUnitUndefined:
         *this = ofUndefined();
@@ -110,7 +114,7 @@ class YOGA_EXPORT CompactValue {
   }
 
   operator YGValue() const noexcept {
-    switch (payload_.repr) {
+    switch (repr_) {
       case AUTO_BITS:
         return YGValueAuto;
       case ZERO_BITS_POINT:
@@ -119,34 +123,28 @@ class YOGA_EXPORT CompactValue {
         return YGValue{0.0f, YGUnitPercent};
     }
 
-    if (std::isnan(payload_.value)) {
+    if (std::isnan(asFloat(repr_))) {
       return YGValueUndefined;
     }
 
-    auto data = payload_;
-    data.repr &= ~PERCENT_BIT;
-    data.repr += BIAS;
+    auto data = repr_;
+    data &= ~PERCENT_BIT;
+    data += BIAS;
 
     return YGValue{
-        data.value, payload_.repr & 0x40000000 ? YGUnitPercent : YGUnitPoint};
+        asFloat(data), repr_ & 0x40000000 ? YGUnitPercent : YGUnitPoint};
   }
 
   bool isUndefined() const noexcept {
     return (
-        payload_.repr != AUTO_BITS && payload_.repr != ZERO_BITS_POINT &&
-        payload_.repr != ZERO_BITS_PERCENT && std::isnan(payload_.value));
+        repr_ != AUTO_BITS && repr_ != ZERO_BITS_POINT &&
+        repr_ != ZERO_BITS_PERCENT && std::isnan(asFloat(repr_)));
   }
 
-  bool isAuto() const noexcept { return payload_.repr == AUTO_BITS; }
+  bool isAuto() const noexcept { return repr_ == AUTO_BITS; }
 
 private:
-  union Payload {
-    float value;
-    uint32_t repr;
-    Payload() = delete;
-    constexpr Payload(uint32_t r) : repr(r) {}
-    constexpr Payload(float v) : value(v) {}
-  };
+  uint32_t repr_;
 
   static constexpr uint32_t BIAS = 0x20000000;
   static constexpr uint32_t PERCENT_BIT = 0x40000000;
@@ -157,11 +155,33 @@ class YOGA_EXPORT CompactValue {
   static constexpr uint32_t ZERO_BITS_POINT = 0x7f8f0f0f;
   static constexpr uint32_t ZERO_BITS_PERCENT = 0x7f80f0f0;
 
-  constexpr CompactValue(Payload data) noexcept : payload_(data) {}
+  constexpr CompactValue(uint32_t data) noexcept : repr_(data) {}
 
-  Payload payload_;
+  VISIBLE_FOR_TESTING uint32_t repr() { return repr_; }
 
-  VISIBLE_FOR_TESTING uint32_t repr() { return payload_.repr; }
+  static uint32_t asU32(float f) {
+#ifdef __cpp_lib_bit_cast
+    return std::bit_cast<uint32_t>(f);
+#else
+    uint32_t u;
+    static_assert(
+        sizeof(u) == sizeof(f), "uint32_t and float must have the same size");
+    std::memcpy(&u, &f, sizeof(f));
+    return u;
+#endif
+  }
+
+  static float asFloat(uint32_t u) {
+#ifdef __cpp_lib_bit_cast
+    return std::bit_cast<float>(u);
+#else
+    float f;
+    static_assert(
+        sizeof(f) == sizeof(u), "uint32_t and float must have the same size");
+    std::memcpy(&f, &u, sizeof(u));
+    return f;
+#endif
+  }
 };
 
 template <>
@@ -174,7 +194,7 @@ template <>
 CompactValue CompactValue::ofMaybe<YGUnitAuto>(float) noexcept = delete;
 
 constexpr bool operator==(CompactValue a, CompactValue b) noexcept {
-  return a.payload_.repr == b.payload_.repr;
+  return a.repr_ == b.repr_;
 }
 
 constexpr bool operator!=(CompactValue a, CompactValue b) noexcept {
diff --git a/ReactCommon/yoga/yoga/Utils.cpp b/ReactCommon/yoga/yoga/Utils.cpp
index f2af12b2305d..e448d99439e2 100644
--- a/ReactCommon/yoga/yoga/Utils.cpp
+++ b/ReactCommon/yoga/yoga/Utils.cpp
@@ -75,5 +75,9 @@ YGFloatOptional YGFloatOptionalMax(YGFloatOptional op1, YGFloatOptional op2) {
 }
 
 void throwLogicalErrorWithMessage(const char* message) {
+#if defined(__cpp_exceptions)
   throw std::logic_error(message);
+#else // !defined(__cpp_exceptions)
+  std::terminate();
+#endif // defined(__cpp_exceptions)
 }
diff --git a/ReactCommon/yoga/yoga/YGEnums.cpp b/ReactCommon/yoga/yoga/YGEnums.cpp
index b97342d8c279..3c3c0929a74f 100644
--- a/ReactCommon/yoga/yoga/YGEnums.cpp
+++ b/ReactCommon/yoga/yoga/YGEnums.cpp
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 #include "YGEnums.h"
 
 const char* YGAlignToString(const YGAlign value) {
@@ -107,6 +109,18 @@ const char* YGFlexDirectionToString(const YGFlexDirection value) {
   return "unknown";
 }
 
+const char* YGGutterToString(const YGGutter value) {
+  switch (value) {
+    case YGGutterColumn:
+      return "column";
+    case YGGutterRow:
+      return "row";
+    case YGGutterAll:
+      return "all";
+  }
+  return "unknown";
+}
+
 const char* YGJustifyToString(const YGJustify value) {
   switch (value) {
     case YGJustifyFlexStart:
diff --git a/ReactCommon/yoga/yoga/YGEnums.h b/ReactCommon/yoga/yoga/YGEnums.h
index c14daaa1a678..8e4bb4efd0ed 100644
--- a/ReactCommon/yoga/yoga/YGEnums.h
+++ b/ReactCommon/yoga/yoga/YGEnums.h
@@ -5,52 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#pragma once
+// @generated by enums.py
 
+#pragma once
 #include "YGMacros.h"
 
-#ifdef __cplusplus
-namespace facebook {
-namespace yoga {
-namespace enums {
-
-template <typename T>
-constexpr int count(); // can't use `= delete` due to a defect in clang < 3.9
-
-namespace detail {
-template <int... xs>
-constexpr int n() {
-  return sizeof...(xs);
-}
-} // namespace detail
-
-} // namespace enums
-} // namespace yoga
-} // namespace facebook
-#endif
-
-#define YG_ENUM_DECL(NAME, ...)                               \
-  typedef YG_ENUM_BEGIN(NAME){__VA_ARGS__} YG_ENUM_END(NAME); \
-  WIN_EXPORT const char* NAME##ToString(NAME);
-
-#ifdef __cplusplus
-#define YG_ENUM_SEQ_DECL(NAME, ...)  \
-  YG_ENUM_DECL(NAME, __VA_ARGS__)    \
-  YG_EXTERN_C_END                    \
-  namespace facebook {               \
-  namespace yoga {                   \
-  namespace enums {                  \
-  template <>                        \
-  constexpr int count<NAME>() {      \
-    return detail::n<__VA_ARGS__>(); \
-  }                                  \
-  }                                  \
-  }                                  \
-  }                                  \
-  YG_EXTERN_C_BEGIN
-#else
-#define YG_ENUM_SEQ_DECL YG_ENUM_DECL
-#endif
+// clang-format off
+
 
 YG_EXTERN_C_BEGIN
 
@@ -63,9 +24,12 @@ YG_ENUM_SEQ_DECL(
     YGAlignStretch,
     YGAlignBaseline,
     YGAlignSpaceBetween,
-    YGAlignSpaceAround);
+    YGAlignSpaceAround)
 
-YG_ENUM_SEQ_DECL(YGDimension, YGDimensionWidth, YGDimensionHeight)
+YG_ENUM_SEQ_DECL(
+    YGDimension,
+    YGDimensionWidth,
+    YGDimensionHeight)
 
 YG_ENUM_SEQ_DECL(
     YGDirection,
@@ -73,7 +37,10 @@ YG_ENUM_SEQ_DECL(
     YGDirectionLTR,
     YGDirectionRTL)
 
-YG_ENUM_SEQ_DECL(YGDisplay, YGDisplayFlex, YGDisplayNone)
+YG_ENUM_SEQ_DECL(
+    YGDisplay,
+    YGDisplayFlex,
+    YGDisplayNone)
 
 YG_ENUM_SEQ_DECL(
     YGEdge,
@@ -87,7 +54,9 @@ YG_ENUM_SEQ_DECL(
     YGEdgeVertical,
     YGEdgeAll)
 
-YG_ENUM_SEQ_DECL(YGExperimentalFeature, YGExperimentalFeatureWebFlexBasis)
+YG_ENUM_SEQ_DECL(
+    YGExperimentalFeature,
+    YGExperimentalFeatureWebFlexBasis)
 
 YG_ENUM_SEQ_DECL(
     YGFlexDirection,
@@ -96,6 +65,12 @@ YG_ENUM_SEQ_DECL(
     YGFlexDirectionRow,
     YGFlexDirectionRowReverse)
 
+YG_ENUM_SEQ_DECL(
+    YGGutter,
+    YGGutterColumn,
+    YGGutterRow,
+    YGGutterAll)
+
 YG_ENUM_SEQ_DECL(
     YGJustify,
     YGJustifyFlexStart,
@@ -120,7 +95,10 @@ YG_ENUM_SEQ_DECL(
     YGMeasureModeExactly,
     YGMeasureModeAtMost)
 
-YG_ENUM_SEQ_DECL(YGNodeType, YGNodeTypeDefault, YGNodeTypeText)
+YG_ENUM_SEQ_DECL(
+    YGNodeType,
+    YGNodeTypeDefault,
+    YGNodeTypeText)
 
 YG_ENUM_SEQ_DECL(
     YGOverflow,
@@ -147,9 +125,10 @@ YG_ENUM_SEQ_DECL(
     YGUnitPercent,
     YGUnitAuto)
 
-YG_ENUM_SEQ_DECL(YGWrap, YGWrapNoWrap, YGWrapWrap, YGWrapWrapReverse)
+YG_ENUM_SEQ_DECL(
+    YGWrap,
+    YGWrapNoWrap,
+    YGWrapWrap,
+    YGWrapWrapReverse)
 
 YG_EXTERN_C_END
-
-#undef YG_ENUM_DECL
-#undef YG_ENUM_SEQ_DECL
diff --git a/ReactCommon/yoga/yoga/YGMacros.h b/ReactCommon/yoga/yoga/YGMacros.h
index 9211c87b317b..ee143c29ffa2 100644
--- a/ReactCommon/yoga/yoga/YGMacros.h
+++ b/ReactCommon/yoga/yoga/YGMacros.h
@@ -40,6 +40,49 @@
 #define YG_ENUM_END(name) name
 #endif
 
+#ifdef __cplusplus
+namespace facebook {
+namespace yoga {
+namespace enums {
+
+template <typename T>
+constexpr int count(); // can't use `= delete` due to a defect in clang < 3.9
+
+namespace detail {
+template <int... xs>
+constexpr int n() {
+  return sizeof...(xs);
+}
+} // namespace detail
+
+} // namespace enums
+} // namespace yoga
+} // namespace facebook
+#endif
+
+#define YG_ENUM_DECL(NAME, ...)                               \
+  typedef YG_ENUM_BEGIN(NAME){__VA_ARGS__} YG_ENUM_END(NAME); \
+  WIN_EXPORT const char* NAME##ToString(NAME);
+
+#ifdef __cplusplus
+#define YG_ENUM_SEQ_DECL(NAME, ...)  \
+  YG_ENUM_DECL(NAME, __VA_ARGS__)    \
+  YG_EXTERN_C_END                    \
+  namespace facebook {               \
+  namespace yoga {                   \
+  namespace enums {                  \
+  template <>                        \
+  constexpr int count<NAME>() {      \
+    return detail::n<__VA_ARGS__>(); \
+  }                                  \
+  }                                  \
+  }                                  \
+  }                                  \
+  YG_EXTERN_C_BEGIN
+#else
+#define YG_ENUM_SEQ_DECL YG_ENUM_DECL
+#endif
+
 #ifdef __GNUC__
 #define YG_DEPRECATED __attribute__((deprecated))
 #elif defined(_MSC_VER)
diff --git a/ReactCommon/yoga/yoga/YGNode.cpp b/ReactCommon/yoga/yoga/YGNode.cpp
index 32eabd1d5f92..5e52b6158b8c 100644
--- a/ReactCommon/yoga/yoga/YGNode.cpp
+++ b/ReactCommon/yoga/yoga/YGNode.cpp
@@ -83,6 +83,30 @@ CompactValue YGNode::computeEdgeValueForColumn(
   }
 }
 
+CompactValue YGNode::computeRowGap(
+    const YGStyle::Gutters& gutters,
+    CompactValue defaultValue) {
+  if (!gutters[YGGutterRow].isUndefined()) {
+    return gutters[YGGutterRow];
+  } else if (!gutters[YGGutterAll].isUndefined()) {
+    return gutters[YGGutterAll];
+  } else {
+    return defaultValue;
+  }
+}
+
+CompactValue YGNode::computeColumnGap(
+    const YGStyle::Gutters& gutters,
+    CompactValue defaultValue) {
+  if (!gutters[YGGutterColumn].isUndefined()) {
+    return gutters[YGGutterColumn];
+  } else if (!gutters[YGGutterAll].isUndefined()) {
+    return gutters[YGGutterAll];
+  } else {
+    return defaultValue;
+  }
+}
+
 YGFloatOptional YGNode::getLeadingPosition(
     const YGFlexDirection axis,
     const float axisSize) const {
@@ -163,6 +187,15 @@ YGFloatOptional YGNode::getMarginForAxis(
   return getLeadingMargin(axis, widthSize) + getTrailingMargin(axis, widthSize);
 }
 
+YGFloatOptional YGNode::getGapForAxis(
+    const YGFlexDirection axis,
+    const float widthSize) const {
+  auto gap = YGFlexDirectionIsRow(axis)
+      ? computeColumnGap(style_.gap(), CompactValue::ofZero())
+      : computeRowGap(style_.gap(), CompactValue::ofZero());
+  return YGResolveValue(gap, widthSize);
+}
+
 YGSize YGNode::measure(
     float width,
     YGMeasureMode widthMode,
diff --git a/ReactCommon/yoga/yoga/YGNode.h b/ReactCommon/yoga/yoga/YGNode.h
index 8c511236770a..ac20b1098b7a 100644
--- a/ReactCommon/yoga/yoga/YGNode.h
+++ b/ReactCommon/yoga/yoga/YGNode.h
@@ -204,6 +204,14 @@ struct YOGA_EXPORT YGNode {
       YGEdge edge,
       CompactValue defaultValue);
 
+  static CompactValue computeRowGap(
+      const YGStyle::Gutters& gutters,
+      CompactValue defaultValue);
+
+  static CompactValue computeColumnGap(
+      const YGStyle::Gutters& gutters,
+      CompactValue defaultValue);
+
   // Methods related to positions, margin, padding and border
   YGFloatOptional getLeadingPosition(
       const YGFlexDirection axis,
@@ -236,6 +244,9 @@ struct YOGA_EXPORT YGNode {
   YGFloatOptional getMarginForAxis(
       const YGFlexDirection axis,
       const float widthSize) const;
+  YGFloatOptional getGapForAxis(
+      const YGFlexDirection axis,
+      const float widthSize) const;
   // Setters
 
   void setContext(void* context) { context_ = context; }
diff --git a/ReactCommon/yoga/yoga/YGNodePrint.cpp b/ReactCommon/yoga/yoga/YGNodePrint.cpp
index d46373c4b814..6149cf53bcd2 100644
--- a/ReactCommon/yoga/yoga/YGNodePrint.cpp
+++ b/ReactCommon/yoga/yoga/YGNodePrint.cpp
@@ -184,6 +184,20 @@ void YGNodeToString(
     appendEdges(str, "padding", style.padding());
     appendEdges(str, "border", style.border());
 
+    if (YGNode::computeColumnGap(
+            style.gap(), detail::CompactValue::ofUndefined()) !=
+        YGNode::computeColumnGap(
+            YGNode().getStyle().gap(), detail::CompactValue::ofUndefined())) {
+      appendNumberIfNotUndefined(
+          str, "column-gap", style.gap()[YGGutterColumn]);
+    }
+    if (YGNode::computeRowGap(
+            style.gap(), detail::CompactValue::ofUndefined()) !=
+        YGNode::computeRowGap(
+            YGNode().getStyle().gap(), detail::CompactValue::ofUndefined())) {
+      appendNumberIfNotUndefined(str, "row-gap", style.gap()[YGGutterRow]);
+    }
+
     appendNumberIfNotAuto(str, "width", style.dimensions()[YGDimensionWidth]);
     appendNumberIfNotAuto(str, "height", style.dimensions()[YGDimensionHeight]);
     appendNumberIfNotAuto(
diff --git a/ReactCommon/yoga/yoga/YGStyle.cpp b/ReactCommon/yoga/yoga/YGStyle.cpp
index f8bba25d5e5f..37153f2e9276 100644
--- a/ReactCommon/yoga/yoga/YGStyle.cpp
+++ b/ReactCommon/yoga/yoga/YGStyle.cpp
@@ -22,7 +22,7 @@ bool operator==(const YGStyle& lhs, const YGStyle& rhs) {
       YGValueEqual(lhs.flexBasis(), rhs.flexBasis()) &&
       lhs.margin() == rhs.margin() && lhs.position() == rhs.position() &&
       lhs.padding() == rhs.padding() && lhs.border() == rhs.border() &&
-      lhs.dimensions() == rhs.dimensions() &&
+      lhs.gap() == rhs.gap() && lhs.dimensions() == rhs.dimensions() &&
       lhs.minDimensions() == rhs.minDimensions() &&
       lhs.maxDimensions() == rhs.maxDimensions();
 
diff --git a/ReactCommon/yoga/yoga/YGStyle.h b/ReactCommon/yoga/yoga/YGStyle.h
index b463623abc98..858b7cd1b4ab 100644
--- a/ReactCommon/yoga/yoga/YGStyle.h
+++ b/ReactCommon/yoga/yoga/YGStyle.h
@@ -29,6 +29,7 @@ class YOGA_EXPORT YGStyle {
 public:
   using Dimensions = Values<YGDimension>;
   using Edges = Values<YGEdge>;
+  using Gutters = Values<YGGutter>;
 
   template <typename T>
   struct BitfieldRef {
@@ -113,6 +114,7 @@ class YOGA_EXPORT YGStyle {
   Edges position_ = {};
   Edges padding_ = {};
   Edges border_ = {};
+  Gutters gap_ = {};
   Dimensions dimensions_{CompactValue::ofAuto()};
   Dimensions minDimensions_ = {};
   Dimensions maxDimensions_ = {};
@@ -210,6 +212,9 @@ class YOGA_EXPORT YGStyle {
   const Edges& border() const { return border_; }
   IdxRef<YGEdge, &YGStyle::border_> border() { return {*this}; }
 
+  const Gutters& gap() const { return gap_; }
+  IdxRef<YGGutter, &YGStyle::gap_> gap() { return {*this}; }
+
   const Dimensions& dimensions() const { return dimensions_; }
   IdxRef<YGDimension, &YGStyle::dimensions_> dimensions() { return {*this}; }
 
diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp
index 20389d4f2404..a66adec1234d 100644
--- a/ReactCommon/yoga/yoga/Yoga.cpp
+++ b/ReactCommon/yoga/yoga/Yoga.cpp
@@ -302,7 +302,7 @@ YOGA_EXPORT void YGNodeReset(YGNodeRef node) {
   node->reset();
 }
 
-int32_t YGConfigGetInstanceCount(void) {
+YOGA_EXPORT int32_t YGConfigGetInstanceCount(void) {
   return gConfigInstanceCount;
 }
 
@@ -797,6 +797,27 @@ YOGA_EXPORT float YGNodeStyleGetBorder(
   return static_cast<YGValue>(border).value;
 }
 
+YOGA_EXPORT void YGNodeStyleSetGap(
+    const YGNodeRef node,
+    const YGGutter gutter,
+    const float gapLength) {
+  auto length = detail::CompactValue::ofMaybe<YGUnitPoint>(gapLength);
+  updateIndexedStyleProp<MSVC_HINT(gap)>(node, &YGStyle::gap, gutter, length);
+}
+
+YOGA_EXPORT float YGNodeStyleGetGap(
+    const YGNodeConstRef node,
+    const YGGutter gutter) {
+  auto gapLength = node->getStyle().gap()[gutter];
+  if (gapLength.isUndefined() || gapLength.isAuto()) {
+    // TODO(T26792433): Rather than returning YGUndefined, change the api to
+    // return YGFloatOptional.
+    return YGUndefined;
+  }
+
+  return static_cast<YGValue>(gapLength).value;
+}
+
 // Yoga specific properties, not compatible with flexbox specification
 
 // TODO(T26792433): Change the API to accept YGFloatOptional.
@@ -1972,6 +1993,7 @@ static YGCollectFlexItemsRowValues YGCalculateCollectFlexItemsRowValues(
   const YGFlexDirection mainAxis = YGResolveFlexDirection(
       node->getStyle().flexDirection(), node->resolveDirection(ownerDirection));
   const bool isNodeFlexWrap = node->getStyle().flexWrap() != YGWrapNoWrap;
+  const float gap = node->getGapForAxis(mainAxis, availableInnerWidth).unwrap();
 
   // Add items to the current line until it's full or we run out of items.
   uint32_t endOfLineIndex = startOfLineIndex;
@@ -1981,9 +2003,13 @@ static YGCollectFlexItemsRowValues YGCalculateCollectFlexItemsRowValues(
         child->getStyle().positionType() == YGPositionTypeAbsolute) {
       continue;
     }
+
+    const bool isFirstElementInLine = (endOfLineIndex - startOfLineIndex) == 0;
+
     child->setLineIndex(lineCount);
     const float childMarginMainAxis =
         child->getMarginForAxis(mainAxis, availableInnerWidth).unwrap();
+    const float childLeadingGapMainAxis = isFirstElementInLine ? 0.0f : gap;
     const float flexBasisWithMinAndMaxConstraints =
         YGNodeBoundAxisWithinMinAndMax(
             child,
@@ -1996,16 +2022,19 @@ static YGCollectFlexItemsRowValues YGCalculateCollectFlexItemsRowValues(
     // size, we've hit the end of the current line. Break out of the loop and
     // lay out the current line.
     if (sizeConsumedOnCurrentLineIncludingMinConstraint +
-                flexBasisWithMinAndMaxConstraints + childMarginMainAxis >
+                flexBasisWithMinAndMaxConstraints + childMarginMainAxis +
+                childLeadingGapMainAxis >
             availableInnerMainDim &&
         isNodeFlexWrap && flexAlgoRowMeasurement.itemsOnLine > 0) {
       break;
     }
 
     sizeConsumedOnCurrentLineIncludingMinConstraint +=
-        flexBasisWithMinAndMaxConstraints + childMarginMainAxis;
+        flexBasisWithMinAndMaxConstraints + childMarginMainAxis +
+        childLeadingGapMainAxis;
     flexAlgoRowMeasurement.sizeConsumedOnCurrentLine +=
-        flexBasisWithMinAndMaxConstraints + childMarginMainAxis;
+        flexBasisWithMinAndMaxConstraints + childMarginMainAxis +
+        childLeadingGapMainAxis;
     flexAlgoRowMeasurement.itemsOnLine++;
 
     if (child->isNodeFlexible()) {
@@ -2050,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,
@@ -2146,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 &&
@@ -2354,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,
@@ -2382,7 +2411,7 @@ static void YGResolveFlexibleLength(
       availableInnerCrossDim,
       availableInnerWidth,
       availableInnerHeight,
-      flexBasisOverflows,
+      mainAxisOverflows,
       measureModeCrossDim,
       performLayout,
       config,
@@ -2415,6 +2444,7 @@ static void YGJustifyMainAxis(
       node->getLeadingPaddingAndBorder(mainAxis, ownerWidth).unwrap();
   const float trailingPaddingAndBorderMain =
       node->getTrailingPaddingAndBorder(mainAxis, ownerWidth).unwrap();
+  const float gap = node->getGapForAxis(mainAxis, ownerWidth).unwrap();
   // If we are using "at most" rules in the main axis, make sure that
   // remainingFreeSpace is 0 when min main dimension is not given
   if (measureModeMainDim == YGMeasureModeAtMost &&
@@ -2462,7 +2492,7 @@ static void YGJustifyMainAxis(
   // The space between the beginning and the first element and the space between
   // each two elements.
   float leadingMainDim = 0;
-  float betweenMainDim = 0;
+  float betweenMainDim = gap;
   const YGJustify justifyContent = node->getStyle().justifyContent();
 
   if (numberOfAutoMarginsOnCurrentLine == 0) {
@@ -2475,24 +2505,22 @@ static void YGJustifyMainAxis(
         break;
       case YGJustifySpaceBetween:
         if (collectedFlexItemsValues.itemsOnLine > 1) {
-          betweenMainDim =
+          betweenMainDim +=
               YGFloatMax(collectedFlexItemsValues.remainingFreeSpace, 0) /
               (collectedFlexItemsValues.itemsOnLine - 1);
-        } else {
-          betweenMainDim = 0;
         }
         break;
       case YGJustifySpaceEvenly:
         // Space is distributed evenly across all elements
-        betweenMainDim = collectedFlexItemsValues.remainingFreeSpace /
+        leadingMainDim = collectedFlexItemsValues.remainingFreeSpace /
             (collectedFlexItemsValues.itemsOnLine + 1);
-        leadingMainDim = betweenMainDim;
+        betweenMainDim += leadingMainDim;
         break;
       case YGJustifySpaceAround:
         // Space on the edges is half of the space between elements
-        betweenMainDim = collectedFlexItemsValues.remainingFreeSpace /
+        leadingMainDim = 0.5f * collectedFlexItemsValues.remainingFreeSpace /
             collectedFlexItemsValues.itemsOnLine;
-        leadingMainDim = betweenMainDim / 2;
+        betweenMainDim += leadingMainDim * 2;
         break;
       case YGJustifyFlexStart:
         break;
@@ -2512,6 +2540,11 @@ static void YGJustifyMainAxis(
     const YGNodeRef child = node->getChild(i);
     const YGStyle& childStyle = child->getStyle();
     const YGLayout childLayout = child->getLayout();
+    const bool isLastChild = i == collectedFlexItemsValues.endOfLineIndex - 1;
+    // remove the gap if it is the last element of the line
+    if (isLastChild) {
+      betweenMainDim -= gap;
+    }
     if (childStyle.display() == YGDisplayNone) {
       continue;
     }
@@ -2641,7 +2674,7 @@ static void YGJustifyMainAxis(
 //    but the algorithm below assumes a default of 'column'.
 //
 // Input parameters:
-//    - node: current node to be sized and layed out
+//    - node: current node to be sized and laid out
 //    - availableWidth & availableHeight: available size to be used for sizing
 //      the node or YGUndefined if the size is not available; interpretation
 //      depends on layout flags
@@ -2653,7 +2686,7 @@ static void YGJustifyMainAxis(
 //      for explanation)
 //    - performLayout: specifies whether the caller is interested in just the
 //      dimensions of the node or it requires the entire node and its subtree to
-//      be layed out (with final positions)
+//      be laid out (with final positions)
 //
 // Details:
 //    This routine is called recursively to lay out subtrees of flexbox
@@ -2856,7 +2889,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,
@@ -2871,10 +2906,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;
   }
@@ -2890,6 +2932,9 @@ static void YGNodelayoutImpl(
   // Accumulated cross dimensions of all lines so far.
   float totalLineCrossDim = 0;
 
+  const float crossAxisGap =
+      node->getGapForAxis(crossAxis, availableInnerCrossDim).unwrap();
+
   // Max main dimension of all the lines.
   float maxLineMainDim = 0;
   YGCollectFlexItemsRowValues collectedFlexItemsValues;
@@ -2952,10 +2997,10 @@ static void YGNodelayoutImpl(
         availableInnerMainDim = maxInnerMainDim;
       } else {
         if (!node->getConfig()->useLegacyStretchBehaviour &&
-            ((YGFloatIsUndefined(
+            ((!YGFloatIsUndefined(
                   collectedFlexItemsValues.totalFlexGrowFactors) &&
               collectedFlexItemsValues.totalFlexGrowFactors == 0) ||
-             (YGFloatIsUndefined(node->resolveFlexGrow()) &&
+             (!YGFloatIsUndefined(node->resolveFlexGrow()) &&
               node->resolveFlexGrow() == 0))) {
           // If we don't have any children to flex or we can't flex the node
           // itself, space we've used is all space we need. Root node also
@@ -2994,7 +3039,7 @@ static void YGNodelayoutImpl(
           availableInnerCrossDim,
           availableInnerWidth,
           availableInnerHeight,
-          flexBasisOverflows,
+          mainAxisOverflows,
           measureModeCrossDim,
           performLayout,
           config,
@@ -3209,7 +3254,8 @@ static void YGNodelayoutImpl(
       }
     }
 
-    totalLineCrossDim += collectedFlexItemsValues.crossDim;
+    const float appliedCrossGap = lineCount != 0 ? crossAxisGap : 0.0f;
+    totalLineCrossDim += collectedFlexItemsValues.crossDim + appliedCrossGap;
     maxLineMainDim =
         YGFloatMax(maxLineMainDim, collectedFlexItemsValues.mainDim);
   }
@@ -3304,6 +3350,7 @@ static void YGNodelayoutImpl(
       }
       endIndex = ii;
       lineHeight += crossDimLead;
+      currentLead += i != 0 ? crossAxisGap : 0;
 
       if (performLayout) {
         for (ii = startIndex; ii < endIndex; ii++) {
@@ -3790,7 +3837,7 @@ bool YGLayoutNodeInternal(
   // Determine whether the results are already cached. We maintain a separate
   // cache for layouts and measurements. A layout operation modifies the
   // positions and dimensions for nodes in the subtree. The algorithm assumes
-  // that each node gets layed out a maximum of one time per tree layout, but
+  // that each node gets laid out a maximum of one time per tree layout, but
   // multiple measurements may be required to resolve all of the flex
   // dimensions. We handle nodes with measure functions specially here because
   // they are the most expensive to measure, so it's worth avoiding redundant
@@ -4324,7 +4371,7 @@ YOGA_EXPORT void YGConfigSetExperimentalFeatureEnabled(
   config->experimentalFeatures[feature] = enabled;
 }
 
-inline bool YGConfigIsExperimentalFeatureEnabled(
+YOGA_EXPORT bool YGConfigIsExperimentalFeatureEnabled(
     const YGConfigRef config,
     const YGExperimentalFeature feature) {
   return config->experimentalFeatures[feature];
@@ -4336,6 +4383,11 @@ YOGA_EXPORT void YGConfigSetUseWebDefaults(
   config->useWebDefaults = enabled;
 }
 
+YOGA_EXPORT bool YGConfigGetUseLegacyStretchBehaviour(
+    const YGConfigRef config) {
+  return config->useLegacyStretchBehaviour;
+}
+
 YOGA_EXPORT void YGConfigSetUseLegacyStretchBehaviour(
     const YGConfigRef config,
     const bool useLegacyStretchBehaviour) {
diff --git a/ReactCommon/yoga/yoga/Yoga.h b/ReactCommon/yoga/yoga/Yoga.h
index 3444658bbe0d..07beea4e527e 100644
--- a/ReactCommon/yoga/yoga/Yoga.h
+++ b/ReactCommon/yoga/yoga/Yoga.h
@@ -232,6 +232,12 @@ WIN_EXPORT YGValue YGNodeStyleGetPadding(YGNodeConstRef node, YGEdge edge);
 WIN_EXPORT void YGNodeStyleSetBorder(YGNodeRef node, YGEdge edge, float border);
 WIN_EXPORT float YGNodeStyleGetBorder(YGNodeConstRef node, YGEdge edge);
 
+WIN_EXPORT void YGNodeStyleSetGap(
+    YGNodeRef node,
+    YGGutter gutter,
+    float gapLength);
+WIN_EXPORT float YGNodeStyleGetGap(YGNodeConstRef node, YGGutter gutter);
+
 WIN_EXPORT void YGNodeStyleSetWidth(YGNodeRef node, float width);
 WIN_EXPORT void YGNodeStyleSetWidthPercent(YGNodeRef node, float width);
 WIN_EXPORT void YGNodeStyleSetWidthAuto(YGNodeRef node);
@@ -318,6 +324,7 @@ void YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviour(
 // resulted in implicit behaviour similar to align-self: stretch; Because this
 // was such a long-standing bug we must allow legacy users to switch back to
 // this behaviour.
+WIN_EXPORT bool YGConfigGetUseLegacyStretchBehaviour(YGConfigRef config);
 WIN_EXPORT void YGConfigSetUseLegacyStretchBehaviour(
     YGConfigRef config,
     bool useLegacyStretchBehaviour);
diff --git a/ReactCommon/yoga/yoga/event/event.h b/ReactCommon/yoga/yoga/event/event.h
index a5978914a9b9..a50f8e4301fa 100644
--- a/ReactCommon/yoga/yoga/event/event.h
+++ b/ReactCommon/yoga/yoga/event/event.h
@@ -91,6 +91,9 @@ struct YOGA_EXPORT Event {
   static void publish(const YGNode& node, const TypedData<E>& eventData = {}) {
 #ifdef YG_ENABLE_EVENTS
     publish(node, E, Data{eventData});
+#else
+    (void) node;
+    (void) eventData;
 #endif
   }
 
diff --git a/android/README.md b/android/README.md
new file mode 100644
index 000000000000..613d9a3f2839
--- /dev/null
+++ b/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.
diff --git a/bots/yarn.lock b/bots/yarn.lock
deleted file mode 100644
index 2bd83418391d..000000000000
--- a/bots/yarn.lock
+++ /dev/null
@@ -1,1686 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@babel/polyfill@^7.2.5":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.12.1.tgz#1f2d6371d1261bbd961f3c5d5909150e12d0bd96"
-  integrity sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==
-  dependencies:
-    core-js "^2.6.5"
-    regenerator-runtime "^0.13.4"
-
-"@firebase/analytics-compat@0.1.6":
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.1.6.tgz#a5a8c909c67128d89c0aaa1c87699d1c5e873746"
-  integrity sha512-xvdp4/zwOG1f+v9JSpfCQoPJ98HcJR42cEnZ9pRIQLmUy7L7QceIuaF3m+zVtoqa4agBQnJ1dhe58FshOFKOPw==
-  dependencies:
-    "@firebase/analytics" "0.7.5"
-    "@firebase/analytics-types" "0.7.0"
-    "@firebase/component" "0.5.10"
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/analytics-types@0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.7.0.tgz#91960e7c87ce8bf18cf8dd9e55ccbf5dc3989b5d"
-  integrity sha512-DNE2Waiwy5+zZnCfintkDtBfaW6MjIG883474v6Z0K1XZIvl76cLND4iv0YUb48leyF+PJK1KO2XrgHb/KpmhQ==
-
-"@firebase/analytics@0.7.5":
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.7.5.tgz#c12a2ea10067e8e0947bc54758750c65a700e79f"
-  integrity sha512-vrKDh84hBbKPJaU2oAZDewyC79D8opJOQZ5AU3BXBBwEfRjKt3C3jj/Vl6aJUme+RKXlomTw3xcHIOoPzTgBVA==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/installations" "0.5.5"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/app-check-compat@0.2.3":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@firebase/app-check-compat/-/app-check-compat-0.2.3.tgz#f6ee8b8581423fe4efbba6165c14c3f9625a95e4"
-  integrity sha512-e2mKkuecr1XgsyTGXKfg83PcV1UdT7+tXYoHIjeBeLrP5gGL4OQbWCzzt6uVQpk1gmJbUktje/rd6Et6cdL+wg==
-  dependencies:
-    "@firebase/app-check" "0.5.3"
-    "@firebase/component" "0.5.10"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/app-check-interop-types@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@firebase/app-check-interop-types/-/app-check-interop-types-0.1.0.tgz#83afd9d41f99166c2bdb2d824e5032e9edd8fe53"
-  integrity sha512-uZfn9s4uuRsaX5Lwx+gFP3B6YsyOKUE+Rqa6z9ojT4VSRAsZFko9FRn6OxQUA1z5t5d08fY4pf+/+Dkd5wbdbA==
-
-"@firebase/app-check@0.5.3":
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/@firebase/app-check/-/app-check-0.5.3.tgz#477ea3d925bde898dce1c25bc3d3886252ad2aaf"
-  integrity sha512-M2/UO5PgxHCl0wPYWGdF6lO8nqclwuRMCIrc+75xv3/Dr3hhUu4ztF5JNaAV5tktSCt1UrnASG+4rNVifCzSRw==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/app-compat@0.1.16":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@firebase/app-compat/-/app-compat-0.1.16.tgz#cf006b7c9639731a9f13e9d20c6a36298f73eeef"
-  integrity sha512-PCGqanykO1H2jO3gzT0x7VxjZ0stBkF89VBqpOJfZ+srjSQgfWZuHjwbaVoq2Ayza1/s79iF0Eg7LSBx54TBSg==
-  dependencies:
-    "@firebase/app" "0.7.15"
-    "@firebase/component" "0.5.10"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/app-types@0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.7.0.tgz#c9e16d1b8bed1a991840b8d2a725fb58d0b5899f"
-  integrity sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg==
-
-"@firebase/app@0.7.15":
-  version "0.7.15"
-  resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.7.15.tgz#b437bc6a0a2f8c592fc40812084df63aa302435f"
-  integrity sha512-jZzopQ5rKC3QcivZ9tBsYjPWB0+d5+lSO4tASIgAia30pyACCFaN2M1PKX/lwoGmB+oklHzSIMu+iNtLUyDl2A==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/auth-compat@0.2.7":
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/@firebase/auth-compat/-/auth-compat-0.2.7.tgz#9386ea64096a445c244061b9a8686389a560b7bc"
-  integrity sha512-VdwGPf5Gr6s7JCW9Y7NOuCIp/izOHVdWcVKLlotcaWep3z+C+1eTws7bbQU+sy2xbsXEXETHAM6Gb6AMu8fC4g==
-  dependencies:
-    "@firebase/auth" "0.19.7"
-    "@firebase/auth-types" "0.11.0"
-    "@firebase/component" "0.5.10"
-    "@firebase/util" "1.4.3"
-    node-fetch "2.6.7"
-    selenium-webdriver "^4.0.0-beta.2"
-    tslib "^2.1.0"
-
-"@firebase/auth-interop-types@0.1.6":
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz#5ce13fc1c527ad36f1bb1322c4492680a6cf4964"
-  integrity sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g==
-
-"@firebase/auth-types@0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.11.0.tgz#b9c73c60ca07945b3bbd7a097633e5f78fa9e886"
-  integrity sha512-q7Bt6cx+ySj9elQHTsKulwk3+qDezhzRBFC9zlQ1BjgMueUOnGMcvqmU0zuKlQ4RhLSH7MNAdBV2znVaoN3Vxw==
-
-"@firebase/auth@0.19.7":
-  version "0.19.7"
-  resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.19.7.tgz#0c537e3966fc95f9e79783c49242818426956c96"
-  integrity sha512-+9a5ideiY+ey3LeRsg9RdnR+BjxJwN8+nfifNl1Hucuj2MZOXIv/D6D/6xzi4XdZj3cFrFvBjZdg5nCiKZsZ7w==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.4.3"
-    node-fetch "2.6.7"
-    selenium-webdriver "4.0.0-rc-1"
-    tslib "^2.1.0"
-
-"@firebase/component@0.5.10":
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.5.10.tgz#eab8acfd9b1a2b6534a63cbcd7cbc7660c47663d"
-  integrity sha512-mzUpg6rsBbdQJvAdu1rNWabU3O7qdd+B+/ubE1b+pTbBKfw5ySRpRRE6sKcZ/oQuwLh0HHB6FRJHcylmI7jDzA==
-  dependencies:
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/database-compat@0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-0.1.5.tgz#df451ce6a8d0ea2ebc2b1c8017da7d773424371d"
-  integrity sha512-UVxkHL24sZfsjsjs+yiKIdYdrWXHrLxSFCYNdwNXDlTkAc0CWP9AAY3feLhBVpUKk+4Cj0I4sGnyIm2C1ltAYg==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/database" "0.12.5"
-    "@firebase/database-types" "0.9.4"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/database-types@0.9.4":
-  version "0.9.4"
-  resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.9.4.tgz#08b7da33d8dca8f5adab45bfb1cdf8654f2c6720"
-  integrity sha512-uAQuc6NUZ5Oh/cWZPeMValtcZ+4L1stgKOeYvz7mLn8+s03tnCDL2N47OLCHdntktVkhImQTwGNARgqhIhtNeA==
-  dependencies:
-    "@firebase/app-types" "0.7.0"
-    "@firebase/util" "1.4.3"
-
-"@firebase/database@0.12.5":
-  version "0.12.5"
-  resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.12.5.tgz#e7f8e8052c3038aff79633e5395c3cc5c30ca7b2"
-  integrity sha512-1Pd2jYqvqZI7SQWAiXbTZxmsOa29PyOaPiUtr8pkLSfLp4AeyMBegYAXCLYLW6BNhKn3zNKFkxYDxYHq4q+Ixg==
-  dependencies:
-    "@firebase/auth-interop-types" "0.1.6"
-    "@firebase/component" "0.5.10"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.4.3"
-    faye-websocket "0.11.4"
-    tslib "^2.1.0"
-
-"@firebase/firestore-compat@0.1.13":
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.1.13.tgz#d249d9ae92b33799ca836de7d0ba48ad0c872c8a"
-  integrity sha512-FJSSn0zYBuf8YQAqrRWnXT/fHI/PBgwNEz6IzGw7EN7KHLWX4lCwNBFhAK5+ieJJDN3CbXjtSeVH3qc+cPiOjA==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/firestore" "3.4.4"
-    "@firebase/firestore-types" "2.5.0"
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/firestore-types@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-2.5.0.tgz#16fca40b6980fdb000de86042d7a96635f2bcdd7"
-  integrity sha512-I6c2m1zUhZ5SH0cWPmINabDyH5w0PPFHk2UHsjBpKdZllzJZ2TwTkXbDtpHUZNmnc/zAa0WNMNMvcvbb/xJLKA==
-
-"@firebase/firestore@3.4.4":
-  version "3.4.4"
-  resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-3.4.4.tgz#6810b2b9a9fa2cafe7c1d1d83f9274e15b95268d"
-  integrity sha512-IC8KZ6LbhECch9xPWp2Kj/0dqN+douzw7SWMAfWxXKmg+CjXpoyUoCh7UU/jshWafd4AUU3OV8QTv8tXRaMpdA==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.4.3"
-    "@firebase/webchannel-wrapper" "0.6.1"
-    "@grpc/grpc-js" "^1.3.2"
-    "@grpc/proto-loader" "^0.6.0"
-    node-fetch "2.6.7"
-    tslib "^2.1.0"
-
-"@firebase/functions-compat@0.1.9":
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.1.9.tgz#c81b98a0b1378e234533b3552dcef9529da6c389"
-  integrity sha512-XhcLUVgxwqyk4euz1VO/qM6LUrkbR0vibh/2triR2ciJS2epkpvPICVMxWXaetsKOVpcaTs15eGpJClCRHGLjw==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/functions" "0.7.8"
-    "@firebase/functions-types" "0.5.0"
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/functions-types@0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.5.0.tgz#b50ba95ccce9e96f7cda453228ffe1684645625b"
-  integrity sha512-qza0M5EwX+Ocrl1cYI14zoipUX4gI/Shwqv0C1nB864INAD42Dgv4v94BCyxGHBg2kzlWy8PNafdP7zPO8aJQA==
-
-"@firebase/functions@0.7.8":
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.7.8.tgz#5cc45dddc42e8ce0fac7d8ce2f95e92bfbe33544"
-  integrity sha512-WNpKnQqufNkqHkFm1ol4oeF+/mA1y5gtj1csRFZqQS2EeDcq6FCs49abBFpjBOxWz8XDDNlSasCKhIrAAKIFfg==
-  dependencies:
-    "@firebase/app-check-interop-types" "0.1.0"
-    "@firebase/auth-interop-types" "0.1.6"
-    "@firebase/component" "0.5.10"
-    "@firebase/messaging-interop-types" "0.1.0"
-    "@firebase/util" "1.4.3"
-    node-fetch "2.6.7"
-    tslib "^2.1.0"
-
-"@firebase/installations@0.5.5":
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.5.5.tgz#b517e20fe4ce4b9e2f3349596391d54f2294bf7f"
-  integrity sha512-mYWUxYXPlxcR0YOikPw88TjIS2NK35Z0ivkJL0+FevNnVIsqwGSe12AtPlZB/kzjB0RtHoKW+cWC0V9xiTgJ3Q==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/util" "1.4.3"
-    idb "3.0.2"
-    tslib "^2.1.0"
-
-"@firebase/logger@0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.3.2.tgz#5046ffa8295c577846d54b6ca95645a03809800e"
-  integrity sha512-lzLrcJp9QBWpo40OcOM9B8QEtBw2Fk1zOZQdvv+rWS6gKmhQBCEMc4SMABQfWdjsylBcDfniD1Q+fUX1dcBTXA==
-  dependencies:
-    tslib "^2.1.0"
-
-"@firebase/messaging-compat@0.1.7":
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/@firebase/messaging-compat/-/messaging-compat-0.1.7.tgz#db9066032bbb001f18d34d707e42f4703d3c8ffb"
-  integrity sha512-EKKcMin7myL8GXu2Mq6daje6o13VZtgxUKe+sLVL4DfxPbJdhVvNirYTi14KM81tDPdKAIakZNIGiIm/r8S2zA==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/messaging" "0.9.7"
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/messaging-interop-types@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@firebase/messaging-interop-types/-/messaging-interop-types-0.1.0.tgz#bdac02dd31edd5cb9eec37b1db698ea5e2c1a631"
-  integrity sha512-DbvUl/rXAZpQeKBnwz0NYY5OCqr2nFA0Bj28Fmr3NXGqR4PAkfTOHuQlVtLO1Nudo3q0HxAYLa68ZDAcuv2uKQ==
-
-"@firebase/messaging@0.9.7":
-  version "0.9.7"
-  resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.9.7.tgz#fa4e566f3632d3437cbc667c7755ed0c83ee38a2"
-  integrity sha512-qRPWO5fvS1yahe0As0rlpo+Gc3v5IKHlULGJPYvWGJWE3W5aCvooxsT3vYgYNmAMFjgLlugfg8KKd41O1ebgqg==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/installations" "0.5.5"
-    "@firebase/messaging-interop-types" "0.1.0"
-    "@firebase/util" "1.4.3"
-    idb "3.0.2"
-    tslib "^2.1.0"
-
-"@firebase/performance-compat@0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@firebase/performance-compat/-/performance-compat-0.1.5.tgz#e5e13629740ad28fdcbb7bb4e6e49160bbe71550"
-  integrity sha512-s9mqR0GXJaqvIZD/GsshacpKOGa3NP6Yht33mNEtpL7ERqj35mvD1CBoUwH52eMYAaxlQd9y9JrphQgK3EmWWw==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/logger" "0.3.2"
-    "@firebase/performance" "0.5.5"
-    "@firebase/performance-types" "0.1.0"
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/performance-types@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@firebase/performance-types/-/performance-types-0.1.0.tgz#5e6efa9dc81860aee2cb7121b39ae8fa137e69fc"
-  integrity sha512-6p1HxrH0mpx+622Ql6fcxFxfkYSBpE3LSuwM7iTtYU2nw91Hj6THC8Bc8z4nboIq7WvgsT/kOTYVVZzCSlXl8w==
-
-"@firebase/performance@0.5.5":
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.5.5.tgz#2ec0167f4d318f05a5a4fe6daac3977cc1bc598d"
-  integrity sha512-eA8mEKVnyY64fwAKxHbJF5t1hNkdR0EZVib0LfEWl/2elPmFcjik097hqLHzdFE88JYCxNGfFaSPo9Lbk/qe6A==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/installations" "0.5.5"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/polyfill@0.3.36":
-  version "0.3.36"
-  resolved "https://registry.yarnpkg.com/@firebase/polyfill/-/polyfill-0.3.36.tgz#c057cce6748170f36966b555749472b25efdb145"
-  integrity sha512-zMM9oSJgY6cT2jx3Ce9LYqb0eIpDE52meIzd/oe/y70F+v9u1LDqk5kUF5mf16zovGBWMNFmgzlsh6Wj0OsFtg==
-  dependencies:
-    core-js "3.6.5"
-    promise-polyfill "8.1.3"
-    whatwg-fetch "2.0.4"
-
-"@firebase/remote-config-compat@0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@firebase/remote-config-compat/-/remote-config-compat-0.1.5.tgz#560aef7ce56d235ac2cfbebccc65fbe9545f6574"
-  integrity sha512-bgpmrCGyOj46c0xNFvivcXRHlaVkbt4mX2etbF9s6jaOILPd4rBHIfAiBpKL64GGwTkrOjWO9/HZun4I01gbpg==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/logger" "0.3.2"
-    "@firebase/remote-config" "0.3.4"
-    "@firebase/remote-config-types" "0.2.0"
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/remote-config-types@0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@firebase/remote-config-types/-/remote-config-types-0.2.0.tgz#1e2759fc01f20b58c564db42196f075844c3d1fd"
-  integrity sha512-hqK5sCPeZvcHQ1D6VjJZdW6EexLTXNMJfPdTwbD8NrXUw6UjWC4KWhLK/TSlL0QPsQtcKRkaaoP+9QCgKfMFPw==
-
-"@firebase/remote-config@0.3.4":
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.3.4.tgz#1197c92513130bcb1fe67c4978e6a9b034ef88be"
-  integrity sha512-SLlyVVNJ6DnU1AOjNrmv5u9Fge7gUwZVooyxMIkaT3Lj9MBM5MwfJsoG3UyiV4l7yI0iPj34LuKPpMJXOOcs4w==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/installations" "0.5.5"
-    "@firebase/logger" "0.3.2"
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/storage-compat@0.1.10":
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.1.10.tgz#94a7fbe89e901f4cd0d8fbec4be554186f897fea"
-  integrity sha512-l/mvUhDEJ/0/F2uBqmEqxZk+jvIEwLc9BO6lGPE3TtPdT2896u3GIzbI4XHjSLLUo5bA0ZKz8Z7GVev9CLsHfA==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/storage" "0.9.2"
-    "@firebase/storage-types" "0.6.0"
-    "@firebase/util" "1.4.3"
-    tslib "^2.1.0"
-
-"@firebase/storage-types@0.6.0":
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.6.0.tgz#0b1af64a2965af46fca138e5b70700e9b7e6312a"
-  integrity sha512-1LpWhcCb1ftpkP/akhzjzeFxgVefs6eMD2QeKiJJUGH1qOiows2w5o0sKCUSQrvrRQS1lz3SFGvNR1Ck/gqxeA==
-
-"@firebase/storage@0.9.2":
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.9.2.tgz#ca7bd034a45a9ec41412238eb82fe9413b1b4653"
-  integrity sha512-5xWgVHnE+n+cZAnFYd3NyNAQbp6/t3NL7TdqRGu1OaW5L7ioN7Rhq+L4I2yjIskVCoTaemYQDF+vICjCWoalbA==
-  dependencies:
-    "@firebase/component" "0.5.10"
-    "@firebase/util" "1.4.3"
-    node-fetch "2.6.7"
-    tslib "^2.1.0"
-
-"@firebase/util@1.4.3":
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.4.3.tgz#4358cf5f18beaa9c8a1e5a5fc4c7c44a4ccd4b7b"
-  integrity sha512-gQJl6r0a+MElLQEyU8Dx0kkC2coPj67f/zKZrGR7z7WpLgVanhaCUqEsptwpwoxi9RMFIaebleG+C9xxoARq+Q==
-  dependencies:
-    tslib "^2.1.0"
-
-"@firebase/webchannel-wrapper@0.6.1":
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.6.1.tgz#0c74724ba6e9ea6ad25a391eab60a79eaba4c556"
-  integrity sha512-9FqhNjKQWpQ3fGnSOCovHOm+yhhiorKEqYLAfd525jWavunDJcx8rOW6i6ozAh+FbwcYMkL7b+3j4UR/30MpoQ==
-
-"@grpc/grpc-js@^1.3.2":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.5.4.tgz#dd0237ad7df80a7a24766fe516d7e4a22cb4855e"
-  integrity sha512-+nJTOsqpFAXnfFrMZ7Too4XXZ/J9O+8jYvSoaunupoC7I7b9H4iex1BRsbTdOmiowfPGJrWit7jUPmbENSUSpw==
-  dependencies:
-    "@grpc/proto-loader" "^0.6.4"
-    "@types/node" ">=12.12.47"
-
-"@grpc/proto-loader@^0.6.0", "@grpc/proto-loader@^0.6.4":
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.9.tgz#4014eef366da733f8e04a9ddd7376fe8a58547b7"
-  integrity sha512-UlcCS8VbsU9d3XTXGiEVFonN7hXk+oMXZtoHHG2oSA1/GcDP1q6OUgs20PzHDGizzyi8ufGSUDlk3O2NyY7leg==
-  dependencies:
-    "@types/long" "^4.0.1"
-    lodash.camelcase "^4.3.0"
-    long "^4.0.0"
-    protobufjs "^6.10.0"
-    yargs "^16.2.0"
-
-"@octokit/auth-token@^2.4.4":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.5.0.tgz#27c37ea26c205f28443402477ffd261311f21e36"
-  integrity sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==
-  dependencies:
-    "@octokit/types" "^6.0.3"
-
-"@octokit/core@^3.5.1":
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.5.1.tgz#8601ceeb1ec0e1b1b8217b960a413ed8e947809b"
-  integrity sha512-omncwpLVxMP+GLpLPgeGJBF6IWJFjXDS5flY5VbppePYX9XehevbDykRH9PdCdvqt9TS5AOTiDide7h0qrkHjw==
-  dependencies:
-    "@octokit/auth-token" "^2.4.4"
-    "@octokit/graphql" "^4.5.8"
-    "@octokit/request" "^5.6.0"
-    "@octokit/request-error" "^2.0.5"
-    "@octokit/types" "^6.0.3"
-    before-after-hook "^2.2.0"
-    universal-user-agent "^6.0.0"
-
-"@octokit/endpoint@^6.0.1":
-  version "6.0.12"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.12.tgz#3b4d47a4b0e79b1027fb8d75d4221928b2d05658"
-  integrity sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==
-  dependencies:
-    "@octokit/types" "^6.0.3"
-    is-plain-object "^5.0.0"
-    universal-user-agent "^6.0.0"
-
-"@octokit/graphql@^4.5.8":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.8.0.tgz#664d9b11c0e12112cbf78e10f49a05959aa22cc3"
-  integrity sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==
-  dependencies:
-    "@octokit/request" "^5.6.0"
-    "@octokit/types" "^6.0.3"
-    universal-user-agent "^6.0.0"
-
-"@octokit/openapi-types@^11.2.0":
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-11.2.0.tgz#b38d7fc3736d52a1e96b230c1ccd4a58a2f400a6"
-  integrity sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==
-
-"@octokit/plugin-paginate-rest@^2.16.8":
-  version "2.17.0"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz#32e9c7cab2a374421d3d0de239102287d791bce7"
-  integrity sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==
-  dependencies:
-    "@octokit/types" "^6.34.0"
-
-"@octokit/plugin-request-log@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
-  integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
-
-"@octokit/plugin-rest-endpoint-methods@^5.12.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz#8c46109021a3412233f6f50d28786f8e552427ba"
-  integrity sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==
-  dependencies:
-    "@octokit/types" "^6.34.0"
-    deprecation "^2.3.1"
-
-"@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677"
-  integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==
-  dependencies:
-    "@octokit/types" "^6.0.3"
-    deprecation "^2.0.0"
-    once "^1.4.0"
-
-"@octokit/request@^5.6.0":
-  version "5.6.3"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.3.tgz#19a022515a5bba965ac06c9d1334514eb50c48b0"
-  integrity sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==
-  dependencies:
-    "@octokit/endpoint" "^6.0.1"
-    "@octokit/request-error" "^2.1.0"
-    "@octokit/types" "^6.16.1"
-    is-plain-object "^5.0.0"
-    node-fetch "^2.6.7"
-    universal-user-agent "^6.0.0"
-
-"@octokit/rest@^16.43.0 || ^17.11.0 || ^18.12.0", "@octokit/rest@^18.12.0":
-  version "18.12.0"
-  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.12.0.tgz#f06bc4952fc87130308d810ca9d00e79f6988881"
-  integrity sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==
-  dependencies:
-    "@octokit/core" "^3.5.1"
-    "@octokit/plugin-paginate-rest" "^2.16.8"
-    "@octokit/plugin-request-log" "^1.0.4"
-    "@octokit/plugin-rest-endpoint-methods" "^5.12.0"
-
-"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.34.0":
-  version "6.34.0"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.34.0.tgz#c6021333334d1ecfb5d370a8798162ddf1ae8218"
-  integrity sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==
-  dependencies:
-    "@octokit/openapi-types" "^11.2.0"
-
-"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
-  integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78=
-
-"@protobufjs/base64@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
-  integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==
-
-"@protobufjs/codegen@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
-  integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==
-
-"@protobufjs/eventemitter@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
-  integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A=
-
-"@protobufjs/fetch@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
-  integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=
-  dependencies:
-    "@protobufjs/aspromise" "^1.1.1"
-    "@protobufjs/inquire" "^1.1.0"
-
-"@protobufjs/float@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
-  integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=
-
-"@protobufjs/inquire@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
-  integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=
-
-"@protobufjs/path@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
-  integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=
-
-"@protobufjs/pool@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
-  integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=
-
-"@protobufjs/utf8@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
-  integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
-
-"@types/long@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"
-  integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==
-
-"@types/node@>=12.12.47", "@types/node@>=13.7.0":
-  version "17.0.14"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.14.tgz#33b9b94f789a8fedd30a68efdbca4dbb06b61f20"
-  integrity sha512-SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng==
-
-abort-controller@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
-  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
-  dependencies:
-    event-target-shim "^5.0.0"
-
-agent-base@4, agent-base@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-async-retry@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.2.3.tgz#a6521f338358d322b1a0012b79030c6f411d1ce0"
-  integrity sha512-tfDb02Th6CE6pJUF2gjW5ZVjsgwlucVXOEQMvEX9JgSJMs9gAX+Nz3xRuJBKuUYjTSYORqvDBORdAQ3LU59g7Q==
-  dependencies:
-    retry "0.12.0"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-before-after-hook@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"
-  integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-buffer-equal-constant-time@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
-  integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
-
-chalk@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-cliui@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
-  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^7.0.0"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-colors@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
-combined-stream@^1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@^2.18.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-core-js@3.6.5:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
-  integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
-
-core-js@^2.6.5:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
-  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-
-core-util-is@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
-  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
-
-danger@^11.0.2:
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/danger/-/danger-11.0.2.tgz#245b65aaf26c9b5eb3d0c65fcd403b5c31782138"
-  integrity sha512-TKE5E1Zrb0uV7Ft3mhbTA3bwVf4hZs7DVx6Mo8weVdIcaXJIIle3+aCjn259GX9/pF4ewoYuof7eLRPJligOgA==
-  dependencies:
-    "@babel/polyfill" "^7.2.5"
-    "@octokit/rest" "^18.12.0"
-    async-retry "1.2.3"
-    chalk "^2.3.0"
-    commander "^2.18.0"
-    debug "^4.1.1"
-    fast-json-patch "^3.0.0-1"
-    get-stdin "^6.0.0"
-    gitlab "^10.0.1"
-    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.1"
-    hyperlinker "^1.0.0"
-    json5 "^2.1.0"
-    jsonpointer "^5.0.0"
-    jsonwebtoken "^8.4.0"
-    lodash.find "^4.6.0"
-    lodash.includes "^4.3.0"
-    lodash.isobject "^3.0.2"
-    lodash.keys "^4.0.8"
-    lodash.mapvalues "^4.6.0"
-    lodash.memoize "^4.1.2"
-    memfs-or-file-map-to-github-branch "^1.2.1"
-    micromatch "^4.0.4"
-    node-cleanup "^2.1.2"
-    node-fetch "^2.6.7"
-    override-require "^1.1.1"
-    p-limit "^2.1.0"
-    parse-diff "^0.7.0"
-    parse-git-config "^2.0.3"
-    parse-github-url "^1.0.2"
-    parse-link-header "^2.0.0"
-    pinpoint "^1.1.0"
-    prettyjson "^1.2.1"
-    readline-sync "^1.4.9"
-    require-from-string "^2.0.2"
-    supports-hyperlinks "^1.0.1"
-
-debug@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.1.1:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
-  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
-  dependencies:
-    ms "2.1.2"
-
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-deprecation@^2.0.0, deprecation@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
-  integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
-
-ecdsa-sig-formatter@1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
-  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
-  dependencies:
-    safe-buffer "^5.0.1"
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-es6-promise@^4.0.3:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
-es6-promisify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
-  dependencies:
-    es6-promise "^4.0.3"
-
-escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
-
-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-event-target-shim@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
-  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
-
-expand-tilde@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-fast-json-patch@^3.0.0-1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-3.1.0.tgz#ec8cd9b9c4c564250ec8b9140ef7a55f70acaee6"
-  integrity sha512-IhpytlsVTRndz0hU5t0/MGzS/etxLlfrpG5V5M9mVbuj9TrJLWaMfsox9REM5rkuGX0T+5qjpe8XA1o0gZ42nA==
-
-faye-websocket@0.11.4:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
-  integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-filter-obj@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
-  integrity sha1-mzERErxsYSehbgFsbF1/GeCAXFs=
-
-firebase@^9.6.5:
-  version "9.6.5"
-  resolved "https://registry.yarnpkg.com/firebase/-/firebase-9.6.5.tgz#cf664a953e85f8c7013783db9be21f063877ca9b"
-  integrity sha512-RtJjR5iWU4B9FyGIQ3uorJwp9vXiu5ozAJZZjd1m2Lh9lWqfTKVQitG6nZOdK/Bcc/p4X3OEzlCcBnbi+XFZBA==
-  dependencies:
-    "@firebase/analytics" "0.7.5"
-    "@firebase/analytics-compat" "0.1.6"
-    "@firebase/app" "0.7.15"
-    "@firebase/app-check" "0.5.3"
-    "@firebase/app-check-compat" "0.2.3"
-    "@firebase/app-compat" "0.1.16"
-    "@firebase/app-types" "0.7.0"
-    "@firebase/auth" "0.19.7"
-    "@firebase/auth-compat" "0.2.7"
-    "@firebase/database" "0.12.5"
-    "@firebase/database-compat" "0.1.5"
-    "@firebase/firestore" "3.4.4"
-    "@firebase/firestore-compat" "0.1.13"
-    "@firebase/functions" "0.7.8"
-    "@firebase/functions-compat" "0.1.9"
-    "@firebase/installations" "0.5.5"
-    "@firebase/messaging" "0.9.7"
-    "@firebase/messaging-compat" "0.1.7"
-    "@firebase/performance" "0.5.5"
-    "@firebase/performance-compat" "0.1.5"
-    "@firebase/polyfill" "0.3.36"
-    "@firebase/remote-config" "0.3.4"
-    "@firebase/remote-config-compat" "0.1.5"
-    "@firebase/storage" "0.9.2"
-    "@firebase/storage-compat" "0.1.10"
-    "@firebase/util" "1.4.3"
-
-form-data@^2.5.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
-  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
-fs-exists-sync@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
-  integrity sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-get-caller-file@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-get-stdin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
-  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
-
-git-config-path@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/git-config-path/-/git-config-path-1.0.1.tgz#6d33f7ed63db0d0e118131503bab3aca47d54664"
-  integrity sha1-bTP37WPbDQ4RgTFQO6s6ykfVRmQ=
-  dependencies:
-    extend-shallow "^2.0.1"
-    fs-exists-sync "^0.1.0"
-    homedir-polyfill "^1.0.0"
-
-gitlab@^10.0.1:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/gitlab/-/gitlab-10.2.1.tgz#1f5fb2c2bad08f95b7c7d91dd41805ab5eea3960"
-  integrity sha512-z+DxRF1C9uayVbocs9aJkJz+kGy14TSm1noB/rAIEBbXOkOYbjKxyuqJzt+0zeFpXFdgA0yq6DVVbvM7HIfGwg==
-  dependencies:
-    form-data "^2.5.0"
-    humps "^2.0.1"
-    ky "^0.12.0"
-    ky-universal "^0.3.0"
-    li "^1.3.0"
-    query-string "^6.8.2"
-    universal-url "^2.0.0"
-
-glob@^7.1.3:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-has-flag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-  integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-hasurl@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/hasurl/-/hasurl-1.0.0.tgz#e4c619097ae1e8fc906bee904ce47e94f5e1ea37"
-  integrity sha512-43ypUd3DbwyCT01UYpA99AEZxZ4aKtRxWGBHEIbjcOsUghd9YUON0C+JF6isNjaiwC/UF5neaUudy6JS9jZPZQ==
-
-homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
-  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
-  dependencies:
-    parse-passwd "^1.0.0"
-
-http-parser-js@>=0.5.1:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5"
-  integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==
-
-http-proxy-agent@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
-  dependencies:
-    agent-base "4"
-    debug "3.1.0"
-
-https-proxy-agent@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
-  dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
-
-humps@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/humps/-/humps-2.0.1.tgz#dd02ea6081bd0568dc5d073184463957ba9ef9aa"
-  integrity sha1-3QLqYIG9BWjcXQcxhEY5V7qe+ao=
-
-hyperlinker@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/hyperlinker/-/hyperlinker-1.0.0.tgz#23dc9e38a206b208ee49bc2d6c8ef47027df0c0e"
-  integrity sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ==
-
-idb@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/idb/-/idb-3.0.2.tgz#c8e9122d5ddd40f13b60ae665e4862f8b13fa384"
-  integrity sha512-+FLa/0sTXqyux0o6C+i2lOR0VoS60LU/jzUo5xjfY6+7sEEgy4Gz1O7yFBXvjd7N0NyIGWIRg8DcQSLEG+VSPw==
-
-immediate@~3.0.5:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-ini@^1.3.5:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
-is-extendable@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-plain-object@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
-  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
-
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-json5@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
-  dependencies:
-    minimist "^1.2.5"
-
-jsonpointer@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.0.tgz#f802669a524ec4805fa7389eadbc9921d5dc8072"
-  integrity sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg==
-
-jsonwebtoken@^8.4.0:
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
-  integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==
-  dependencies:
-    jws "^3.2.2"
-    lodash.includes "^4.3.0"
-    lodash.isboolean "^3.0.3"
-    lodash.isinteger "^4.0.4"
-    lodash.isnumber "^3.0.3"
-    lodash.isplainobject "^4.0.6"
-    lodash.isstring "^4.0.1"
-    lodash.once "^4.0.0"
-    ms "^2.1.1"
-    semver "^5.6.0"
-
-jszip@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
-  integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==
-  dependencies:
-    lie "~3.3.0"
-    pako "~1.0.2"
-    readable-stream "~2.3.6"
-    set-immediate-shim "~1.0.1"
-
-jwa@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
-  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
-  dependencies:
-    buffer-equal-constant-time "1.0.1"
-    ecdsa-sig-formatter "1.0.11"
-    safe-buffer "^5.0.1"
-
-jws@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
-  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
-  dependencies:
-    jwa "^1.4.1"
-    safe-buffer "^5.0.1"
-
-ky-universal@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/ky-universal/-/ky-universal-0.3.0.tgz#3fcbb0dd03da39b5f05100d9362a630d5e1d402e"
-  integrity sha512-CM4Bgb2zZZpsprcjI6DNYTaH3oGHXL2u7BU4DK+lfCuC4snkt9/WRpMYeKbBbXscvKkeqBwzzjFX2WwmKY5K/A==
-  dependencies:
-    abort-controller "^3.0.0"
-    node-fetch "^2.6.0"
-
-ky@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/ky/-/ky-0.12.0.tgz#c05be95e6745ba422a6d2cc8ae964164962279f9"
-  integrity sha512-t9b7v3V2fGwAcQnnDDQwKQGF55eWrf4pwi1RN08Fy8b/9GEwV7Ea0xQiaSW6ZbeghBHIwl8kgnla4vVo9seepQ==
-
-li@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/li/-/li-1.3.0.tgz#22c59bcaefaa9a8ef359cf759784e4bf106aea1b"
-  integrity sha1-IsWbyu+qmo7zWc91l4TkvxBq6hs=
-
-lie@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
-  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
-  dependencies:
-    immediate "~3.0.5"
-
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
-
-lodash.find@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1"
-  integrity sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E=
-
-lodash.includes@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
-  integrity sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=
-
-lodash.isboolean@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
-  integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
-
-lodash.isinteger@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
-  integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=
-
-lodash.isnumber@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
-  integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=
-
-lodash.isobject@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"
-  integrity sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=
-
-lodash.isplainobject@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-  integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
-
-lodash.keys@^4.0.8:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"
-  integrity sha1-oIYCrBLk+4P5H8H7ejYKTZujUgU=
-
-lodash.mapvalues@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
-  integrity sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=
-
-lodash.memoize@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
-
-lodash.once@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
-  integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
-
-lodash.sortby@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
-
-long@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
-  integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
-
-memfs-or-file-map-to-github-branch@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/memfs-or-file-map-to-github-branch/-/memfs-or-file-map-to-github-branch-1.2.1.tgz#fdb9a85408262316a9bd5567409bf89be7d72f96"
-  integrity sha512-I/hQzJ2a/pCGR8fkSQ9l5Yx+FQ4e7X6blNHyWBm2ojeFLT3GVzGkTj7xnyWpdclrr7Nq4dmx3xrvu70m3ypzAQ==
-  dependencies:
-    "@octokit/rest" "^16.43.0 || ^17.11.0 || ^18.12.0"
-
-micromatch@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
-
-mime-db@1.51.0:
-  version "1.51.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
-  integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
-
-mime-types@^2.1.12:
-  version "2.1.34"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
-  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
-  dependencies:
-    mime-db "1.51.0"
-
-minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-node-cleanup@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz#7ac19abd297e09a7f72a71545d951b517e4dde2c"
-  integrity sha1-esGavSl+Caf3KnFUXZUbUX5N3iw=
-
-node-fetch@2.6.7, node-fetch@^2.6.0, node-fetch@^2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-once@^1.3.0, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-override-require@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/override-require/-/override-require-1.1.1.tgz#6ae22fadeb1f850ffb0cf4c20ff7b87e5eb650df"
-  integrity sha1-auIvresfhQ/7DPTCD/e4fl62UN8=
-
-p-limit@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-pako@~1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
-  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
-
-parse-diff@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/parse-diff/-/parse-diff-0.7.1.tgz#9b7a2451c3725baf2c87c831ba192d40ee2237d4"
-  integrity sha512-1j3l8IKcy4yRK2W4o9EYvJLSzpAVwz4DXqCewYyx2vEwk2gcf3DBPqc8Fj4XV3K33OYJ08A8fWwyu/ykD/HUSg==
-
-parse-git-config@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/parse-git-config/-/parse-git-config-2.0.3.tgz#6fb840d4a956e28b971c97b33a5deb73a6d5b6bb"
-  integrity sha512-Js7ueMZOVSZ3tP8C7E3KZiHv6QQl7lnJ+OkbxoaFazzSa2KyEHqApfGbU3XboUgUnq4ZuUmskUpYKTNx01fm5A==
-  dependencies:
-    expand-tilde "^2.0.2"
-    git-config-path "^1.0.1"
-    ini "^1.3.5"
-
-parse-github-url@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-github-url/-/parse-github-url-1.0.2.tgz#242d3b65cbcdda14bb50439e3242acf6971db395"
-  integrity sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==
-
-parse-link-header@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/parse-link-header/-/parse-link-header-2.0.0.tgz#949353e284f8aa01f2ac857a98f692b57733f6b7"
-  integrity sha512-xjU87V0VyHZybn2RrCX5TIFGxTVZE6zqqZWMPlIKiSKuWh/X5WZdt+w1Ki1nXB+8L/KtL+nZ4iq+sfI6MrhhMw==
-  dependencies:
-    xtend "~4.0.1"
-
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-picomatch@^2.2.3:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-pinpoint@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pinpoint/-/pinpoint-1.1.0.tgz#0cf7757a6977f1bf7f6a32207b709e377388e874"
-  integrity sha1-DPd1eml38b9/ajIge3CeN3OI6HQ=
-
-prettyjson@^1.2.1:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.5.tgz#ef3cfffcc70505c032abc59785884b4027031835"
-  integrity sha512-rksPWtoZb2ZpT5OVgtmy0KHVM+Dca3iVwWY9ifwhcexfjebtgjg3wmrUt9PvJ59XIYBcknQeYHD8IAnVlh9lAw==
-  dependencies:
-    colors "1.4.0"
-    minimist "^1.2.0"
-
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-promise-polyfill@8.1.3:
-  version "8.1.3"
-  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.3.tgz#8c99b3cf53f3a91c68226ffde7bde81d7f904116"
-  integrity sha512-MG5r82wBzh7pSKDRa9y+vllNHz3e3d4CNj1PQE4BQYxLme0gKYYBm9YENq+UkEikyZ0XbiGWxYlVw3Rl9O/U8g==
-
-protobufjs@^6.10.0:
-  version "6.11.2"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b"
-  integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==
-  dependencies:
-    "@protobufjs/aspromise" "^1.1.2"
-    "@protobufjs/base64" "^1.1.2"
-    "@protobufjs/codegen" "^2.0.4"
-    "@protobufjs/eventemitter" "^1.1.0"
-    "@protobufjs/fetch" "^1.1.0"
-    "@protobufjs/float" "^1.0.2"
-    "@protobufjs/inquire" "^1.1.0"
-    "@protobufjs/path" "^1.1.2"
-    "@protobufjs/pool" "^1.1.0"
-    "@protobufjs/utf8" "^1.1.0"
-    "@types/long" "^4.0.1"
-    "@types/node" ">=13.7.0"
-    long "^4.0.0"
-
-punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-query-string@^6.8.2:
-  version "6.14.1"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a"
-  integrity sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==
-  dependencies:
-    decode-uri-component "^0.2.0"
-    filter-obj "^1.1.0"
-    split-on-first "^1.0.0"
-    strict-uri-encode "^2.0.0"
-
-readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readline-sync@^1.4.9:
-  version "1.4.10"
-  resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b"
-  integrity sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==
-
-regenerator-runtime@^0.13.4:
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
-  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-from-string@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
-retry@0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
-
-rimraf@^3.0.0, rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-selenium-webdriver@4.0.0-rc-1:
-  version "4.0.0-rc-1"
-  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.0.0-rc-1.tgz#b1e7e5821298c8a071e988518dd6b759f0c41281"
-  integrity sha512-bcrwFPRax8fifRP60p7xkWDGSJJoMkPAzufMlk5K2NyLPht/YZzR2WcIk1+3gR8VOCLlst1P2PI+MXACaFzpIw==
-  dependencies:
-    jszip "^3.6.0"
-    rimraf "^3.0.2"
-    tmp "^0.2.1"
-    ws ">=7.4.6"
-
-selenium-webdriver@^4.0.0-beta.2:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.1.1.tgz#da083177d811f36614950e809e2982570f67d02e"
-  integrity sha512-Fr9e9LC6zvD6/j7NO8M1M/NVxFX67abHcxDJoP5w2KN/Xb1SyYLjMVPGgD14U2TOiKe4XKHf42OmFw9g2JgCBQ==
-  dependencies:
-    jszip "^3.6.0"
-    tmp "^0.2.1"
-    ws ">=7.4.6"
-
-semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-set-immediate-shim@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
-
-split-on-first@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
-  integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
-
-strict-uri-encode@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
-  integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY=
-
-string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-supports-color@^5.0.0, supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-hyperlinks@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-1.0.1.tgz#71daedf36cc1060ac5100c351bb3da48c29c0ef7"
-  integrity sha512-HHi5kVSefKaJkGYXbDuKbUGRVxqnWGn3J2e39CYcNJEfWciGq2zYtOhXLTlvrOZW1QU7VX67w7fMmWafHX9Pfw==
-  dependencies:
-    has-flag "^2.0.0"
-    supports-color "^5.0.0"
-
-tmp@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
-  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
-  dependencies:
-    rimraf "^3.0.0"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-tr46@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
-  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
-  dependencies:
-    punycode "^2.1.0"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
-
-tslib@^2.1.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
-  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
-
-universal-url@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/universal-url/-/universal-url-2.0.0.tgz#35e7fc2c3374804905cee67ea289ed3a47669809"
-  integrity sha512-3DLtXdm/G1LQMCnPj+Aw7uDoleQttNHp2g5FnNQKR6cP6taNWS1b/Ehjjx4PVyvejKi3TJyu8iBraKM4q3JQPg==
-  dependencies:
-    hasurl "^1.0.0"
-    whatwg-url "^7.0.0"
-
-universal-user-agent@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
-  integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
-
-webidl-conversions@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
-  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
-
-websocket-driver@>=0.5.1:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
-  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
-  dependencies:
-    http-parser-js ">=0.5.1"
-    safe-buffer ">=5.1.0"
-    websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
-  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
-
-whatwg-fetch@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
-  integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
-whatwg-url@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
-  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
-  dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^1.0.1"
-    webidl-conversions "^4.0.2"
-
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-ws@>=7.4.6:
-  version "8.4.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b"
-  integrity sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==
-
-xtend@~4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
-y18n@^5.0.5:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
-  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
-
-yargs-parser@^20.2.2:
-  version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
-  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
-
-yargs@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
diff --git a/build.gradle.kts b/build.gradle.kts
index d08c06c10034..bd1b0dc5ac7f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,6 +5,24 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+plugins { id("io.github.gradle-nexus.publish-plugin") version "1.1.0" }
+
+val reactAndroidProperties = java.util.Properties()
+
+File("$rootDir/ReactAndroid/gradle.properties").inputStream().use {
+  reactAndroidProperties.load(it)
+}
+
+version =
+    if (project.hasProperty("isNightly") &&
+        (project.property("isNightly") as? String).toBoolean()) {
+      "${reactAndroidProperties.getProperty("VERSION_NAME")}-SNAPSHOT"
+    } else {
+      reactAndroidProperties.getProperty("VERSION_NAME")
+    }
+
+group = "com.facebook.react"
+
 val ndkPath by extra(System.getenv("ANDROID_NDK"))
 val ndkVersion by extra(System.getenv("ANDROID_NDK_VERSION"))
 
@@ -12,12 +30,23 @@ buildscript {
   repositories {
     google()
     mavenCentral()
+    gradlePluginPortal()
   }
   dependencies {
-    classpath("com.android.tools.build:gradle:7.2.1")
+    classpath("com.android.tools.build:gradle:7.3.1")
     classpath("de.undercouch:gradle-download-task:5.0.1")
-    // NOTE: Do not place your application dependencies here; they belong
-    // in the individual module build.gradle files
+  }
+}
+
+val sonatypeUsername = findProperty("SONATYPE_USERNAME")?.toString()
+val sonatypePassword = findProperty("SONATYPE_PASSWORD")?.toString()
+
+nexusPublishing {
+  repositories {
+    sonatype {
+      username.set(sonatypeUsername)
+      password.set(sonatypePassword)
+    }
   }
 }
 
@@ -37,6 +66,9 @@ allprojects {
 tasks.register("cleanAll", Delete::class.java) {
   description = "Remove all the build files and intermediate build outputs"
   dependsOn(gradle.includedBuild("react-native-gradle-plugin").task(":clean"))
+  dependsOn(":ReactAndroid:clean")
+  dependsOn(":ReactAndroid:hermes-engine:clean")
+  dependsOn(":packages:rn-tester:android:app:clean")
   delete(allprojects.map { it.buildDir })
   delete(rootProject.file("./ReactAndroid/.cxx"))
   delete(rootProject.file("./ReactAndroid/hermes-engine/.cxx"))
@@ -59,6 +91,9 @@ tasks.register("buildAll") {
   dependsOn(":ReactAndroid:installArchives")
   // This builds RN Tester for Hermes/JSC for debug only
   dependsOn(":packages:rn-tester:android:app:assembleDebug")
+  // This compiles the Unit Test sources (without running them as they're partially broken)
+  dependsOn(":ReactAndroid:compileDebugUnitTestSources")
+  dependsOn(":ReactAndroid:compileReleaseUnitTestSources")
 }
 
 tasks.register("downloadAll") {
@@ -70,3 +105,26 @@ tasks.register("downloadAll") {
   dependsOn(":ReactAndroid:hermes-engine:dependencies")
   dependsOn(":ReactAndroid:hermes-engine:androidDependencies")
 }
+
+tasks.register("publishAllInsideNpmPackage") {
+  description =
+      "Publish all the artifacts to be available inside the NPM package in the `android` folder."
+  // Due to size constraints of NPM, we publish only react-native and hermes-engine inside
+  // the NPM package.
+  dependsOn(":ReactAndroid:installArchives")
+  dependsOn(":ReactAndroid:hermes-engine:installArchives")
+}
+
+tasks.register("publishAllToMavenTempLocal") {
+  description = "Publish all the artifacts to be available inside a Maven Local repository on /tmp."
+  dependsOn(":ReactAndroid:publishAllPublicationsToMavenTempLocalRepository")
+  // We don't publish the external-artifacts to Maven Local as CircleCI is using it via workspace.
+  dependsOn(":ReactAndroid:hermes-engine:publishAllPublicationsToMavenTempLocalRepository")
+}
+
+tasks.register("publishAllToSonatype") {
+  description = "Publish all the artifacts to Sonatype (Maven Central or Snapshot repository)"
+  dependsOn(":ReactAndroid:publishToSonatype")
+  dependsOn(":ReactAndroid:external-artifacts:publishToSonatype")
+  dependsOn(":ReactAndroid:hermes-engine:publishToSonatype")
+}
diff --git a/flow-typed/npm/react-dom_v16.x.x.js b/flow-typed/npm/react-dom_v17.x.x.js
similarity index 72%
rename from flow-typed/npm/react-dom_v16.x.x.js
rename to flow-typed/npm/react-dom_v17.x.x.js
index 01da4d0f52a8..7c5fe5329e92 100644
--- a/flow-typed/npm/react-dom_v16.x.x.js
+++ b/flow-typed/npm/react-dom_v17.x.x.js
@@ -1,32 +1,31 @@
-/**
- * react-dom v16.x.x libdefs from flow-typed
- *
- * @noformat
- */
+// flow-typed signature: e556c06e721548417501c08b01fec911
+// flow-typed version: ad3adf2de8/react-dom_v17.x.x/flow_>=v0.127.x
+
 declare module 'react-dom' {
+  declare var version: string;
+
   declare function findDOMNode(
-    componentOrElement: Element | ?React$Component<any, any>,
+    componentOrElement: Element | ?React$Component<any, any>
   ): null | Element | Text;
 
   declare function render<ElementType: React$ElementType>(
     element: React$Element<ElementType>,
     container: Element,
-    callback?: () => void,
+    callback?: () => void
   ): React$ElementRef<ElementType>;
 
   declare function hydrate<ElementType: React$ElementType>(
     element: React$Element<ElementType>,
     container: Element,
-    callback?: () => void,
+    callback?: () => void
   ): React$ElementRef<ElementType>;
 
   declare function createPortal(
     node: React$Node,
-    container: Element,
+    container: Element
   ): React$Portal;
 
   declare function unmountComponentAtNode(container: any): boolean;
-  declare var version: string;
 
   declare function unstable_batchedUpdates<A, B, C, D, E>(
     callback: (a: A, b: B, c: C, d: D, e: E) => mixed,
@@ -34,79 +33,107 @@ declare module 'react-dom' {
     b: B,
     c: C,
     d: D,
-    e: E,
+    e: E
   ): void;
+
   declare function unstable_renderSubtreeIntoContainer<
-    ElementType: React$ElementType,
+    ElementType: React$ElementType
   >(
     parentComponent: React$Component<any, any>,
     nextElement: React$Element<ElementType>,
     container: any,
-    callback?: () => void,
+    callback?: () => void
   ): React$ElementRef<ElementType>;
 }
 
 declare module 'react-dom/server' {
+  declare var version: string;
+
   declare function renderToString(element: React$Node): string;
+
   declare function renderToStaticMarkup(element: React$Node): string;
+
   declare function renderToNodeStream(element: React$Node): stream$Readable;
+
   declare function renderToStaticNodeStream(
-    element: React$Node,
+    element: React$Node
   ): stream$Readable;
-  declare var version: string;
 }
 
-type Thenable = { then(resolve: () => mixed, reject?: () => mixed): mixed, ... };
-
 declare module 'react-dom/test-utils' {
-  declare var Simulate: { [eventName: string]: (element: Element, eventData?: Object) => void, ... };
+  declare interface Thenable {
+    then(resolve: () => mixed, reject?: () => mixed): mixed,
+  }
+
+  declare var Simulate: {
+    [eventName: string]: (
+      element: Element,
+      eventData?: { [key: string]: mixed, ... }
+    ) => void,
+    ...
+  };
+
   declare function renderIntoDocument(
-    instance: React$Element<any>,
+    instance: React$Element<any>
   ): React$Component<any, any>;
+
   declare function mockComponent(
     componentClass: React$ElementType,
-    mockTagName?: string,
-  ): Object;
+    mockTagName?: string
+  ): { [key: string]: mixed, ... };
+
   declare function isElement(element: React$Element<any>): boolean;
+
   declare function isElementOfType(
     element: React$Element<any>,
-    componentClass: React$ElementType,
+    componentClass: React$ElementType
   ): boolean;
+
   declare function isDOMComponent(instance: any): boolean;
+
   declare function isCompositeComponent(
-    instance: React$Component<any, any>,
+    instance: React$Component<any, any>
   ): boolean;
+
   declare function isCompositeComponentWithType(
     instance: React$Component<any, any>,
-    componentClass: React$ElementType,
+    componentClass: React$ElementType
   ): boolean;
+
   declare function findAllInRenderedTree(
     tree: React$Component<any, any>,
-    test: (child: React$Component<any, any>) => boolean,
+    test: (child: React$Component<any, any>) => boolean
   ): Array<React$Component<any, any>>;
+
   declare function scryRenderedDOMComponentsWithClass(
     tree: React$Component<any, any>,
-    className: string,
+    className: string
   ): Array<Element>;
+
   declare function findRenderedDOMComponentWithClass(
     tree: React$Component<any, any>,
-    className: string,
+    className: string
   ): ?Element;
+
   declare function scryRenderedDOMComponentsWithTag(
     tree: React$Component<any, any>,
-    tagName: string,
+    tagName: string
   ): Array<Element>;
+
   declare function findRenderedDOMComponentWithTag(
     tree: React$Component<any, any>,
-    tagName: string,
+    tagName: string
   ): ?Element;
+
   declare function scryRenderedComponentsWithType(
     tree: React$Component<any, any>,
-    componentClass: React$ElementType,
+    componentClass: React$ElementType
   ): Array<React$Component<any, any>>;
+
   declare function findRenderedComponentWithType(
     tree: React$Component<any, any>,
-    componentClass: React$ElementType,
+    componentClass: React$ElementType
   ): ?React$Component<any, any>;
+
   declare function act(callback: () => void | Thenable): Thenable;
 }
diff --git a/flow-typed/npm/yargs_v17.x.x.js b/flow-typed/npm/yargs_v17.x.x.js
new file mode 100644
index 000000000000..2750236797a3
--- /dev/null
+++ b/flow-typed/npm/yargs_v17.x.x.js
@@ -0,0 +1,341 @@
+// flow-typed signature: cab38813101e0a162deaae556391abc8
+// flow-typed version: f7c859e705/yargs_v17.x.x/flow_>=v0.104.x
+
+declare module "yargs" {
+  declare type Argv = {
+    [key: string]: any,
+    _: Array<string>,
+    $0: string,
+    ...
+  };
+
+  declare type Options = $Shape<{
+    alias: string | Array<string>,
+    array: boolean,
+    boolean: boolean,
+    choices: Array<mixed>,
+    coerce: (arg: {[key: string]: any, ...} | any) => mixed,
+    config: boolean,
+    configParser: (configPath: string) => { [key: string]: mixed, ... },
+    conflicts: string | Array<string> | { [key: string]: string, ... },
+    count: boolean,
+    default: mixed,
+    defaultDescription: string,
+    demandOption: boolean | string,
+    desc: string,
+    describe: string,
+    description: string,
+    global: boolean,
+    group: string,
+    hidden: boolean,
+    implies: string | { [key: string]: string, ... },
+    nargs: number,
+    normalize: boolean,
+    number: boolean,
+    required: boolean,
+    requiresArg: boolean,
+    skipValidation: boolean,
+    string: boolean,
+    type: "array" | "boolean" | "count" | "number" | "string",
+    ...
+  }>;
+
+  declare type CommonModuleObject = {|
+    command?: string | Array<string>,
+    aliases?: Array<string> | string,
+    builder?: { [key: string]: Options, ... } | ((yargsInstance: Yargs) => mixed),
+    handler?: ((argv: Argv) => void) | ((argv: Argv) => Promise<void>)
+  |};
+
+  declare type ModuleObjectDesc = {|
+    ...CommonModuleObject,
+    desc?: string | false
+  |};
+
+  declare type ModuleObjectDescribe = {|
+    ...CommonModuleObject,
+    describe?: string | false
+  |};
+
+  declare type ModuleObjectDescription = {|
+    ...CommonModuleObject,
+    description?: string | false
+  |};
+
+  declare type ModuleObject =
+    | ModuleObjectDesc
+    | ModuleObjectDescribe
+    | ModuleObjectDescription;
+
+  declare type MiddleWareCallback =
+    | (argv: Argv, yargsInstance?: Yargs) => void
+    | (argv: Argv, yargsInstance?: Yargs) => Promise<void>;
+
+  declare type Middleware = MiddleWareCallback | Array<MiddleWareCallback>;
+
+  declare class Yargs {
+    (args: Array<string>): Yargs;
+
+    alias(key: string, alias: string): this;
+    alias(alias: { [key: string]: string | Array<string>, ... }): this;
+    argv: Argv | Promise<Argv>;
+    array(key: string | Array<string>): this;
+    boolean(parameter: string | Array<string>): this;
+    check(fn: (argv: Argv, options: Array<string>) => mixed): this;
+    choices(key: string, allowed: Array<string>): this;
+    choices(allowed: { [key: string]: Array<string>, ... }): this;
+    coerce(key: string, fn: (value: any) => mixed): this;
+    coerce(object: { [key: string]: (value: any) => mixed, ... }): this;
+    coerce(keys: Array<string>, fn: (value: any) => mixed): this;
+
+    command(
+      cmd: string | Array<string>,
+      desc: string | false,
+      builder?:
+        | { [key: string]: Options, ... }
+        | ((yargsInstance: Yargs) => mixed),
+      handler?: Function
+    ): this;
+    command(
+      cmd: string | Array<string>,
+      desc: string | false,
+      module: ModuleObject
+    ): this;
+    command(module: ModuleObject): this;
+
+    commands(
+      cmd: string | Array<string>,
+      desc: string | false,
+      builder?:
+        | { [key: string]: Options, ... }
+        | ((yargsInstance: Yargs) => mixed),
+      handler?: Function
+    ): this;
+    commands(
+      cmd: string | Array<string>,
+      desc: string | false,
+      module: ModuleObject
+    ): this;
+    commands(module: ModuleObject): this;
+
+    commandDir(
+      directory: string,
+      options?: {
+        exclude?: string | Function,
+        extensions?: Array<string>,
+        include?: string | Function,
+        recurse?: boolean,
+        visit?: Function,
+        ...
+      },
+    ): this;
+
+    completion(
+      cmd?: string,
+      description?: string | false | (
+        current: string,
+        argv: Argv,
+        done: (compeltion: Array<string>) => void
+      ) => ?(Array<string> | Promise<Array<string>>),
+      fn?: (
+        current: string,
+        argv: Argv,
+        done: (completion: Array<string>) => void
+      ) => ?(Array<string> | Promise<Array<string>>)
+    ): this;
+
+    config(
+      key?: string,
+      description?: string,
+      parseFn?: (configPath: string) => { [key: string]: mixed, ... }
+    ): this;
+    config(
+      key: string,
+      parseFn?: (configPath: string) => { [key: string]: mixed, ... }
+    ): this;
+    config(config: { [key: string]: mixed, ... }): this;
+
+    conflicts(key: string, value: string | Array<string>): this;
+    conflicts(keys: { [key: string]: string | Array<string>, ... }): this;
+
+    count(name: string): this;
+
+    default(key: string, value: mixed, description?: string): this;
+    default(defaults: { [key: string]: mixed, ... }): this;
+
+    // Deprecated: use demandOption() and demandCommand() instead.
+    demand(key: string, msg?: string | boolean): this;
+    demand(count: number, max?: number, msg?: string | boolean): this;
+
+    demandOption(key: string | Array<string>, msg?: string | boolean): this;
+
+    demandCommand(): this;
+    demandCommand(min: number, minMsg?: string): this;
+    demandCommand(
+      min: number,
+      max: number,
+      minMsg?: string,
+      maxMsg?: string
+    ): this;
+
+    describe(key: string, description: string): this;
+    describe(describeObject: { [key: string]: string, ... }): this;
+
+    detectLocale(shouldDetect: boolean): this;
+
+    env(prefix?: string): this;
+
+    epilog(text: string): this;
+    epilogue(text: string): this;
+
+    example(cmd: string, desc?: string): this;
+
+    exitProcess(enable: boolean): this;
+
+    fail(fn: (failureMessage: string, err: Error, yargs: Yargs) => mixed): this;
+
+    getCompletion(
+      args: Array<string>,
+      fn: (err: Error | null, completions: Array<string> | void) => void
+    ): Promise<Array<string> | void>;
+
+    global(globals: string | Array<string>, isGlobal?: boolean): this;
+
+    group(key: string | Array<string>, groupName: string): this;
+
+    help(option: boolean): this;
+
+    help(option?: string, desc?: string): this;
+
+    hide(key: string): this;
+
+    implies(key: string, value: string | Array<string>): this;
+    implies(keys: { [key: string]: string | Array<string>, ... }): this;
+
+    locale(
+      locale: | "de"
+      | "en"
+      | "es"
+      | "fr"
+      | "hi"
+      | "hu"
+      | "id"
+      | "it"
+      | "ja"
+      | "ko"
+      | "nb"
+      | "pirate"
+      | "pl"
+      | "pt"
+      | "pt_BR"
+      | "ru"
+      | "th"
+      | "tr"
+      | "zh_CN"
+    ): this;
+    locale(): string;
+
+    middleware(
+      middlewareCallbacks: Middleware,
+      applyBeforeValidation?: boolean,
+    ): this;
+
+    nargs(key: string, count: number): this;
+
+    normalize(key: string): this;
+
+    number(key: string | Array<string>): this;
+
+    option(key: string, options?: Options): this;
+    option(optionMap: { [key: string]: Options, ... }): this;
+
+    options(key: string, options?: Options): this;
+    options(optionMap: { [key: string]: Options, ... }): this;
+
+    parse(
+      args?: string | Array<string>,
+      context?: { [key: string]: any, ... },
+      parseCallback?: (err: Error, argv: Argv, output?: string) => void
+    ): Argv | Promise<Argv>;
+    parse(
+      args?: string | Array<string>,
+      parseCallback?: (err: Error, argv: Argv, output?: string) => void
+    ): Argv | Promise<Argv>;
+
+    parseAsync(
+      args?: string | Array<string>,
+      context?: { [key: string]: any, ... },
+      parseCallback?: (err: Error, argv: Argv, output?: string) => void
+    ): Promise<Argv>;
+    parseAsync(
+      args?: string | Array<string>,
+      parseCallback?: (err: Error, argv: Argv, output?: string) => void
+    ): Promise<Argv>;
+
+    parseSync(
+      args?: string | Array<string>,
+      context?: { [key: string]: any, ... },
+      parseCallback?: (err: Error, argv: Argv, output?: string) => void
+    ): Argv;
+    parseSync(
+      args?: string | Array<string>,
+      parseCallback?: (err: Error, argv: Argv, output?: string) => void
+    ): Argv;
+
+    parserConfiguration(configuration: {[key: string]: any, ...}): this;
+
+    pkgConf(key: string, cwd?: string): this;
+
+    positional(key: string, opt?: Options): this;
+
+    recommendCommands(): this;
+
+    // Alias of demand()
+    require(key: string, msg: string | boolean): this;
+    require(count: number, max?: number, msg?: string | boolean): this;
+
+    requiresArg(key: string | Array<string>): this;
+
+    scriptName(name: string): this;
+
+    showCompletionScript(): this;
+
+    showHelp(consoleLevel?: "error" | "warn" | "log"): this;
+    showHelp(printCallback: (usageData: string) => void): this;
+
+    showHelpOnFail(enable: boolean, message?: string): this;
+
+    skipValidation(key: string): this;
+
+    showVersion(consoleLevel?: "error" | "warn" | "log"): this;
+    showVersion(printCallback: (usageData: string) => void): this;
+
+    strict(enabled?: boolean): this;
+
+    strictCommands(enabled?: boolean): this;
+
+    strictOptions(enabled?: boolean): this;
+
+    string(key: string | Array<string>): this;
+
+    terminalWidth(): number;
+
+    updateLocale(obj: { [key: string]: string, ... }): this;
+    updateStrings(obj: { [key: string]: string, ... }): this;
+
+    usage(message: string, opts?: { [key: string]: Options, ... }): this;
+
+    version(): this;
+    version(version: string | false): this;
+    version(option: string | (() => string), version: string): this;
+    version(
+      option: string | (() => string),
+      description: string | (() => string),
+      version: string
+    ): this;
+
+    wrap(columns: number | null): this;
+  }
+
+  declare module.exports: Yargs;
+}
diff --git a/flow/jest.js b/flow/jest.js
index 8f5621169616..5dd8790ce2b6 100644
--- a/flow/jest.js
+++ b/flow/jest.js
@@ -810,7 +810,7 @@ type JestObjectType = {
    * Returns a new, unused mock function. Optionally takes a mock
    * implementation.
    */
-  fn<TArguments: $ReadOnlyArray<mixed>, TReturn>(
+  fn<TArguments: $ReadOnlyArray<mixed> = $ReadOnlyArray<any>, TReturn = any>(
     implementation?: (...args: TArguments) => TReturn,
   ): JestMockFn<TArguments, TReturn>,
   /**
@@ -900,7 +900,7 @@ type JestObjectType = {
    * (setTimeout, setInterval, clearTimeout, clearInterval, nextTick,
    * setImmediate and clearImmediate).
    */
-  useFakeTimers(): JestObjectType,
+  useFakeTimers(type?: 'legacy' | 'modern'): JestObjectType,
   /**
    * Instructs Jest to use the real versions of the standard timer functions.
    */
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 92f06b50fd65..8fad3f5a98bf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/index.js b/index.js
index d59ba3454e9c..f556fa31fa1d 100644
--- a/index.js
+++ b/index.js
@@ -21,7 +21,6 @@ import typeof Image from './Libraries/Image/Image';
 import typeof ImageBackground from './Libraries/Image/ImageBackground';
 import typeof InputAccessoryView from './Libraries/Components/TextInput/InputAccessoryView';
 import typeof KeyboardAvoidingView from './Libraries/Components/Keyboard/KeyboardAvoidingView';
-import typeof MaskedViewIOS from './Libraries/Components/MaskedView/MaskedViewIOS';
 import typeof Modal from './Libraries/Modal/Modal';
 import typeof Pressable from './Libraries/Components/Pressable/Pressable';
 import typeof ProgressBarAndroid from './Libraries/Components/ProgressBarAndroid/ProgressBarAndroid';
@@ -48,10 +47,10 @@ import typeof VirtualizedSectionList from './Libraries/Lists/VirtualizedSectionL
 import typeof ActionSheetIOS from './Libraries/ActionSheetIOS/ActionSheetIOS';
 import typeof Alert from './Libraries/Alert/Alert';
 import typeof Animated from './Libraries/Animated/Animated';
+import typeof * as AnimatedModule from './Libraries/Animated/Animated';
 import typeof Appearance from './Libraries/Utilities/Appearance';
 import typeof AppRegistry from './Libraries/ReactNative/AppRegistry';
 import typeof AppState from './Libraries/AppState/AppState';
-import typeof AsyncStorage from './Libraries/Storage/AsyncStorage';
 import typeof BackHandler from './Libraries/Utilities/BackHandler';
 import typeof Clipboard from './Libraries/Components/Clipboard/Clipboard';
 import typeof DeviceInfo from './Libraries/Utilities/DeviceInfo';
@@ -60,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';
@@ -76,10 +74,11 @@ import typeof PushNotificationIOS from './Libraries/PushNotificationIOS/PushNoti
 import typeof Settings from './Libraries/Settings/Settings';
 import typeof Share from './Libraries/Share/Share';
 import typeof StyleSheet from './Libraries/StyleSheet/StyleSheet';
-import typeof Systrace from './Libraries/Performance/Systrace';
+import typeof * as Systrace from './Libraries/Performance/Systrace';
 import typeof ToastAndroid from './Libraries/Components/ToastAndroid/ToastAndroid';
 import typeof * as TurboModuleRegistry from './Libraries/TurboModule/TurboModuleRegistry';
 import typeof UIManager from './Libraries/ReactNative/UIManager';
+import typeof useAnimatedValue from './Libraries/Animated/useAnimatedValue';
 import typeof useColorScheme from './Libraries/Utilities/useColorScheme';
 import typeof useWindowDimensions from './Libraries/Utilities/useWindowDimensions';
 import typeof UTFSequence from './Libraries/UTFSequence';
@@ -145,15 +144,6 @@ module.exports = {
     return require('./Libraries/Components/Keyboard/KeyboardAvoidingView')
       .default;
   },
-  get MaskedViewIOS(): MaskedViewIOS {
-    warnOnce(
-      'maskedviewios-moved',
-      'MaskedViewIOS has been extracted from react-native core and will be removed in a future release. ' +
-        "It can now be installed and imported from '@react-native-masked-view/masked-view' instead of 'react-native'. " +
-        'See https://github.com/react-native-masked-view/masked-view',
-    );
-    return require('./Libraries/Components/MaskedView/MaskedViewIOS');
-  },
   get Modal(): Modal {
     return require('./Libraries/Modal/Modal');
   },
@@ -232,7 +222,7 @@ module.exports = {
     return require('./Libraries/Components/View/View');
   },
   get VirtualizedList(): VirtualizedList {
-    return require('./Libraries/Lists/VirtualizedList');
+    return require('./Libraries/Lists/VirtualizedList').default;
   },
   get VirtualizedSectionList(): VirtualizedSectionList {
     return require('./Libraries/Lists/VirtualizedSectionList');
@@ -245,8 +235,11 @@ module.exports = {
   get Alert(): Alert {
     return require('./Libraries/Alert/Alert');
   },
-  get Animated(): Animated {
-    return require('./Libraries/Animated/Animated');
+  // Include any types exported in the Animated module together with its default export, so
+  // you can references types such as Animated.Numeric
+  get Animated(): {...$Diff<AnimatedModule, {default: any}>, ...Animated} {
+    // $FlowExpectedError[prop-missing]: we only return the default export, all other exports are types
+    return require('./Libraries/Animated/Animated').default;
   },
   get Appearance(): Appearance {
     return require('./Libraries/Utilities/Appearance');
@@ -257,16 +250,6 @@ module.exports = {
   get AppState(): AppState {
     return require('./Libraries/AppState/AppState');
   },
-  // $FlowFixMe[value-as-type]
-  get AsyncStorage(): AsyncStorage {
-    warnOnce(
-      'async-storage-moved',
-      'AsyncStorage has been extracted from react-native core and will be removed in a future release. ' +
-        "It can now be installed and imported from '@react-native-async-storage/async-storage' instead of 'react-native'. " +
-        'See https://github.com/react-native-async-storage/async-storage',
-    );
-    return require('./Libraries/Storage/AsyncStorage');
-  },
   get BackHandler(): BackHandler {
     return require('./Libraries/Utilities/BackHandler');
   },
@@ -289,24 +272,14 @@ module.exports = {
     return require('./Libraries/Utilities/Dimensions');
   },
   get Easing(): Easing {
-    return require('./Libraries/Animated/Easing');
+    return require('./Libraries/Animated/Easing').default;
   },
   get findNodeHandle(): $PropertyType<ReactNative, 'findNodeHandle'> {
-    return require('./Libraries/Renderer/shims/ReactNative').findNodeHandle;
+    return require('./Libraries/ReactNative/RendererProxy').findNodeHandle;
   },
   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');
   },
@@ -376,9 +349,12 @@ module.exports = {
     ReactNative,
     'unstable_batchedUpdates',
   > {
-    return require('./Libraries/Renderer/shims/ReactNative')
+    return require('./Libraries/ReactNative/RendererProxy')
       .unstable_batchedUpdates;
   },
+  get useAnimatedValue(): useAnimatedValue {
+    return require('./Libraries/Animated/useAnimatedValue').default;
+  },
   get useColorScheme(): useColorScheme {
     return require('./Libraries/Utilities/useColorScheme').default;
   },
@@ -435,32 +411,44 @@ module.exports = {
   },
   // Deprecated Prop Types
   get ColorPropType(): $FlowFixMe {
-    invariant(
-      false,
-      'ColorPropType has been removed from React Native. Migrate to ' +
-        "ColorPropType exported from 'deprecated-react-native-prop-types'.",
+    console.error(
+      'ColorPropType will be removed from React Native, along with all ' +
+        'other PropTypes. We recommend that you migrate away from PropTypes ' +
+        'and switch to a type system like TypeScript. If you need to ' +
+        'continue using ColorPropType, migrate to the ' +
+        "'deprecated-react-native-prop-types' package.",
     );
+    return require('deprecated-react-native-prop-types').ColorPropType;
   },
   get EdgeInsetsPropType(): $FlowFixMe {
-    invariant(
-      false,
-      'EdgeInsetsPropType has been removed from React Native. Migrate to ' +
-        "EdgeInsetsPropType exported from 'deprecated-react-native-prop-types'.",
+    console.error(
+      'EdgeInsetsPropType will be removed from React Native, along with all ' +
+        'other PropTypes. We recommend that you migrate away from PropTypes ' +
+        'and switch to a type system like TypeScript. If you need to ' +
+        'continue using EdgeInsetsPropType, migrate to the ' +
+        "'deprecated-react-native-prop-types' package.",
     );
+    return require('deprecated-react-native-prop-types').EdgeInsetsPropType;
   },
   get PointPropType(): $FlowFixMe {
-    invariant(
-      false,
-      'PointPropType has been removed from React Native. Migrate to ' +
-        "PointPropType exported from 'deprecated-react-native-prop-types'.",
+    console.error(
+      'PointPropType will be removed from React Native, along with all ' +
+        'other PropTypes. We recommend that you migrate away from PropTypes ' +
+        'and switch to a type system like TypeScript. If you need to ' +
+        'continue using PointPropType, migrate to the ' +
+        "'deprecated-react-native-prop-types' package.",
     );
+    return require('deprecated-react-native-prop-types').PointPropType;
   },
   get ViewPropTypes(): $FlowFixMe {
-    invariant(
-      false,
-      'ViewPropTypes has been removed from React Native. Migrate to ' +
-        "ViewPropTypes exported from 'deprecated-react-native-prop-types'.",
+    console.error(
+      'ViewPropTypes will be removed from React Native, along with all ' +
+        'other PropTypes. We recommend that you migrate away from PropTypes ' +
+        'and switch to a type system like TypeScript. If you need to ' +
+        'continue using ViewPropTypes, migrate to the ' +
+        "'deprecated-react-native-prop-types' package.",
     );
+    return require('deprecated-react-native-prop-types').ViewPropTypes;
   },
 };
 
@@ -736,4 +724,50 @@ if (__DEV__) {
       );
     },
   });
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access MaskedViewIOS. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access MaskedViewIOS. */
+  Object.defineProperty(module.exports, 'MaskedViewIOS', {
+    configurable: true,
+    get() {
+      invariant(
+        false,
+        'MaskedViewIOS has been removed from React Native. ' +
+          "It can now be installed and imported from '@react-native-community/react-native-masked-view' instead of 'react-native'. " +
+          'See https://github.com/react-native-masked-view/masked-view',
+      );
+    },
+  });
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access AsyncStorage. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access AsyncStorage. */
+  Object.defineProperty(module.exports, 'AsyncStorage', {
+    configurable: true,
+    get() {
+      invariant(
+        false,
+        'AsyncStorage has been removed from react-native core. ' +
+          "It can now be installed and imported from '@react-native-async-storage/async-storage' instead of 'react-native'. " +
+          'See https://github.com/react-native-async-storage/async-storage',
+      );
+    },
+  });
+  /* $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',
+      );
+    },
+  });
 }
diff --git a/interface.js b/interface.js
index 85325036dcf4..291c81952e34 100644
--- a/interface.js
+++ b/interface.js
@@ -10,6 +10,14 @@
 
 'use strict';
 
+// NOTE: Hmm... I don't think declaring variables within this module actually
+// accomplishes anything besides documenting that these globals are exepcted to
+// exist. So I think the correct "fix" to this lint warning is to delete this
+// entire file. But in lieu of doing that... no harm for now in keeping this
+// file around, even if it is only for documentation purposes. ¯\_(ツ)_/¯
+
+/* eslint-disable no-unused-vars */
+
 declare var __DEV__: boolean;
 
 declare var __REACT_DEVTOOLS_GLOBAL_HOOK__: any; /*?{
diff --git a/jest-preset.js b/jest-preset.js
index e49c4062687e..d1a749c5a270 100644
--- a/jest-preset.js
+++ b/jest-preset.js
@@ -24,5 +24,5 @@ module.exports = {
     'node_modules/(?!((jest-)?react-native|@react-native(-community)?)/)',
   ],
   setupFiles: [require.resolve('./jest/setup.js')],
-  testEnvironment: 'node',
+  testEnvironment: require.resolve('./jest/react-native-env.js'),
 };
diff --git a/jest.config.js b/jest.config.js
index 512bd1b538ef..a9560d29e9bb 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -16,7 +16,14 @@ module.exports = {
     '.*': './jest/private/preprocessor.js',
   },
   setupFiles: ['./jest/setup.js'],
-  timers: 'fake',
+  fakeTimers: {
+    enableGlobally: true,
+    legacyFakeTimers: true,
+  },
+  snapshotFormat: {
+    escapeString: true,
+    printBasicPrototype: true,
+  },
   testRegex: '/__tests__/.*-test\\.js$',
   testPathIgnorePatterns: [
     '/node_modules/',
diff --git a/jest/react-native-env.js b/jest/react-native-env.js
new file mode 100644
index 000000000000..624d3648766c
--- /dev/null
+++ b/jest/react-native-env.js
@@ -0,0 +1,18 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+const NodeEnv = require('jest-environment-node').TestEnvironment;
+
+module.exports = class ReactNativeEnv extends NodeEnv {
+  exportConditions() {
+    return ['react-native'];
+  }
+};
diff --git a/jest/renderer.js b/jest/renderer.js
index 46f06212e499..18f551660f2a 100644
--- a/jest/renderer.js
+++ b/jest/renderer.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @format
- * @emails oncall+react_native
  * @flow
+ * @format
+ * @oncall react_native
  */
 
 import * as React from 'react';
diff --git a/jest/setup.js b/jest/setup.js
index ae32f2f02eba..3738bd2c61e5 100644
--- a/jest/setup.js
+++ b/jest/setup.js
@@ -21,7 +21,6 @@ global.performance = {
   now: jest.fn(Date.now),
 };
 
-global.Promise = jest.requireActual('promise');
 global.regeneratorRuntime = jest.requireActual('regenerator-runtime/runtime');
 global.window = global;
 
@@ -128,14 +127,18 @@ jest
       isGrayscaleEnabled: jest.fn(),
       isInvertColorsEnabled: jest.fn(),
       isReduceMotionEnabled: jest.fn(),
+      prefersCrossFadeTransitions: jest.fn(),
       isReduceTransparencyEnabled: jest.fn(),
       isScreenReaderEnabled: jest.fn(() => Promise.resolve(false)),
-      removeEventListener: jest.fn(),
       setAccessibilityFocus: jest.fn(),
-      sendAccessibilityEvent_unstable: jest.fn(),
+      sendAccessibilityEvent: jest.fn(),
       getRecommendedTimeoutMillis: jest.fn(),
     },
   }))
+  .mock('../Libraries/Components/Clipboard/Clipboard', () => ({
+    getString: jest.fn(() => ''),
+    setString: jest.fn(),
+  }))
   .mock('../Libraries/Components/RefreshControl/RefreshControl', () =>
     jest.requireActual(
       '../Libraries/Components/RefreshControl/__mocks__/RefreshControlMock',
@@ -177,7 +180,6 @@ jest
     openSettings: jest.fn(),
     addEventListener: jest.fn(),
     getInitialURL: jest.fn(() => Promise.resolve()),
-    removeEventListener: jest.fn(),
     sendIntent: jest.fn(),
   }))
   // Mock modules defined by the native layer (ex: Objective-C, Java)
@@ -203,10 +205,6 @@ jest
         process.nextTick(() => callback(null, [])),
       ),
     },
-    Clipboard: {
-      getString: jest.fn(() => ''),
-      setString: jest.fn(),
-    },
     DeviceInfo: {
       getConstants() {
         return {
@@ -232,7 +230,7 @@ jest
       reload: jest.fn(),
     },
     ImageLoader: {
-      getSize: jest.fn(url => Promise.resolve({width: 320, height: 240})),
+      getSize: jest.fn(url => Promise.resolve([320, 240])),
       prefetchImage: jest.fn(),
     },
     ImageViewManager: {
diff --git a/metro.config.js b/metro.config.js
index 9125b65f004e..190f04114a3a 100644
--- a/metro.config.js
+++ b/metro.config.js
@@ -19,7 +19,7 @@ const getPolyfills = require('./rn-get-polyfills');
 module.exports = {
   resolver: {
     // $FlowFixMe[signature-verification-failure] Can't infer RegExp type.
-    blockList: /buck-out/,
+    blockList: [/buck-out/, /sdks\/hermes/],
     extraNodeModules: {
       'react-native': __dirname,
     },
diff --git a/package.json b/package.json
index eaba0ca0d854..562f67676d60 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,6 @@
 {
   "name": "react-native",
-  "private": true,
-  "version": "1000.0.0",
+  "version": "0.71.0-rc.5",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -9,6 +8,7 @@
   "engines": {
     "node": ">=14"
   },
+  "types": "types",
   "jest-junit": {
     "outputDirectory": "reports/junit",
     "outputName": "js-test-results.xml"
@@ -37,7 +37,7 @@
     "rn-get-polyfills.js",
     "scripts/compose-source-maps.js",
     "scripts/find-node-for-xcode.sh",
-    "scripts/generate-artifacts.js",
+    "scripts/generate-codegen-artifacts.js",
     "scripts/generate-provider-cli.js",
     "scripts/generate-specs-cli.js",
     "scripts/codegen/codegen-utils.js",
@@ -49,6 +49,7 @@
     "scripts/xcode/with-environment.sh",
     "scripts/launchPackager.bat",
     "scripts/launchPackager.command",
+    "scripts/native_modules.rb",
     "scripts/node-binary.sh",
     "scripts/packager.sh",
     "scripts/packager-reporter.js",
@@ -65,7 +66,8 @@
     "!template/node_modules",
     "!template/package-lock.json",
     "!template/yarn.lock",
-    "third-party-podspecs"
+    "third-party-podspecs",
+    "types"
   ],
   "scripts": {
     "start": "react-native start",
@@ -80,10 +82,10 @@
     "shellcheck": "./scripts/circleci/analyze_scripts.sh",
     "clang-format": "clang-format -i --glob=*/**/*.{h,cpp,m,mm}",
     "format": "npm run prettier && npm run clang-format",
-    "prettier": "prettier --write \"./**/*.{js,md,yml}\"",
-    "format-check": "prettier --list-different \"./**/*.{js,md,yml}\"",
+    "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:5.2",
+    "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",
@@ -92,53 +94,98 @@
     "test-android-instrumentation": "yarn run docker-build-android && yarn run test-android-run-instrumentation",
     "test-android-unit": "yarn run docker-build-android && yarn run test-android-run-unit",
     "test-android-e2e": "yarn run docker-build-android && yarn run test-android-run-e2e",
-    "test-ios": "./scripts/objc-test.sh test"
+    "test-e2e-local": "node ./scripts/test-e2e-local.js",
+    "test-e2e-local-clean": "node ./scripts/test-e2e-local-clean.js",
+    "test-ios": "./scripts/objc-test.sh test",
+    "test-typescript": "dtslint types",
+    "test-typescript-offline": "dtslint --localTs node_modules/typescript/lib types"
   },
-  "workspaces": [
-    "packages/!(eslint-config-react-native-community)",
-    "repo-config"
-  ],
   "peerDependencies": {
-    "react": "18.1.0"
+    "react": "18.2.0"
   },
   "dependencies": {
-    "@jest/create-cache-key-function": "^27.0.1",
-    "@react-native-community/cli": "^9.0.0-alpha.3",
-    "@react-native-community/cli-platform-android": "^9.0.0-alpha.3",
-    "@react-native-community/cli-platform-ios": "^9.0.0-alpha.3",
+    "@jest/create-cache-key-function": "^29.2.1",
+    "@react-native-community/cli": "10.0.0",
+    "@react-native-community/cli-platform-android": "10.0.0",
+    "@react-native-community/cli-platform-ios": "10.0.0",
     "@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",
     "base64-js": "^1.1.2",
+    "deprecated-react-native-prop-types": "^3.0.1",
     "event-target-shim": "^5.0.1",
     "invariant": "^2.2.4",
+    "jest-environment-node": "^29.2.1",
     "jsc-android": "^250230.2.1",
     "memoize-one": "^5.0.0",
-    "metro-react-native-babel-transformer": "0.71.3",
-    "metro-runtime": "0.71.3",
-    "metro-source-map": "0.71.3",
+    "metro-react-native-babel-transformer": "0.73.5",
+    "metro-runtime": "0.73.5",
+    "metro-source-map": "0.73.5",
     "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",
-    "promise": "^8.0.3",
-    "react-devtools-core": "4.24.0",
-    "react-native-gradle-plugin": "^0.70.0",
+    "promise": "^8.3.0",
+    "react-devtools-core": "^4.26.1",
+    "react-native-gradle-plugin": "^0.71.12",
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "^16.15.0",
     "regenerator-runtime": "^0.13.2",
-    "scheduler": "^0.22.0",
+    "scheduler": "^0.23.0",
     "stacktrace-parser": "^0.1.3",
     "use-sync-external-store": "^1.0.0",
     "whatwg-fetch": "^3.0.0",
-    "ws": "^6.1.4"
+    "ws": "^6.2.2",
+    "react-native-codegen": "^0.71.3"
   },
   "devDependencies": {
-    "flow-bin": "^0.182.0",
+    "flow-bin": "^0.191.0",
     "hermes-eslint": "0.8.0",
-    "react": "18.1.0",
-    "react-test-renderer": "^18.1.0"
+    "react": "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.5",
+    "metro-memory-fs": "0.73.5",
+    "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": [
@@ -158,4 +205,4 @@
       }
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/packages/assets/BUCK b/packages/assets/BUCK
index a1c34d6e1504..df68edf8b3a9 100644
--- a/packages/assets/BUCK
+++ b/packages/assets/BUCK
@@ -5,7 +5,6 @@ rn_library(
     name = "assets",
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.core",
     ],
     skip_processors = True,
     visibility = ["PUBLIC"],
diff --git a/packages/assets/__tests__/path-support-test.js b/packages/assets/__tests__/path-support-test.js
index 37cc3ba7fee6..fa96053c3014 100644
--- a/packages/assets/__tests__/path-support-test.js
+++ b/packages/assets/__tests__/path-support-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 import {getAndroidResourceFolderName} from '../path-support';
diff --git a/packages/babel-plugin-codegen/__tests__/__snapshots__/index-test.js.snap b/packages/babel-plugin-codegen/__tests__/__snapshots__/index-test.js.snap
index 474b38783393..93cdd3389e1a 100644
--- a/packages/babel-plugin-codegen/__tests__/__snapshots__/index-test.js.snap
+++ b/packages/babel-plugin-codegen/__tests__/__snapshots__/index-test.js.snap
@@ -30,7 +30,7 @@ const {
 
 const {
   dispatchCommand
-} = require(\\"react-native/Libraries/Renderer/shims/ReactNative\\");
+} = require(\\"react-native/Libraries/ReactNative/RendererProxy\\");
 
 let nativeComponentName = 'RCTModule';
 export const __INTERNAL_VIEW_CONFIG = {
@@ -99,7 +99,7 @@ const {
 
 const {
   dispatchCommand
-} = require(\\"react-native/Libraries/Renderer/shims/ReactNative\\");
+} = require(\\"react-native/Libraries/ReactNative/RendererProxy\\");
 
 let nativeComponentName = 'RCTModule';
 export const __INTERNAL_VIEW_CONFIG = {
diff --git a/packages/babel-plugin-codegen/__tests__/index-test.js b/packages/babel-plugin-codegen/__tests__/index-test.js
index 820a711f8685..20195b5ea403 100644
--- a/packages/babel-plugin-codegen/__tests__/index-test.js
+++ b/packages/babel-plugin-codegen/__tests__/index-test.js
@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/babel-plugin-codegen/index.js b/packages/babel-plugin-codegen/index.js
index 33a71e403109..b1a11612ecae 100644
--- a/packages/babel-plugin-codegen/index.js
+++ b/packages/babel-plugin-codegen/index.js
@@ -9,23 +9,42 @@
 
 'use strict';
 
-let flow, RNCodegen;
+let flowParser, typeScriptParser, RNCodegen;
 
 const {basename} = require('path');
 
 try {
-  flow = require('react-native-codegen/src/parsers/flow');
+  flowParser = require('react-native-codegen/src/parsers/flow');
+  typeScriptParser = require('react-native-codegen/src/parsers/typescript');
   RNCodegen = require('react-native-codegen/src/generators/RNCodegen');
 } catch (e) {
   // Fallback to lib when source doesn't exit (e.g. when installed as a dev dependency)
-  flow = require('react-native-codegen/lib/parsers/flow');
+  flowParser = require('react-native-codegen/lib/parsers/flow');
+  typeScriptParser = require('react-native-codegen/lib/parsers/typescript');
   RNCodegen = require('react-native-codegen/lib/generators/RNCodegen');
 }
 
+function parseFile(filename, code) {
+  if (filename.endsWith('js')) {
+    return flowParser.parseString(code);
+  }
+
+  if (filename.endsWith('ts')) {
+    return typeScriptParser.parseString(code);
+  }
+
+  throw new Error(
+    `Unable to parse file '${filename}'. Unsupported filename extension.`,
+  );
+}
+
 function generateViewConfig(filename, code) {
-  const schema = flow.parseString(code);
+  const schema = parseFile(filename, code);
 
-  const libraryName = basename(filename).replace(/NativeComponent\.js$/, '');
+  const libraryName = basename(filename).replace(
+    /NativeComponent\.(js|ts)$/,
+    '',
+  );
   return RNCodegen.generateViewConfig({
     schema,
     libraryName,
diff --git a/packages/babel-plugin-codegen/package.json b/packages/babel-plugin-codegen/package.json
index 56dc4f1d6c7e..9a06f6cfa73a 100644
--- a/packages/babel-plugin-codegen/package.json
+++ b/packages/babel-plugin-codegen/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.0.6",
+  "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": {
diff --git a/packages/eslint-config-react-native-community/BUCK b/packages/eslint-config-react-native-community/BUCK
new file mode 100644
index 000000000000..8fd38289431b
--- /dev/null
+++ b/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"],
+)
diff --git a/packages/eslint-config-react-native-community/index.js b/packages/eslint-config-react-native-community/index.js
index 09af8a2395b0..bb5e2e32c94b 100644
--- a/packages/eslint-config-react-native-community/index.js
+++ b/packages/eslint-config-react-native-community/index.js
@@ -37,13 +37,13 @@ module.exports = {
     {
       files: ['*.js'],
       parser: '@babel/eslint-parser',
-      plugins: ['flowtype'],
+      plugins: ['ft-flow'],
       rules: {
         // Flow Plugin
-        // The following rules are made available via `eslint-plugin-flowtype`
+        // The following rules are made available via `eslint-plugin-ft-flow`
 
-        'flowtype/define-flow-type': 1,
-        'flowtype/use-flow-type': 1,
+        'ft-flow/define-flow-type': 1,
+        'ft-flow/use-flow-type': 1,
       },
     },
     {
@@ -53,7 +53,10 @@ module.exports = {
       rules: {
         '@typescript-eslint/no-unused-vars': [
           'error',
-          {argsIgnorePattern: '^_'},
+          {
+            argsIgnorePattern: '^_',
+            destructuredArrayIgnorePattern: '^_',
+          },
         ],
         'no-unused-vars': 'off',
         'no-shadow': 'off',
diff --git a/packages/eslint-config-react-native-community/package.json b/packages/eslint-config-react-native-community/package.json
index 244273c114c3..c9d777b7bd3f 100644
--- a/packages/eslint-config-react-native-community/package.json
+++ b/packages/eslint-config-react-native-community/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-community/eslint-config",
-  "version": "3.0.3",
+  "version": "3.2.0",
   "description": "ESLint config for React Native",
   "main": "index.js",
   "license": "MIT",
@@ -14,23 +14,23 @@
     "@babel/core": "^7.14.0",
     "@babel/eslint-parser": "^7.18.2",
     "@react-native-community/eslint-plugin": "^1.1.0",
-    "@typescript-eslint/eslint-plugin": "^5.15.0",
-    "@typescript-eslint/parser": "^5.15.0",
-    "eslint-config-prettier": "^8.3.0",
+    "@typescript-eslint/eslint-plugin": "^5.30.5",
+    "@typescript-eslint/parser": "^5.30.5",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-flowtype": "^8.0.0",
-    "eslint-plugin-jest": "^25.2.4",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.26.1",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "eslint-plugin-react-native": "^3.11.0"
+    "eslint-plugin-ft-flow": "^2.0.1",
+    "eslint-plugin-jest": "^26.5.3",
+    "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"
   },
   "peerDependencies": {
-    "eslint": ">=7",
+    "eslint": ">=8",
     "prettier": ">=2"
   },
   "devDependencies": {
-    "eslint": "^7.32.0",
+    "eslint": "^8.19.0",
     "prettier": "^2.4.1"
   }
 }
diff --git a/packages/eslint-config-react-native-community/yarn.lock b/packages/eslint-config-react-native-community/yarn.lock
deleted file mode 100644
index 3ae4af19ec0d..000000000000
--- a/packages/eslint-config-react-native-community/yarn.lock
+++ /dev/null
@@ -1,1828 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@ampproject/remapping@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
-  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.1.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
-"@babel/code-frame@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
-  dependencies:
-    "@babel/highlight" "^7.16.7"
-
-"@babel/compat-data@^7.17.10":
-  version "7.18.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.5.tgz#acac0c839e317038c73137fbb6ef71a1d6238471"
-  integrity sha512-BxhE40PVCBxVEJsSBhB6UWyAuqJRxGsAw8BdHMJ3AKGydcwuWW4kOO3HmqBQAdcq/OP+/DlTVxLvsCzRTnZuGg==
-
-"@babel/core@^7.14.0":
-  version "7.18.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.5.tgz#c597fa680e58d571c28dda9827669c78cdd7f000"
-  integrity sha512-MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ==
-  dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.18.2"
-    "@babel/helper-compilation-targets" "^7.18.2"
-    "@babel/helper-module-transforms" "^7.18.0"
-    "@babel/helpers" "^7.18.2"
-    "@babel/parser" "^7.18.5"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.18.5"
-    "@babel/types" "^7.18.4"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
-
-"@babel/eslint-parser@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.18.2.tgz#e14dee36c010edfb0153cf900c2b0815e82e3245"
-  integrity sha512-oFQYkE8SuH14+uR51JVAmdqwKYXGRjEXx7s+WiagVjqQ+HPE+nnwyF2qlVG8evUsUHmPcA+6YXMEDbIhEyQc5A==
-  dependencies:
-    eslint-scope "^5.1.1"
-    eslint-visitor-keys "^2.1.0"
-    semver "^6.3.0"
-
-"@babel/generator@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d"
-  integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==
-  dependencies:
-    "@babel/types" "^7.18.2"
-    "@jridgewell/gen-mapping" "^0.3.0"
-    jsesc "^2.5.1"
-
-"@babel/helper-compilation-targets@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz#67a85a10cbd5fc7f1457fec2e7f45441dc6c754b"
-  integrity sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==
-  dependencies:
-    "@babel/compat-data" "^7.17.10"
-    "@babel/helper-validator-option" "^7.16.7"
-    browserslist "^4.20.2"
-    semver "^6.3.0"
-
-"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz#8a6d2dedb53f6bf248e31b4baf38739ee4a637bd"
-  integrity sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==
-
-"@babel/helper-function-name@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12"
-  integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==
-  dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.17.0"
-
-"@babel/helper-hoist-variables@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
-  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-module-imports@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
-  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-module-transforms@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz#baf05dec7a5875fb9235bd34ca18bad4e21221cd"
-  integrity sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-simple-access" "^7.17.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.18.0"
-    "@babel/types" "^7.18.0"
-
-"@babel/helper-simple-access@^7.17.7":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz#4dc473c2169ac3a1c9f4a51cfcd091d1c36fcff9"
-  integrity sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==
-  dependencies:
-    "@babel/types" "^7.18.2"
-
-"@babel/helper-split-export-declaration@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
-  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-validator-identifier@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
-  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
-
-"@babel/helper-validator-option@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
-  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
-
-"@babel/helpers@^7.18.2":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.2.tgz#970d74f0deadc3f5a938bfa250738eb4ac889384"
-  integrity sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==
-  dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.18.2"
-    "@babel/types" "^7.18.2"
-
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.12.tgz#257de56ee5afbd20451ac0a75686b6b404257351"
-  integrity sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.16.7", "@babel/parser@^7.18.5":
-  version "7.18.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.5.tgz#337062363436a893a2d22faa60be5bb37091c83c"
-  integrity sha512-YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw==
-
-"@babel/template@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
-  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/traverse@^7.18.0", "@babel/traverse@^7.18.2", "@babel/traverse@^7.18.5", "@babel/traverse@^7.7.4":
-  version "7.18.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.5.tgz#94a8195ad9642801837988ab77f36e992d9a20cd"
-  integrity sha512-aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.18.2"
-    "@babel/helper-environment-visitor" "^7.18.2"
-    "@babel/helper-function-name" "^7.17.9"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.18.5"
-    "@babel/types" "^7.18.4"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.18.0", "@babel/types@^7.18.2", "@babel/types@^7.18.4":
-  version "7.18.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.4.tgz#27eae9b9fd18e9dccc3f9d6ad051336f307be354"
-  integrity sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    to-fast-properties "^2.0.0"
-
-"@eslint/eslintrc@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
-  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
-    globals "^13.9.0"
-    ignore "^4.0.6"
-    import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
-    strip-json-comments "^3.1.1"
-
-"@humanwhocodes/config-array@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
-  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
-  dependencies:
-    "@humanwhocodes/object-schema" "^1.2.0"
-    debug "^4.1.1"
-    minimatch "^3.0.4"
-
-"@humanwhocodes/object-schema@^1.2.0":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
-
-"@jridgewell/gen-mapping@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
-  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.0"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@jridgewell/gen-mapping@^0.3.0":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9"
-  integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.0"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe"
-  integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==
-
-"@jridgewell/set-array@^1.0.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea"
-  integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==
-
-"@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.13"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
-  integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
-
-"@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.13"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea"
-  integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@nodelib/fs.scandir@2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
-  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.4"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
-  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
-
-"@nodelib/fs.walk@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
-  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.4"
-    fastq "^1.6.0"
-
-"@react-native-community/eslint-plugin@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/eslint-plugin/-/eslint-plugin-1.1.0.tgz#e42b1bef12d2415411519fd528e64b593b1363dc"
-  integrity sha512-W/J0fNYVO01tioHjvYWQ9m6RgndVtbElzYozBq1ZPrHO/iCzlqoySHl4gO/fpCl9QEFjvJfjPgtPMTMlsoq5DQ==
-
-"@types/json-schema@^7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
-  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
-
-"@typescript-eslint/eslint-plugin@^5.15.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.17.0.tgz#704eb4e75039000531255672bf1c85ee85cf1d67"
-  integrity sha512-qVstvQilEd89HJk3qcbKt/zZrfBZ+9h2ynpAGlWjWiizA7m/MtLT9RoX6gjtpE500vfIg8jogAkDzdCxbsFASQ==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.17.0"
-    "@typescript-eslint/type-utils" "5.17.0"
-    "@typescript-eslint/utils" "5.17.0"
-    debug "^4.3.2"
-    functional-red-black-tree "^1.0.1"
-    ignore "^5.1.8"
-    regexpp "^3.2.0"
-    semver "^7.3.5"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/experimental-utils@^5.0.0":
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.3.1.tgz#bbd8f9b67b4d5fdcb9d2f90297d8fcda22561e05"
-  integrity sha512-RgFn5asjZ5daUhbK5Sp0peq0SSMytqcrkNfU4pnDma2D8P3ElZ6JbYjY8IMSFfZAJ0f3x3tnO3vXHweYg0g59w==
-  dependencies:
-    "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.3.1"
-    "@typescript-eslint/types" "5.3.1"
-    "@typescript-eslint/typescript-estree" "5.3.1"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
-
-"@typescript-eslint/parser@^5.15.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.17.0.tgz#7def77d5bcd8458d12d52909118cf3f0a45f89d5"
-  integrity sha512-aRzW9Jg5Rlj2t2/crzhA2f23SIYFlF9mchGudyP0uiD6SenIxzKoLjwzHbafgHn39dNV/TV7xwQkLfFTZlJ4ig==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.17.0"
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/typescript-estree" "5.17.0"
-    debug "^4.3.2"
-
-"@typescript-eslint/scope-manager@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.17.0.tgz#4cea7d0e0bc0e79eb60cad431c89120987c3f952"
-  integrity sha512-062iCYQF/doQ9T2WWfJohQKKN1zmmXVfAcS3xaiialiw8ZUGy05Em6QVNYJGO34/sU1a7a+90U3dUNfqUDHr3w==
-  dependencies:
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/visitor-keys" "5.17.0"
-
-"@typescript-eslint/scope-manager@5.3.1":
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.3.1.tgz#3cfbfbcf5488fb2a9a6fbbe97963ee1e8d419269"
-  integrity sha512-XksFVBgAq0Y9H40BDbuPOTUIp7dn4u8oOuhcgGq7EoDP50eqcafkMVGrypyVGvDYHzjhdUCUwuwVUK4JhkMAMg==
-  dependencies:
-    "@typescript-eslint/types" "5.3.1"
-    "@typescript-eslint/visitor-keys" "5.3.1"
-
-"@typescript-eslint/type-utils@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.17.0.tgz#1c4549d68c89877662224aabb29fbbebf5fc9672"
-  integrity sha512-3hU0RynUIlEuqMJA7dragb0/75gZmwNwFf/QJokWzPehTZousP/MNifVSgjxNcDCkM5HI2K22TjQWUmmHUINSg==
-  dependencies:
-    "@typescript-eslint/utils" "5.17.0"
-    debug "^4.3.2"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/types@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.17.0.tgz#861ec9e669ffa2aa9b873dd4d28d9b1ce26d216f"
-  integrity sha512-AgQ4rWzmCxOZLioFEjlzOI3Ch8giDWx8aUDxyNw9iOeCvD3GEYAB7dxWGQy4T/rPVe8iPmu73jPHuaSqcjKvxw==
-
-"@typescript-eslint/types@5.3.1":
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.3.1.tgz#afaa715b69ebfcfde3af8b0403bf27527912f9b7"
-  integrity sha512-bG7HeBLolxKHtdHG54Uac750eXuQQPpdJfCYuw4ZI3bZ7+GgKClMWM8jExBtp7NSP4m8PmLRM8+lhzkYnSmSxQ==
-
-"@typescript-eslint/typescript-estree@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.17.0.tgz#a7cba7dfc8f9cc2ac78c18584e684507df4f2488"
-  integrity sha512-X1gtjEcmM7Je+qJRhq7ZAAaNXYhTgqMkR10euC4Si6PIjb+kwEQHSxGazXUQXFyqfEXdkGf6JijUu5R0uceQzg==
-  dependencies:
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/visitor-keys" "5.17.0"
-    debug "^4.3.2"
-    globby "^11.0.4"
-    is-glob "^4.0.3"
-    semver "^7.3.5"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/typescript-estree@5.3.1":
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.1.tgz#50cc4bfb93dc31bc75e08ae52e29fcb786d606ec"
-  integrity sha512-PwFbh/PKDVo/Wct6N3w+E4rLZxUDgsoII/GrWM2A62ETOzJd4M6s0Mu7w4CWsZraTbaC5UQI+dLeyOIFF1PquQ==
-  dependencies:
-    "@typescript-eslint/types" "5.3.1"
-    "@typescript-eslint/visitor-keys" "5.3.1"
-    debug "^4.3.2"
-    globby "^11.0.4"
-    is-glob "^4.0.3"
-    semver "^7.3.5"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/utils@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.17.0.tgz#549a9e1d491c6ccd3624bc3c1b098f5cfb45f306"
-  integrity sha512-DVvndq1QoxQH+hFv+MUQHrrWZ7gQ5KcJzyjhzcqB1Y2Xes1UQQkTRPUfRpqhS8mhTWsSb2+iyvDW1Lef5DD7vA==
-  dependencies:
-    "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.17.0"
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/typescript-estree" "5.17.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
-
-"@typescript-eslint/visitor-keys@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.17.0.tgz#52daae45c61b0211b4c81b53a71841911e479128"
-  integrity sha512-6K/zlc4OfCagUu7Am/BD5k8PSWQOgh34Nrv9Rxe2tBzlJ7uOeJ/h7ugCGDCeEZHT6k2CJBhbk9IsbkPI0uvUkA==
-  dependencies:
-    "@typescript-eslint/types" "5.17.0"
-    eslint-visitor-keys "^3.0.0"
-
-"@typescript-eslint/visitor-keys@5.3.1":
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.3.1.tgz#c2860ff22939352db4f3806f34b21d8ad00588ba"
-  integrity sha512-3cHUzUuVTuNHx0Gjjt5pEHa87+lzyqOiHXy/Gz+SJOCW1mpw9xQHIIEwnKn+Thph1mgWyZ90nboOcSuZr/jTTQ==
-  dependencies:
-    "@typescript-eslint/types" "5.3.1"
-    eslint-visitor-keys "^3.0.0"
-
-acorn-jsx@^5.3.1:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
-  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
-
-acorn@^7.4.0:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
-ajv@^6.10.0, ajv@^6.12.4:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^8.0.1:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.7.1.tgz#52be6f1736b076074798124293618f132ad07a7e"
-  integrity sha512-gPpOObTO1QjbnN1sVMjJcp1TF9nggMfO4MBR5uQl6ZVTOaEPq5i4oq/6R9q2alMMPB3eg53wFv1RuJBLuxf3Hw==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-array-includes@^3.1.3:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
-  integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-    get-intrinsic "^1.1.1"
-    is-string "^1.0.7"
-
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
-array.prototype.flatmap@^1.2.4:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446"
-  integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-browserslist@^4.20.2:
-  version "4.20.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.4.tgz#98096c9042af689ee1e0271333dbc564b8ce4477"
-  integrity sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==
-  dependencies:
-    caniuse-lite "^1.0.30001349"
-    electron-to-chromium "^1.4.147"
-    escalade "^3.1.1"
-    node-releases "^2.0.5"
-    picocolors "^1.0.0"
-
-call-bind@^1.0.0, call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
-
-callsites@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
-  integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==
-
-caniuse-lite@^1.0.30001349:
-  version "1.0.30001355"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001355.tgz#e240b7177443ed0198c737a7f609536976701c77"
-  integrity sha512-Sd6pjJHF27LzCB7pT7qs+kuX2ndurzCzkpJl6Qct7LPSZ9jn0bkOA8mdgMgmqnQAWLVOOGjLpc+66V57eLtb1g==
-
-chalk@^2.0.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-convert-source-map@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
-  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
-  dependencies:
-    safe-buffer "~5.1.1"
-
-cross-spawn@^7.0.2:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
-  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
-  dependencies:
-    ms "2.1.2"
-
-deep-is@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
-
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
-  dependencies:
-    esutils "^2.0.2"
-
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
-electron-to-chromium@^1.4.147:
-  version "1.4.160"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.160.tgz#da54e24fddeaca52f37965c7bec1bd964c97d487"
-  integrity sha512-O1Z12YfyeX2LXYO7MdHIPazGXzLzQnr1ADW55U2ARQsJBPgfpJz3u+g3Mo2l1wSyfOCdiGqaX9qtV4XKZ0HNRA==
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
-  dependencies:
-    ansi-colors "^4.1.1"
-
-es-abstract@^1.19.0, es-abstract@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
-  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    get-intrinsic "^1.1.1"
-    get-symbol-description "^1.0.0"
-    has "^1.0.3"
-    has-symbols "^1.0.2"
-    internal-slot "^1.0.3"
-    is-callable "^1.2.4"
-    is-negative-zero "^2.0.1"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.1"
-    is-string "^1.0.7"
-    is-weakref "^1.0.1"
-    object-inspect "^1.11.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.1"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
-
-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
-eslint-config-prettier@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
-  integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
-
-eslint-plugin-eslint-comments@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz#9e1cd7b4413526abb313933071d7aba05ca12ffa"
-  integrity sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    ignore "^5.0.5"
-
-eslint-plugin-flowtype@^8.0.0:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz#e1557e37118f24734aa3122e7536a038d34a4912"
-  integrity sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==
-  dependencies:
-    lodash "^4.17.21"
-    string-natural-compare "^3.0.1"
-
-eslint-plugin-jest@^25.2.4:
-  version "25.2.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-25.2.4.tgz#bb9f6a0bd1fd524ffb0b8b7a159cd70a58a1a793"
-  integrity sha512-HRyinpgmEdkVr7pNPaYPHCoGqEzpgk79X8pg/xCeoAdurbyQjntJQ4pTzHl7BiVEBlam/F1Qsn+Dk0HtJO7Aaw==
-  dependencies:
-    "@typescript-eslint/experimental-utils" "^5.0.0"
-
-eslint-plugin-prettier@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0"
-  integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==
-  dependencies:
-    prettier-linter-helpers "^1.0.0"
-
-eslint-plugin-react-hooks@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556"
-  integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==
-
-eslint-plugin-react-native-globals@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz#ee1348bc2ceb912303ce6bdbd22e2f045ea86ea2"
-  integrity sha512-9aEPf1JEpiTjcFAmmyw8eiIXmcNZOqaZyHO77wgm0/dWfT/oxC1SrIq8ET38pMxHYrcB6Uew+TzUVsBeczF88g==
-
-eslint-plugin-react-native@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.11.0.tgz#c73b0886abb397867e5e6689d3a6a418682e6bac"
-  integrity sha512-7F3OTwrtQPfPFd+VygqKA2VZ0f2fz0M4gJmry/TRE18JBb94/OtMxwbL7Oqwu7FGyrdeIOWnXQbBAveMcSTZIA==
-  dependencies:
-    "@babel/traverse" "^7.7.4"
-    eslint-plugin-react-native-globals "^0.1.1"
-
-eslint-plugin-react@^7.26.1:
-  version "7.26.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz#41bcfe3e39e6a5ac040971c1af94437c80daa40e"
-  integrity sha512-Lug0+NOFXeOE+ORZ5pbsh6mSKjBKXDXItUD2sQoT+5Yl0eoT82DqnXeTMfUare4QVCn9QwXbfzO/dBLjLXwVjQ==
-  dependencies:
-    array-includes "^3.1.3"
-    array.prototype.flatmap "^1.2.4"
-    doctrine "^2.1.0"
-    estraverse "^5.2.0"
-    jsx-ast-utils "^2.4.1 || ^3.0.0"
-    minimatch "^3.0.4"
-    object.entries "^1.1.4"
-    object.fromentries "^2.0.4"
-    object.hasown "^1.0.0"
-    object.values "^1.1.4"
-    prop-types "^15.7.2"
-    resolve "^2.0.0-next.3"
-    semver "^6.3.0"
-    string.prototype.matchall "^4.0.5"
-
-eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
-eslint-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
-  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
-  dependencies:
-    eslint-visitor-keys "^2.0.0"
-
-eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
-eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-
-eslint-visitor-keys@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2"
-  integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==
-
-eslint@^7.32.0:
-  version "7.32.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
-  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
-  dependencies:
-    "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.3"
-    "@humanwhocodes/config-array" "^0.5.0"
-    ajv "^6.10.0"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
-    debug "^4.0.1"
-    doctrine "^3.0.0"
-    enquirer "^2.3.5"
-    escape-string-regexp "^4.0.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.1"
-    esquery "^1.4.0"
-    esutils "^2.0.2"
-    fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.1.2"
-    globals "^13.6.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    js-yaml "^3.13.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
-    lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
-    natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    progress "^2.0.0"
-    regexpp "^3.1.0"
-    semver "^7.2.1"
-    strip-ansi "^6.0.0"
-    strip-json-comments "^3.1.0"
-    table "^6.0.9"
-    text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
-
-espree@^7.3.0, espree@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
-  dependencies:
-    acorn "^7.4.0"
-    acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
-  dependencies:
-    estraverse "^5.1.0"
-
-esrecurse@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
-  dependencies:
-    estraverse "^5.2.0"
-
-estraverse@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
-
-estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
-  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
-
-esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
-
-fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-diff@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
-  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
-
-fast-glob@^3.1.1:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
-  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.0"
-    merge2 "^1.3.0"
-    micromatch "^4.0.2"
-    picomatch "^2.2.1"
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
-
-fast-levenshtein@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
-
-fastq@^1.6.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
-  integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==
-  dependencies:
-    reusify "^1.0.4"
-
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
-  dependencies:
-    flat-cache "^3.0.4"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-flat-cache@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
-  dependencies:
-    flatted "^3.1.0"
-    rimraf "^3.0.2"
-
-flatted@^3.1.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561"
-  integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
-gensync@^1.0.0-beta.2:
-  version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
-  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
-
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
-get-symbol-description@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
-  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
-
-glob-parent@^5.1.0, glob-parent@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob@^7.1.3:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-globals@^11.1.0:
-  version "11.11.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.11.0.tgz#dcf93757fa2de5486fbeed7118538adf789e9c2e"
-  integrity sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==
-
-globals@^13.6.0, globals@^13.9.0:
-  version "13.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e"
-  integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==
-  dependencies:
-    type-fest "^0.20.2"
-
-globby@^11.0.4:
-  version "11.0.4"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
-  integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.1.1"
-    ignore "^5.1.4"
-    merge2 "^1.3.0"
-    slash "^3.0.0"
-
-has-bigints@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
-  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-has-symbols@^1.0.1, has-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
-
-has-tostringtag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
-  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
-  dependencies:
-    has-symbols "^1.0.2"
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
-ignore@^5.0.5, ignore@^5.1.4, ignore@^5.1.8:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
-
-import-fresh@^3.0.0, import-fresh@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
-  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-internal-slot@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
-  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
-  dependencies:
-    get-intrinsic "^1.1.0"
-    has "^1.0.3"
-    side-channel "^1.0.4"
-
-is-bigint@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
-  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
-  dependencies:
-    has-bigints "^1.0.1"
-
-is-boolean-object@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
-  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-callable@^1.1.4, is-callable@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
-  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
-
-is-core-module@^2.2.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
-  integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
-  dependencies:
-    has "^1.0.3"
-
-is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-negative-zero@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
-  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
-
-is-number-object@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0"
-  integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-regex@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
-  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-shared-array-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
-  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
-
-is-string@^1.0.5, is-string@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
-  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
-  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
-  dependencies:
-    has-symbols "^1.0.2"
-
-is-weakref@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
-  integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==
-  dependencies:
-    call-bind "^1.0.0"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@^3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema-traverse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
-  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
-
-json5@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
-
-"jsx-ast-utils@^2.4.1 || ^3.0.0":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
-  integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==
-  dependencies:
-    array-includes "^3.1.3"
-    object.assign "^4.1.2"
-
-levn@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
-  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
-  dependencies:
-    prelude-ls "^1.2.1"
-    type-check "~0.4.0"
-
-lodash.merge@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
-  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
-
-lodash.truncate@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
-
-lodash@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-loose-envify@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-merge2@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-micromatch@^4.0.2:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
-
-minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
-
-node-releases@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666"
-  integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==
-
-object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-inspect@^1.11.0, object-inspect@^1.9.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
-  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
-
-object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-object.entries@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
-  integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-
-object.fromentries@^2.0.4:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251"
-  integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-
-object.hasown@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5"
-  integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-
-object.values@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
-  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
-  dependencies:
-    deep-is "^0.1.3"
-    fast-levenshtein "^2.0.6"
-    levn "^0.4.1"
-    prelude-ls "^1.2.1"
-    type-check "^0.4.0"
-    word-wrap "^1.2.3"
-
-parent-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.0.tgz#df250bdc5391f4a085fb589dad761f5ad6b865b5"
-  integrity sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA==
-  dependencies:
-    callsites "^3.0.0"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
-
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
-
-picomatch@^2.2.1, picomatch@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
-  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
-
-prelude-ls@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
-  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
-
-prettier-linter-helpers@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
-  integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
-  dependencies:
-    fast-diff "^1.1.2"
-
-prettier@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c"
-  integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==
-
-progress@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
-prop-types@^15.7.2:
-  version "15.7.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.8.1"
-
-punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-queue-microtask@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
-  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
-
-react-is@^16.8.1:
-  version "16.8.4"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2"
-  integrity sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==
-
-regexp.prototype.flags@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
-  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-regexpp@^3.1.0, regexpp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
-require-from-string@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-resolve@^2.0.0-next.3:
-  version "2.0.0-next.3"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46"
-  integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==
-  dependencies:
-    is-core-module "^2.2.0"
-    path-parse "^1.0.6"
-
-reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
-
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-run-parallel@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
-  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
-  dependencies:
-    queue-microtask "^1.2.2"
-
-safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-semver@^7.2.1, semver@^7.3.5:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-side-channel@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
-  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
-  dependencies:
-    call-bind "^1.0.0"
-    get-intrinsic "^1.0.2"
-    object-inspect "^1.9.0"
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-string-natural-compare@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
-  integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
-
-string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string.prototype.matchall@^4.0.5:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"
-  integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-    get-intrinsic "^1.1.1"
-    has-symbols "^1.0.2"
-    internal-slot "^1.0.3"
-    regexp.prototype.flags "^1.3.1"
-    side-channel "^1.0.4"
-
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
-  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
-  dependencies:
-    has-flag "^4.0.0"
-
-table@^6.0.9:
-  version "6.7.3"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.7.3.tgz#255388439715a738391bd2ee4cbca89a4d05a9b7"
-  integrity sha512-5DkIxeA7XERBqMwJq0aHZOdMadBx4e6eDoFRuyT5VR82J0Ycg2DwM6GfA/EQAhJ+toRTaS1lIdSQCqgrmhPnlw==
-  dependencies:
-    ajv "^8.0.1"
-    lodash.truncate "^4.4.2"
-    slice-ansi "^4.0.0"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
-
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-tslib@^1.8.1:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
-  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
-
-tsutils@^3.21.0:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
-
-type-check@^0.4.0, type-check@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
-  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
-  dependencies:
-    prelude-ls "^1.2.1"
-
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-
-unbox-primitive@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
-  dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
-    which-boxed-primitive "^1.0.2"
-
-uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
-  dependencies:
-    punycode "^2.1.0"
-
-v8-compile-cache@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
-  integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
-
-which-boxed-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
-  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
-  dependencies:
-    is-bigint "^1.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
-    is-symbol "^1.0.3"
-
-which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
diff --git a/packages/eslint-plugin-react-native-community/README.md b/packages/eslint-plugin-react-native-community/README.md
index 0ae562692f5d..4512dff9efc2 100644
--- a/packages/eslint-plugin-react-native-community/README.md
+++ b/packages/eslint-plugin-react-native-community/README.md
@@ -22,16 +22,6 @@ Add to your eslint config (`.eslintrc`, or `eslintConfig` field in `package.json
 
 ## Rules
 
-### `error-subclass-name`
-
-**NOTE:** This rule is primarily used for developing React Native itself and is not generally applicable to other projects.
-
-Enforces that error classes ( = classes with PascalCase names ending with `Error`) only extend other error classes, and that regular functions don't have names that could be mistaken for those of error classes.
-
-### `no-haste-imports`
-
-Disallows Haste module names in `import` statements and `require()` calls.
-
 ### `platform-colors`
 
 Enforces that calls to `PlatformColor` and `DynamicColorIOS` are statically analyzable to enable performance optimizations.
diff --git a/packages/eslint-plugin-react-native-community/__tests__/error-subclass-name-test.js b/packages/eslint-plugin-react-native-community/__tests__/error-subclass-name-test.js
deleted file mode 100644
index 39787fb0944b..000000000000
--- a/packages/eslint-plugin-react-native-community/__tests__/error-subclass-name-test.js
+++ /dev/null
@@ -1,100 +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.
- *
- * @emails oncall+react_native
- * @format
- */
-
-'use strict';
-
-const ESLintTester = require('./eslint-tester.js');
-
-const rule = require('../error-subclass-name.js');
-
-const eslintTester = new ESLintTester();
-
-const INVALID_SUPERCLASS_MESSAGE =
-  "'SomethingEndingWithError' must extend an error class (like 'Error') because its name is in PascalCase and ends with 'Error'.";
-const INVALID_OWN_NAME_MESSAGE =
-  "'Foo' may not be the name of an error class. It should be in PascalCase and end with 'Error'.";
-const MISSING_OWN_NAME_MESSAGE =
-  "An error class should have a PascalCase name ending with 'Error'.";
-const INVALID_FUNCTION_NAME_MESSAGE =
-  "'SomethingEndingWithError' is a reserved name. PascalCase names ending with 'Error' are reserved for error classes and may not be used for regular functions. Either rename this function or convert it to a class that extends 'Error'.";
-
-eslintTester.run('../error-subclass-name', rule, {
-  valid: [
-    'class FooError extends Error {}',
-    '(class FooError extends Error {})',
-    'class FooError extends SomethingEndingWithError {}',
-    '(class FooError extends SomethingEndingWithError {})',
-    'function makeError() {}',
-    '(function () {})',
-
-    // The following cases are currently allowed but could be disallowed in the
-    // future. This is technically an escape hatch.
-    'class Foo extends SomeLibrary.FooError {}',
-    '(class extends SomeLibrary.FooError {})',
-  ],
-  invalid: [
-    {
-      code: 'class SomethingEndingWithError {}',
-      errors: [{message: INVALID_SUPERCLASS_MESSAGE}],
-    },
-    {
-      code: '(class SomethingEndingWithError {})',
-      errors: [{message: INVALID_SUPERCLASS_MESSAGE}],
-    },
-    {
-      code: 'class Foo extends Error {}',
-      errors: [{message: INVALID_OWN_NAME_MESSAGE}],
-    },
-    {
-      code: '(class Foo extends Error {})',
-      errors: [{message: INVALID_OWN_NAME_MESSAGE}],
-    },
-    {
-      code: 'class Foo extends SomethingEndingWithError {}',
-      errors: [{message: INVALID_OWN_NAME_MESSAGE}],
-    },
-    {
-      code: '(class Foo extends SomethingEndingWithError {})',
-      errors: [{message: INVALID_OWN_NAME_MESSAGE}],
-    },
-    {
-      code: '(class extends Error {})',
-      errors: [{message: MISSING_OWN_NAME_MESSAGE}],
-    },
-    {
-      code: 'class SomethingEndingWithError extends C {}',
-      errors: [{message: INVALID_SUPERCLASS_MESSAGE}],
-    },
-    {
-      code: '(class SomethingEndingWithError extends C {})',
-      errors: [{message: INVALID_SUPERCLASS_MESSAGE}],
-    },
-    {
-      code: 'function SomethingEndingWithError() {}',
-      errors: [{message: INVALID_FUNCTION_NAME_MESSAGE}],
-    },
-    {
-      code: '(function SomethingEndingWithError() {})',
-      errors: [{message: INVALID_FUNCTION_NAME_MESSAGE}],
-    },
-
-    // The following cases are intentionally disallowed because the member
-    // expression `SomeLibrary.FooError` doesn't imply that the superclass is
-    // actually declared with the name `FooError`.
-    {
-      code: 'class SomethingEndingWithError extends SomeLibrary.FooError {}',
-      errors: [{message: INVALID_SUPERCLASS_MESSAGE}],
-    },
-    {
-      code: '(class SomethingEndingWithError extends SomeLibrary.FooError {})',
-      errors: [{message: INVALID_SUPERCLASS_MESSAGE}],
-    },
-  ],
-});
diff --git a/packages/eslint-plugin-react-native-community/__tests__/platform-colors-test.js b/packages/eslint-plugin-react-native-community/__tests__/platform-colors-test.js
index 81df7cb6a91d..76e799f3cb5b 100644
--- a/packages/eslint-plugin-react-native-community/__tests__/platform-colors-test.js
+++ b/packages/eslint-plugin-react-native-community/__tests__/platform-colors-test.js
@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/eslint-plugin-react-native-community/error-subclass-name.js b/packages/eslint-plugin-react-native-community/error-subclass-name.js
deleted file mode 100644
index 3791436ba813..000000000000
--- a/packages/eslint-plugin-react-native-community/error-subclass-name.js
+++ /dev/null
@@ -1,66 +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
- */
-
-'use strict';
-
-module.exports = function rule(context) {
-  function classVisitor(node) {
-    const {superClass, id} = node;
-    const nodeIsError = isErrorLikeId(id);
-    const superIsError = isErrorLikeId(superClass);
-    if (nodeIsError && !superIsError) {
-      const idName = getNameFromId(id);
-      context.report({
-        node: superClass || id,
-        message: `'${idName}' must extend an error class (like 'Error') because its name is in PascalCase and ends with 'Error'.`,
-      });
-    } else if (superIsError && !nodeIsError) {
-      const idName = getNameFromId(id);
-      context.report({
-        node: id || node,
-        message: idName
-          ? `'${idName}' may not be the name of an error class. It should be in PascalCase and end with 'Error'.`
-          : "An error class should have a PascalCase name ending with 'Error'.",
-      });
-    }
-  }
-
-  function functionVisitor(node) {
-    const {id} = node;
-    const nodeIsError = isErrorLikeId(id);
-    if (nodeIsError) {
-      const idName = getNameFromId(id);
-      context.report({
-        node: id,
-        message: `'${idName}' is a reserved name. PascalCase names ending with 'Error' are reserved for error classes and may not be used for regular functions. Either rename this function or convert it to a class that extends 'Error'.`,
-      });
-    }
-  }
-
-  return {
-    ClassDeclaration: classVisitor,
-    ClassExpression: classVisitor,
-    FunctionExpression: functionVisitor,
-    FunctionDeclaration: functionVisitor,
-  };
-};
-
-// Checks whether `node` is an identifier (or similar name node) with a
-// PascalCase name ending with 'Error'.
-function isErrorLikeId(node) {
-  return (
-    node && node.type === 'Identifier' && /^([A-Z].*)?Error$/.test(node.name)
-  );
-}
-
-// If `node` is an identifier (or similar name node), returns its name as a
-// string. Otherwise returns null.
-function getNameFromId(node) {
-  return node ? node.name : null;
-}
diff --git a/packages/eslint-plugin-react-native-community/index.js b/packages/eslint-plugin-react-native-community/index.js
index 3a1fa9896a49..5c3756184557 100644
--- a/packages/eslint-plugin-react-native-community/index.js
+++ b/packages/eslint-plugin-react-native-community/index.js
@@ -8,7 +8,5 @@
  */
 
 exports.rules = {
-  'error-subclass-name': require('./error-subclass-name'),
-  'no-haste-imports': require('./no-haste-imports'),
   'platform-colors': require('./platform-colors'),
 };
diff --git a/packages/eslint-plugin-react-native-community/package.json b/packages/eslint-plugin-react-native-community/package.json
index 29c7ddaa6102..f50afbdad52d 100644
--- a/packages/eslint-plugin-react-native-community/package.json
+++ b/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": {
diff --git a/packages/eslint-plugin-specs/__tests__/react-native-modules-test.js b/packages/eslint-plugin-specs/__tests__/react-native-modules-test.js
index afa544725c37..ae3b5c62ac66 100644
--- a/packages/eslint-plugin-specs/__tests__/react-native-modules-test.js
+++ b/packages/eslint-plugin-specs/__tests__/react-native-modules-test.js
@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails react_native
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/eslint-plugin-specs/index.js b/packages/eslint-plugin-specs/index.js
index 4a0b58ad5572..eb77fdd6a9a2 100644
--- a/packages/eslint-plugin-specs/index.js
+++ b/packages/eslint-plugin-specs/index.js
@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails react_native
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/eslint-plugin-specs/package.json b/packages/eslint-plugin-specs/package.json
index 8339cd008eea..2956a52d482a 100644
--- a/packages/eslint-plugin-specs/package.json
+++ b/packages/eslint-plugin-specs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native/eslint-plugin-specs",
-  "version": "0.0.4",
+  "version": "0.71.1",
   "description": "ESLint rules to validate NativeModule and Component Specs",
   "main": "index.js",
   "repository": {
@@ -9,14 +9,15 @@
     "directory": "packages/eslint-plugin-specs"
   },
   "scripts": {
-    "prepublish": "node prepublish.js"
+    "prepack": "node prepack.js",
+    "postpack": "node postpack.js"
   },
   "dependencies": {
     "@babel/core": "^7.14.0",
     "@babel/eslint-parser": "^7.18.2",
     "@babel/plugin-transform-flow-strip-types": "^7.0.0",
     "@babel/preset-flow": "^7.17.12",
-    "flow-parser": "^0.121.0",
+    "flow-parser": "^0.185.0",
     "make-dir": "^2.1.0",
     "pirates": "^4.0.1",
     "react-native-codegen": "*",
diff --git a/packages/eslint-plugin-specs/postpack.js b/packages/eslint-plugin-specs/postpack.js
new file mode 100644
index 000000000000..99807d8b086d
--- /dev/null
+++ b/packages/eslint-plugin-specs/postpack.js
@@ -0,0 +1,44 @@
+/**
+ * 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
+ */
+
+const fs = require('fs');
+
+/**
+ * script to prepare package for publish.
+ *
+ * Due to differences to how we consume internal packages, update a flag
+ */
+
+fs.readFile('./react-native-modules.js', 'utf8', function (readError, source) {
+  if (readError != null) {
+    return console.error(
+      'Failed to read react-native-modules.js for publish',
+      readError,
+    );
+  }
+
+  const result = source.replace(
+    'const PACKAGE_USAGE = true;',
+    'const PACKAGE_USAGE = false;',
+  );
+
+  fs.writeFile(
+    './react-native-modules.js',
+    result,
+    'utf8',
+    function (writeError) {
+      if (writeError != null) {
+        return console.error(
+          'Failed to update react-native-modules.js for publish',
+          writeError,
+        );
+      }
+    },
+  );
+});
diff --git a/packages/eslint-plugin-specs/prepublish.js b/packages/eslint-plugin-specs/prepack.js
similarity index 100%
rename from packages/eslint-plugin-specs/prepublish.js
rename to packages/eslint-plugin-specs/prepack.js
diff --git a/packages/eslint-plugin-specs/react-native-modules.js b/packages/eslint-plugin-specs/react-native-modules.js
index ae0041b04844..f303ab539eba 100644
--- a/packages/eslint-plugin-specs/react-native-modules.js
+++ b/packages/eslint-plugin-specs/react-native-modules.js
@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails react_native
  * @format
+ * @oncall react_native
  */
 
 'use strict';
@@ -13,7 +13,7 @@
 const path = require('path');
 const withBabelRegister = require('./with-babel-register');
 
-// We run yarn prepublish before publishing package which will set this value to true
+// We use the prepack hook before publishing package to set this value to true
 const PACKAGE_USAGE = false;
 const ERRORS = {
   misnamedHasteModule(hasteModuleName) {
@@ -35,7 +35,7 @@ function requireModuleParser() {
 
       withBabelRegister(config, () => {
         RNModuleParser = require('react-native-codegen/src/parsers/flow/modules');
-        RNParserUtils = require('react-native-codegen/src/parsers/flow/utils');
+        RNParserUtils = require('react-native-codegen/src/parsers/utils');
       });
     } else {
       const config = {
@@ -45,7 +45,7 @@ function requireModuleParser() {
 
       withBabelRegister(config, () => {
         RNModuleParser = require('react-native-codegen/lib/parsers/flow/modules');
-        RNParserUtils = require('react-native-codegen/lib/parsers/flow/utils');
+        RNParserUtils = require('react-native-codegen/lib/parsers/utils');
       });
     }
   }
@@ -134,7 +134,7 @@ function rule(context) {
       const [parsingErrors, tryParse] = createParserErrorCapturer();
 
       const sourceCode = context.getSourceCode().getText();
-      const ast = flowParser.parse(sourceCode);
+      const ast = flowParser.parse(sourceCode, {enums: true});
 
       tryParse(() => {
         buildModuleSchema(hasteModuleName, ast, tryParse);
diff --git a/packages/eslint-plugin-specs/with-babel-register/disk-cache.js b/packages/eslint-plugin-specs/with-babel-register/disk-cache.js
index 70184943ecc0..9a797909cec8 100644
--- a/packages/eslint-plugin-specs/with-babel-register/disk-cache.js
+++ b/packages/eslint-plugin-specs/with-babel-register/disk-cache.js
@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails react_native
  * @format
+ * @oncall react_native
  */
 
 const path = require('path');
diff --git a/packages/eslint-plugin-specs/with-babel-register/index.js b/packages/eslint-plugin-specs/with-babel-register/index.js
index 649954b33b5e..e4fe1450367b 100644
--- a/packages/eslint-plugin-specs/with-babel-register/index.js
+++ b/packages/eslint-plugin-specs/with-babel-register/index.js
@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails react_native
  * @format
+ * @oncall react_native
  */
 
 const babel = require('@babel/core');
diff --git a/ReactCommon/hermes/inspector/tools/msggen/.babelrc b/packages/hermes-inspector-msggen/.babelrc
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/.babelrc
rename to packages/hermes-inspector-msggen/.babelrc
diff --git a/ReactCommon/hermes/inspector/tools/msggen/.gitignore b/packages/hermes-inspector-msggen/.gitignore
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/.gitignore
rename to packages/hermes-inspector-msggen/.gitignore
diff --git a/ReactCommon/hermes/inspector/tools/msggen/__tests__/CommandTest.js b/packages/hermes-inspector-msggen/__tests__/CommandTest.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/__tests__/CommandTest.js
rename to packages/hermes-inspector-msggen/__tests__/CommandTest.js
diff --git a/ReactCommon/hermes/inspector/tools/msggen/__tests__/EventTest.js b/packages/hermes-inspector-msggen/__tests__/EventTest.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/__tests__/EventTest.js
rename to packages/hermes-inspector-msggen/__tests__/EventTest.js
diff --git a/ReactCommon/hermes/inspector/tools/msggen/__tests__/GraphTest.js b/packages/hermes-inspector-msggen/__tests__/GraphTest.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/__tests__/GraphTest.js
rename to packages/hermes-inspector-msggen/__tests__/GraphTest.js
diff --git a/ReactCommon/hermes/inspector/tools/msggen/__tests__/HeaderWriterTest.js b/packages/hermes-inspector-msggen/__tests__/HeaderWriterTest.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/__tests__/HeaderWriterTest.js
rename to packages/hermes-inspector-msggen/__tests__/HeaderWriterTest.js
diff --git a/ReactCommon/hermes/inspector/tools/msggen/__tests__/ImplementationWriterTest.js b/packages/hermes-inspector-msggen/__tests__/ImplementationWriterTest.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/__tests__/ImplementationWriterTest.js
rename to packages/hermes-inspector-msggen/__tests__/ImplementationWriterTest.js
diff --git a/ReactCommon/hermes/inspector/tools/msggen/__tests__/PropertyTest.js b/packages/hermes-inspector-msggen/__tests__/PropertyTest.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/__tests__/PropertyTest.js
rename to packages/hermes-inspector-msggen/__tests__/PropertyTest.js
diff --git a/ReactCommon/hermes/inspector/tools/msggen/__tests__/TypeTest.js b/packages/hermes-inspector-msggen/__tests__/TypeTest.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/__tests__/TypeTest.js
rename to packages/hermes-inspector-msggen/__tests__/TypeTest.js
diff --git a/packages/hermes-inspector-msggen/package.json b/packages/hermes-inspector-msggen/package.json
new file mode 100644
index 000000000000..add61d46ca79
--- /dev/null
+++ b/packages/hermes-inspector-msggen/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "@react-native/hermes-inspector-msggen",
+  "private": true,
+  "version": "0.71.1",
+  "license": "MIT",
+  "bin": {
+    "msggen": "./bin/index.js"
+  },
+  "scripts": {
+    "flow": "flow",
+    "build": "babel src --out-dir bin --source-maps",
+    "watch": "babel src --out-dir bin --source-maps --watch",
+    "test": "jest"
+  },
+  "dependencies": {
+    "devtools-protocol": "0.0.959523",
+    "yargs": "^17.5.1"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.14.0",
+    "@babel/core": "^7.14.0",
+    "@babel/preset-env": "^7.14.0",
+    "@babel/preset-flow": "^7.14.0",
+    "jest": "^29.2.1"
+  },
+  "jest": {
+    "transform": {
+      ".*": "<rootDir>/node_modules/babel-jest"
+    }
+  }
+}
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/Command.js b/packages/hermes-inspector-msggen/src/Command.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/src/Command.js
rename to packages/hermes-inspector-msggen/src/Command.js
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/Converters.js b/packages/hermes-inspector-msggen/src/Converters.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/src/Converters.js
rename to packages/hermes-inspector-msggen/src/Converters.js
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/Event.js b/packages/hermes-inspector-msggen/src/Event.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/src/Event.js
rename to packages/hermes-inspector-msggen/src/Event.js
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/GeneratedHeader.js b/packages/hermes-inspector-msggen/src/GeneratedHeader.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/src/GeneratedHeader.js
rename to packages/hermes-inspector-msggen/src/GeneratedHeader.js
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/Graph.js b/packages/hermes-inspector-msggen/src/Graph.js
similarity index 98%
rename from ReactCommon/hermes/inspector/tools/msggen/src/Graph.js
rename to packages/hermes-inspector-msggen/src/Graph.js
index d14760ce93d0..359e4673924c 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/src/Graph.js
+++ b/packages/hermes-inspector-msggen/src/Graph.js
@@ -63,7 +63,7 @@ export class Graph {
       root.children.add(node);
     }
 
-    const output = [];
+    const output: Array<NodeId> = [];
     postorder(root, output);
 
     // remove fake root node
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/HeaderWriter.js b/packages/hermes-inspector-msggen/src/HeaderWriter.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/src/HeaderWriter.js
rename to packages/hermes-inspector-msggen/src/HeaderWriter.js
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/ImplementationWriter.js b/packages/hermes-inspector-msggen/src/ImplementationWriter.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/src/ImplementationWriter.js
rename to packages/hermes-inspector-msggen/src/ImplementationWriter.js
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/Property.js b/packages/hermes-inspector-msggen/src/Property.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/src/Property.js
rename to packages/hermes-inspector-msggen/src/Property.js
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/TestHelpers.js b/packages/hermes-inspector-msggen/src/TestHelpers.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/src/TestHelpers.js
rename to packages/hermes-inspector-msggen/src/TestHelpers.js
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/Type.js b/packages/hermes-inspector-msggen/src/Type.js
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/src/Type.js
rename to packages/hermes-inspector-msggen/src/Type.js
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/custom.json b/packages/hermes-inspector-msggen/src/custom.json
similarity index 100%
rename from ReactCommon/hermes/inspector/tools/msggen/src/custom.json
rename to packages/hermes-inspector-msggen/src/custom.json
diff --git a/ReactCommon/hermes/inspector/tools/msggen/src/index.js b/packages/hermes-inspector-msggen/src/index.js
similarity index 97%
rename from ReactCommon/hermes/inspector/tools/msggen/src/index.js
rename to packages/hermes-inspector-msggen/src/index.js
index 1a137ac71707..5826643c753d 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/src/index.js
+++ b/packages/hermes-inspector-msggen/src/index.js
@@ -44,9 +44,9 @@ function parseDomains(
   includeExperimental: Set<string>,
 ): Descriptor {
   const desc = {
-    types: [],
-    commands: [],
-    events: [],
+    types: ([]: Array<Type>),
+    commands: ([]: Array<Command>),
+    events: ([]: Array<Event>),
   };
 
   for (const obj of domainObjs) {
@@ -197,8 +197,8 @@ function filterReachableFromRoots(
   return {types, commands, events};
 }
 
-function main() {
-  const args = yargs
+async function main(): Promise<void> {
+  const args = await yargs
     .usage('Usage: msggen <header_path> <cpp_path>')
     .alias('h', 'help')
     .help('h')
diff --git a/packages/normalize-color/BUCK b/packages/normalize-color/BUCK
index 17fbdd53bd8d..faaff9e880b0 100644
--- a/packages/normalize-color/BUCK
+++ b/packages/normalize-color/BUCK
@@ -5,7 +5,6 @@ rn_library(
     name = "normalize-color",
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.core",
     ],
     skip_processors = True,
     visibility = ["PUBLIC"],
diff --git a/packages/normalize-color/__tests__/normalizeColor-test.js b/packages/normalize-color/__tests__/normalizeColor-test.js
index 257ae1db0cbc..56d47df5e159 100644
--- a/packages/normalize-color/__tests__/normalizeColor-test.js
+++ b/packages/normalize-color/__tests__/normalizeColor-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict
  * @format
+ * @oncall react_native
  */
 
 'use strict';
@@ -19,6 +19,7 @@ it('accepts only spec compliant colors', () => {
   expect(normalizeColor('#abcdef')).not.toBe(null);
   expect(normalizeColor('#abcdef01')).not.toBe(null);
   expect(normalizeColor('rgb(1,2,3)')).not.toBe(null);
+  expect(normalizeColor('rgb(1 2 3)')).not.toBe(null);
   expect(normalizeColor('rgb(1, 2, 3)')).not.toBe(null);
   expect(normalizeColor('rgb(   1   , 2   , 3   )')).not.toBe(null);
   expect(normalizeColor('rgb(-1, -2, -3)')).not.toBe(null);
@@ -45,6 +46,7 @@ it('refuses non-spec compliant colors', () => {
   expect(normalizeColor('rgb 255 0 0')).toBe(null);
   expect(normalizeColor('RGBA(0, 1, 2)')).toBe(null);
   expect(normalizeColor('rgb (0, 1, 2)')).toBe(null);
+  expect(normalizeColor('rgba(0 0 0 0.0)')).toBe(null);
   expect(normalizeColor('hsv(0, 1, 2)')).toBe(null);
   // $FlowExpectedError - Intentionally malformed argument.
   expect(normalizeColor({r: 10, g: 10, b: 10})).toBe(null);
@@ -81,6 +83,8 @@ it('handles rgb properly', () => {
   expect(normalizeColor('rgb(100, 15, 69)')).toBe(0x640f45ff);
   expect(normalizeColor('rgb(255, 255, 255)')).toBe(0xffffffff);
   expect(normalizeColor('rgb(256, 256, 256)')).toBe(0xffffffff);
+  expect(normalizeColor('rgb(0  0  0)')).toBe(0x000000ff);
+  expect(normalizeColor('rgb(0 0 255)')).toBe(0x0000ffff);
 });
 
 it('handles rgba properly', () => {
@@ -91,6 +95,9 @@ it('handles rgba properly', () => {
   expect(normalizeColor('rgba(0, 0, 0, 1)')).toBe(0x000000ff);
   expect(normalizeColor('rgba(0, 0, 0, 1.5)')).toBe(0x000000ff);
   expect(normalizeColor('rgba(100, 15, 69, 0.5)')).toBe(0x640f4580);
+  expect(normalizeColor('rgba(0  0  0 / 0.0)')).toBe(0x00000000);
+  expect(normalizeColor('rgba(0 0 0 / 1)')).toBe(0x000000ff);
+  expect(normalizeColor('rgba(100 15 69 / 0.5)')).toBe(0x640f4580);
 });
 
 it('handles hsl properly', () => {
@@ -103,6 +110,9 @@ it('handles hsl properly', () => {
   expect(normalizeColor('hsl(70, 110%, 75%)')).toBe(0xeaff80ff);
   expect(normalizeColor('hsl(70, 0%, 75%)')).toBe(0xbfbfbfff);
   expect(normalizeColor('hsl(70, -10%, 75%)')).toBe(0xbfbfbfff);
+  expect(normalizeColor('hsl(0 0% 0%)')).toBe(0x000000ff);
+  expect(normalizeColor('hsl(360 100% 100%)')).toBe(0xffffffff);
+  expect(normalizeColor('hsl(180 50% 50%)')).toBe(0x40bfbfff);
 });
 
 it('handles hsla properly', () => {
@@ -110,6 +120,21 @@ it('handles hsla properly', () => {
   expect(normalizeColor('hsla(360, 100%, 100%, 1)')).toBe(0xffffffff);
   expect(normalizeColor('hsla(360, 100%, 100%, 0)')).toBe(0xffffff00);
   expect(normalizeColor('hsla(180, 50%, 50%, 0.2)')).toBe(0x40bfbf33);
+  expect(normalizeColor('hsla(0 0% 0% / 0)')).toBe(0x00000000);
+  expect(normalizeColor('hsla(360 100% 100% / 1)')).toBe(0xffffffff);
+  expect(normalizeColor('hsla(360 100% 100% / 0)')).toBe(0xffffff00);
+  expect(normalizeColor('hsla(180 50% 50% / 0.2)')).toBe(0x40bfbf33);
+});
+
+it('handles hwb properly', () => {
+  expect(normalizeColor('hwb(0, 0%, 100%)')).toBe(0x000000ff);
+  expect(normalizeColor('hwb(0, 100%, 0%)')).toBe(0xffffffff);
+  expect(normalizeColor('hwb(0, 0%, 0%)')).toBe(0xff0000ff);
+  expect(normalizeColor('hwb(70, 50%, 0%)')).toBe(0xeaff80ff);
+  expect(normalizeColor('hwb(0, 50%, 50%)')).toBe(0x808080ff);
+  expect(normalizeColor('hwb(360, 100%, 100%)')).toBe(0x808080ff);
+  expect(normalizeColor('hwb(0 0% 0%)')).toBe(0xff0000ff);
+  expect(normalizeColor('hwb(70 50% 0%)')).toBe(0xeaff80ff);
 });
 
 it('handles named colors properly', () => {
diff --git a/packages/normalize-color/index.js b/packages/normalize-color/index.js
index a20b1c3486d4..611baaffc138 100644
--- a/packages/normalize-color/index.js
+++ b/packages/normalize-color/index.js
@@ -48,11 +48,23 @@ function normalizeColor(color) {
   }
 
   if ((match = matchers.rgba.exec(color))) {
+    // rgba(R G B / A) notation
+    if (match[6] !== undefined) {
+      return (
+        ((parse255(match[6]) << 24) | // r
+          (parse255(match[7]) << 16) | // g
+          (parse255(match[8]) << 8) | // b
+          parse1(match[9])) >>> // a
+        0
+      );
+    }
+
+    // rgba(R, G, B, A) notation
     return (
-      ((parse255(match[1]) << 24) | // r
-        (parse255(match[2]) << 16) | // g
-        (parse255(match[3]) << 8) | // b
-        parse1(match[4])) >>> // a
+      ((parse255(match[2]) << 24) | // r
+        (parse255(match[3]) << 16) | // g
+        (parse255(match[4]) << 8) | // b
+        parse1(match[5])) >>> // a
       0
     );
   }
@@ -106,13 +118,39 @@ function normalizeColor(color) {
   }
 
   if ((match = matchers.hsla.exec(color))) {
+    // hsla(H S L / A) notation
+    if (match[6] !== undefined) {
+      return (
+        (hslToRgb(
+          parse360(match[6]), // h
+          parsePercentage(match[7]), // s
+          parsePercentage(match[8]), // l
+        ) |
+          parse1(match[9])) >>> // a
+        0
+      );
+    }
+
+    // hsla(H, S, L, A) notation
     return (
       (hslToRgb(
+        parse360(match[2]), // h
+        parsePercentage(match[3]), // s
+        parsePercentage(match[4]), // l
+      ) |
+        parse1(match[5])) >>> // a
+      0
+    );
+  }
+
+  if ((match = matchers.hwb.exec(color))) {
+    return (
+      (hwbToRgb(
         parse360(match[1]), // h
-        parsePercentage(match[2]), // s
-        parsePercentage(match[3]), // l
+        parsePercentage(match[2]), // w
+        parsePercentage(match[3]), // b
       ) |
-        parse1(match[4])) >>> // a
+        0x000000ff) >>> // a
       0
     );
   }
@@ -153,10 +191,42 @@ function hslToRgb(h, s, l) {
   );
 }
 
+function hwbToRgb(h, w, b) {
+  if (w + b >= 1) {
+    const gray = Math.round((w * 255) / (w + b));
+
+    return (gray << 24) | (gray << 16) | (gray << 8);
+  }
+
+  const red = hue2rgb(0, 1, h + 1 / 3) * (1 - w - b) + w;
+  const green = hue2rgb(0, 1, h) * (1 - w - b) + w;
+  const blue = hue2rgb(0, 1, h - 1 / 3) * (1 - w - b) + w;
+
+  return (
+    (Math.round(red * 255) << 24) |
+    (Math.round(green * 255) << 16) |
+    (Math.round(blue * 255) << 8)
+  );
+}
+
 const NUMBER = '[-+]?\\d*\\.?\\d+';
 const PERCENTAGE = NUMBER + '%';
 
 function call(...args) {
+  return '\\(\\s*(' + args.join(')\\s*,?\\s*(') + ')\\s*\\)';
+}
+
+function callWithSlashSeparator(...args) {
+  return (
+    '\\(\\s*(' +
+    args.slice(0, args.length - 1).join(')\\s*,?\\s*(') +
+    ')\\s*/\\s*(' +
+    args[args.length - 1] +
+    ')\\s*\\)'
+  );
+}
+
+function commaSeparatedCall(...args) {
   return '\\(\\s*(' + args.join(')\\s*,\\s*(') + ')\\s*\\)';
 }
 
@@ -166,9 +236,22 @@ function getMatchers() {
   if (cachedMatchers === undefined) {
     cachedMatchers = {
       rgb: new RegExp('rgb' + call(NUMBER, NUMBER, NUMBER)),
-      rgba: new RegExp('rgba' + call(NUMBER, NUMBER, NUMBER, NUMBER)),
+      rgba: new RegExp(
+        'rgba(' +
+          commaSeparatedCall(NUMBER, NUMBER, NUMBER, NUMBER) +
+          '|' +
+          callWithSlashSeparator(NUMBER, NUMBER, NUMBER, NUMBER) +
+          ')',
+      ),
       hsl: new RegExp('hsl' + call(NUMBER, PERCENTAGE, PERCENTAGE)),
-      hsla: new RegExp('hsla' + call(NUMBER, PERCENTAGE, PERCENTAGE, NUMBER)),
+      hsla: new RegExp(
+        'hsla(' +
+          commaSeparatedCall(NUMBER, PERCENTAGE, PERCENTAGE, NUMBER) +
+          '|' +
+          callWithSlashSeparator(NUMBER, PERCENTAGE, PERCENTAGE, NUMBER) +
+          ')',
+      ),
+      hwb: new RegExp('hwb' + call(NUMBER, PERCENTAGE, PERCENTAGE)),
       hex3: /^#([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,
       hex4: /^#([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,
       hex6: /^#([0-9a-fA-F]{6})$/,
diff --git a/packages/normalize-color/package.json b/packages/normalize-color/package.json
index 7ecb89c6b89c..27fe68afd5cb 100644
--- a/packages/normalize-color/package.json
+++ b/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",
diff --git a/packages/polyfills/BUCK b/packages/polyfills/BUCK
index 7b9950a185c1..88ffc9513eee 100644
--- a/packages/polyfills/BUCK
+++ b/packages/polyfills/BUCK
@@ -26,7 +26,6 @@ rn_library(
     is_polyfill = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.core",
     ],
     node_modules_check_enabled = False,
     skip_processors = True,  #  Don't anticipate routes or fbicon here
diff --git a/packages/polyfills/__tests__/Object.es8-test.js b/packages/polyfills/__tests__/Object.es8-test.js
index 697b6cd1c3c4..c53512f17561 100644
--- a/packages/polyfills/__tests__/Object.es8-test.js
+++ b/packages/polyfills/__tests__/Object.es8-test.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @emails oncall+jsinfra
+ * @oncall jsinfra
  */
 
 'use strict';
diff --git a/bots/.babelrc b/packages/react-native-bots/.babelrc
similarity index 100%
rename from bots/.babelrc
rename to packages/react-native-bots/.babelrc
diff --git a/bots/README.md b/packages/react-native-bots/README.md
similarity index 67%
rename from bots/README.md
rename to packages/react-native-bots/README.md
index 884a2ab55c6e..95857e343bbd 100644
--- a/bots/README.md
+++ b/packages/react-native-bots/README.md
@@ -1,13 +1,15 @@
 ## Danger
 
-[Danger](http://danger.systems/js/) is a JavaScript runtime which helps you provide continuous feedback inside GitHub. It's used by @pull-bot to analyze the contents of a GitHub pull request.
+[Danger](http://danger.systems/js/) is a JavaScript runtime which helps you provide continuous feedback inside GitHub.
+It's used inside Github Actions to analyze the contents of a GitHub pull request.
 
 If you want to test changes to Danger, I'd recommend checking out an existing PR and then running the `danger pr` command.
-You'll need a GitHub token. You can re-use this one: `a6edf8e8d40ce4e8b11a 150e1341f4dd9c944d2a` (just remove the space).
+You'll need a GitHub Public Access Token (PAT). It will look like `ghp_<REDACTED>`.
+
 So, for example:
 
 ```
-DANGER_GITHUB_API_TOKEN=[ENV_ABOVE] yarn danger pr https://github.com/facebook/react-native/pull/1234
+DANGER_GITHUB_API_TOKEN=ghp_<REDACTED> yarn danger pr https://github.com/facebook/react-native/pull/1234
 ```
 
 ## Code Analysis Bot
diff --git a/bots/code-analysis-bot.js b/packages/react-native-bots/code-analysis-bot.js
similarity index 100%
rename from bots/code-analysis-bot.js
rename to packages/react-native-bots/code-analysis-bot.js
diff --git a/bots/dangerfile.js b/packages/react-native-bots/dangerfile.js
similarity index 90%
rename from bots/dangerfile.js
rename to packages/react-native-bots/dangerfile.js
index 40e289211795..f5bc31129a6b 100644
--- a/bots/dangerfile.js
+++ b/packages/react-native-bots/dangerfile.js
@@ -9,8 +9,9 @@
 
 'use strict';
 
-const {danger, fail, message, warn} = require('danger');
+const {danger, fail, /*message,*/ warn} = require('danger');
 const includes = require('lodash.includes');
+const eslint = require('@seadub/danger-plugin-eslint');
 
 const isFromPhabricator =
   danger.github.pr.body &&
@@ -90,7 +91,7 @@ if (!includesChangelog) {
 // Warns if the PR is opened against stable, as commits need to be cherry picked and tagged by a release maintainer.
 // Fails if the PR is opened against anything other than `main` or `-stable`.
 const isMergeRefMain = danger.github.pr.base.ref === 'main';
-const isMergeRefStable = danger.github.pr.base.ref.indexOf('-stable') !== -1;
+const isMergeRefStable = danger.github.pr.base.ref.endsWith('-stable');
 if (!isMergeRefMain && !isMergeRefStable) {
   const title = ':exclamation: Base Branch';
   const idea =
@@ -100,15 +101,14 @@ if (!isMergeRefMain && !isMergeRefStable) {
 
 // If the PR is opened against stable should add `Pick Request` label
 if (isMergeRefStable) {
-  const {owner, repo, number: issueNumber} = danger.github.thisPR;
-
-  danger.github.api.request(
-    'POST /repos/{owner}/{repo}/issues/{issueNumber}/labels',
-    {
-      owner,
-      repo,
-      issueNumber,
-      labels: ['Pick Request'],
-    },
-  );
+  danger.github.api.issues.addLabels({
+    owner: danger.github.pr.base.repo.owner.login,
+    repo: danger.github.pr.base.repo.name,
+    issue_number: danger.github.pr.number,
+    labels: ['Pick Request'],
+  });
 }
+
+// Ensures that eslint is run from root folder and that it can find .eslintrc
+process.chdir('../../');
+eslint.default();
diff --git a/bots/datastore.js b/packages/react-native-bots/datastore.js
similarity index 100%
rename from bots/datastore.js
rename to packages/react-native-bots/datastore.js
diff --git a/bots/make-comment.js b/packages/react-native-bots/make-comment.js
similarity index 100%
rename from bots/make-comment.js
rename to packages/react-native-bots/make-comment.js
diff --git a/bots/package.json b/packages/react-native-bots/package.json
similarity index 63%
rename from bots/package.json
rename to packages/react-native-bots/package.json
index a5c45dfeb186..a4a010507228 100644
--- a/bots/package.json
+++ b/packages/react-native-bots/package.json
@@ -1,10 +1,11 @@
 {
+  "name": "@react-native/bots",
+  "version": "0.0.0",
   "private": true,
-  "scripts": {
-    "danger": "node ./node_modules/.bin/danger"
-  },
   "devDependencies": {
+    "@seadub/danger-plugin-eslint": "^3.0.2",
     "danger": "^11.0.2",
+    "eslint": "^8.19.0",
     "lodash.includes": "^4.3.0",
     "minimatch": "^3.0.4"
   },
diff --git a/bots/post-artifacts-link.js b/packages/react-native-bots/post-artifacts-link.js
similarity index 100%
rename from bots/post-artifacts-link.js
rename to packages/react-native-bots/post-artifacts-link.js
diff --git a/bots/report-bundle-size.js b/packages/react-native-bots/report-bundle-size.js
similarity index 100%
rename from bots/report-bundle-size.js
rename to packages/react-native-bots/report-bundle-size.js
diff --git a/packages/react-native-codegen/BUCK b/packages/react-native-codegen/BUCK
index 4a7708056982..d06563f4a08c 100644
--- a/packages/react-native-codegen/BUCK
+++ b/packages/react-native-codegen/BUCK
@@ -17,8 +17,8 @@ fb_native.genrule(
             "**/e2e/__test_fixtures__/modules/Native*.js",
         ],
     ),
-    cmd = "$(exe {}) $OUT $SRCS".format(react_native_root_target("packages/react-native-codegen:write_to_json")),
     out = "schema-codegen_tests.json",
+    cmd = "$(exe {}) $OUT $SRCS".format(react_native_root_target("packages/react-native-codegen:write_to_json")),
 )
 
 rn_codegen_components(
diff --git a/packages/react-native-codegen/DEFS.bzl b/packages/react-native-codegen/DEFS.bzl
index 834c8a9e0cdf..48201e82d063 100644
--- a/packages/react-native-codegen/DEFS.bzl
+++ b/packages/react-native-codegen/DEFS.bzl
@@ -13,12 +13,14 @@ load(
     "IOS",
     "IS_OSS_BUILD",
     "MACOSX",
+    "WINDOWS",
     "YOGA_CXX_TARGET",
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
     "get_preprocessor_flags_for_build_mode",
     "react_native_dep",
+    "react_native_desktop_root_target",
     "react_native_root_target",
     "react_native_target",
     "react_native_xplat_shared_library_target",
@@ -263,6 +265,8 @@ def rn_codegen_components(
     generate_event_emitter_h_name = "generate_event_emitter_h-{}".format(name)
     generate_props_cpp_name = "generate_props_cpp-{}".format(name)
     generate_props_h_name = "generated_props_h-{}".format(name)
+    generate_state_cpp_name = "generate_state_cpp-{}".format(name)
+    generate_state_h_name = "generated_state_h-{}".format(name)
     generate_tests_cpp_name = "generate_tests_cpp-{}".format(name)
     generate_shadow_node_cpp_name = "generated_shadow_node_cpp-{}".format(name)
     generate_shadow_node_h_name = "generated_shadow_node_h-{}".format(name)
@@ -314,6 +318,13 @@ def rn_codegen_components(
         labels = ["codegen_rule"],
     )
 
+    fb_native.genrule(
+        name = generate_state_cpp_name,
+        cmd = "cp $(location :{})/States.cpp $OUT".format(generate_fixtures_rule_name),
+        out = "States.cpp",
+        labels = ["codegen_rule"],
+    )
+
     fb_native.genrule(
         name = generate_tests_cpp_name,
         cmd = "cp $(location :{})/Tests.cpp $OUT".format(generate_fixtures_rule_name),
@@ -328,6 +339,13 @@ def rn_codegen_components(
         labels = ["codegen_rule"],
     )
 
+    fb_native.genrule(
+        name = generate_state_h_name,
+        cmd = "cp $(location :{})/States.h $OUT".format(generate_fixtures_rule_name),
+        out = "States.h",
+        labels = ["codegen_rule"],
+    )
+
     fb_native.genrule(
         name = copy_generated_java_files,
         # TODO: support different package name internally.
@@ -388,12 +406,14 @@ def rn_codegen_components(
                 srcs = [
                     ":{}".format(generate_event_emitter_cpp_name),
                     ":{}".format(generate_props_cpp_name),
+                    ":{}".format(generate_state_cpp_name),
                     ":{}".format(generate_shadow_node_cpp_name),
                 ],
                 headers = [
                     ":{}".format(generate_component_descriptor_h_name),
                     ":{}".format(generate_event_emitter_h_name),
                     ":{}".format(generate_props_h_name),
+                    ":{}".format(generate_state_h_name),
                     ":{}".format(generate_shadow_node_h_name),
                 ],
                 header_namespace = "react/renderer/components/{}".format(name),
@@ -403,6 +423,7 @@ def rn_codegen_components(
                     "Props.h": ":{}".format(generate_props_h_name),
                     "RCTComponentViewHelpers.h": ":{}".format(generate_component_hobjcpp_name),
                     "ShadowNodes.h": ":{}".format(generate_shadow_node_h_name),
+                    "States.h": ":{}".format(generate_state_h_name),
                 },
                 fbobjc_compiler_flags = get_apple_compiler_flags(),
                 fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
@@ -421,12 +442,6 @@ def rn_codegen_components(
                 tests = [":generated_tests-{}".format(name)],
                 visibility = ["PUBLIC"],
                 deps = [
-                    "//third-party/glog:glog",
-                    "//xplat/fbsystrace:fbsystrace",
-                    "//xplat/folly:headers_only_do_not_use",
-                    "//xplat/folly:memory",
-                    "//xplat/folly:molly",
-                    YOGA_CXX_TARGET,
                     react_native_xplat_target("react/renderer/debug:debug"),
                     react_native_xplat_target("react/renderer/core:core"),
                     react_native_xplat_target("react/renderer/graphics:graphics"),
@@ -521,6 +536,7 @@ def rn_codegen_cxx_modules(
     fb_native.genrule(
         name = generate_module_h_name,
         cmd = "cp $(location :{})/{}JSI.h $OUT".format(generate_fixtures_rule_name, name),
+        cmd_exe = "copy $(location :{})\\{}JSI.h $OUT".format(generate_fixtures_rule_name, name),
         out = "{}JSI.h".format(name),
         labels = ["codegen_rule"],
     )
@@ -528,6 +544,7 @@ def rn_codegen_cxx_modules(
     fb_native.genrule(
         name = generate_module_cpp_name,
         cmd = "cp $(location :{})/{}JSI-generated.cpp $OUT".format(generate_fixtures_rule_name, name),
+        cmd_exe = "copy $(location :{})\\{}JSI-generated.cpp $OUT".format(generate_fixtures_rule_name, name),
         out = "{}JSI-generated.cpp".format(name),
         labels = ["codegen_rule"],
     )
@@ -550,15 +567,24 @@ def rn_codegen_cxx_modules(
             fbobjc_compiler_flags = get_apple_compiler_flags(),
             fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
             labels = library_labels + ["codegen_rule"],
-            platforms = (ANDROID, APPLE, CXX),
+            platforms = (ANDROID, APPLE, CXX, WINDOWS),
             preprocessor_flags = [
                 "-DLOG_TAG=\"ReactNative\"",
                 "-DWITH_FBSYSTRACE=1",
             ],
             visibility = ["PUBLIC"],
-            exported_deps = [
+            fbandroid_exported_deps = [
                 react_native_xplat_target("react/nativemodule/core:core"),
             ],
+            ios_exported_deps = [
+                react_native_xplat_target("react/nativemodule/core:core"),
+            ],
+            macosx_exported_deps = [
+                react_native_desktop_root_target(":bridging"),
+            ],
+            windows_exported_deps = [
+                react_native_desktop_root_target(":bridging"),
+            ],
         )
 
 def is_running_buck_project():
diff --git a/packages/react-native-codegen/README.md b/packages/react-native-codegen/README.md
index fe7238736dbb..d1661e4e5bbf 100644
--- a/packages/react-native-codegen/README.md
+++ b/packages/react-native-codegen/README.md
@@ -12,3 +12,10 @@ yarn add --dev react-native-codegen
 
 [version-badge]: https://img.shields.io/npm/v/react-native-codegen?style=flat-square
 [package]: https://www.npmjs.com/package/react-native-codegen
+
+## Testing
+
+To run the tests in this package, run the following commands from the react Native root folder:
+
+1. `yarn` to install the dependencies. You just need to run this once
+2. `yarn jest react-native-codegen`.
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GenerateComponentDescriptorH-test.js b/packages/react-native-codegen/e2e/__tests__/components/GenerateComponentDescriptorH-test.js
index d43988adbbe6..8d35cca3843e 100644
--- a/packages/react-native-codegen/e2e/__tests__/components/GenerateComponentDescriptorH-test.js
+++ b/packages/react-native-codegen/e2e/__tests__/components/GenerateComponentDescriptorH-test.js
@@ -4,14 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const parser = require('../../../src/parsers/flow');
+const {parseFile} = require('../../../src/parsers/utils');
+const FlowParser = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GenerateComponentDescriptorH');
 const fs = require('fs');
 
@@ -22,7 +23,10 @@ const fixtures = fs.readdirSync(FIXTURE_DIR);
 fixtures.forEach(fixture => {
   it(`GenerateComponentDescriptorH can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
+    const schema = parseFile(
+      `${FIXTURE_DIR}/${fixture}`,
+      FlowParser.buildSchema,
+    );
     const output = generator.generate(libName, schema);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GenerateComponentHObjCpp-test.js b/packages/react-native-codegen/e2e/__tests__/components/GenerateComponentHObjCpp-test.js
index 9b601d20dd3f..89d14fc74a63 100644
--- a/packages/react-native-codegen/e2e/__tests__/components/GenerateComponentHObjCpp-test.js
+++ b/packages/react-native-codegen/e2e/__tests__/components/GenerateComponentHObjCpp-test.js
@@ -4,14 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const parser = require('../../../src/parsers/flow');
+const {parseFile} = require('../../../src/parsers/utils');
+const FlowParser = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GenerateComponentHObjCpp');
 const fs = require('fs');
 
@@ -22,7 +23,10 @@ const fixtures = fs.readdirSync(FIXTURE_DIR);
 fixtures.forEach(fixture => {
   it(`GenerateComponentHObjCpp can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
+    const schema = parseFile(
+      `${FIXTURE_DIR}/${fixture}`,
+      FlowParser.buildSchema,
+    );
     const output = generator.generate(libName, schema);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GenerateEventEmitterCpp-test.js b/packages/react-native-codegen/e2e/__tests__/components/GenerateEventEmitterCpp-test.js
index 09532b0f23d9..603c77b56607 100644
--- a/packages/react-native-codegen/e2e/__tests__/components/GenerateEventEmitterCpp-test.js
+++ b/packages/react-native-codegen/e2e/__tests__/components/GenerateEventEmitterCpp-test.js
@@ -4,14 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const parser = require('../../../src/parsers/flow');
+const {parseFile} = require('../../../src/parsers/utils');
+const FlowParser = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GenerateEventEmitterCpp');
 const fs = require('fs');
 
@@ -22,7 +23,10 @@ const fixtures = fs.readdirSync(FIXTURE_DIR);
 fixtures.forEach(fixture => {
   it(`GenerateEventEmitterCpp can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
+    const schema = parseFile(
+      `${FIXTURE_DIR}/${fixture}`,
+      FlowParser.buildSchema,
+    );
     const output = generator.generate(libName, schema);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GenerateEventEmitterH-test.js b/packages/react-native-codegen/e2e/__tests__/components/GenerateEventEmitterH-test.js
index fa8da739ed4a..05b1082297cc 100644
--- a/packages/react-native-codegen/e2e/__tests__/components/GenerateEventEmitterH-test.js
+++ b/packages/react-native-codegen/e2e/__tests__/components/GenerateEventEmitterH-test.js
@@ -4,14 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const parser = require('../../../src/parsers/flow');
+const {parseFile} = require('../../../src/parsers/utils');
+const FlowParser = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GenerateEventEmitterH');
 const fs = require('fs');
 
@@ -22,7 +23,10 @@ const fixtures = fs.readdirSync(FIXTURE_DIR);
 fixtures.forEach(fixture => {
   it(`GenerateEventEmitterH can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
+    const schema = parseFile(
+      `${FIXTURE_DIR}/${fixture}`,
+      FlowParser.buildSchema,
+    );
     const output = generator.generate(libName, schema);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsCpp-test.js b/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsCpp-test.js
index 8bd33f16ca67..131d4f4fd668 100644
--- a/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsCpp-test.js
+++ b/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsCpp-test.js
@@ -4,14 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const parser = require('../../../src/parsers/flow');
+const {parseFile} = require('../../../src/parsers/utils');
+const FlowParser = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GeneratePropsCpp');
 const fs = require('fs');
 
@@ -22,7 +23,10 @@ const fixtures = fs.readdirSync(FIXTURE_DIR);
 fixtures.forEach(fixture => {
   it(`GeneratePropsCpp can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
+    const schema = parseFile(
+      `${FIXTURE_DIR}/${fixture}`,
+      FlowParser.buildSchema,
+    );
     const output = generator.generate(libName, schema);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsH-test.js b/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsH-test.js
index 950e4690e5fd..0600f6bb70d1 100644
--- a/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsH-test.js
+++ b/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsH-test.js
@@ -4,14 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const parser = require('../../../src/parsers/flow');
+const {parseFile} = require('../../../src/parsers/utils');
+const FlowParser = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GeneratePropsH');
 const fs = require('fs');
 
@@ -22,7 +23,10 @@ const fixtures = fs.readdirSync(FIXTURE_DIR);
 fixtures.forEach(fixture => {
   it(`GeneratePropsH can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
+    const schema = parseFile(
+      `${FIXTURE_DIR}/${fixture}`,
+      FlowParser.buildSchema,
+    );
     const output = generator.generate(libName, schema);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsJavaDelegate-test.js b/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsJavaDelegate-test.js
index 9ffa4e7f2220..3f87386c4a0e 100644
--- a/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsJavaDelegate-test.js
+++ b/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsJavaDelegate-test.js
@@ -4,14 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const parser = require('../../../src/parsers/flow');
+const {parseFile} = require('../../../src/parsers/utils');
+const FlowParser = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GeneratePropsJavaDelegate');
 const fs = require('fs');
 
@@ -22,7 +23,10 @@ const fixtures = fs.readdirSync(FIXTURE_DIR);
 fixtures.forEach(fixture => {
   it(`GeneratePropsJavaDelegate can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
+    const schema = parseFile(
+      `${FIXTURE_DIR}/${fixture}`,
+      FlowParser.buildSchema,
+    );
     const output = generator.generate(libName, schema);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsJavaInterface-test.js b/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsJavaInterface-test.js
index 54069af6be45..40fcfe3d9d02 100644
--- a/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsJavaInterface-test.js
+++ b/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsJavaInterface-test.js
@@ -4,14 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const parser = require('../../../src/parsers/flow');
+const {parseFile} = require('../../../src/parsers/utils');
+const FlowParser = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GeneratePropsJavaInterface');
 const fs = require('fs');
 
@@ -21,7 +22,10 @@ const fixtures = fs.readdirSync(FIXTURE_DIR);
 fixtures.forEach(fixture => {
   it(`GeneratePropsJavaInterface can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
+    const schema = parseFile(
+      `${FIXTURE_DIR}/${fixture}`,
+      FlowParser.buildSchema,
+    );
     const output = generator.generate(libName, schema, undefined, false);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GenerateShadowNodeCpp-test.js b/packages/react-native-codegen/e2e/__tests__/components/GenerateShadowNodeCpp-test.js
index 39e88c5f1c33..a4fa38bddab7 100644
--- a/packages/react-native-codegen/e2e/__tests__/components/GenerateShadowNodeCpp-test.js
+++ b/packages/react-native-codegen/e2e/__tests__/components/GenerateShadowNodeCpp-test.js
@@ -4,14 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const parser = require('../../../src/parsers/flow');
+const {parseFile} = require('../../../src/parsers/utils');
+const FlowParser = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GenerateShadowNodeCpp');
 const fs = require('fs');
 
@@ -21,7 +22,10 @@ const fixtures = fs.readdirSync(FIXTURE_DIR);
 fixtures.forEach(fixture => {
   it(`GenerateShadowNodeCpp can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
+    const schema = parseFile(
+      `${FIXTURE_DIR}/${fixture}`,
+      FlowParser.buildSchema,
+    );
     const output = generator.generate(libName, schema, undefined, false);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GenerateShadowNodeH-test.js b/packages/react-native-codegen/e2e/__tests__/components/GenerateShadowNodeH-test.js
index 330625b57b47..0af0ba44f4b2 100644
--- a/packages/react-native-codegen/e2e/__tests__/components/GenerateShadowNodeH-test.js
+++ b/packages/react-native-codegen/e2e/__tests__/components/GenerateShadowNodeH-test.js
@@ -4,14 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const parser = require('../../../src/parsers/flow');
+const {parseFile} = require('../../../src/parsers/utils');
+const FlowParser = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GenerateShadowNodeH');
 const fs = require('fs');
 
@@ -21,7 +22,10 @@ const fixtures = fs.readdirSync(FIXTURE_DIR);
 fixtures.forEach(fixture => {
   it(`GenerateShadowNodeH can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
+    const schema = parseFile(
+      `${FIXTURE_DIR}/${fixture}`,
+      FlowParser.buildSchema,
+    );
     const output = generator.generate(libName, schema, undefined, false);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GenerateViewConfigJs-test.js b/packages/react-native-codegen/e2e/__tests__/components/GenerateViewConfigJs-test.js
index 116a74ef1faa..fa4d90797ba4 100644
--- a/packages/react-native-codegen/e2e/__tests__/components/GenerateViewConfigJs-test.js
+++ b/packages/react-native-codegen/e2e/__tests__/components/GenerateViewConfigJs-test.js
@@ -4,14 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const parser = require('../../../src/parsers/flow');
+const {parseFile} = require('../../../src/parsers/utils');
+const FlowParser = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GenerateViewConfigJs');
 const fs = require('fs');
 
@@ -22,7 +23,10 @@ const fixtures = fs.readdirSync(FIXTURE_DIR);
 fixtures.forEach(fixture => {
   it(`GenerateViewConfigJs can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
+    const schema = parseFile(
+      `${FIXTURE_DIR}/${fixture}`,
+      FlowParser.buildSchema,
+    );
     const output = generator.generate(libName, schema);
     expect(output).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateEventEmitterH-test.js.snap b/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateEventEmitterH-test.js.snap
index 8ea473f15a68..e7be3226bd8c 100644
--- a/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateEventEmitterH-test.js.snap
+++ b/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateEventEmitterH-test.js.snap
@@ -19,7 +19,14 @@ Object {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT ArrayPropsNativeComponentViewEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
 
+  
+
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -46,7 +53,14 @@ Object {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT BooleanPropNativeComponentViewEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
 
+  
+
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -73,7 +87,14 @@ Object {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT ColorPropNativeComponentViewEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -100,7 +121,14 @@ Object {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT EdgeInsetsPropNativeComponentViewEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -127,7 +155,14 @@ Object {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT EnumPropNativeComponentViewEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -281,7 +316,14 @@ Object {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT FloatPropsNativeComponentViewEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -308,7 +350,14 @@ Object {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT ImagePropNativeComponentViewEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -335,7 +384,14 @@ Object {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT IntegerPropNativeComponentViewEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
 
+  
+
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -398,7 +454,14 @@ Object {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT MultiNativePropNativeComponentViewEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -425,7 +488,14 @@ Object {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT NoPropsNoEventsNativeComponentViewEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -452,7 +522,14 @@ Object {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT ObjectPropsNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
 
+  
+
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -479,7 +556,14 @@ Object {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT PointPropNativeComponentViewEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
 
+  
+
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -506,7 +590,14 @@ Object {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT StringPropNativeComponentViewEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
diff --git a/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateShadowNodeH-test.js.snap b/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateShadowNodeH-test.js.snap
index 84724fbf4bd8..15357bb25717 100644
--- a/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateShadowNodeH-test.js.snap
+++ b/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateShadowNodeH-test.js.snap
@@ -14,7 +14,9 @@ Object {
 
 #pragma once
 
+#include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -28,7 +30,9 @@ JSI_EXPORT extern const char ArrayPropsNativeComponentViewComponentName[];
  */
 using ArrayPropsNativeComponentViewShadowNode = ConcreteViewShadowNode<
     ArrayPropsNativeComponentViewComponentName,
-    ArrayPropsNativeComponentViewProps>;
+    ArrayPropsNativeComponentViewProps,
+    ArrayPropsNativeComponentViewEventEmitter,
+    ArrayPropsNativeComponentViewState>;
 
 } // namespace react
 } // namespace facebook
@@ -50,7 +54,9 @@ Object {
 
 #pragma once
 
+#include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -64,7 +70,9 @@ JSI_EXPORT extern const char BooleanPropNativeComponentViewComponentName[];
  */
 using BooleanPropNativeComponentViewShadowNode = ConcreteViewShadowNode<
     BooleanPropNativeComponentViewComponentName,
-    BooleanPropNativeComponentViewProps>;
+    BooleanPropNativeComponentViewProps,
+    BooleanPropNativeComponentViewEventEmitter,
+    BooleanPropNativeComponentViewState>;
 
 } // namespace react
 } // namespace facebook
@@ -86,7 +94,9 @@ Object {
 
 #pragma once
 
+#include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -100,7 +110,9 @@ JSI_EXPORT extern const char ColorPropNativeComponentViewComponentName[];
  */
 using ColorPropNativeComponentViewShadowNode = ConcreteViewShadowNode<
     ColorPropNativeComponentViewComponentName,
-    ColorPropNativeComponentViewProps>;
+    ColorPropNativeComponentViewProps,
+    ColorPropNativeComponentViewEventEmitter,
+    ColorPropNativeComponentViewState>;
 
 } // namespace react
 } // namespace facebook
@@ -122,7 +134,9 @@ Object {
 
 #pragma once
 
+#include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -136,7 +150,9 @@ JSI_EXPORT extern const char EdgeInsetsPropNativeComponentViewComponentName[];
  */
 using EdgeInsetsPropNativeComponentViewShadowNode = ConcreteViewShadowNode<
     EdgeInsetsPropNativeComponentViewComponentName,
-    EdgeInsetsPropNativeComponentViewProps>;
+    EdgeInsetsPropNativeComponentViewProps,
+    EdgeInsetsPropNativeComponentViewEventEmitter,
+    EdgeInsetsPropNativeComponentViewState>;
 
 } // namespace react
 } // namespace facebook
@@ -158,7 +174,9 @@ Object {
 
 #pragma once
 
+#include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -172,7 +190,9 @@ JSI_EXPORT extern const char EnumPropNativeComponentViewComponentName[];
  */
 using EnumPropNativeComponentViewShadowNode = ConcreteViewShadowNode<
     EnumPropNativeComponentViewComponentName,
-    EnumPropNativeComponentViewProps>;
+    EnumPropNativeComponentViewProps,
+    EnumPropNativeComponentViewEventEmitter,
+    EnumPropNativeComponentViewState>;
 
 } // namespace react
 } // namespace facebook
@@ -196,6 +216,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -210,7 +231,8 @@ JSI_EXPORT extern const char EventNestedObjectPropsNativeComponentViewComponentN
 using EventNestedObjectPropsNativeComponentViewShadowNode = ConcreteViewShadowNode<
     EventNestedObjectPropsNativeComponentViewComponentName,
     EventNestedObjectPropsNativeComponentViewProps,
-EventNestedObjectPropsNativeComponentViewEventEmitter>;
+    EventNestedObjectPropsNativeComponentViewEventEmitter,
+    EventNestedObjectPropsNativeComponentViewState>;
 
 } // namespace react
 } // namespace facebook
@@ -234,6 +256,7 @@ Object {
 
 #include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -248,7 +271,8 @@ JSI_EXPORT extern const char EventPropsNativeComponentViewComponentName[];
 using EventPropsNativeComponentViewShadowNode = ConcreteViewShadowNode<
     EventPropsNativeComponentViewComponentName,
     EventPropsNativeComponentViewProps,
-EventPropsNativeComponentViewEventEmitter>;
+    EventPropsNativeComponentViewEventEmitter,
+    EventPropsNativeComponentViewState>;
 
 } // namespace react
 } // namespace facebook
@@ -270,7 +294,9 @@ Object {
 
 #pragma once
 
+#include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -284,7 +310,9 @@ JSI_EXPORT extern const char FloatPropsNativeComponentViewComponentName[];
  */
 using FloatPropsNativeComponentViewShadowNode = ConcreteViewShadowNode<
     FloatPropsNativeComponentViewComponentName,
-    FloatPropsNativeComponentViewProps>;
+    FloatPropsNativeComponentViewProps,
+    FloatPropsNativeComponentViewEventEmitter,
+    FloatPropsNativeComponentViewState>;
 
 } // namespace react
 } // namespace facebook
@@ -306,7 +334,9 @@ Object {
 
 #pragma once
 
+#include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -320,7 +350,9 @@ JSI_EXPORT extern const char ImagePropNativeComponentViewComponentName[];
  */
 using ImagePropNativeComponentViewShadowNode = ConcreteViewShadowNode<
     ImagePropNativeComponentViewComponentName,
-    ImagePropNativeComponentViewProps>;
+    ImagePropNativeComponentViewProps,
+    ImagePropNativeComponentViewEventEmitter,
+    ImagePropNativeComponentViewState>;
 
 } // namespace react
 } // namespace facebook
@@ -342,7 +374,9 @@ Object {
 
 #pragma once
 
+#include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -356,7 +390,9 @@ JSI_EXPORT extern const char IntegerPropNativeComponentViewComponentName[];
  */
 using IntegerPropNativeComponentViewShadowNode = ConcreteViewShadowNode<
     IntegerPropNativeComponentViewComponentName,
-    IntegerPropNativeComponentViewProps>;
+    IntegerPropNativeComponentViewProps,
+    IntegerPropNativeComponentViewEventEmitter,
+    IntegerPropNativeComponentViewState>;
 
 } // namespace react
 } // namespace facebook
@@ -378,7 +414,9 @@ Object {
 
 #pragma once
 
+#include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -407,7 +445,9 @@ Object {
 
 #pragma once
 
+#include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -421,7 +461,9 @@ JSI_EXPORT extern const char MultiNativePropNativeComponentViewComponentName[];
  */
 using MultiNativePropNativeComponentViewShadowNode = ConcreteViewShadowNode<
     MultiNativePropNativeComponentViewComponentName,
-    MultiNativePropNativeComponentViewProps>;
+    MultiNativePropNativeComponentViewProps,
+    MultiNativePropNativeComponentViewEventEmitter,
+    MultiNativePropNativeComponentViewState>;
 
 } // namespace react
 } // namespace facebook
@@ -443,7 +485,9 @@ Object {
 
 #pragma once
 
+#include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -457,7 +501,9 @@ JSI_EXPORT extern const char NoPropsNoEventsNativeComponentViewComponentName[];
  */
 using NoPropsNoEventsNativeComponentViewShadowNode = ConcreteViewShadowNode<
     NoPropsNoEventsNativeComponentViewComponentName,
-    NoPropsNoEventsNativeComponentViewProps>;
+    NoPropsNoEventsNativeComponentViewProps,
+    NoPropsNoEventsNativeComponentViewEventEmitter,
+    NoPropsNoEventsNativeComponentViewState>;
 
 } // namespace react
 } // namespace facebook
@@ -479,7 +525,9 @@ Object {
 
 #pragma once
 
+#include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -493,7 +541,9 @@ JSI_EXPORT extern const char ObjectPropsNativeComponentComponentName[];
  */
 using ObjectPropsNativeComponentShadowNode = ConcreteViewShadowNode<
     ObjectPropsNativeComponentComponentName,
-    ObjectPropsNativeComponentProps>;
+    ObjectPropsNativeComponentProps,
+    ObjectPropsNativeComponentEventEmitter,
+    ObjectPropsNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -515,7 +565,9 @@ Object {
 
 #pragma once
 
+#include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -529,7 +581,9 @@ JSI_EXPORT extern const char PointPropNativeComponentViewComponentName[];
  */
 using PointPropNativeComponentViewShadowNode = ConcreteViewShadowNode<
     PointPropNativeComponentViewComponentName,
-    PointPropNativeComponentViewProps>;
+    PointPropNativeComponentViewProps,
+    PointPropNativeComponentViewEventEmitter,
+    PointPropNativeComponentViewState>;
 
 } // namespace react
 } // namespace facebook
@@ -551,7 +605,9 @@ Object {
 
 #pragma once
 
+#include <react/renderer/components/RNCodegenModuleFixtures/EventEmitters.h>
 #include <react/renderer/components/RNCodegenModuleFixtures/Props.h>
+#include <react/renderer/components/RNCodegenModuleFixtures/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -565,7 +621,9 @@ JSI_EXPORT extern const char StringPropNativeComponentViewComponentName[];
  */
 using StringPropNativeComponentViewShadowNode = ConcreteViewShadowNode<
     StringPropNativeComponentViewComponentName,
-    StringPropNativeComponentViewProps>;
+    StringPropNativeComponentViewProps,
+    StringPropNativeComponentViewEventEmitter,
+    StringPropNativeComponentViewState>;
 
 } // namespace react
 } // namespace facebook
diff --git a/packages/react-native-codegen/e2e/__tests__/modules/GenerateModuleObjCpp-test.js b/packages/react-native-codegen/e2e/__tests__/modules/GenerateModuleObjCpp-test.js
index 69ba5f7205ee..a6bb549d056a 100644
--- a/packages/react-native-codegen/e2e/__tests__/modules/GenerateModuleObjCpp-test.js
+++ b/packages/react-native-codegen/e2e/__tests__/modules/GenerateModuleObjCpp-test.js
@@ -4,14 +4,15 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
-const parser = require('../../../src/parsers/flow');
+const {parseFile} = require('../../../src/parsers/utils');
+const FlowParser = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/modules/GenerateModuleObjCpp');
 const fs = require('fs');
 
@@ -23,7 +24,10 @@ function getModules(): SchemaType {
   const filenames: Array<string> = fs.readdirSync(FIXTURE_DIR);
   return filenames.reduce<SchemaType>(
     (accumulator, file) => {
-      const schema = parser.parseFile(`${FIXTURE_DIR}/${file}`);
+      const schema = parseFile(
+        `${FIXTURE_DIR}/${file}`,
+        FlowParser.buildSchema,
+      );
       return {
         modules: {
           ...accumulator.modules,
diff --git a/packages/react-native-codegen/package.json b/packages/react-native-codegen/package.json
index bcc2c3922db9..48240b88ee75 100644
--- a/packages/react-native-codegen/package.json
+++ b/packages/react-native-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-codegen",
-  "version": "0.70.3",
+  "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": {
@@ -10,7 +10,7 @@
   },
   "scripts": {
     "build": "yarn clean && node scripts/build.js --verbose",
-    "clean": "rm -rf lib",
+    "clean": "rimraf lib",
     "prepare": "yarn run build"
   },
   "license": "MIT",
@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "@babel/parser": "^7.14.0",
-    "flow-parser": "^0.121.0",
+    "flow-parser": "^0.185.0",
     "jscodeshift": "^0.13.1",
     "nullthrows": "^1.1.1"
   },
@@ -33,11 +33,13 @@
     "@babel/plugin-transform-async-to-generator": "^7.0.0",
     "@babel/plugin-transform-destructuring": "^7.0.0",
     "@babel/plugin-transform-flow-strip-types": "^7.0.0",
+    "@babel/preset-env": "^7.14.0",
     "chalk": "^4.0.0",
     "glob": "^7.1.1",
     "invariant": "^2.2.4",
     "micromatch": "^4.0.4",
     "mkdirp": "^0.5.1",
-    "prettier": "^2.4.1"
+    "prettier": "^2.4.1",
+    "rimraf": "^3.0.2"
   }
 }
diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js
index 8776caaa9232..6884ca30710b 100644
--- a/packages/react-native-codegen/src/CodegenSchema.js
+++ b/packages/react-native-codegen/src/CodegenSchema.js
@@ -182,7 +182,8 @@ export type ReservedPropTypeAnnotation = $ReadOnly<{
     | 'ColorPrimitive'
     | 'ImageSourcePrimitive'
     | 'PointPrimitive'
-    | 'EdgeInsetsPrimitive',
+    | 'EdgeInsetsPrimitive'
+    | 'ImageRequestPrimitive',
 }>;
 
 export type CommandTypeAnnotation = FunctionTypeAnnotation<
@@ -282,6 +283,11 @@ export type NativeModuleBooleanTypeAnnotation = $ReadOnly<{
   type: 'BooleanTypeAnnotation',
 }>;
 
+export type NativeModuleEnumDeclaration = $ReadOnly<{
+  type: 'EnumDeclaration',
+  memberType: 'NumberTypeAnnotation' | 'StringTypeAnnotation',
+}>;
+
 export type NativeModuleGenericObjectTypeAnnotation = $ReadOnly<{
   type: 'GenericObjectTypeAnnotation',
 }>;
@@ -295,6 +301,16 @@ export type NativeModulePromiseTypeAnnotation = $ReadOnly<{
   type: 'PromiseTypeAnnotation',
 }>;
 
+export type UnionTypeAnnotationMemberType =
+  | 'NumberTypeAnnotation'
+  | 'ObjectTypeAnnotation'
+  | 'StringTypeAnnotation';
+
+export type NativeModuleUnionTypeAnnotation = $ReadOnly<{
+  type: 'UnionTypeAnnotation',
+  memberType: UnionTypeAnnotationMemberType,
+}>;
+
 export type NativeModuleMixedTypeAnnotation = $ReadOnly<{
   type: 'MixedTypeAnnotation',
 }>;
@@ -306,11 +322,13 @@ export type NativeModuleBaseTypeAnnotation =
   | NativeModuleDoubleTypeAnnotation
   | NativeModuleFloatTypeAnnotation
   | NativeModuleBooleanTypeAnnotation
+  | NativeModuleEnumDeclaration
   | NativeModuleGenericObjectTypeAnnotation
   | ReservedTypeAnnotation
   | NativeModuleTypeAliasTypeAnnotation
   | NativeModuleArrayTypeAnnotation<Nullable<NativeModuleBaseTypeAnnotation>>
   | NativeModuleObjectTypeAnnotation
+  | NativeModuleUnionTypeAnnotation
   | NativeModuleMixedTypeAnnotation;
 
 export type NativeModuleParamTypeAnnotation =
diff --git a/packages/react-native-codegen/src/SchemaValidator.js b/packages/react-native-codegen/src/SchemaValidator.js
index 887c6eb60a9c..87ded8848457 100644
--- a/packages/react-native-codegen/src/SchemaValidator.js
+++ b/packages/react-native-codegen/src/SchemaValidator.js
@@ -15,7 +15,7 @@ const nullthrows = require('nullthrows');
 import type {SchemaType} from './CodegenSchema';
 
 function getErrors(schema: SchemaType): $ReadOnlyArray<string> {
-  const errors = new Set();
+  const errors = new Set<string>();
 
   // Map of component name -> Array of module names
   const componentModules: Map<string, Array<string>> = new Map();
diff --git a/packages/react-native-codegen/src/__tests__/SchemaValidator-test.js b/packages/react-native-codegen/src/__tests__/SchemaValidator-test.js
index 1a5896a7b158..4d18b80c4d8d 100644
--- a/packages/react-native-codegen/src/__tests__/SchemaValidator-test.js
+++ b/packages/react-native-codegen/src/__tests__/SchemaValidator-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/cli/combine/__tests__/combine-utils-test.js b/packages/react-native-codegen/src/cli/combine/__tests__/combine-utils-test.js
new file mode 100644
index 000000000000..84acd9ee5562
--- /dev/null
+++ b/packages/react-native-codegen/src/cli/combine/__tests__/combine-utils-test.js
@@ -0,0 +1,208 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall react_native
+ */
+
+'use-strict';
+
+const {parseArgs, filterJSFile} = require('../combine-utils.js');
+
+describe('parseArgs', () => {
+  const nodeBin = 'node';
+  const combineApp = 'app';
+  const schemaJson = 'schema.json';
+  const specFile1 = 'NativeSpec.js';
+  const specFile2 = 'SpecNativeComponent.js';
+
+  describe('when no platform provided', () => {
+    it('returns null platform, schema and fileList', () => {
+      const {platform, outfile, fileList} = parseArgs([
+        nodeBin,
+        combineApp,
+        schemaJson,
+        specFile1,
+        specFile2,
+      ]);
+
+      expect(platform).toBeNull();
+      expect(outfile).toBe(schemaJson);
+      expect(fileList).toStrictEqual([specFile1, specFile2]);
+    });
+  });
+
+  describe('when platform passed with --platform', () => {
+    it('returns the platform, the schema and the fileList', () => {
+      const {platform, outfile, fileList} = parseArgs([
+        nodeBin,
+        combineApp,
+        '--platform',
+        'ios',
+        schemaJson,
+        specFile1,
+        specFile2,
+      ]);
+
+      expect(platform).toBe('ios');
+      expect(outfile).toBe(schemaJson);
+      expect(fileList).toStrictEqual([specFile1, specFile2]);
+    });
+  });
+
+  describe('when platform passed with -p', () => {
+    it('returns the platform, the schema and the fileList', () => {
+      const {platform, outfile, fileList} = parseArgs([
+        nodeBin,
+        combineApp,
+        '-p',
+        'android',
+        schemaJson,
+        specFile1,
+        specFile2,
+      ]);
+
+      expect(platform).toBe('android');
+      expect(outfile).toBe(schemaJson);
+      expect(fileList).toStrictEqual([specFile1, specFile2]);
+    });
+  });
+});
+
+describe('filterJSFile', () => {
+  describe('When the file is not a Spec file', () => {
+    it('when no platform is passed, return false', () => {
+      const file = 'anyJSFile.js';
+      const result = filterJSFile(file);
+      expect(result).toBeFalsy();
+    });
+
+    it('when ios is passed and the file is iOS specific, return false', () => {
+      const file = 'anyJSFile.ios.js';
+      const result = filterJSFile(file);
+      expect(result).toBeFalsy();
+    });
+
+    it('when android is passed and the file is android specific, return false', () => {
+      const file = 'anyJSFile.android.js';
+      const result = filterJSFile(file);
+      expect(result).toBeFalsy();
+    });
+  });
+
+  describe('When the file is NativeUIManager', () => {
+    it('returns false', () => {
+      const file = 'NativeUIManager.js';
+      const result = filterJSFile(file);
+      expect(result).toBeFalsy();
+    });
+  });
+
+  describe('When the file is NativeSampleTurboModule', () => {
+    it('returns false', () => {
+      const file = 'NativeSampleTurboModule.js';
+      const result = filterJSFile(file);
+      expect(result).toBeFalsy();
+    });
+  });
+
+  describe('When the file is a test file', () => {
+    it('returns false', () => {
+      const file = '__tests__/NativeModule-test.js';
+      const result = filterJSFile(file);
+      expect(result).toBeFalsy();
+    });
+  });
+
+  describe('When the file is a TS type def', () => {
+    it('returns false', () => {
+      const file = 'NativeModule.d.ts';
+      const result = filterJSFile(file);
+      expect(result).toBeFalsy();
+    });
+  });
+
+  describe('When the file is valid and it is platform agnostic', () => {
+    const file = 'NativeModule.js';
+    it('if the platform is null, returns true', () => {
+      const result = filterJSFile(file);
+      expect(result).toBeTruthy();
+    });
+    it('if the platform is ios, returns true', () => {
+      const result = filterJSFile(file, 'ios');
+      expect(result).toBeTruthy();
+    });
+    it('if the platform is android, returns true', () => {
+      const result = filterJSFile(file, 'android');
+      expect(result).toBeTruthy();
+    });
+    it('if the platform is windows, returns false', () => {
+      const result = filterJSFile(file, 'windows');
+      expect(result).toBeTruthy();
+    });
+  });
+
+  describe('When the file is valid and it is iOS specific', () => {
+    const file = 'MySampleNativeComponent.ios.js';
+    it('if the platform is null, returns false', () => {
+      const result = filterJSFile(file);
+      expect(result).toBeFalsy();
+    });
+    it('if the platform is ios, returns true', () => {
+      const result = filterJSFile(file, 'ios');
+      expect(result).toBeTruthy();
+    });
+    it('if the platform is android, returns false', () => {
+      const result = filterJSFile(file, 'android');
+      expect(result).toBeFalsy();
+    });
+    it('if the platform is windows, returns false', () => {
+      const result = filterJSFile(file, 'windows');
+      expect(result).toBeFalsy();
+    });
+  });
+
+  describe('When the file is valid and it is Android specific', () => {
+    const file = 'MySampleNativeComponent.android.js';
+    it('if the platform is null, returns false', () => {
+      const result = filterJSFile(file);
+      expect(result).toBeFalsy();
+    });
+    it('if the platform is ios, returns false', () => {
+      const result = filterJSFile(file, 'ios');
+      expect(result).toBeFalsy();
+    });
+    it('if the platform is android, returns true', () => {
+      const result = filterJSFile(file, 'android');
+      expect(result).toBeTruthy();
+    });
+    it('if the platform is windows, returns false', () => {
+      const result = filterJSFile(file, 'windows');
+      expect(result).toBeFalsy();
+    });
+  });
+
+  describe('When the file is valid and it is Windows specific', () => {
+    const file = 'MySampleNativeComponent.windows.js';
+    it('if the platform is null, returns false', () => {
+      const result = filterJSFile(file);
+      expect(result).toBeFalsy();
+    });
+    it('if the platform is ios, returns false', () => {
+      const result = filterJSFile(file, 'ios');
+      expect(result).toBeFalsy();
+    });
+    it('if the platform is android, returns false', () => {
+      const result = filterJSFile(file, 'android');
+      expect(result).toBeFalsy();
+    });
+    it('if the platform is windows, returns true', () => {
+      const result = filterJSFile(file, 'windows');
+      expect(result).toBeTruthy();
+    });
+  });
+});
diff --git a/packages/react-native-codegen/src/cli/combine/combine-js-to-schema-cli.js b/packages/react-native-codegen/src/cli/combine/combine-js-to-schema-cli.js
index 1c8fc7bc2f43..00fadf3dd661 100644
--- a/packages/react-native-codegen/src/cli/combine/combine-js-to-schema-cli.js
+++ b/packages/react-native-codegen/src/cli/combine/combine-js-to-schema-cli.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
@@ -14,22 +14,9 @@
 const combine = require('./combine-js-to-schema');
 const fs = require('fs');
 const glob = require('glob');
-const path = require('path');
+const {parseArgs, filterJSFile} = require('./combine-utils');
 
-const [outfile, ...fileList] = process.argv.slice(2);
-
-function filterJSFile(file: string) {
-  return (
-    /^(Native.+|.+NativeComponent)/.test(path.basename(file)) &&
-    // NativeUIManager will be deprecated by Fabric UIManager.
-    // For now, ignore this spec completely because the types are not fully supported.
-    !file.endsWith('NativeUIManager.js') &&
-    // NativeSampleTurboModule is for demo purpose. It should be added manually to the
-    // app for now.
-    !file.endsWith('NativeSampleTurboModule.js') &&
-    !file.includes('__tests')
-  );
-}
+const {platform, outfile, fileList} = parseArgs(process.argv);
 
 const allFiles = [];
 fileList.forEach(file => {
@@ -38,7 +25,7 @@ fileList.forEach(file => {
       .sync(`${file}/**/*.{js,ts,tsx}`, {
         nodir: true,
       })
-      .filter(filterJSFile);
+      .filter(element => filterJSFile(element, platform));
     allFiles.push(...dirFiles);
   } else if (filterJSFile(file)) {
     allFiles.push(file);
diff --git a/packages/react-native-codegen/src/cli/combine/combine-js-to-schema.js b/packages/react-native-codegen/src/cli/combine/combine-js-to-schema.js
index 71550527915e..e4bc8780db67 100644
--- a/packages/react-native-codegen/src/cli/combine/combine-js-to-schema.js
+++ b/packages/react-native-codegen/src/cli/combine/combine-js-to-schema.js
@@ -11,6 +11,7 @@
 'use strict';
 import type {SchemaType} from '../../CodegenSchema.js';
 
+const {parseFile} = require('../../parsers/utils');
 const FlowParser = require('../../parsers/flow');
 const TypeScriptParser = require('../../parsers/typescript');
 const fs = require('fs');
@@ -29,9 +30,10 @@ function combineSchemas(files: Array<string>): SchemaType {
         const isTypeScript =
           path.extname(filename) === '.ts' || path.extname(filename) === '.tsx';
 
-        const schema = isTypeScript
-          ? TypeScriptParser.parseFile(filename)
-          : FlowParser.parseFile(filename);
+        const schema = parseFile(
+          filename,
+          isTypeScript ? TypeScriptParser.buildSchema : FlowParser.buildSchema,
+        );
 
         if (schema && schema.modules) {
           merged.modules = {...merged.modules, ...schema.modules};
diff --git a/packages/react-native-codegen/src/cli/combine/combine-utils.js b/packages/react-native-codegen/src/cli/combine/combine-utils.js
new file mode 100644
index 000000000000..5dad6e041b6b
--- /dev/null
+++ b/packages/react-native-codegen/src/cli/combine/combine-utils.js
@@ -0,0 +1,85 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall react_native
+ */
+
+'use strict';
+
+const path = require('path');
+
+function parseArgs(args: string[]): {
+  platform: ?string,
+  outfile: string,
+  fileList: string[],
+} {
+  if (args.length > 2 && ['-p', '--platform'].indexOf(args[2]) >= 0) {
+    const [outfile, ...fileList] = args.slice(4);
+    return {
+      platform: args[3],
+      outfile,
+      fileList,
+    };
+  }
+
+  const [outfile, ...fileList] = args.slice(2);
+  return {
+    platform: null,
+    outfile,
+    fileList,
+  };
+}
+
+/**
+ * This function is used by the CLI to decide whether a JS/TS file has to be processed or not by the Codegen.
+ * Parameters:
+ *   - file: the path to the file
+ *   - currentPlatform: the current platform for which we are creating the specs
+ * Returns: `true` if the file can be used to generate some code; `false` otherwise
+ *
+ */
+function filterJSFile(file: string, currentPlatform: ?string): boolean {
+  const isSpecFile = /^(Native.+|.+NativeComponent)/.test(path.basename(file));
+  const isNotNativeUIManager = !file.endsWith('NativeUIManager.js');
+  const isNotNativeSampleTurboModule = !file.endsWith(
+    'NativeSampleTurboModule.js',
+  );
+  const isNotTest = !file.includes('__tests');
+  const isNotTSTypeDefinition = !file.endsWith('.d.ts');
+
+  const isValidCandidate =
+    isSpecFile &&
+    isNotNativeUIManager &&
+    isNotNativeSampleTurboModule &&
+    isNotTest &&
+    isNotTSTypeDefinition;
+
+  const filenameComponents = path.basename(file).split('.');
+  const isPlatformAgnostic = filenameComponents.length === 2;
+
+  if (currentPlatform == null) {
+    // need to accept only files that are platform agnostic
+    return isValidCandidate && isPlatformAgnostic;
+  }
+
+  // If a platform is passed, accept both platform agnostic specs...
+  if (isPlatformAgnostic) {
+    return isValidCandidate;
+  }
+
+  // ...and specs that share the same platform as the one passed.
+  // specfiles must follow the pattern: <filename>[.<platform>].(js|ts|tsx)
+  const filePlatform =
+    filenameComponents.length > 2 ? filenameComponents[1] : 'unknown';
+  return isValidCandidate && currentPlatform === filePlatform;
+}
+
+module.exports = {
+  parseArgs,
+  filterJSFile,
+};
diff --git a/packages/react-native-codegen/src/cli/generators/generate-all.js b/packages/react-native-codegen/src/cli/generators/generate-all.js
index 6ceeedc9eb9b..46d207510208 100644
--- a/packages/react-native-codegen/src/cli/generators/generate-all.js
+++ b/packages/react-native-codegen/src/cli/generators/generate-all.js
@@ -55,6 +55,7 @@ RNCodegen.generate(
       'descriptors',
       'events',
       'props',
+      'states',
       'tests',
       'shadow-nodes',
       'modulesAndroid',
diff --git a/packages/react-native-codegen/src/cli/parser/parser-cli.js b/packages/react-native-codegen/src/cli/parser/parser-cli.js
index f6edb7da44bb..084b11c7adec 100644
--- a/packages/react-native-codegen/src/cli/parser/parser-cli.js
+++ b/packages/react-native-codegen/src/cli/parser/parser-cli.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/cli/parser/parser.js b/packages/react-native-codegen/src/cli/parser/parser.js
index af0dbb17f783..1afc70035bc0 100644
--- a/packages/react-native-codegen/src/cli/parser/parser.js
+++ b/packages/react-native-codegen/src/cli/parser/parser.js
@@ -11,6 +11,7 @@
 'use strict';
 
 const path = require('path');
+const {parseFile} = require('../../parsers/utils');
 const FlowParser = require('../../parsers/flow');
 const TypeScriptParser = require('../../parsers/typescript');
 
@@ -22,9 +23,10 @@ function parseFiles(files: Array<string>) {
     console.log(
       filename,
       JSON.stringify(
-        isTypeScript
-          ? TypeScriptParser.parseFile(filename)
-          : FlowParser.parseFile(filename),
+        parseFile(
+          filename,
+          isTypeScript ? TypeScriptParser.buildSchema : FlowParser.buildSchema,
+        ),
         null,
         2,
       ),
diff --git a/packages/react-native-codegen/src/generators/RNCodegen.js b/packages/react-native-codegen/src/generators/RNCodegen.js
index 78004999db3a..b2648c626c1a 100644
--- a/packages/react-native-codegen/src/generators/RNCodegen.js
+++ b/packages/react-native-codegen/src/generators/RNCodegen.js
@@ -23,6 +23,8 @@ const generateEventEmitterCpp = require('./components/GenerateEventEmitterCpp.js
 const generateEventEmitterH = require('./components/GenerateEventEmitterH.js');
 const generatePropsCpp = require('./components/GeneratePropsCpp.js');
 const generatePropsH = require('./components/GeneratePropsH.js');
+const generateStateCpp = require('./components/GenerateStateCpp.js');
+const generateStateH = require('./components/GenerateStateH.js');
 const generateModuleH = require('./modules/GenerateModuleH.js');
 const generateModuleCpp = require('./modules/GenerateModuleCpp.js');
 const generateModuleObjCpp = require('./modules/GenerateModuleObjCpp');
@@ -61,6 +63,7 @@ type LibraryGenerators =
   | 'descriptors'
   | 'events'
   | 'props'
+  | 'states'
   | 'tests'
   | 'shadow-nodes'
   | 'modulesAndroid'
@@ -82,6 +85,7 @@ type SchemasConfig = $ReadOnly<{
 const LIBRARY_GENERATORS = {
   descriptors: [generateComponentDescriptorH.generate],
   events: [generateEventEmitterCpp.generate, generateEventEmitterH.generate],
+  states: [generateStateCpp.generate, generateStateH.generate],
   props: [
     generateComponentHObjCpp.generate,
     generatePropsCpp.generate,
@@ -97,6 +101,8 @@ const LIBRARY_GENERATORS = {
     generateEventEmitterH.generate,
     generatePropsCpp.generate,
     generatePropsH.generate,
+    generateStateCpp.generate,
+    generateStateH.generate,
     generateShadowNodeCpp.generate,
     generateShadowNodeH.generate,
     // Java files
@@ -110,6 +116,8 @@ const LIBRARY_GENERATORS = {
     generateComponentHObjCpp.generate,
     generatePropsCpp.generate,
     generatePropsH.generate,
+    generateStateCpp.generate,
+    generateStateH.generate,
     generateShadowNodeCpp.generate,
     generateShadowNodeH.generate,
   ],
@@ -211,6 +219,7 @@ module.exports = {
       descriptors: outputDirectory,
       events: outputDirectory,
       props: outputDirectory,
+      states: outputDirectory,
       componentsAndroid: outputDirectory,
       modulesAndroid: outputDirectory,
       modulesCxx: outputDirectory,
diff --git a/packages/react-native-codegen/src/generators/__tests__/RNCodegen-test.js b/packages/react-native-codegen/src/generators/__tests__/RNCodegen-test.js
index 4cc51277d1d0..44a70349ab2e 100644
--- a/packages/react-native-codegen/src/generators/__tests__/RNCodegen-test.js
+++ b/packages/react-native-codegen/src/generators/__tests__/RNCodegen-test.js
@@ -4,46 +4,50 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
 const rnCodegen = require('../RNCodegen.js');
 const fixture = require('../__test_fixtures__/fixtures.js');
-const path = require('path');
-
-const outputDirectory = 'tmp/out/';
 const packageName = 'na';
 
 describe('RNCodegen.generate', () => {
   beforeEach(() => {
     jest.resetModules();
   });
-  it('when type `all`, with default paths', () => {
-    const componentsOutputDir = 'react/renderer/components/library';
-    const modulesOutputDir = 'library';
-
-    const expectedPaths = {
-      'library.h': modulesOutputDir,
-      'library-generated.mm': modulesOutputDir,
-      'ShadowNodes.h': componentsOutputDir,
-      'ShadowNodes.cpp': componentsOutputDir,
-      'Props.h': componentsOutputDir,
-      'Props.cpp': componentsOutputDir,
-      'RCTComponentViewHelpers.h': componentsOutputDir,
-      'EventEmitters.h': componentsOutputDir,
-      'EventEmitters.cpp': componentsOutputDir,
-      'ComponentDescriptors.h': componentsOutputDir,
-    };
 
+  it('when type `all`, with default paths', () => {
     jest.mock('fs', () => ({
       existsSync: location => {
         return true;
       },
       writeFileSync: (location, content) => {
+        // Jest in the OSS does not allow to capture variables in closures.
+        // Therefore, we have to bring the variables inside the closure.
+        // see: https://github.com/facebook/jest/issues/2567
+        const path = require('path');
+        const outputDirectory = 'tmp/out/';
+        const componentsOutputDir = 'react/renderer/components/library';
+        const modulesOutputDir = 'library';
+        const expectedPaths = {
+          'library.h': modulesOutputDir,
+          'library-generated.mm': modulesOutputDir,
+          'ShadowNodes.h': componentsOutputDir,
+          'ShadowNodes.cpp': componentsOutputDir,
+          'Props.h': componentsOutputDir,
+          'Props.cpp': componentsOutputDir,
+          'States.h': componentsOutputDir,
+          'States.cpp': componentsOutputDir,
+          'RCTComponentViewHelpers.h': componentsOutputDir,
+          'EventEmitters.h': componentsOutputDir,
+          'EventEmitters.cpp': componentsOutputDir,
+          'ComponentDescriptors.h': componentsOutputDir,
+        };
+
         let receivedDir = path.dirname(location);
         let receivedBasename = path.basename(location);
 
@@ -55,6 +59,7 @@ describe('RNCodegen.generate', () => {
       },
     }));
 
+    const outputDirectory = 'tmp/out/';
     const res = rnCodegen.generate(
       {
         libraryName: 'library',
diff --git a/packages/react-native-codegen/src/generators/components/ComponentsGeneratorUtils.js b/packages/react-native-codegen/src/generators/components/ComponentsGeneratorUtils.js
new file mode 100644
index 000000000000..5e6b6c9aeb3b
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/components/ComponentsGeneratorUtils.js
@@ -0,0 +1,304 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {NamedShape, PropTypeAnnotation} from '../../CodegenSchema';
+
+import type {
+  StringTypeAnnotation,
+  ReservedPropTypeAnnotation,
+  ObjectTypeAnnotation,
+  Int32TypeAnnotation,
+  FloatTypeAnnotation,
+  DoubleTypeAnnotation,
+  BooleanTypeAnnotation,
+} from '../../CodegenSchema';
+
+const {
+  getCppTypeForAnnotation,
+  getEnumMaskName,
+  getEnumName,
+  generateStructName,
+  getImports,
+} = require('./CppHelpers.js');
+
+function getNativeTypeFromAnnotation(
+  componentName: string,
+  prop:
+    | NamedShape<PropTypeAnnotation>
+    | {
+        name: string,
+        typeAnnotation:
+          | $FlowFixMe
+          | DoubleTypeAnnotation
+          | FloatTypeAnnotation
+          | BooleanTypeAnnotation
+          | Int32TypeAnnotation
+          | StringTypeAnnotation
+          | ObjectTypeAnnotation<PropTypeAnnotation>
+          | ReservedPropTypeAnnotation
+          | {
+              +default: string,
+              +options: $ReadOnlyArray<string>,
+              +type: 'StringEnumTypeAnnotation',
+            }
+          | {
+              +elementType: ObjectTypeAnnotation<PropTypeAnnotation>,
+              +type: 'ArrayTypeAnnotation',
+            },
+      },
+  nameParts: $ReadOnlyArray<string>,
+): string {
+  const typeAnnotation = prop.typeAnnotation;
+
+  switch (typeAnnotation.type) {
+    case 'BooleanTypeAnnotation':
+    case 'StringTypeAnnotation':
+    case 'Int32TypeAnnotation':
+    case 'DoubleTypeAnnotation':
+    case 'FloatTypeAnnotation':
+      return getCppTypeForAnnotation(typeAnnotation.type);
+    case 'ReservedPropTypeAnnotation':
+      switch (typeAnnotation.name) {
+        case 'ColorPrimitive':
+          return 'SharedColor';
+        case 'ImageSourcePrimitive':
+          return 'ImageSource';
+        case 'ImageRequestPrimitive':
+          return 'ImageRequest';
+        case 'PointPrimitive':
+          return 'Point';
+        case 'EdgeInsetsPrimitive':
+          return 'EdgeInsets';
+        default:
+          (typeAnnotation.name: empty);
+          throw new Error('Received unknown ReservedPropTypeAnnotation');
+      }
+    case 'ArrayTypeAnnotation': {
+      const arrayType = typeAnnotation.elementType.type;
+      if (arrayType === 'ArrayTypeAnnotation') {
+        return `std::vector<${getNativeTypeFromAnnotation(
+          componentName,
+          {typeAnnotation: typeAnnotation.elementType, name: ''},
+          nameParts.concat([prop.name]),
+        )}>`;
+      }
+      if (arrayType === 'ObjectTypeAnnotation') {
+        const structName = generateStructName(
+          componentName,
+          nameParts.concat([prop.name]),
+        );
+        return `std::vector<${structName}>`;
+      }
+      if (arrayType === 'StringEnumTypeAnnotation') {
+        const enumName = getEnumName(componentName, prop.name);
+        return getEnumMaskName(enumName);
+      }
+      const itemAnnotation = getNativeTypeFromAnnotation(
+        componentName,
+        {
+          typeAnnotation: typeAnnotation.elementType,
+          name: componentName,
+        },
+        nameParts.concat([prop.name]),
+      );
+      return `std::vector<${itemAnnotation}>`;
+    }
+    case 'ObjectTypeAnnotation': {
+      return generateStructName(componentName, nameParts.concat([prop.name]));
+    }
+    case 'StringEnumTypeAnnotation':
+      return getEnumName(componentName, prop.name);
+    case 'Int32EnumTypeAnnotation':
+      return getEnumName(componentName, prop.name);
+    default:
+      (typeAnnotation: empty);
+      throw new Error(
+        `Received invalid typeAnnotation for ${componentName} prop ${prop.name}, received ${typeAnnotation.type}`,
+      );
+  }
+}
+
+/// This function process some types if we need to customize them
+/// For example, the ImageSource and the reserved types could be trasformed into
+/// const address instead of using them as plain types.
+function convertTypesToConstAddressIfNeeded(
+  type: string,
+  convertibleTypes: Set<string>,
+): string {
+  if (convertibleTypes.has(type)) {
+    return `${type} const &`;
+  }
+  return type;
+}
+
+function convertValueToSharedPointerWithMove(
+  type: string,
+  value: string,
+  convertibleTypes: Set<string>,
+): string {
+  if (convertibleTypes.has(type)) {
+    return `std::make_shared<${type}>(std::move(${value}))`;
+  }
+  return value;
+}
+
+function convertVariableToSharedPointer(
+  type: string,
+  convertibleTypes: Set<string>,
+): string {
+  if (convertibleTypes.has(type)) {
+    return `std::shared_ptr<${type}>`;
+  }
+  return type;
+}
+
+function convertVariableToPointer(
+  type: string,
+  value: string,
+  convertibleTypes: Set<string>,
+): string {
+  if (convertibleTypes.has(type)) {
+    return `*${value}`;
+  }
+  return value;
+}
+
+const convertCtorParamToAddressType = (type: string): string => {
+  const typesToConvert: Set<string> = new Set();
+  typesToConvert.add('ImageSource');
+
+  return convertTypesToConstAddressIfNeeded(type, typesToConvert);
+};
+
+const convertCtorInitToSharedPointers = (
+  type: string,
+  value: string,
+): string => {
+  const typesToConvert: Set<string> = new Set();
+  typesToConvert.add('ImageRequest');
+
+  return convertValueToSharedPointerWithMove(type, value, typesToConvert);
+};
+
+const convertGettersReturnTypeToAddressType = (type: string): string => {
+  const typesToConvert: Set<string> = new Set();
+  typesToConvert.add('ImageRequest');
+
+  return convertTypesToConstAddressIfNeeded(type, typesToConvert);
+};
+
+const convertVarTypeToSharedPointer = (type: string): string => {
+  const typesToConvert: Set<string> = new Set();
+  typesToConvert.add('ImageRequest');
+
+  return convertVariableToSharedPointer(type, typesToConvert);
+};
+
+const convertVarValueToPointer = (type: string, value: string): string => {
+  const typesToConvert: Set<string> = new Set();
+  typesToConvert.add('ImageRequest');
+
+  return convertVariableToPointer(type, value, typesToConvert);
+};
+
+function getLocalImports(
+  properties: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
+): Set<string> {
+  const imports: Set<string> = new Set();
+
+  function addImportsForNativeName(
+    name:
+      | 'ColorPrimitive'
+      | 'EdgeInsetsPrimitive'
+      | 'ImageSourcePrimitive'
+      | 'PointPrimitive'
+      | 'ImageRequestPrimitive',
+  ) {
+    switch (name) {
+      case 'ColorPrimitive':
+        imports.add('#include <react/renderer/graphics/Color.h>');
+        return;
+      case 'ImageSourcePrimitive':
+        imports.add('#include <react/renderer/imagemanager/primitives.h>');
+        return;
+      case 'ImageRequestPrimitive':
+        imports.add('#include <react/renderer/imagemanager/ImageRequest.h>');
+        return;
+      case 'PointPrimitive':
+        imports.add('#include <react/renderer/graphics/Geometry.h>');
+        return;
+      case 'EdgeInsetsPrimitive':
+        imports.add('#include <react/renderer/graphics/Geometry.h>');
+        return;
+      default:
+        (name: empty);
+        throw new Error(`Invalid ReservedPropTypeAnnotation name, got ${name}`);
+    }
+  }
+
+  properties.forEach(prop => {
+    const typeAnnotation = prop.typeAnnotation;
+
+    if (typeAnnotation.type === 'ReservedPropTypeAnnotation') {
+      addImportsForNativeName(typeAnnotation.name);
+    }
+
+    if (typeAnnotation.type === 'ArrayTypeAnnotation') {
+      imports.add('#include <vector>');
+      if (typeAnnotation.elementType.type === 'StringEnumTypeAnnotation') {
+        imports.add('#include <cinttypes>');
+      }
+    }
+
+    if (
+      typeAnnotation.type === 'ArrayTypeAnnotation' &&
+      typeAnnotation.elementType.type === 'ReservedPropTypeAnnotation'
+    ) {
+      addImportsForNativeName(typeAnnotation.elementType.name);
+    }
+
+    if (
+      typeAnnotation.type === 'ArrayTypeAnnotation' &&
+      typeAnnotation.elementType.type === 'ObjectTypeAnnotation'
+    ) {
+      const objectProps = typeAnnotation.elementType.properties;
+      const objectImports = getImports(objectProps);
+      const localImports = getLocalImports(objectProps);
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+      objectImports.forEach(imports.add, imports);
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+      localImports.forEach(imports.add, imports);
+    }
+
+    if (typeAnnotation.type === 'ObjectTypeAnnotation') {
+      imports.add('#include <react/renderer/core/propsConversions.h>');
+      const objectImports = getImports(typeAnnotation.properties);
+      const localImports = getLocalImports(typeAnnotation.properties);
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+      objectImports.forEach(imports.add, imports);
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
+      localImports.forEach(imports.add, imports);
+    }
+  });
+
+  return imports;
+}
+
+module.exports = {
+  getNativeTypeFromAnnotation,
+  convertCtorParamToAddressType,
+  convertGettersReturnTypeToAddressType,
+  convertCtorInitToSharedPointers,
+  convertVarTypeToSharedPointer,
+  convertVarValueToPointer,
+  getLocalImports,
+};
diff --git a/packages/react-native-codegen/src/generators/components/CppHelpers.js b/packages/react-native-codegen/src/generators/components/CppHelpers.js
index 608fd6d98127..2f222412878b 100644
--- a/packages/react-native-codegen/src/generators/components/CppHelpers.js
+++ b/packages/react-native-codegen/src/generators/components/CppHelpers.js
@@ -61,6 +61,7 @@ function getImports(
     name:
       | 'ColorPrimitive'
       | 'EdgeInsetsPrimitive'
+      | 'ImageRequestPrimitive'
       | 'ImageSourcePrimitive'
       | 'PointPrimitive',
   ) {
@@ -71,6 +72,8 @@ function getImports(
         return;
       case 'EdgeInsetsPrimitive':
         return;
+      case 'ImageRequestPrimitive':
+        return;
       case 'ImageSourcePrimitive':
         imports.add('#include <react/renderer/components/image/conversions.h>');
         return;
@@ -163,6 +166,8 @@ function convertDefaultTypeToString(
           return '';
         case 'ImageSourcePrimitive':
           return '';
+        case 'ImageRequestPrimitive':
+          return '';
         case 'PointPrimitive':
           return '';
         case 'EdgeInsetsPrimitive':
diff --git a/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js b/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js
index 269567575c02..f61ca1ac091a 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js
@@ -285,9 +285,7 @@ module.exports = {
       .filter(Boolean)
       .reduce((acc, components) => Object.assign(acc, components), {});
 
-    const moduleComponentsWithEvents = Object.keys(moduleComponents).filter(
-      componentName => moduleComponents[componentName].events.length > 0,
-    );
+    const moduleComponentsWithEvents = Object.keys(moduleComponents);
 
     const fileName = 'EventEmitters.h';
 
diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsH.js b/packages/react-native-codegen/src/generators/components/GeneratePropsH.js
index 26521b0cbb19..008c5d410611 100644
--- a/packages/react-native-codegen/src/generators/components/GeneratePropsH.js
+++ b/packages/react-native-codegen/src/generators/components/GeneratePropsH.js
@@ -9,25 +9,19 @@
  */
 
 'use strict';
-import type {
-  StringTypeAnnotation,
-  ReservedPropTypeAnnotation,
-  ObjectTypeAnnotation,
-  Int32TypeAnnotation,
-  FloatTypeAnnotation,
-  DoubleTypeAnnotation,
-  ComponentShape,
-  BooleanTypeAnnotation,
-} from '../../CodegenSchema';
+import type {ComponentShape} from '../../CodegenSchema';
+
+const {
+  getNativeTypeFromAnnotation,
+  getLocalImports,
+} = require('./ComponentsGeneratorUtils.js');
 
 const {
   convertDefaultTypeToString,
-  getCppTypeForAnnotation,
   getEnumMaskName,
   getEnumName,
   toSafeCppString,
   generateStructName,
-  getImports,
   toIntEnumValueName,
 } = require('./CppHelpers.js');
 
@@ -294,101 +288,6 @@ function getClassExtendString(component: ComponentShape): string {
   return extendString;
 }
 
-function getNativeTypeFromAnnotation(
-  componentName: string,
-  prop:
-    | NamedShape<PropTypeAnnotation>
-    | {
-        name: string,
-        typeAnnotation:
-          | $FlowFixMe
-          | DoubleTypeAnnotation
-          | FloatTypeAnnotation
-          | BooleanTypeAnnotation
-          | Int32TypeAnnotation
-          | StringTypeAnnotation
-          | ObjectTypeAnnotation<PropTypeAnnotation>
-          | ReservedPropTypeAnnotation
-          | {
-              +default: string,
-              +options: $ReadOnlyArray<string>,
-              +type: 'StringEnumTypeAnnotation',
-            }
-          | {
-              +elementType: ObjectTypeAnnotation<PropTypeAnnotation>,
-              +type: 'ArrayTypeAnnotation',
-            },
-      },
-  nameParts: $ReadOnlyArray<string>,
-): string {
-  const typeAnnotation = prop.typeAnnotation;
-
-  switch (typeAnnotation.type) {
-    case 'BooleanTypeAnnotation':
-    case 'StringTypeAnnotation':
-    case 'Int32TypeAnnotation':
-    case 'DoubleTypeAnnotation':
-    case 'FloatTypeAnnotation':
-      return getCppTypeForAnnotation(typeAnnotation.type);
-    case 'ReservedPropTypeAnnotation':
-      switch (typeAnnotation.name) {
-        case 'ColorPrimitive':
-          return 'SharedColor';
-        case 'ImageSourcePrimitive':
-          return 'ImageSource';
-        case 'PointPrimitive':
-          return 'Point';
-        case 'EdgeInsetsPrimitive':
-          return 'EdgeInsets';
-        default:
-          (typeAnnotation.name: empty);
-          throw new Error('Received unknown ReservedPropTypeAnnotation');
-      }
-    case 'ArrayTypeAnnotation': {
-      const arrayType = typeAnnotation.elementType.type;
-      if (arrayType === 'ArrayTypeAnnotation') {
-        return `std::vector<${getNativeTypeFromAnnotation(
-          componentName,
-          {typeAnnotation: typeAnnotation.elementType, name: ''},
-          nameParts.concat([prop.name]),
-        )}>`;
-      }
-      if (arrayType === 'ObjectTypeAnnotation') {
-        const structName = generateStructName(
-          componentName,
-          nameParts.concat([prop.name]),
-        );
-        return `std::vector<${structName}>`;
-      }
-      if (arrayType === 'StringEnumTypeAnnotation') {
-        const enumName = getEnumName(componentName, prop.name);
-        return getEnumMaskName(enumName);
-      }
-      const itemAnnotation = getNativeTypeFromAnnotation(
-        componentName,
-        {
-          typeAnnotation: typeAnnotation.elementType,
-          name: componentName,
-        },
-        nameParts.concat([prop.name]),
-      );
-      return `std::vector<${itemAnnotation}>`;
-    }
-    case 'ObjectTypeAnnotation': {
-      return generateStructName(componentName, nameParts.concat([prop.name]));
-    }
-    case 'StringEnumTypeAnnotation':
-      return getEnumName(componentName, prop.name);
-    case 'Int32EnumTypeAnnotation':
-      return getEnumName(componentName, prop.name);
-    default:
-      (typeAnnotation: empty);
-      throw new Error(
-        `Received invalid typeAnnotation for ${componentName} prop ${prop.name}, received ${typeAnnotation.type}`,
-      );
-  }
-}
-
 function convertValueToEnumOption(value: string): string {
   return toSafeCppString(value);
 }
@@ -603,85 +502,6 @@ function getExtendsImports(
   return imports;
 }
 
-function getLocalImports(
-  properties: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
-): Set<string> {
-  const imports: Set<string> = new Set();
-
-  function addImportsForNativeName(
-    name:
-      | 'ColorPrimitive'
-      | 'EdgeInsetsPrimitive'
-      | 'ImageSourcePrimitive'
-      | 'PointPrimitive',
-  ) {
-    switch (name) {
-      case 'ColorPrimitive':
-        imports.add('#include <react/renderer/graphics/Color.h>');
-        return;
-      case 'ImageSourcePrimitive':
-        imports.add('#include <react/renderer/imagemanager/primitives.h>');
-        return;
-      case 'PointPrimitive':
-        imports.add('#include <react/renderer/graphics/Geometry.h>');
-        return;
-      case 'EdgeInsetsPrimitive':
-        imports.add('#include <react/renderer/graphics/Geometry.h>');
-        return;
-      default:
-        (name: empty);
-        throw new Error(`Invalid ReservedPropTypeAnnotation name, got ${name}`);
-    }
-  }
-
-  properties.forEach(prop => {
-    const typeAnnotation = prop.typeAnnotation;
-
-    if (typeAnnotation.type === 'ReservedPropTypeAnnotation') {
-      addImportsForNativeName(typeAnnotation.name);
-    }
-
-    if (typeAnnotation.type === 'ArrayTypeAnnotation') {
-      imports.add('#include <vector>');
-      if (typeAnnotation.elementType.type === 'StringEnumTypeAnnotation') {
-        imports.add('#include <cinttypes>');
-      }
-    }
-
-    if (
-      typeAnnotation.type === 'ArrayTypeAnnotation' &&
-      typeAnnotation.elementType.type === 'ReservedPropTypeAnnotation'
-    ) {
-      addImportsForNativeName(typeAnnotation.elementType.name);
-    }
-
-    if (
-      typeAnnotation.type === 'ArrayTypeAnnotation' &&
-      typeAnnotation.elementType.type === 'ObjectTypeAnnotation'
-    ) {
-      const objectProps = typeAnnotation.elementType.properties;
-      const objectImports = getImports(objectProps);
-      const localImports = getLocalImports(objectProps);
-      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-      objectImports.forEach(imports.add, imports);
-      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-      localImports.forEach(imports.add, imports);
-    }
-
-    if (typeAnnotation.type === 'ObjectTypeAnnotation') {
-      imports.add('#include <react/renderer/core/propsConversions.h>');
-      const objectImports = getImports(typeAnnotation.properties);
-      const localImports = getLocalImports(typeAnnotation.properties);
-      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-      objectImports.forEach(imports.add, imports);
-      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
-      localImports.forEach(imports.add, imports);
-    }
-  });
-
-  return imports;
-}
-
 function generateStructsForComponent(
   componentName: string,
   component: ComponentShape,
diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js
index f39fe2a51d90..a75042292076 100644
--- a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js
+++ b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaDelegate.js
@@ -122,6 +122,8 @@ function getJavaValueForProp(
           return 'ColorPropConverter.getColor(value, view.getContext())';
         case 'ImageSourcePrimitive':
           return '(ReadableMap) value';
+        case 'ImageRequestPrimitive':
+          return '(ReadableMap) value';
         case 'PointPrimitive':
           return '(ReadableMap) value';
         case 'EdgeInsetsPrimitive':
@@ -294,7 +296,7 @@ module.exports = {
     const normalizedPackageName = 'com.facebook.react.viewmanagers';
     const outputDir = `java/${normalizedPackageName.replace(/\./g, '/')}`;
 
-    const files = new Map();
+    const files = new Map<string, string>();
     Object.keys(schema.modules).forEach(moduleName => {
       const module = schema.modules[moduleName];
       if (module.type !== 'Component') {
diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js
index 5afeeb6e51db..d373e1712244 100644
--- a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js
+++ b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaInterface.js
@@ -97,6 +97,9 @@ function getJavaValueForProp(
         case 'ImageSourcePrimitive':
           addNullable(imports);
           return '@Nullable ReadableMap value';
+        case 'ImageRequestPrimitive':
+          addNullable(imports);
+          return '@Nullable ReadableMap value';
         case 'PointPrimitive':
           addNullable(imports);
           return '@Nullable ReadableMap value';
@@ -232,7 +235,7 @@ module.exports = {
     const normalizedPackageName = 'com.facebook.react.viewmanagers';
     const outputDir = `java/${normalizedPackageName.replace(/\./g, '/')}`;
 
-    const files = new Map();
+    const files = new Map<string, string>();
     Object.keys(schema.modules).forEach(moduleName => {
       const module = schema.modules[moduleName];
       if (module.type !== 'Component') {
diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/serializePojo.js b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/serializePojo.js
index 3e3e2ad532dd..c2c36c1ff610 100644
--- a/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/serializePojo.js
+++ b/packages/react-native-codegen/src/generators/components/GeneratePropsJavaPojo/serializePojo.js
@@ -81,6 +81,12 @@ function toJavaType(
           importReadableMap();
           return '@Nullable ReadableMap';
 
+        // TODO: Make ImageRequestPrimitive type-safe
+        case 'ImageRequestPrimitive':
+          importNullable();
+          importReadableMap();
+          return '@Nullable ReadableMap';
+
         // TODO: Make PointPrimitive type-safe
         case 'PointPrimitive':
           importNullable();
@@ -162,6 +168,11 @@ function toJavaType(
                 importReadableMap();
                 return 'ReadableMap';
 
+              // TODO: Make ImageRequestPrimitive type-safe
+              case 'ImageRequestPrimitive':
+                importReadableMap();
+                return 'ReadableMap';
+
               // TODO: Make PointPrimitive type-safe
               case 'PointPrimitive':
                 importReadableMap();
diff --git a/packages/react-native-codegen/src/generators/components/GenerateShadowNodeH.js b/packages/react-native-codegen/src/generators/components/GenerateShadowNodeH.js
index 5159bd616856..3e7cf71117ef 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateShadowNodeH.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateShadowNodeH.js
@@ -36,6 +36,7 @@ const FileTemplate = ({
 #pragma once
 
 ${imports}#include <react/renderer/components/${libraryName}/Props.h>
+#include <react/renderer/components/${libraryName}/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -63,7 +64,8 @@ JSI_EXPORT extern const char ${className}ComponentName[];
  */
 using ${className}ShadowNode = ConcreteViewShadowNode<
     ${className}ComponentName,
-    ${className}Props${eventEmitter}>;
+    ${className}Props${eventEmitter},
+    ${className}State>;
 `.trim();
 
 module.exports = {
@@ -75,8 +77,6 @@ module.exports = {
   ): FilesOutput {
     const fileName = 'ShadowNodes.h';
 
-    let hasAnyEvents = false;
-
     const moduleResults = Object.keys(schema.modules)
       .map(moduleName => {
         const module = schema.modules[moduleName];
@@ -97,15 +97,7 @@ module.exports = {
               return;
             }
 
-            const hasEvents = component.events.length > 0;
-
-            if (hasEvents) {
-              hasAnyEvents = true;
-            }
-
-            const eventEmitter = hasEvents
-              ? `,\n${componentName}EventEmitter`
-              : '';
+            const eventEmitter = `,\n    ${componentName}EventEmitter`;
 
             const replacedTemplate = ComponentTemplate({
               className: componentName,
@@ -124,7 +116,7 @@ module.exports = {
     const replacedTemplate = FileTemplate({
       componentClasses: moduleResults,
       libraryName,
-      imports: hasAnyEvents ? eventEmitterImport : '',
+      imports: eventEmitterImport,
     });
 
     return new Map([[fileName, replacedTemplate]]);
diff --git a/packages/react-native-codegen/src/generators/components/GenerateStateCpp.js b/packages/react-native-codegen/src/generators/components/GenerateStateCpp.js
new file mode 100644
index 000000000000..36c843398192
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/components/GenerateStateCpp.js
@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {SchemaType} from '../../CodegenSchema';
+
+// File path -> contents
+type FilesOutput = Map<string, string>;
+
+const FileTemplate = ({
+  libraryName,
+  stateClasses,
+}: {
+  libraryName: string,
+  stateClasses: string,
+}) => `
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * ${'@'}generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/${libraryName}/States.h>
+
+namespace facebook {
+namespace react {
+
+${stateClasses}
+
+} // namespace react
+} // namespace facebook
+`;
+
+const StateTemplate = ({stateName}: {stateName: string}) => '';
+
+module.exports = {
+  generate(
+    libraryName: string,
+    schema: SchemaType,
+    packageName?: string,
+    assumeNonnull: boolean = false,
+  ): FilesOutput {
+    const fileName = 'States.cpp';
+
+    const stateClasses = Object.keys(schema.modules)
+      .map(moduleName => {
+        const module = schema.modules[moduleName];
+        if (module.type !== 'Component') {
+          return;
+        }
+
+        const {components} = module;
+        // No components in this module
+        if (components == null) {
+          return null;
+        }
+
+        return Object.keys(components)
+          .map(componentName => {
+            const component = components[componentName];
+            if (component.interfaceOnly === true) {
+              return null;
+            }
+
+            return StateTemplate({
+              stateName: `${componentName}State`,
+            });
+          })
+          .filter(Boolean)
+          .join('\n');
+      })
+      .filter(Boolean)
+      .join('\n');
+
+    const replacedTemplate = FileTemplate({
+      libraryName,
+      stateClasses,
+    });
+
+    return new Map([[fileName, replacedTemplate]]);
+  },
+};
diff --git a/packages/react-native-codegen/src/generators/components/GenerateStateH.js b/packages/react-native-codegen/src/generators/components/GenerateStateH.js
new file mode 100644
index 000000000000..658142eaea04
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/components/GenerateStateH.js
@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {SchemaType} from '../../CodegenSchema';
+
+// File path -> contents
+type FilesOutput = Map<string, string>;
+
+const FileTemplate = ({
+  libraryName,
+  stateClasses,
+}: {
+  libraryName: string,
+  stateClasses: string,
+}) =>
+  `
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * ${'@'}generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+${stateClasses}
+
+} // namespace react
+} // namespace facebook
+`.trim();
+
+const StateTemplate = ({stateName}: {stateName: string}) =>
+  `
+class ${stateName}State {
+public:
+  ${stateName}State() = default;
+
+#ifdef ANDROID
+  ${stateName}State(${stateName}State const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+`.trim();
+
+module.exports = {
+  generate(
+    libraryName: string,
+    schema: SchemaType,
+    packageName?: string,
+    assumeNonnull: boolean = false,
+  ): FilesOutput {
+    const fileName = 'States.h';
+
+    const stateClasses = Object.keys(schema.modules)
+      .map(moduleName => {
+        const module = schema.modules[moduleName];
+        if (module.type !== 'Component') {
+          return;
+        }
+
+        const {components} = module;
+        // No components in this module
+        if (components == null) {
+          return null;
+        }
+
+        return Object.keys(components)
+          .map(componentName => {
+            const component = components[componentName];
+            if (component.interfaceOnly === true) {
+              return null;
+            }
+            return StateTemplate({stateName: componentName});
+          })
+          .filter(Boolean)
+          .join('\n\n');
+      })
+      .filter(Boolean)
+      .join('\n\n');
+
+    const template = FileTemplate({
+      libraryName,
+      stateClasses,
+    });
+    return new Map([[fileName, template]]);
+  },
+};
diff --git a/packages/react-native-codegen/src/generators/components/GenerateThirdPartyFabricComponentsProviderObjCpp.js b/packages/react-native-codegen/src/generators/components/GenerateThirdPartyFabricComponentsProviderObjCpp.js
index 549633cd1604..fcd7b5281926 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateThirdPartyFabricComponentsProviderObjCpp.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateThirdPartyFabricComponentsProviderObjCpp.js
@@ -75,7 +75,7 @@ module.exports = {
               return null;
             }
 
-            return Object.keys(components)
+            const componentTemplates = Object.keys(components)
               .filter(componentName => {
                 const component = components[componentName];
                 return !(
@@ -91,6 +91,8 @@ module.exports = {
 
                 return replacedTemplate;
               });
+
+            return componentTemplates.length > 0 ? componentTemplates : null;
           })
           .filter(Boolean);
       })
diff --git a/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js b/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js
index 49e1a9208d74..efdea0ec5ade 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js
@@ -70,6 +70,8 @@ function getReactDiffProcessValue(typeAnnotation: PropTypeAnnotation) {
         case 'ImageSourcePrimitive':
           return j.template
             .expression`{ process: require('react-native/Libraries/Image/resolveAssetSource') }`;
+        case 'ImageRequestPrimitive':
+          throw new Error('ImageRequest should not be used in props');
         case 'PointPrimitive':
           return j.template
             .expression`{ diff: require('react-native/Libraries/Utilities/differ/pointsDiffer') }`;
@@ -350,7 +352,7 @@ function buildCommands(
   }
 
   imports.add(
-    'const {dispatchCommand} = require("react-native/Libraries/Renderer/shims/ReactNative");',
+    'const {dispatchCommand} = require("react-native/Libraries/ReactNative/RendererProxy");',
   );
 
   const properties = commands.map(command => {
diff --git a/packages/react-native-codegen/src/generators/components/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/generators/components/__test_fixtures__/fixtures.js
index 1498da712738..b38d07d189e6 100644
--- a/packages/react-native-codegen/src/generators/components/__test_fixtures__/fixtures.js
+++ b/packages/react-native-codegen/src/generators/components/__test_fixtures__/fixtures.js
@@ -1594,6 +1594,53 @@ const EXCLUDE_ANDROID_IOS: SchemaType = {
   },
 };
 
+const EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES: SchemaType = {
+  modules: {
+    ComponentFile1: {
+      type: 'Component',
+      components: {
+        ExcludedIosComponent: {
+          excludedPlatforms: ['iOS'],
+          extendsProps: [
+            {
+              type: 'ReactNativeBuiltInType',
+              knownTypeName: 'ReactNativeCoreViewProps',
+            },
+          ],
+          events: [],
+          props: [],
+          commands: [],
+        },
+      },
+    },
+    ComponentFile2: {
+      type: 'Component',
+      components: {
+        MultiFileIncludedNativeComponent: {
+          extendsProps: [
+            {
+              type: 'ReactNativeBuiltInType',
+              knownTypeName: 'ReactNativeCoreViewProps',
+            },
+          ],
+          events: [],
+          props: [
+            {
+              name: 'disabled',
+              optional: true,
+              typeAnnotation: {
+                type: 'BooleanTypeAnnotation',
+                default: true,
+              },
+            },
+          ],
+          commands: [],
+        },
+      },
+    },
+  },
+};
+
 module.exports = {
   NO_PROPS_NO_EVENTS,
   INTERFACE_ONLY,
@@ -1621,4 +1668,5 @@ module.exports = {
   COMMANDS_AND_PROPS,
   EXCLUDE_ANDROID,
   EXCLUDE_ANDROID_IOS,
+  EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES,
 };
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentDescriptorH-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentDescriptorH-test.js
index 233663143103..4074282cc57a 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentDescriptorH-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentDescriptorH-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentHObjCpp-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentHObjCpp-test.js
index 8e3d0caf63c1..0dbe605607ce 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentHObjCpp-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateComponentHObjCpp-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterCpp-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterCpp-test.js
index e6028d81705c..11c6328ab729 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterCpp-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterCpp-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterH-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterH-test.js
index 73d4dacc9c16..7709553b48a6 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterH-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateEventEmitterH-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsCpp-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsCpp-test.js
index e808259e18db..ff77b09ca49b 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsCpp-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsCpp-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsH-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsH-test.js
index 5fd7d66f2aa0..4e03ca4f8f68 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsH-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsH-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaDelegate-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaDelegate-test.js
index 7901c9f58a45..a4e310642d84 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaDelegate-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaDelegate-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaInterface-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaInterface-test.js
index 6849a80f9f75..7f5af5f68c5d 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaInterface-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaInterface-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaPojo-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaPojo-test.js
index 5de44fa4cb21..f53552383403 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaPojo-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GeneratePropsJavaPojo-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateShadowNodeCpp-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateShadowNodeCpp-test.js
index 90d194c0ea21..3acb8162fe65 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateShadowNodeCpp-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateShadowNodeCpp-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateShadowNodeH-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateShadowNodeH-test.js
index e21cd6a9caf0..cafe5cf886f7 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateShadowNodeH-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateShadowNodeH-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateStateCpp-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateStateCpp-test.js
new file mode 100644
index 000000000000..1ccba96ba02d
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateStateCpp-test.js
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall react_native
+ */
+
+'use strict';
+
+const fixtures = require('../__test_fixtures__/fixtures.js');
+const generator = require('../GenerateStateCpp.js');
+
+describe('GenerateStateCpp', () => {
+  Object.keys(fixtures)
+    .sort()
+    .forEach(fixtureName => {
+      const fixture = fixtures[fixtureName];
+
+      it(`can generate fixture ${fixtureName}`, () => {
+        expect(generator.generate(fixtureName, fixture)).toMatchSnapshot();
+      });
+    });
+});
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateStateH-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateStateH-test.js
new file mode 100644
index 000000000000..30b6b184b0e5
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateStateH-test.js
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall react_native
+ */
+
+'use strict';
+
+const fixtures = require('../__test_fixtures__/fixtures.js');
+const generator = require('../GenerateStateH.js');
+
+describe('GenerateStateH', () => {
+  Object.keys(fixtures)
+    .sort()
+    .forEach(fixtureName => {
+      const fixture = fixtures[fixtureName];
+
+      it(`can generate fixture ${fixtureName}`, () => {
+        expect(generator.generate(fixtureName, fixture)).toMatchSnapshot();
+      });
+    });
+});
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateTests-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateTests-test.js
index df9215da4dca..e40772a62b47 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateTests-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateTests-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateThirdPartyFabricComponentsProviderH-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateThirdPartyFabricComponentsProviderH-test.js
index 5c2a06332487..f5cc5eac0d9e 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateThirdPartyFabricComponentsProviderH-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateThirdPartyFabricComponentsProviderH-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateThirdPartyFabricComponentsProviderObjCpp-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateThirdPartyFabricComponentsProviderObjCpp-test.js
index 06badb829aed..046c7c81ff29 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateThirdPartyFabricComponentsProviderObjCpp-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateThirdPartyFabricComponentsProviderObjCpp-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/GenerateViewConfigJs-test.js b/packages/react-native-codegen/src/generators/components/__tests__/GenerateViewConfigJs-test.js
index da1136da5cdc..e90bfe4e4a36 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/GenerateViewConfigJs-test.js
+++ b/packages/react-native-codegen/src/generators/components/__tests__/GenerateViewConfigJs-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap
index 20ab6f69ffd1..7cf29170dec8 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap
@@ -336,6 +336,35 @@ using ExcludedAndroidIosComponentComponentDescriptor = ConcreteComponentDescript
 }
 `;
 
+exports[`GenerateComponentDescriptorH can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "ComponentDescriptors.h" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateComponentDescriptorH.js
+ */
+
+#pragma once
+
+#include <react/renderer/components/EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES/ShadowNodes.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook {
+namespace react {
+
+using ExcludedIosComponentComponentDescriptor = ConcreteComponentDescriptor<ExcludedIosComponentShadowNode>;
+using MultiFileIncludedNativeComponentComponentDescriptor = ConcreteComponentDescriptor<MultiFileIncludedNativeComponentShadowNode>;
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
 exports[`GenerateComponentDescriptorH can generate fixture FLOAT_PROPS 1`] = `
 Map {
   "ComponentDescriptors.h" => "
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentHObjCpp-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentHObjCpp-test.js.snap
index d21fa8930f0b..f7b45e6fc31e 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentHObjCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentHObjCpp-test.js.snap
@@ -430,6 +430,31 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 
+NS_ASSUME_NONNULL_END",
+}
+`;
+
+exports[`GenerateComponentHObjCpp can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "RCTComponentViewHelpers.h" => "/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GenerateComponentHObjCpp.js
+*/
+
+#import <Foundation/Foundation.h>
+#import <React/RCTDefines.h>
+#import <React/RCTLog.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol RCTMultiFileIncludedNativeComponentViewProtocol <NSObject>
+
+@end
+
 NS_ASSUME_NONNULL_END",
 }
 `;
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterCpp-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterCpp-test.js.snap
index 8d0858dc93bf..9c58425980fe 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterCpp-test.js.snap
@@ -351,6 +351,32 @@ namespace react {
 
 
 
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateEventEmitterCpp can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "EventEmitters.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateEventEmitterCpp.js
+ */
+
+#include <react/renderer/components/EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES/EventEmitters.h>
+
+namespace facebook {
+namespace react {
+
+
+
+
 } // namespace react
 } // namespace facebook
 ",
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterH-test.js.snap
index 942ca4c88ead..fffed7043384 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterH-test.js.snap
@@ -19,7 +19,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT ArrayPropsNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
 
+  
+
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -46,7 +53,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT ArrayPropsNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -73,7 +87,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT BooleanPropNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -100,7 +121,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT ColorPropNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -127,7 +155,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT CommandNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -154,7 +189,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT CommandNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
 
+  
+
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -181,7 +223,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT DoublePropNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
 
+  
+
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -361,7 +410,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT ExcludedAndroidComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -388,7 +444,56 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT ExcludedAndroidIosComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
 
+  
+
+  
+};
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateEventEmitterH can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "EventEmitters.h" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateEventEmitterH.js
+ */
+#pragma once
+
+#include <react/renderer/components/view/ViewEventEmitter.h>
+#include <jsi/jsi.h>
+
+namespace facebook {
+namespace react {
+
+class JSI_EXPORT ExcludedIosComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
+
+  
+};
+class JSI_EXPORT MultiFileIncludedNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
+
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -415,7 +520,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT FloatPropNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -442,7 +554,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT ImagePropNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -469,7 +588,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT InsetsPropNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -496,7 +622,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT Int32EnumPropsNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -523,7 +656,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT IntegerPropNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -586,7 +726,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT ImageColorPropNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -613,7 +760,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT NoPropsNoEventsComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -640,7 +794,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT ObjectPropsEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -667,7 +828,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT PointPropNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
 
+  
+
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -694,7 +862,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT StringEnumPropsNativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
 
+  
+
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -721,7 +896,14 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT StringPropComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -748,7 +930,22 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT MultiFile1NativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
 
+  
+
+  
+};
+class JSI_EXPORT MultiFile2NativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
+
+  
+};
 
 } // namespace react
 } // namespace facebook
@@ -775,7 +972,22 @@ Map {
 namespace facebook {
 namespace react {
 
+class JSI_EXPORT MultiComponent1NativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
+
+  
+};
+class JSI_EXPORT MultiComponent2NativeComponentEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
 
+  
+};
 
 } // namespace react
 } // namespace facebook
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap
index ceae8252ed00..56ada8a6bffe 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap
@@ -412,6 +412,46 @@ ExcludedAndroidIosComponentProps::ExcludedAndroidIosComponentProps(
 }
 `;
 
+exports[`GeneratePropsCpp can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "Props.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GeneratePropsCpp.js
+ */
+
+#include <react/renderer/components/EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/propsConversions.h>
+
+namespace facebook {
+namespace react {
+
+ExcludedIosComponentProps::ExcludedIosComponentProps(
+    const PropsParserContext &context,
+    const ExcludedIosComponentProps &sourceProps,
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps)
+
+    
+      {}
+MultiFileIncludedNativeComponentProps::MultiFileIncludedNativeComponentProps(
+    const PropsParserContext &context,
+    const MultiFileIncludedNativeComponentProps &sourceProps,
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
+
+    disabled(convertRawProp(context, rawProps, \\"disabled\\", sourceProps.disabled, {true}))
+      {}
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
 exports[`GeneratePropsCpp can generate fixture FLOAT_PROPS 1`] = `
 Map {
   "Props.cpp" => "
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap
index bdede2c33e87..7f8a84fe0020 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap
@@ -660,6 +660,52 @@ class JSI_EXPORT ExcludedAndroidIosComponentProps final : public ViewProps {
 }
 `;
 
+exports[`GeneratePropsH can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "Props.h" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GeneratePropsH.js
+ */
+#pragma once
+
+#include <jsi/jsi.h>
+#include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
+
+namespace facebook {
+namespace react {
+
+class JSI_EXPORT ExcludedIosComponentProps final : public ViewProps {
+ public:
+  ExcludedIosComponentProps() = default;
+  ExcludedIosComponentProps(const PropsParserContext& context, const ExcludedIosComponentProps &sourceProps, const RawProps &rawProps);
+
+#pragma mark - Props
+
+  
+};
+
+class JSI_EXPORT MultiFileIncludedNativeComponentProps final : public ViewProps {
+ public:
+  MultiFileIncludedNativeComponentProps() = default;
+  MultiFileIncludedNativeComponentProps(const PropsParserContext& context, const MultiFileIncludedNativeComponentProps &sourceProps, const RawProps &rawProps);
+
+#pragma mark - Props
+
+  bool disabled{true};
+};
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
 exports[`GeneratePropsH can generate fixture FLOAT_PROPS 1`] = `
 Map {
   "Props.h" => "
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap
index 9cd5fb54c8af..6c5dd2dbb4f7 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaDelegate-test.js.snap
@@ -436,6 +436,69 @@ exports[`GeneratePropsJavaDelegate can generate fixture EXCLUDE_ANDROID 1`] = `M
 
 exports[`GeneratePropsJavaDelegate can generate fixture EXCLUDE_ANDROID_IOS 1`] = `Map {}`;
 
+exports[`GeneratePropsJavaDelegate can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/ExcludedIosComponentManagerDelegate.java" => "/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class ExcludedIosComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & ExcludedIosComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public ExcludedIosComponentManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    super.setProperty(view, propName, value);
+  }
+}
+",
+  "java/com/facebook/react/viewmanagers/MultiFileIncludedNativeComponentManagerDelegate.java" => "/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class MultiFileIncludedNativeComponentManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & MultiFileIncludedNativeComponentManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public MultiFileIncludedNativeComponentManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case \\"disabled\\":
+        mViewManager.setDisabled(view, value == null ? true : (boolean) value);
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}
+",
+}
+`;
+
 exports[`GeneratePropsJavaDelegate can generate fixture FLOAT_PROPS 1`] = `
 Map {
   "java/com/facebook/react/viewmanagers/FloatPropNativeComponentManagerDelegate.java" => "/**
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaInterface-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaInterface-test.js.snap
index 550da64c73b0..c4e652f19a38 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaInterface-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaInterface-test.js.snap
@@ -249,6 +249,45 @@ exports[`GeneratePropsJavaInterface can generate fixture EXCLUDE_ANDROID 1`] = `
 
 exports[`GeneratePropsJavaInterface can generate fixture EXCLUDE_ANDROID_IOS 1`] = `Map {}`;
 
+exports[`GeneratePropsJavaInterface can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/ExcludedIosComponentManagerInterface.java" => "/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+
+public interface ExcludedIosComponentManagerInterface<T extends View> {
+  // No props
+}
+",
+  "java/com/facebook/react/viewmanagers/MultiFileIncludedNativeComponentManagerInterface.java" => "/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+
+public interface MultiFileIncludedNativeComponentManagerInterface<T extends View> {
+  void setDisabled(T view, boolean value);
+}
+",
+}
+`;
+
 exports[`GeneratePropsJavaInterface can generate fixture FLOAT_PROPS 1`] = `
 Map {
   "java/com/facebook/react/viewmanagers/FloatPropNativeComponentManagerInterface.java" => "/**
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaPojo-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaPojo-test.js.snap
index 25f4abc590c2..9cb2b17fe2b3 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaPojo-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsJavaPojo-test.js.snap
@@ -474,6 +474,52 @@ exports[`GeneratePropsJavaPojo can generate fixture EXCLUDE_ANDROID 1`] = `Map {
 
 exports[`GeneratePropsJavaPojo can generate fixture EXCLUDE_ANDROID_IOS 1`] = `Map {}`;
 
+exports[`GeneratePropsJavaPojo can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "java/com/facebook/react/viewmanagers/ComponentFile1/ExcludedIosComponentProps.java" => "/**
+* 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.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.ComponentFile1;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class ExcludedIosComponentProps {
+
+
+}
+",
+  "java/com/facebook/react/viewmanagers/ComponentFile2/MultiFileIncludedNativeComponentProps.java" => "/**
+* 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.
+*
+* @generated by codegen project: GeneratePropsJavaPojo.js
+*/
+
+package com.facebook.react.viewmanagers.ComponentFile2;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public class MultiFileIncludedNativeComponentProps {
+  private boolean mDisabled;
+  @DoNotStrip
+  public boolean getDisabled() {
+    return mDisabled;
+  }
+}
+",
+}
+`;
+
 exports[`GeneratePropsJavaPojo can generate fixture FLOAT_PROPS 1`] = `
 Map {
   "java/com/facebook/react/viewmanagers/Switch/FloatPropNativeComponentProps.java" => "/**
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeCpp-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeCpp-test.js.snap
index 028d4fcbde95..b09ab9ea8beb 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeCpp-test.js.snap
@@ -300,6 +300,32 @@ extern const char ExcludedAndroidIosComponentComponentName[] = \\"ExcludedAndroi
 }
 `;
 
+exports[`GenerateShadowNodeCpp can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "ShadowNodes.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateShadowNodeCpp.js
+ */
+
+#include <react/renderer/components/EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES/ShadowNodes.h>
+
+namespace facebook {
+namespace react {
+
+extern const char ExcludedIosComponentComponentName[] = \\"ExcludedIosComponent\\";
+extern const char MultiFileIncludedNativeComponentComponentName[] = \\"MultiFileIncludedNativeComponent\\";
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
 exports[`GenerateShadowNodeCpp can generate fixture FLOAT_PROPS 1`] = `
 Map {
   "ShadowNodes.cpp" => "
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeH-test.js.snap
index 25deb9ca8427..86226abbbd72 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeH-test.js.snap
@@ -14,7 +14,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/ARRAY_PROPS/EventEmitters.h>
 #include <react/renderer/components/ARRAY_PROPS/Props.h>
+#include <react/renderer/components/ARRAY_PROPS/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -28,7 +30,9 @@ JSI_EXPORT extern const char ArrayPropsNativeComponentComponentName[];
  */
 using ArrayPropsNativeComponentShadowNode = ConcreteViewShadowNode<
     ArrayPropsNativeComponentComponentName,
-    ArrayPropsNativeComponentProps>;
+    ArrayPropsNativeComponentProps,
+    ArrayPropsNativeComponentEventEmitter,
+    ArrayPropsNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -50,7 +54,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT/EventEmitters.h>
 #include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT/Props.h>
+#include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -64,7 +70,9 @@ JSI_EXPORT extern const char ArrayPropsNativeComponentComponentName[];
  */
 using ArrayPropsNativeComponentShadowNode = ConcreteViewShadowNode<
     ArrayPropsNativeComponentComponentName,
-    ArrayPropsNativeComponentProps>;
+    ArrayPropsNativeComponentProps,
+    ArrayPropsNativeComponentEventEmitter,
+    ArrayPropsNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -86,7 +94,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/BOOLEAN_PROP/EventEmitters.h>
 #include <react/renderer/components/BOOLEAN_PROP/Props.h>
+#include <react/renderer/components/BOOLEAN_PROP/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -100,7 +110,9 @@ JSI_EXPORT extern const char BooleanPropNativeComponentComponentName[];
  */
 using BooleanPropNativeComponentShadowNode = ConcreteViewShadowNode<
     BooleanPropNativeComponentComponentName,
-    BooleanPropNativeComponentProps>;
+    BooleanPropNativeComponentProps,
+    BooleanPropNativeComponentEventEmitter,
+    BooleanPropNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -122,7 +134,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/COLOR_PROP/EventEmitters.h>
 #include <react/renderer/components/COLOR_PROP/Props.h>
+#include <react/renderer/components/COLOR_PROP/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -136,7 +150,9 @@ JSI_EXPORT extern const char ColorPropNativeComponentComponentName[];
  */
 using ColorPropNativeComponentShadowNode = ConcreteViewShadowNode<
     ColorPropNativeComponentComponentName,
-    ColorPropNativeComponentProps>;
+    ColorPropNativeComponentProps,
+    ColorPropNativeComponentEventEmitter,
+    ColorPropNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -158,7 +174,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/COMMANDS/EventEmitters.h>
 #include <react/renderer/components/COMMANDS/Props.h>
+#include <react/renderer/components/COMMANDS/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -172,7 +190,9 @@ JSI_EXPORT extern const char CommandNativeComponentComponentName[];
  */
 using CommandNativeComponentShadowNode = ConcreteViewShadowNode<
     CommandNativeComponentComponentName,
-    CommandNativeComponentProps>;
+    CommandNativeComponentProps,
+    CommandNativeComponentEventEmitter,
+    CommandNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -194,7 +214,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/COMMANDS_AND_PROPS/EventEmitters.h>
 #include <react/renderer/components/COMMANDS_AND_PROPS/Props.h>
+#include <react/renderer/components/COMMANDS_AND_PROPS/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -208,7 +230,9 @@ JSI_EXPORT extern const char CommandNativeComponentComponentName[];
  */
 using CommandNativeComponentShadowNode = ConcreteViewShadowNode<
     CommandNativeComponentComponentName,
-    CommandNativeComponentProps>;
+    CommandNativeComponentProps,
+    CommandNativeComponentEventEmitter,
+    CommandNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -230,7 +254,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/DOUBLE_PROPS/EventEmitters.h>
 #include <react/renderer/components/DOUBLE_PROPS/Props.h>
+#include <react/renderer/components/DOUBLE_PROPS/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -244,7 +270,9 @@ JSI_EXPORT extern const char DoublePropNativeComponentComponentName[];
  */
 using DoublePropNativeComponentShadowNode = ConcreteViewShadowNode<
     DoublePropNativeComponentComponentName,
-    DoublePropNativeComponentProps>;
+    DoublePropNativeComponentProps,
+    DoublePropNativeComponentEventEmitter,
+    DoublePropNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -268,6 +296,7 @@ Map {
 
 #include <react/renderer/components/EVENT_NESTED_OBJECT_PROPS/EventEmitters.h>
 #include <react/renderer/components/EVENT_NESTED_OBJECT_PROPS/Props.h>
+#include <react/renderer/components/EVENT_NESTED_OBJECT_PROPS/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -282,7 +311,8 @@ JSI_EXPORT extern const char EventsNestedObjectNativeComponentComponentName[];
 using EventsNestedObjectNativeComponentShadowNode = ConcreteViewShadowNode<
     EventsNestedObjectNativeComponentComponentName,
     EventsNestedObjectNativeComponentProps,
-EventsNestedObjectNativeComponentEventEmitter>;
+    EventsNestedObjectNativeComponentEventEmitter,
+    EventsNestedObjectNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -306,6 +336,7 @@ Map {
 
 #include <react/renderer/components/EVENT_PROPS/EventEmitters.h>
 #include <react/renderer/components/EVENT_PROPS/Props.h>
+#include <react/renderer/components/EVENT_PROPS/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -320,7 +351,8 @@ JSI_EXPORT extern const char EventsNativeComponentComponentName[];
 using EventsNativeComponentShadowNode = ConcreteViewShadowNode<
     EventsNativeComponentComponentName,
     EventsNativeComponentProps,
-EventsNativeComponentEventEmitter>;
+    EventsNativeComponentEventEmitter,
+    EventsNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -342,7 +374,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/EVENTS_WITH_PAPER_NAME/EventEmitters.h>
 #include <react/renderer/components/EVENTS_WITH_PAPER_NAME/Props.h>
+#include <react/renderer/components/EVENTS_WITH_PAPER_NAME/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -371,7 +405,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/EXCLUDE_ANDROID/EventEmitters.h>
 #include <react/renderer/components/EXCLUDE_ANDROID/Props.h>
+#include <react/renderer/components/EXCLUDE_ANDROID/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -385,7 +421,9 @@ JSI_EXPORT extern const char ExcludedAndroidComponentComponentName[];
  */
 using ExcludedAndroidComponentShadowNode = ConcreteViewShadowNode<
     ExcludedAndroidComponentComponentName,
-    ExcludedAndroidComponentProps>;
+    ExcludedAndroidComponentProps,
+    ExcludedAndroidComponentEventEmitter,
+    ExcludedAndroidComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -407,7 +445,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/EXCLUDE_ANDROID_IOS/EventEmitters.h>
 #include <react/renderer/components/EXCLUDE_ANDROID_IOS/Props.h>
+#include <react/renderer/components/EXCLUDE_ANDROID_IOS/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -421,7 +461,60 @@ JSI_EXPORT extern const char ExcludedAndroidIosComponentComponentName[];
  */
 using ExcludedAndroidIosComponentShadowNode = ConcreteViewShadowNode<
     ExcludedAndroidIosComponentComponentName,
-    ExcludedAndroidIosComponentProps>;
+    ExcludedAndroidIosComponentProps,
+    ExcludedAndroidIosComponentEventEmitter,
+    ExcludedAndroidIosComponentState>;
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateShadowNodeH can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "ShadowNodes.h" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateShadowNodeH.js
+ */
+
+#pragma once
+
+#include <react/renderer/components/EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES/EventEmitters.h>
+#include <react/renderer/components/EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES/Props.h>
+#include <react/renderer/components/EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES/States.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <jsi/jsi.h>
+
+namespace facebook {
+namespace react {
+
+JSI_EXPORT extern const char ExcludedIosComponentComponentName[];
+
+/*
+ * \`ShadowNode\` for <ExcludedIosComponent> component.
+ */
+using ExcludedIosComponentShadowNode = ConcreteViewShadowNode<
+    ExcludedIosComponentComponentName,
+    ExcludedIosComponentProps,
+    ExcludedIosComponentEventEmitter,
+    ExcludedIosComponentState>;
+
+JSI_EXPORT extern const char MultiFileIncludedNativeComponentComponentName[];
+
+/*
+ * \`ShadowNode\` for <MultiFileIncludedNativeComponent> component.
+ */
+using MultiFileIncludedNativeComponentShadowNode = ConcreteViewShadowNode<
+    MultiFileIncludedNativeComponentComponentName,
+    MultiFileIncludedNativeComponentProps,
+    MultiFileIncludedNativeComponentEventEmitter,
+    MultiFileIncludedNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -443,7 +536,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/FLOAT_PROPS/EventEmitters.h>
 #include <react/renderer/components/FLOAT_PROPS/Props.h>
+#include <react/renderer/components/FLOAT_PROPS/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -457,7 +552,9 @@ JSI_EXPORT extern const char FloatPropNativeComponentComponentName[];
  */
 using FloatPropNativeComponentShadowNode = ConcreteViewShadowNode<
     FloatPropNativeComponentComponentName,
-    FloatPropNativeComponentProps>;
+    FloatPropNativeComponentProps,
+    FloatPropNativeComponentEventEmitter,
+    FloatPropNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -479,7 +576,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/IMAGE_PROP/EventEmitters.h>
 #include <react/renderer/components/IMAGE_PROP/Props.h>
+#include <react/renderer/components/IMAGE_PROP/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -493,7 +592,9 @@ JSI_EXPORT extern const char ImagePropNativeComponentComponentName[];
  */
 using ImagePropNativeComponentShadowNode = ConcreteViewShadowNode<
     ImagePropNativeComponentComponentName,
-    ImagePropNativeComponentProps>;
+    ImagePropNativeComponentProps,
+    ImagePropNativeComponentEventEmitter,
+    ImagePropNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -515,7 +616,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/INSETS_PROP/EventEmitters.h>
 #include <react/renderer/components/INSETS_PROP/Props.h>
+#include <react/renderer/components/INSETS_PROP/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -529,7 +632,9 @@ JSI_EXPORT extern const char InsetsPropNativeComponentComponentName[];
  */
 using InsetsPropNativeComponentShadowNode = ConcreteViewShadowNode<
     InsetsPropNativeComponentComponentName,
-    InsetsPropNativeComponentProps>;
+    InsetsPropNativeComponentProps,
+    InsetsPropNativeComponentEventEmitter,
+    InsetsPropNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -551,7 +656,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/INT32_ENUM_PROP/EventEmitters.h>
 #include <react/renderer/components/INT32_ENUM_PROP/Props.h>
+#include <react/renderer/components/INT32_ENUM_PROP/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -565,7 +672,9 @@ JSI_EXPORT extern const char Int32EnumPropsNativeComponentComponentName[];
  */
 using Int32EnumPropsNativeComponentShadowNode = ConcreteViewShadowNode<
     Int32EnumPropsNativeComponentComponentName,
-    Int32EnumPropsNativeComponentProps>;
+    Int32EnumPropsNativeComponentProps,
+    Int32EnumPropsNativeComponentEventEmitter,
+    Int32EnumPropsNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -587,7 +696,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/INTEGER_PROPS/EventEmitters.h>
 #include <react/renderer/components/INTEGER_PROPS/Props.h>
+#include <react/renderer/components/INTEGER_PROPS/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -601,7 +712,9 @@ JSI_EXPORT extern const char IntegerPropNativeComponentComponentName[];
  */
 using IntegerPropNativeComponentShadowNode = ConcreteViewShadowNode<
     IntegerPropNativeComponentComponentName,
-    IntegerPropNativeComponentProps>;
+    IntegerPropNativeComponentProps,
+    IntegerPropNativeComponentEventEmitter,
+    IntegerPropNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -623,7 +736,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/INTERFACE_ONLY/EventEmitters.h>
 #include <react/renderer/components/INTERFACE_ONLY/Props.h>
+#include <react/renderer/components/INTERFACE_ONLY/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -652,7 +767,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/MULTI_NATIVE_PROP/EventEmitters.h>
 #include <react/renderer/components/MULTI_NATIVE_PROP/Props.h>
+#include <react/renderer/components/MULTI_NATIVE_PROP/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -666,7 +783,9 @@ JSI_EXPORT extern const char ImageColorPropNativeComponentComponentName[];
  */
 using ImageColorPropNativeComponentShadowNode = ConcreteViewShadowNode<
     ImageColorPropNativeComponentComponentName,
-    ImageColorPropNativeComponentProps>;
+    ImageColorPropNativeComponentProps,
+    ImageColorPropNativeComponentEventEmitter,
+    ImageColorPropNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -688,7 +807,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/NO_PROPS_NO_EVENTS/EventEmitters.h>
 #include <react/renderer/components/NO_PROPS_NO_EVENTS/Props.h>
+#include <react/renderer/components/NO_PROPS_NO_EVENTS/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -702,7 +823,9 @@ JSI_EXPORT extern const char NoPropsNoEventsComponentComponentName[];
  */
 using NoPropsNoEventsComponentShadowNode = ConcreteViewShadowNode<
     NoPropsNoEventsComponentComponentName,
-    NoPropsNoEventsComponentProps>;
+    NoPropsNoEventsComponentProps,
+    NoPropsNoEventsComponentEventEmitter,
+    NoPropsNoEventsComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -724,7 +847,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/OBJECT_PROPS/EventEmitters.h>
 #include <react/renderer/components/OBJECT_PROPS/Props.h>
+#include <react/renderer/components/OBJECT_PROPS/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -738,7 +863,9 @@ JSI_EXPORT extern const char ObjectPropsComponentName[];
  */
 using ObjectPropsShadowNode = ConcreteViewShadowNode<
     ObjectPropsComponentName,
-    ObjectPropsProps>;
+    ObjectPropsProps,
+    ObjectPropsEventEmitter,
+    ObjectPropsState>;
 
 } // namespace react
 } // namespace facebook
@@ -760,7 +887,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/POINT_PROP/EventEmitters.h>
 #include <react/renderer/components/POINT_PROP/Props.h>
+#include <react/renderer/components/POINT_PROP/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -774,7 +903,9 @@ JSI_EXPORT extern const char PointPropNativeComponentComponentName[];
  */
 using PointPropNativeComponentShadowNode = ConcreteViewShadowNode<
     PointPropNativeComponentComponentName,
-    PointPropNativeComponentProps>;
+    PointPropNativeComponentProps,
+    PointPropNativeComponentEventEmitter,
+    PointPropNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -796,7 +927,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/STRING_ENUM_PROP/EventEmitters.h>
 #include <react/renderer/components/STRING_ENUM_PROP/Props.h>
+#include <react/renderer/components/STRING_ENUM_PROP/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -810,7 +943,9 @@ JSI_EXPORT extern const char StringEnumPropsNativeComponentComponentName[];
  */
 using StringEnumPropsNativeComponentShadowNode = ConcreteViewShadowNode<
     StringEnumPropsNativeComponentComponentName,
-    StringEnumPropsNativeComponentProps>;
+    StringEnumPropsNativeComponentProps,
+    StringEnumPropsNativeComponentEventEmitter,
+    StringEnumPropsNativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -832,7 +967,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/STRING_PROP/EventEmitters.h>
 #include <react/renderer/components/STRING_PROP/Props.h>
+#include <react/renderer/components/STRING_PROP/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -846,7 +983,9 @@ JSI_EXPORT extern const char StringPropComponentComponentName[];
  */
 using StringPropComponentShadowNode = ConcreteViewShadowNode<
     StringPropComponentComponentName,
-    StringPropComponentProps>;
+    StringPropComponentProps,
+    StringPropComponentEventEmitter,
+    StringPropComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -868,7 +1007,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/TWO_COMPONENTS_DIFFERENT_FILES/EventEmitters.h>
 #include <react/renderer/components/TWO_COMPONENTS_DIFFERENT_FILES/Props.h>
+#include <react/renderer/components/TWO_COMPONENTS_DIFFERENT_FILES/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -882,7 +1023,9 @@ JSI_EXPORT extern const char MultiFile1NativeComponentComponentName[];
  */
 using MultiFile1NativeComponentShadowNode = ConcreteViewShadowNode<
     MultiFile1NativeComponentComponentName,
-    MultiFile1NativeComponentProps>;
+    MultiFile1NativeComponentProps,
+    MultiFile1NativeComponentEventEmitter,
+    MultiFile1NativeComponentState>;
 
 JSI_EXPORT extern const char MultiFile2NativeComponentComponentName[];
 
@@ -891,7 +1034,9 @@ JSI_EXPORT extern const char MultiFile2NativeComponentComponentName[];
  */
 using MultiFile2NativeComponentShadowNode = ConcreteViewShadowNode<
     MultiFile2NativeComponentComponentName,
-    MultiFile2NativeComponentProps>;
+    MultiFile2NativeComponentProps,
+    MultiFile2NativeComponentEventEmitter,
+    MultiFile2NativeComponentState>;
 
 } // namespace react
 } // namespace facebook
@@ -913,7 +1058,9 @@ Map {
 
 #pragma once
 
+#include <react/renderer/components/TWO_COMPONENTS_SAME_FILE/EventEmitters.h>
 #include <react/renderer/components/TWO_COMPONENTS_SAME_FILE/Props.h>
+#include <react/renderer/components/TWO_COMPONENTS_SAME_FILE/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
@@ -927,7 +1074,9 @@ JSI_EXPORT extern const char MultiComponent1NativeComponentComponentName[];
  */
 using MultiComponent1NativeComponentShadowNode = ConcreteViewShadowNode<
     MultiComponent1NativeComponentComponentName,
-    MultiComponent1NativeComponentProps>;
+    MultiComponent1NativeComponentProps,
+    MultiComponent1NativeComponentEventEmitter,
+    MultiComponent1NativeComponentState>;
 
 JSI_EXPORT extern const char MultiComponent2NativeComponentComponentName[];
 
@@ -936,7 +1085,9 @@ JSI_EXPORT extern const char MultiComponent2NativeComponentComponentName[];
  */
 using MultiComponent2NativeComponentShadowNode = ConcreteViewShadowNode<
     MultiComponent2NativeComponentComponentName,
-    MultiComponent2NativeComponentProps>;
+    MultiComponent2NativeComponentProps,
+    MultiComponent2NativeComponentEventEmitter,
+    MultiComponent2NativeComponentState>;
 
 } // namespace react
 } // namespace facebook
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateStateCpp-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateStateCpp-test.js.snap
new file mode 100644
index 000000000000..04084fb1b5a0
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateStateCpp-test.js.snap
@@ -0,0 +1,649 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`GenerateStateCpp can generate fixture ARRAY_PROPS 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/ARRAY_PROPS/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture ARRAY_PROPS_WITH_NESTED_OBJECT 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/ARRAY_PROPS_WITH_NESTED_OBJECT/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture BOOLEAN_PROP 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/BOOLEAN_PROP/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture COLOR_PROP 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/COLOR_PROP/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture COMMANDS 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/COMMANDS/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture COMMANDS_AND_PROPS 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/COMMANDS_AND_PROPS/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture DOUBLE_PROPS 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/DOUBLE_PROPS/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture EVENT_NESTED_OBJECT_PROPS 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/EVENT_NESTED_OBJECT_PROPS/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture EVENT_PROPS 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/EVENT_PROPS/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture EVENTS_WITH_PAPER_NAME 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/EVENTS_WITH_PAPER_NAME/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture EXCLUDE_ANDROID 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/EXCLUDE_ANDROID/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture EXCLUDE_ANDROID_IOS 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/EXCLUDE_ANDROID_IOS/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture FLOAT_PROPS 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/FLOAT_PROPS/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture IMAGE_PROP 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/IMAGE_PROP/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture INSETS_PROP 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/INSETS_PROP/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture INT32_ENUM_PROP 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/INT32_ENUM_PROP/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture INTEGER_PROPS 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/INTEGER_PROPS/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture INTERFACE_ONLY 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/INTERFACE_ONLY/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture MULTI_NATIVE_PROP 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/MULTI_NATIVE_PROP/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture NO_PROPS_NO_EVENTS 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/NO_PROPS_NO_EVENTS/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture OBJECT_PROPS 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/OBJECT_PROPS/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture POINT_PROP 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/POINT_PROP/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture STRING_ENUM_PROP 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/STRING_ENUM_PROP/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture STRING_PROP 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/STRING_PROP/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/TWO_COMPONENTS_DIFFERENT_FILES/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
+
+exports[`GenerateStateCpp can generate fixture TWO_COMPONENTS_SAME_FILE 1`] = `
+Map {
+  "States.cpp" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateCpp.js
+ */
+#include <react/renderer/components/TWO_COMPONENTS_SAME_FILE/States.h>
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook
+",
+}
+`;
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateStateH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateStateH-test.js.snap
new file mode 100644
index 000000000000..a0bb2f075a0a
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateStateH-test.js.snap
@@ -0,0 +1,1127 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`GenerateStateH can generate fixture ARRAY_PROPS 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class ArrayPropsNativeComponentState {
+public:
+  ArrayPropsNativeComponentState() = default;
+
+#ifdef ANDROID
+  ArrayPropsNativeComponentState(ArrayPropsNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture ARRAY_PROPS_WITH_NESTED_OBJECT 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class ArrayPropsNativeComponentState {
+public:
+  ArrayPropsNativeComponentState() = default;
+
+#ifdef ANDROID
+  ArrayPropsNativeComponentState(ArrayPropsNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture BOOLEAN_PROP 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class BooleanPropNativeComponentState {
+public:
+  BooleanPropNativeComponentState() = default;
+
+#ifdef ANDROID
+  BooleanPropNativeComponentState(BooleanPropNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture COLOR_PROP 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class ColorPropNativeComponentState {
+public:
+  ColorPropNativeComponentState() = default;
+
+#ifdef ANDROID
+  ColorPropNativeComponentState(ColorPropNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture COMMANDS 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class CommandNativeComponentState {
+public:
+  CommandNativeComponentState() = default;
+
+#ifdef ANDROID
+  CommandNativeComponentState(CommandNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture COMMANDS_AND_PROPS 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class CommandNativeComponentState {
+public:
+  CommandNativeComponentState() = default;
+
+#ifdef ANDROID
+  CommandNativeComponentState(CommandNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture DOUBLE_PROPS 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class DoublePropNativeComponentState {
+public:
+  DoublePropNativeComponentState() = default;
+
+#ifdef ANDROID
+  DoublePropNativeComponentState(DoublePropNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture EVENT_NESTED_OBJECT_PROPS 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class EventsNestedObjectNativeComponentState {
+public:
+  EventsNestedObjectNativeComponentState() = default;
+
+#ifdef ANDROID
+  EventsNestedObjectNativeComponentState(EventsNestedObjectNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture EVENT_PROPS 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class EventsNativeComponentState {
+public:
+  EventsNativeComponentState() = default;
+
+#ifdef ANDROID
+  EventsNativeComponentState(EventsNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture EVENTS_WITH_PAPER_NAME 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture EXCLUDE_ANDROID 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class ExcludedAndroidComponentState {
+public:
+  ExcludedAndroidComponentState() = default;
+
+#ifdef ANDROID
+  ExcludedAndroidComponentState(ExcludedAndroidComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture EXCLUDE_ANDROID_IOS 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class ExcludedAndroidIosComponentState {
+public:
+  ExcludedAndroidIosComponentState() = default;
+
+#ifdef ANDROID
+  ExcludedAndroidIosComponentState(ExcludedAndroidIosComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class ExcludedIosComponentState {
+public:
+  ExcludedIosComponentState() = default;
+
+#ifdef ANDROID
+  ExcludedIosComponentState(ExcludedIosComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+class MultiFileIncludedNativeComponentState {
+public:
+  MultiFileIncludedNativeComponentState() = default;
+
+#ifdef ANDROID
+  MultiFileIncludedNativeComponentState(MultiFileIncludedNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture FLOAT_PROPS 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class FloatPropNativeComponentState {
+public:
+  FloatPropNativeComponentState() = default;
+
+#ifdef ANDROID
+  FloatPropNativeComponentState(FloatPropNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture IMAGE_PROP 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class ImagePropNativeComponentState {
+public:
+  ImagePropNativeComponentState() = default;
+
+#ifdef ANDROID
+  ImagePropNativeComponentState(ImagePropNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture INSETS_PROP 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class InsetsPropNativeComponentState {
+public:
+  InsetsPropNativeComponentState() = default;
+
+#ifdef ANDROID
+  InsetsPropNativeComponentState(InsetsPropNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture INT32_ENUM_PROP 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class Int32EnumPropsNativeComponentState {
+public:
+  Int32EnumPropsNativeComponentState() = default;
+
+#ifdef ANDROID
+  Int32EnumPropsNativeComponentState(Int32EnumPropsNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture INTEGER_PROPS 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class IntegerPropNativeComponentState {
+public:
+  IntegerPropNativeComponentState() = default;
+
+#ifdef ANDROID
+  IntegerPropNativeComponentState(IntegerPropNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture INTERFACE_ONLY 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture MULTI_NATIVE_PROP 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class ImageColorPropNativeComponentState {
+public:
+  ImageColorPropNativeComponentState() = default;
+
+#ifdef ANDROID
+  ImageColorPropNativeComponentState(ImageColorPropNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture NO_PROPS_NO_EVENTS 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class NoPropsNoEventsComponentState {
+public:
+  NoPropsNoEventsComponentState() = default;
+
+#ifdef ANDROID
+  NoPropsNoEventsComponentState(NoPropsNoEventsComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture OBJECT_PROPS 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class ObjectPropsState {
+public:
+  ObjectPropsState() = default;
+
+#ifdef ANDROID
+  ObjectPropsState(ObjectPropsState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture POINT_PROP 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class PointPropNativeComponentState {
+public:
+  PointPropNativeComponentState() = default;
+
+#ifdef ANDROID
+  PointPropNativeComponentState(PointPropNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture STRING_ENUM_PROP 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class StringEnumPropsNativeComponentState {
+public:
+  StringEnumPropsNativeComponentState() = default;
+
+#ifdef ANDROID
+  StringEnumPropsNativeComponentState(StringEnumPropsNativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture STRING_PROP 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class StringPropComponentState {
+public:
+  StringPropComponentState() = default;
+
+#ifdef ANDROID
+  StringPropComponentState(StringPropComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class MultiFile1NativeComponentState {
+public:
+  MultiFile1NativeComponentState() = default;
+
+#ifdef ANDROID
+  MultiFile1NativeComponentState(MultiFile1NativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+class MultiFile2NativeComponentState {
+public:
+  MultiFile2NativeComponentState() = default;
+
+#ifdef ANDROID
+  MultiFile2NativeComponentState(MultiFile2NativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
+
+exports[`GenerateStateH can generate fixture TWO_COMPONENTS_SAME_FILE 1`] = `
+Map {
+  "States.h" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#endif
+
+namespace facebook {
+namespace react {
+
+class MultiComponent1NativeComponentState {
+public:
+  MultiComponent1NativeComponentState() = default;
+
+#ifdef ANDROID
+  MultiComponent1NativeComponentState(MultiComponent1NativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+class MultiComponent2NativeComponentState {
+public:
+  MultiComponent2NativeComponentState() = default;
+
+#ifdef ANDROID
+  MultiComponent2NativeComponentState(MultiComponent2NativeComponentState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
+
+} // namespace react
+} // namespace facebook",
+}
+`;
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap
index 14a07e9534c0..e8f46ea1f104 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap
@@ -486,6 +486,67 @@ TEST(ExcludedAndroidIosComponentProps_DoesNotDie, etc) {
 }
 `;
 
+exports[`GenerateTests can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "Tests.cpp" => "/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateTests.js
+ * */
+
+#include <gtest/gtest.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/components/EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES/Props.h>
+#include <react/renderer/core/RawProps.h>
+#include <react/renderer/core/RawPropsParser.h>
+#include <react/renderer/core/propsConversions.h>
+
+using namespace facebook::react;
+
+TEST(ExcludedIosComponentProps_DoesNotDie, etc) {
+  auto propParser = RawPropsParser();
+  propParser.prepare<ExcludedIosComponentProps>();
+  auto const &sourceProps = ExcludedIosComponentProps();
+  auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  ExcludedIosComponentProps(parserContext, sourceProps, rawProps);
+}
+
+TEST(MultiFileIncludedNativeComponentProps_DoesNotDie, etc) {
+  auto propParser = RawPropsParser();
+  propParser.prepare<MultiFileIncludedNativeComponentProps>();
+  auto const &sourceProps = MultiFileIncludedNativeComponentProps();
+  auto const &rawProps = RawProps(folly::dynamic::object(\\"xx_invalid_xx\\", \\"xx_invalid_xx\\"));
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  MultiFileIncludedNativeComponentProps(parserContext, sourceProps, rawProps);
+}
+
+TEST(MultiFileIncludedNativeComponentProps_disabled, etc) {
+  auto propParser = RawPropsParser();
+  propParser.prepare<MultiFileIncludedNativeComponentProps>();
+  auto const &sourceProps = MultiFileIncludedNativeComponentProps();
+  auto const &rawProps = RawProps(folly::dynamic::object(\\"disabled\\", true));
+
+  ContextContainer contextContainer{};
+  PropsParserContext parserContext{-1, contextContainer};
+
+  rawProps.parse(propParser, parserContext);
+  MultiFileIncludedNativeComponentProps(parserContext, sourceProps, rawProps);
+}",
+}
+`;
+
 exports[`GenerateTests can generate fixture FLOAT_PROPS 1`] = `
 Map {
   "Tests.cpp" => "/**
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateThirdPartyFabricComponentsProviderH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateThirdPartyFabricComponentsProviderH-test.js.snap
index 46ad5bcb81a6..4cab36433d24 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateThirdPartyFabricComponentsProviderH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateThirdPartyFabricComponentsProviderH-test.js.snap
@@ -51,6 +51,7 @@ Class<RCTComponentViewProtocol> CommandNativeComponentCls(void) __attribute__((u
 Class<RCTComponentViewProtocol> CommandNativeComponentCls(void) __attribute__((used)); // COMMANDS_AND_PROPS
 Class<RCTComponentViewProtocol> ExcludedAndroidComponentCls(void) __attribute__((used)); // EXCLUDE_ANDROID
 
+Class<RCTComponentViewProtocol> MultiFileIncludedNativeComponentCls(void) __attribute__((used)); // EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES
 
 #ifdef __cplusplus
 }
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateThirdPartyFabricComponentsProviderObjCpp-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateThirdPartyFabricComponentsProviderObjCpp-test.js.snap
index fd1ed6671544..0fa2add3459f 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateThirdPartyFabricComponentsProviderObjCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateThirdPartyFabricComponentsProviderObjCpp-test.js.snap
@@ -74,6 +74,8 @@ Class<RCTComponentViewProtocol> RCTThirdPartyFabricComponentsProvider(const char
 
     {\\"ExcludedAndroidComponent\\", ExcludedAndroidComponentCls}, // EXCLUDE_ANDROID
 
+
+    {\\"MultiFileIncludedNativeComponent\\", MultiFileIncludedNativeComponentCls}, // EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES
   };
 
   auto p = sFabricComponentsClassMap.find(name);
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap
index f4c068dcb280..a48a2426a815 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap
@@ -169,7 +169,7 @@ Map {
 'use strict';
 
 const NativeComponentRegistry = require('react-native/Libraries/NativeComponent/NativeComponentRegistry');
-const {dispatchCommand} = require(\\"react-native/Libraries/Renderer/shims/ReactNative\\");
+const {dispatchCommand} = require(\\"react-native/Libraries/ReactNative/RendererProxy\\");
 
 let nativeComponentName = 'CommandNativeComponent';
 
@@ -211,7 +211,7 @@ Map {
 'use strict';
 
 const NativeComponentRegistry = require('react-native/Libraries/NativeComponent/NativeComponentRegistry');
-const {dispatchCommand} = require(\\"react-native/Libraries/Renderer/shims/ReactNative\\");
+const {dispatchCommand} = require(\\"react-native/Libraries/ReactNative/RendererProxy\\");
 
 let nativeComponentName = 'CommandNativeComponent';
 
@@ -509,6 +509,50 @@ export default NativeComponentRegistry.get(nativeComponentName, () => __INTERNAL
 }
 `;
 
+exports[`GenerateViewConfigJs can generate fixture EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILES 1`] = `
+Map {
+  "EXCLUDE_IOS_TWO_COMPONENTS_DIFFERENT_FILESNativeViewConfig.js" => "
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @flow
+ *
+ * @generated by codegen project: GenerateViewConfigJs.js
+ */
+
+'use strict';
+
+const NativeComponentRegistry = require('react-native/Libraries/NativeComponent/NativeComponentRegistry');
+
+let nativeComponentName = 'ExcludedIosComponent';
+
+
+export const __INTERNAL_VIEW_CONFIG = {
+  uiViewClassName: 'ExcludedIosComponent',
+  validAttributes: {},
+};
+
+export default NativeComponentRegistry.get(nativeComponentName, () => __INTERNAL_VIEW_CONFIG);
+
+let nativeComponentName = 'MultiFileIncludedNativeComponent';
+
+
+export const __INTERNAL_VIEW_CONFIG = {
+  uiViewClassName: 'MultiFileIncludedNativeComponent',
+
+  validAttributes: {
+    disabled: true,
+  },
+};
+
+export default NativeComponentRegistry.get(nativeComponentName, () => __INTERNAL_VIEW_CONFIG);
+",
+}
+`;
+
 exports[`GenerateViewConfigJs can generate fixture FLOAT_PROPS 1`] = `
 Map {
   "FLOAT_PROPSNativeViewConfig.js" => "
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
index 046e86b1c65e..159c05f13006 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
@@ -22,7 +22,7 @@ import type {
 
 import type {AliasResolver} from './Utils';
 const {createAliasResolver, getModules} = require('./Utils');
-const {unwrapNullable} = require('../../parsers/flow/modules/utils');
+const {unwrapNullable} = require('../../parsers/parsers-commons');
 
 type FilesOutput = Map<string, string>;
 
@@ -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) {
@@ -153,6 +157,17 @@ function serializeArg(
       return wrap(val => `${val}.asString(rt)`);
     case 'BooleanTypeAnnotation':
       return wrap(val => `${val}.asBool()`);
+    case 'EnumDeclaration':
+      switch (realTypeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return wrap(val => `${val}.asNumber()`);
+        case 'StringTypeAnnotation':
+          return wrap(val => `${val}.asString(rt)`);
+        default:
+          throw new Error(
+            `Unknown enum type for "${arg.name}, found: ${realTypeAnnotation.type}"`,
+          );
+      }
     case 'NumberTypeAnnotation':
       return wrap(val => `${val}.asNumber()`);
     case 'FloatTypeAnnotation':
@@ -167,6 +182,19 @@ function serializeArg(
       return wrap(val => `${val}.asObject(rt).asFunction(rt)`);
     case 'GenericObjectTypeAnnotation':
       return wrap(val => `${val}.asObject(rt)`);
+    case 'UnionTypeAnnotation':
+      switch (typeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return wrap(val => `${val}.asNumber()`);
+        case 'ObjectTypeAnnotation':
+          return wrap(val => `${val}.asObject(rt)`);
+        case 'StringTypeAnnotation':
+          return wrap(val => `${val}.asString(rt)`);
+        default:
+          throw new Error(
+            `Unsupported union member type for param  "${arg.name}, found: ${realTypeAnnotation.memberType}"`,
+          );
+      }
     case 'ObjectTypeAnnotation':
       return wrap(val => `${val}.asObject(rt)`);
     case 'MixedTypeAnnotation':
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
index 1f518d3f47e0..7076ab941311 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
@@ -16,20 +16,26 @@ import type {
   NativeModuleTypeAnnotation,
   NativeModuleFunctionTypeAnnotation,
   NativeModulePropertyShape,
+  NativeModuleAliasMap,
 } from '../../CodegenSchema';
 
 import type {AliasResolver} from './Utils';
 const {createAliasResolver, getModules} = require('./Utils');
 const {indent} = require('../Utils');
-const {unwrapNullable} = require('../../parsers/flow/modules/utils');
+const {unwrapNullable} = require('../../parsers/parsers-commons');
 
 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) {
@@ -146,8 +154,28 @@ function translatePrimitiveJSTypeToCpp(
       return wrap('int');
     case 'BooleanTypeAnnotation':
       return wrap('bool');
+    case 'EnumDeclaration':
+      switch (realTypeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return wrap('double');
+        case 'StringTypeAnnotation':
+          return wrap('jsi::String');
+        default:
+          throw new Error(createErrorMessage(realTypeAnnotation.type));
+      }
     case 'GenericObjectTypeAnnotation':
       return wrap('jsi::Object');
+    case 'UnionTypeAnnotation':
+      switch (typeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return wrap('double');
+        case 'ObjectTypeAnnotation':
+          return wrap('jsi::Object');
+        case 'StringTypeAnnotation':
+          return wrap('jsi::String');
+        default:
+          throw new Error(createErrorMessage(realTypeAnnotation.type));
+      }
     case 'ObjectTypeAnnotation':
       return wrap('jsi::Object');
     case 'ArrayTypeAnnotation':
@@ -164,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,
@@ -179,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,
@@ -188,6 +287,7 @@ function translatePropertyToCpp(
 
   const returnType = translatePrimitiveJSTypeToCpp(
     propTypeAnnotation.returnTypeAnnotation,
+    false,
     typeName => `Unsupported return type for ${prop.name}. Found: ${typeName}`,
     resolveAlias,
   );
@@ -227,6 +327,7 @@ module.exports = {
         moduleNames: [moduleName],
       } = nativeModules[hasteModuleName];
       const resolveAlias = createAliasResolver(aliases);
+      const structs = createStructs(moduleName, aliases, resolveAlias);
 
       return [
         ModuleClassDeclarationTemplate({
@@ -234,6 +335,7 @@ module.exports = {
           moduleProperties: properties.map(prop =>
             translatePropertyToCpp(prop, resolveAlias, true),
           ),
+          structs,
         }),
         ModuleSpecClassDeclarationTemplate({
           hasteModuleName,
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
index 538371a7c495..0b807bbbfa96 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
@@ -22,7 +22,7 @@ import type {
 
 import type {AliasResolver} from './Utils';
 const {createAliasResolver, getModules} = require('./Utils');
-const {unwrapNullable} = require('../../parsers/flow/modules/utils');
+const {unwrapNullable} = require('../../parsers/parsers-commons');
 
 type FilesOutput = Map<string, string>;
 
@@ -138,6 +138,15 @@ function translateFunctionParamToJavaType(
       return !isRequired ? 'Double' : 'double';
     case 'BooleanTypeAnnotation':
       return !isRequired ? 'Boolean' : 'boolean';
+    case 'EnumDeclaration':
+      switch (realTypeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return !isRequired ? 'Double' : 'double';
+        case 'StringTypeAnnotation':
+          return wrapIntoNullableIfNeeded('String');
+        default:
+          throw new Error(createErrorMessage(realTypeAnnotation.type));
+      }
     case 'ObjectTypeAnnotation':
       imports.add('com.facebook.react.bridge.ReadableMap');
       if (typeAnnotation.type === 'TypeAliasTypeAnnotation') {
@@ -156,7 +165,10 @@ function translateFunctionParamToJavaType(
       imports.add('com.facebook.react.bridge.Callback');
       return 'Callback';
     default:
-      (realTypeAnnotation.type: 'MixedTypeAnnotation');
+      (realTypeAnnotation.type:
+        | 'EnumDeclaration'
+        | 'MixedTypeAnnotation'
+        | 'UnionTypeAnnotation');
       throw new Error(createErrorMessage(realTypeAnnotation.type));
   }
 }
@@ -210,6 +222,15 @@ function translateFunctionReturnTypeToJavaType(
       return nullable ? 'Double' : 'double';
     case 'BooleanTypeAnnotation':
       return nullable ? 'Boolean' : 'boolean';
+    case 'EnumDeclaration':
+      switch (realTypeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return nullable ? 'Double' : 'double';
+        case 'StringTypeAnnotation':
+          return wrapIntoNullableIfNeeded('String');
+        default:
+          throw new Error(createErrorMessage(realTypeAnnotation.type));
+      }
     case 'ObjectTypeAnnotation':
       imports.add('com.facebook.react.bridge.WritableMap');
       return wrapIntoNullableIfNeeded('WritableMap');
@@ -220,7 +241,10 @@ function translateFunctionReturnTypeToJavaType(
       imports.add('com.facebook.react.bridge.WritableArray');
       return wrapIntoNullableIfNeeded('WritableArray');
     default:
-      (realTypeAnnotation.type: 'MixedTypeAnnotation');
+      (realTypeAnnotation.type:
+        | 'EnumDeclaration'
+        | 'MixedTypeAnnotation'
+        | 'UnionTypeAnnotation');
       throw new Error(createErrorMessage(realTypeAnnotation.type));
   }
 }
@@ -263,6 +287,15 @@ function getFalsyReturnStatementFromReturnType(
       return nullable ? 'return null;' : 'return 0;';
     case 'BooleanTypeAnnotation':
       return nullable ? 'return null;' : 'return false;';
+    case 'EnumDeclaration':
+      switch (realTypeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return nullable ? 'return null;' : 'return 0;';
+        case 'StringTypeAnnotation':
+          return nullable ? 'return null;' : 'return "";';
+        default:
+          throw new Error(createErrorMessage(realTypeAnnotation.type));
+      }
     case 'StringTypeAnnotation':
       return nullable ? 'return null;' : 'return "";';
     case 'ObjectTypeAnnotation':
@@ -272,7 +305,10 @@ function getFalsyReturnStatementFromReturnType(
     case 'ArrayTypeAnnotation':
       return 'return null;';
     default:
-      (realTypeAnnotation.type: 'MixedTypeAnnotation');
+      (realTypeAnnotation.type:
+        | 'EnumDeclaration'
+        | 'MixedTypeAnnotation'
+        | 'UnionTypeAnnotation');
       throw new Error(createErrorMessage(realTypeAnnotation.type));
   }
 }
@@ -364,7 +400,7 @@ module.exports = {
     packageName?: string,
     assumeNonnull: boolean = false,
   ): FilesOutput {
-    const files = new Map();
+    const files = new Map<string, string>();
     const nativeModules = getModules(schema);
 
     const normalizedPackageName =
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
index 4adb37c943c5..891f4fa61037 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
@@ -22,7 +22,7 @@ import type {
 
 import type {AliasResolver} from './Utils';
 const {createAliasResolver, getModules} = require('./Utils');
-const {unwrapNullable} = require('../../parsers/flow/modules/utils');
+const {unwrapNullable} = require('../../parsers/parsers-commons');
 
 type FilesOutput = Map<string, string>;
 
@@ -154,6 +154,17 @@ function translateReturnTypeToKind(
       return 'StringKind';
     case 'BooleanTypeAnnotation':
       return 'BooleanKind';
+    case 'EnumDeclaration':
+      switch (typeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return 'NumberKind';
+        case 'StringTypeAnnotation':
+          return 'StringKind';
+        default:
+          throw new Error(
+            `Unknown enum prop type for returning value, found: ${realTypeAnnotation.type}"`,
+          );
+      }
     case 'NumberTypeAnnotation':
       return 'NumberKind';
     case 'DoubleTypeAnnotation':
@@ -171,7 +182,10 @@ function translateReturnTypeToKind(
     case 'ArrayTypeAnnotation':
       return 'ArrayKind';
     default:
-      (realTypeAnnotation.type: 'MixedTypeAnnotation');
+      (realTypeAnnotation.type:
+        | 'EnumDeclaration'
+        | 'MixedTypeAnnotation'
+        | 'UnionTypeAnnotation');
       throw new Error(
         `Unknown prop type for returning value, found: ${realTypeAnnotation.type}"`,
       );
@@ -209,6 +223,17 @@ function translateParamTypeToJniType(
       return 'Ljava/lang/String;';
     case 'BooleanTypeAnnotation':
       return !isRequired ? 'Ljava/lang/Boolean;' : 'Z';
+    case 'EnumDeclaration':
+      switch (typeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return !isRequired ? 'Ljava/lang/Double;' : 'D';
+        case 'StringTypeAnnotation':
+          return 'Ljava/lang/String;';
+        default:
+          throw new Error(
+            `Unknown enum prop type for method arg, found: ${realTypeAnnotation.type}"`,
+          );
+      }
     case 'NumberTypeAnnotation':
       return !isRequired ? 'Ljava/lang/Double;' : 'D';
     case 'DoubleTypeAnnotation':
@@ -226,7 +251,10 @@ function translateParamTypeToJniType(
     case 'FunctionTypeAnnotation':
       return 'Lcom/facebook/react/bridge/Callback;';
     default:
-      (realTypeAnnotation.type: 'MixedTypeAnnotation');
+      (realTypeAnnotation.type:
+        | 'EnumDeclaration'
+        | 'MixedTypeAnnotation'
+        | 'UnionTypeAnnotation');
       throw new Error(
         `Unknown prop type for method arg, found: ${realTypeAnnotation.type}"`,
       );
@@ -261,6 +289,17 @@ function translateReturnTypeToJniType(
       return 'Ljava/lang/String;';
     case 'BooleanTypeAnnotation':
       return nullable ? 'Ljava/lang/Boolean;' : 'Z';
+    case 'EnumDeclaration':
+      switch (typeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return nullable ? 'Ljava/lang/Double;' : 'D';
+        case 'StringTypeAnnotation':
+          return 'Ljava/lang/String;';
+        default:
+          throw new Error(
+            `Unknown enum prop type for method return type, found: ${realTypeAnnotation.type}"`,
+          );
+      }
     case 'NumberTypeAnnotation':
       return nullable ? 'Ljava/lang/Double;' : 'D';
     case 'DoubleTypeAnnotation':
@@ -278,7 +317,10 @@ function translateReturnTypeToJniType(
     case 'ArrayTypeAnnotation':
       return 'Lcom/facebook/react/bridge/WritableArray;';
     default:
-      (realTypeAnnotation.type: 'MixedTypeAnnotation');
+      (realTypeAnnotation.type:
+        | 'EnumDeclaration'
+        | 'MixedTypeAnnotation'
+        | 'UnionTypeAnnotation');
       throw new Error(
         `Unknown prop type for method return type, found: ${realTypeAnnotation.type}"`,
       );
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
index 146e39b46774..bdedd8615a99 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
@@ -92,6 +92,9 @@ LOCAL_SHARED_LIBRARIES := libfbjni \
   libreact_render_core \
   libreact_render_debug \
   libreact_render_graphics \
+  libreact_render_imagemanager \
+  libreact_render_mapbuffer \
+  librrc_image \
   librrc_view \
   libturbomodulejsijni \
   libyoga
@@ -139,6 +142,8 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
+  rrc_image
   rrc_view
   turbomodulejsijni
   yoga
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js
index e942ff3c9782..ef7af6ae44a1 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js
@@ -19,6 +19,7 @@ import type {
   NativeModuleDoubleTypeAnnotation,
   NativeModuleFloatTypeAnnotation,
   NativeModuleBooleanTypeAnnotation,
+  NativeModuleEnumDeclaration,
   NativeModuleGenericObjectTypeAnnotation,
   ReservedTypeAnnotation,
   NativeModuleTypeAliasTypeAnnotation,
@@ -32,7 +33,7 @@ const {capitalize} = require('../../Utils');
 const {
   unwrapNullable,
   wrapNullable,
-} = require('../../../parsers/flow/modules/utils');
+} = require('../../../parsers/parsers-commons');
 
 type StructContext = 'CONSTANTS' | 'REGULAR';
 
@@ -63,6 +64,7 @@ export type StructTypeAnnotation =
   | NativeModuleDoubleTypeAnnotation
   | NativeModuleFloatTypeAnnotation
   | NativeModuleBooleanTypeAnnotation
+  | NativeModuleEnumDeclaration
   | NativeModuleGenericObjectTypeAnnotation
   | ReservedTypeAnnotation
   | NativeModuleTypeAliasTypeAnnotation
@@ -112,8 +114,12 @@ class StructCollector {
         this._insertAlias(typeAnnotation.name, structContext, resolveAlias);
         return wrapNullable(nullable, typeAnnotation);
       }
+      case 'EnumDeclaration':
+        return wrapNullable(nullable, typeAnnotation);
       case 'MixedTypeAnnotation':
         throw new Error('Mixed types are unsupported in structs');
+      case 'UnionTypeAnnotation':
+        throw new Error('Union types are unsupported in structs');
       default: {
         return wrapNullable(nullable, typeAnnotation);
       }
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
index 019724049a15..0fa67683e662 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
@@ -17,7 +17,7 @@ import type {Nullable} from '../../../../CodegenSchema';
 import type {StructTypeAnnotation, ConstantsStruct} from '../StructCollector';
 import type {StructSerilizationOutput} from './serializeStruct';
 
-const {unwrapNullable} = require('../../../../parsers/flow/modules/utils');
+const {unwrapNullable} = require('../../../../parsers/parsers-commons');
 
 const StructTemplate = ({
   hasteModuleName,
@@ -104,6 +104,17 @@ function toObjCType(
       return wrapOptional('double');
     case 'BooleanTypeAnnotation':
       return wrapOptional('bool');
+    case 'EnumDeclaration':
+      switch (typeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return wrapOptional('double');
+        case 'StringTypeAnnotation':
+          return 'NSString *';
+        default:
+          throw new Error(
+            `Couldn't convert enum into ObjC type: ${typeAnnotation.type}"`,
+          );
+      }
     case 'GenericObjectTypeAnnotation':
       return isRequired ? 'id<NSObject> ' : 'id<NSObject> _Nullable ';
     case 'ArrayTypeAnnotation':
@@ -171,6 +182,17 @@ function toObjCValue(
       return wrapPrimitive('double');
     case 'BooleanTypeAnnotation':
       return wrapPrimitive('BOOL');
+    case 'EnumDeclaration':
+      switch (typeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return wrapPrimitive('double');
+        case 'StringTypeAnnotation':
+          return value;
+        default:
+          throw new Error(
+            `Couldn't convert enum into ObjC value: ${typeAnnotation.type}"`,
+          );
+      }
     case 'GenericObjectTypeAnnotation':
       return value;
     case 'ArrayTypeAnnotation':
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
index e17c30005d41..e6c73c733888 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
@@ -17,7 +17,7 @@ import type {Nullable} from '../../../../CodegenSchema';
 import type {StructTypeAnnotation, RegularStruct} from '../StructCollector';
 import type {StructSerilizationOutput} from './serializeStruct';
 
-const {unwrapNullable} = require('../../../../parsers/flow/modules/utils');
+const {unwrapNullable} = require('../../../../parsers/parsers-commons');
 
 const StructTemplate = ({
   hasteModuleName,
@@ -95,6 +95,17 @@ function toObjCType(
       return wrapOptional('double');
     case 'BooleanTypeAnnotation':
       return wrapOptional('bool');
+    case 'EnumDeclaration':
+      switch (typeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return wrapOptional('double');
+        case 'StringTypeAnnotation':
+          return 'NSString *';
+        default:
+          throw new Error(
+            `Couldn't convert enum into ObjC type: ${typeAnnotation.type}"`,
+          );
+      }
     case 'GenericObjectTypeAnnotation':
       return isRequired ? 'id<NSObject> ' : 'id<NSObject> _Nullable';
     case 'ArrayTypeAnnotation':
@@ -161,6 +172,17 @@ function toObjCValue(
       return RCTBridgingTo('Double');
     case 'BooleanTypeAnnotation':
       return RCTBridgingTo('Bool');
+    case 'EnumDeclaration':
+      switch (typeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return RCTBridgingTo('Double');
+        case 'StringTypeAnnotation':
+          return RCTBridgingTo('String');
+        default:
+          throw new Error(
+            `Couldn't convert enum into ObjC value: ${typeAnnotation.type}"`,
+          );
+      }
     case 'GenericObjectTypeAnnotation':
       return value;
     case 'ArrayTypeAnnotation':
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
index 8bedb6cb61f9..d0864ca5ea8e 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
@@ -19,15 +19,15 @@ import type {
 } from '../../../CodegenSchema';
 
 import type {AliasResolver} from '../Utils';
+import type {StructCollector} from './StructCollector';
 
 const invariant = require('invariant');
-const {StructCollector} = require('./StructCollector');
 const {getNamespacedStructName} = require('./Utils');
 const {capitalize} = require('../../Utils');
 const {
   wrapNullable,
   unwrapNullable,
-} = require('../../../parsers/flow/modules/utils');
+} = require('../../../parsers/parsers-commons');
 
 const ProtocolMethodTemplate = ({
   returnObjCType,
@@ -271,6 +271,17 @@ function getParamObjCType(
       return notStruct(notRequired ? 'NSNumber *' : 'double');
     case 'BooleanTypeAnnotation':
       return notStruct(notRequired ? 'NSNumber *' : 'BOOL');
+    case 'EnumDeclaration':
+      switch (typeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return notStruct(notRequired ? 'NSNumber *' : 'double');
+        case 'StringTypeAnnotation':
+          return notStruct(wrapIntoNullableIfNeeded('NSString *'));
+        default:
+          throw new Error(
+            `Unsupported enum type for param "${paramName}" in ${methodName}. Found: ${typeAnnotation.type}`,
+          );
+      }
     case 'GenericObjectTypeAnnotation':
       return notStruct(wrapIntoNullableIfNeeded('NSDictionary *'));
     default:
@@ -284,7 +295,7 @@ function getParamObjCType(
 function getReturnObjCType(
   methodName: string,
   nullableTypeAnnotation: Nullable<NativeModuleReturnTypeAnnotation>,
-) {
+): string {
   const [typeAnnotation, nullable] = unwrapNullable(nullableTypeAnnotation);
 
   function wrapIntoNullableIfNeeded(generatedType: string) {
@@ -335,10 +346,24 @@ function getReturnObjCType(
       return wrapIntoNullableIfNeeded('NSNumber *');
     case 'BooleanTypeAnnotation':
       return wrapIntoNullableIfNeeded('NSNumber *');
+    case 'EnumDeclaration':
+      switch (typeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return wrapIntoNullableIfNeeded('NSNumber *');
+        case 'StringTypeAnnotation':
+          return wrapIntoNullableIfNeeded('NSString *');
+        default:
+          throw new Error(
+            `Unsupported enum return type for ${methodName}. Found: ${typeAnnotation.type}`,
+          );
+      }
     case 'GenericObjectTypeAnnotation':
       return wrapIntoNullableIfNeeded('NSDictionary *');
     default:
-      (typeAnnotation.type: 'MixedTypeAnnotation');
+      (typeAnnotation.type:
+        | 'EnumDeclaration'
+        | 'MixedTypeAnnotation'
+        | 'UnionTypeAnnotation');
       throw new Error(
         `Unsupported return type for ${methodName}. Found: ${typeAnnotation.type}`,
       );
@@ -377,8 +402,22 @@ function getReturnJSType(
       return 'BooleanKind';
     case 'GenericObjectTypeAnnotation':
       return 'ObjectKind';
+    case 'EnumDeclaration':
+      switch (typeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return 'NumberKind';
+        case 'StringTypeAnnotation':
+          return 'StringKind';
+        default:
+          throw new Error(
+            `Unsupported return type for ${methodName}. Found: ${typeAnnotation.type}`,
+          );
+      }
     default:
-      (typeAnnotation.type: 'MixedTypeAnnotation');
+      (typeAnnotation.type:
+        | 'EnumDeclaration'
+        | 'MixedTypeAnnotation'
+        | 'UnionTypeAnnotation');
       throw new Error(
         `Unsupported return type for ${methodName}. Found: ${typeAnnotation.type}`,
       );
diff --git a/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
index 16f6bd517ba4..b2b7e0cdfa9a 100644
--- a/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
+++ b/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
@@ -275,6 +275,61 @@ 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,
+            typeAnnotation: {
+              type: 'FunctionTypeAnnotation',
+              returnTypeAnnotation: {
+                type: 'StringTypeAnnotation',
+              },
+              params: [
+                {
+                  name: 'enumInt',
+                  optional: false,
+                  typeAnnotation: {
+                    type: 'EnumDeclaration',
+                    memberType: 'NumberTypeAnnotation',
+                  },
+                },
+                {
+                  name: 'enumFloat',
+                  optional: false,
+                  typeAnnotation: {
+                    type: 'EnumDeclaration',
+                    memberType: 'NumberTypeAnnotation',
+                  },
+                },
+                {
+                  name: 'enumString',
+                  optional: false,
+                  typeAnnotation: {
+                    type: 'EnumDeclaration',
+                    memberType: 'StringTypeAnnotation',
+                  },
+                },
+              ],
+            },
+          },
         ],
       },
       moduleNames: ['SampleTurboModule'],
@@ -1169,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: {
@@ -1567,6 +1555,87 @@ const CXX_ONLY_NATIVE_MODULES: SchemaType = {
               ],
             },
           },
+          {
+            name: 'getEnums',
+            optional: false,
+            typeAnnotation: {
+              type: 'FunctionTypeAnnotation',
+              returnTypeAnnotation: {
+                type: 'StringTypeAnnotation',
+              },
+              params: [
+                {
+                  name: 'enumInt',
+                  optional: false,
+                  typeAnnotation: {
+                    type: 'EnumDeclaration',
+                    memberType: 'NumberTypeAnnotation',
+                  },
+                },
+                {
+                  name: 'enumFloat',
+                  optional: false,
+                  typeAnnotation: {
+                    type: 'EnumDeclaration',
+                    memberType: 'NumberTypeAnnotation',
+                  },
+                },
+                {
+                  name: 'enumString',
+                  optional: false,
+                  typeAnnotation: {
+                    type: 'EnumDeclaration',
+                    memberType: 'StringTypeAnnotation',
+                  },
+                },
+              ],
+            },
+          },
+          {
+            name: 'getUnion',
+            optional: false,
+            typeAnnotation: {
+              type: 'FunctionTypeAnnotation',
+              returnTypeAnnotation: {
+                type: 'UnionTypeAnnotation',
+                memberType: 'ObjectTypeAnnotation',
+              },
+              params: [
+                {
+                  name: 'chooseInt',
+                  optional: false,
+                  typeAnnotation: {
+                    type: 'UnionTypeAnnotation',
+                    memberType: 'NumberTypeAnnotation',
+                  },
+                },
+                {
+                  name: 'chooseFloat',
+                  optional: false,
+                  typeAnnotation: {
+                    type: 'UnionTypeAnnotation',
+                    memberType: 'NumberTypeAnnotation',
+                  },
+                },
+                {
+                  name: 'chooseObject',
+                  optional: false,
+                  typeAnnotation: {
+                    type: 'UnionTypeAnnotation',
+                    memberType: 'ObjectTypeAnnotation',
+                  },
+                },
+                {
+                  name: 'chooseString',
+                  optional: false,
+                  typeAnnotation: {
+                    type: 'UnionTypeAnnotation',
+                    memberType: 'StringTypeAnnotation',
+                  },
+                },
+              ],
+            },
+          },
         ],
       },
       moduleNames: ['SampleTurboModuleCxx'],
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleCpp-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleCpp-test.js
index dfef8d4cdb8c..993cf01ef1b4 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleCpp-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleCpp-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleH-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleH-test.js
index 43c2ccf080ed..2d7e3e49f8c3 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleH-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleH-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleHObjCpp-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleHObjCpp-test.js
index 0d7431c05285..6476daa01c41 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleHObjCpp-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleHObjCpp-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJavaSpec-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJavaSpec-test.js
index 53cbac6ba70b..b3ea40c76e02 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJavaSpec-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJavaSpec-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniCpp-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniCpp-test.js
index 59f2568c770d..dc9565119937 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniCpp-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniCpp-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniH-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniH-test.js
index 3321f9f68b2e..0ce2e0ef1460 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniH-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleJniH-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleMm-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleMm-test.js
index bb4428292c53..11fd335a9b44 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleMm-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleMm-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleCpp-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleCpp-test.js.snap
index 93a57fc91bcb..4a22ab252d74 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleCpp-test.js.snap
+++ b/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) {
@@ -115,11 +115,19 @@ static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getNullableNu
   auto result = static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getNullableNumberFromNullableAlias(rt, args[0].isNull() || args[0].isUndefined() ? std::nullopt : std::make_optional(args[0].asObject(rt)));
   return result ? jsi::Value(std::move(*result)) : jsi::Value::null();
 }
+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));
+}
+static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getUnion(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getUnion(rt, args[0].asNumber(), args[1].asNumber(), args[2].asObject(rt), args[3].asString(rt));
+}
 
 NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
   : TurboModule(\\"SampleTurboModuleCxx\\", jsInvoker) {
   methodMap_[\\"getMixed\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getMixed};
   methodMap_[\\"getNullableNumberFromNullableAlias\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getNullableNumberFromNullableAlias};
+  methodMap_[\\"getEnums\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getEnums};
+  methodMap_[\\"getUnion\\"] = MethodMetadata {4, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getUnion};
 }
 
 
@@ -232,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();
@@ -329,6 +328,12 @@ 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));
+}
 
 NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
   : TurboModule(\\"SampleTurboModule\\", jsInvoker) {
@@ -343,6 +348,8 @@ 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};
 }
 
 
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap
index 7fce7ea93108..679072d878eb 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap
+++ b/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);
@@ -209,6 +239,8 @@ protected:
 public:
   virtual jsi::Value getMixed(jsi::Runtime &rt, jsi::Value arg) = 0;
   virtual std::optional<double> getNullableNumberFromNullableAlias(jsi::Runtime &rt, std::optional<jsi::Object> a) = 0;
+  virtual jsi::String getEnums(jsi::Runtime &rt, double enumInt, double enumFloat, jsi::String enumString) = 0;
+  virtual jsi::Object getUnion(jsi::Runtime &rt, double chooseInt, double chooseFloat, jsi::Object chooseObject, jsi::String chooseString) = 0;
 
 };
 
@@ -246,6 +278,22 @@ private:
       return bridging::callFromJs<std::optional<double>>(
           rt, &T::getNullableNumberFromNullableAlias, jsInvoker_, instance_, std::move(a));
     }
+    jsi::String getEnums(jsi::Runtime &rt, double enumInt, double enumFloat, jsi::String enumString) override {
+      static_assert(
+          bridging::getParameterCount(&T::getEnums) == 4,
+          \\"Expected getEnums(...) to have 4 parameters\\");
+
+      return bridging::callFromJs<jsi::String>(
+          rt, &T::getEnums, jsInvoker_, instance_, std::move(enumInt), std::move(enumFloat), std::move(enumString));
+    }
+    jsi::Object getUnion(jsi::Runtime &rt, double chooseInt, double chooseFloat, jsi::Object chooseObject, jsi::String chooseString) override {
+      static_assert(
+          bridging::getParameterCount(&T::getUnion) == 5,
+          \\"Expected getUnion(...) to have 5 parameters\\");
+
+      return bridging::callFromJs<jsi::Object>(
+          rt, &T::getUnion, jsInvoker_, instance_, std::move(chooseInt), std::move(chooseFloat), std::move(chooseObject), std::move(chooseString));
+    }
 
   private:
     T *instance_;
@@ -340,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);
@@ -417,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);
@@ -487,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) {}
+  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;
+  }
+};
 
-    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));
-    }
+#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;
+  }
+};
 
-  private:
-    T *instance_;
-  };
+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;
+  }
 
-  Delegate delegate_;
+  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 {
@@ -650,6 +978,8 @@ 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;
 
 };
 
@@ -759,6 +1089,22 @@ 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,
+          \\"Expected getEnums(...) to have 4 parameters\\");
+
+      return bridging::callFromJs<jsi::String>(
+          rt, &T::getEnums, jsInvoker_, instance_, std::move(enumInt), std::move(enumFloat), std::move(enumString));
+    }
 
   private:
     T *instance_;
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap
index 07ab8ba9129c..4e923454c776 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap
+++ b/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,12 @@ 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;
 - (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants::Builder>)constantsToExport;
 - (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants::Builder>)getConstants;
 
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJavaSpec-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJavaSpec-test.js.snap
index 3fec5218b9ff..473878ebefa9 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJavaSpec-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJavaSpec-test.js.snap
@@ -376,6 +376,14 @@ public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaMo
   @ReactMethod
   @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);
 }
 ",
 }
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniCpp-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniCpp-test.js.snap
index 9d771b73ddda..bb1428ed7ae0 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniCpp-test.js.snap
@@ -384,6 +384,16 @@ 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);
+}
+
 NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const JavaTurboModule::InitParams &params)
   : JavaTurboModule(params) {
   methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
@@ -397,6 +407,8 @@ 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};
 }
 
 std::shared_ptr<TurboModule> simple_native_modules_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
index 0a84dc885c4f..26467d5eb841 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
@@ -54,7 +54,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/SampleWithUppercaseName
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_image   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -93,6 +93,8 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
+  rrc_image
   rrc_view
   turbomodulejsijni
   yoga
@@ -165,7 +167,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/complex_objects
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_image   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -204,6 +206,8 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
+  rrc_image
   rrc_view
   turbomodulejsijni
   yoga
@@ -269,7 +273,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/cxx_only_native_modules
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_image   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -308,6 +312,8 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
+  rrc_image
   rrc_view
   turbomodulejsijni
   yoga
@@ -380,7 +386,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/empty_native_modules
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_image   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -419,6 +425,8 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
+  rrc_image
   rrc_view
   turbomodulejsijni
   yoga
@@ -491,7 +499,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/native_modules_with_type_aliases
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_image   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -530,6 +538,8 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
+  rrc_image
   rrc_view
   turbomodulejsijni
   yoga
@@ -610,7 +620,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/real_module_example
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_image   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -649,6 +659,8 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
+  rrc_image
   rrc_view
   turbomodulejsijni
   yoga
@@ -721,7 +733,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/simple_native_modules
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_image   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -760,6 +772,8 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
+  rrc_image
   rrc_view
   turbomodulejsijni
   yoga
@@ -840,7 +854,7 @@ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/two_modules_different_files
 
-LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   librrc_view   libturbomodulejsijni   libyoga
+LOCAL_SHARED_LIBRARIES := libfbjni   libfolly_runtime   libglog   libjsi   libreact_codegen_rncore   libreact_debug   libreact_nativemodule_core   libreact_render_core   libreact_render_debug   libreact_render_graphics   libreact_render_imagemanager   libreact_render_mapbuffer   librrc_image   librrc_view   libturbomodulejsijni   libyoga
 
 LOCAL_CFLAGS := \\\\
   -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
@@ -879,6 +893,8 @@ target_link_libraries(
   react_render_core
   react_render_debug
   react_render_graphics
+  react_render_imagemanager
+  rrc_image
   rrc_view
   turbomodulejsijni
   yoga
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
index 3b2acb73c239..867858ae3252 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
+++ b/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,14 @@ 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);
+    }
+
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
@@ -490,6 +477,12 @@ namespace facebook {
         methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise};
         
         
+        methodMap_[\\"getValueWithOptionalArg\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithOptionalArg};
+        
+        
+        methodMap_[\\"getEnums\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleSpecJSI_getEnums};
+        
+        
         methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
         
     }
diff --git a/packages/react-native-codegen/src/parsers/__tests__/error-utils-test.js b/packages/react-native-codegen/src/parsers/__tests__/error-utils-test.js
new file mode 100644
index 000000000000..58c4081abdb1
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/__tests__/error-utils-test.js
@@ -0,0 +1,654 @@
+/**
+ * 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
+ * @oncall react_native
+ */
+
+'use strict';
+
+const {
+  throwIfModuleInterfaceNotFound,
+  throwIfMoreThanOneModuleRegistryCalls,
+  throwIfModuleInterfaceIsMisnamed,
+  throwIfUnusedModuleInterfaceParserError,
+  throwIfWrongNumberOfCallExpressionArgs,
+  throwIfIncorrectModuleRegistryCallTypeParameterParserError,
+  throwIfUnsupportedFunctionReturnTypeAnnotationParserError,
+  throwIfMoreThanOneModuleInterfaceParserError,
+  throwIfModuleTypeIsUnsupported,
+  throwIfUntypedModule,
+  throwIfUnsupportedFunctionParamTypeAnnotationParserError,
+} = require('../error-utils');
+const {
+  UnsupportedModulePropertyParserError,
+  ModuleInterfaceNotFoundParserError,
+  MoreThanOneModuleRegistryCallsParserError,
+  MisnamedModuleInterfaceParserError,
+  UnusedModuleInterfaceParserError,
+  IncorrectModuleRegistryCallArityParserError,
+  IncorrectModuleRegistryCallTypeParameterParserError,
+  UnsupportedFunctionReturnTypeAnnotationParserError,
+  UntypedModuleRegistryCallParserError,
+  MoreThanOneModuleInterfaceParserError,
+  UnsupportedFunctionParamTypeAnnotationParserError,
+} = require('../errors');
+
+describe('throwIfModuleInterfaceIsMisnamed', () => {
+  it("don't throw error if module interface name is Spec", () => {
+    const nativeModuleName = 'moduleName';
+    const specId = {name: 'Spec'};
+    const parserType = 'Flow';
+
+    expect(() => {
+      throwIfModuleInterfaceIsMisnamed(nativeModuleName, specId, parserType);
+    }).not.toThrow(MisnamedModuleInterfaceParserError);
+  });
+  it('throw error if module interface is misnamed', () => {
+    const nativeModuleName = 'moduleName';
+    const specId = {name: 'Name'};
+    const parserType = 'TypeScript';
+
+    expect(() => {
+      throwIfModuleInterfaceIsMisnamed(nativeModuleName, specId, parserType);
+    }).toThrow(MisnamedModuleInterfaceParserError);
+  });
+});
+
+describe('throwIfModuleInterfaceNotFound', () => {
+  it('throw error if there are zero module specs', () => {
+    const nativeModuleName = 'moduleName';
+    const specId = {name: 'Name'};
+    const parserType = 'TypeScript';
+
+    expect(() => {
+      throwIfModuleInterfaceNotFound(0, nativeModuleName, specId, parserType);
+    }).toThrow(ModuleInterfaceNotFoundParserError);
+  });
+
+  it("don't throw error if there is at least one module spec", () => {
+    const nativeModuleName = 'moduleName';
+    const specId = {name: 'Spec'};
+    const parserType = 'Flow';
+
+    expect(() => {
+      throwIfModuleInterfaceNotFound(1, nativeModuleName, specId, parserType);
+    }).not.toThrow(ModuleInterfaceNotFoundParserError);
+  });
+});
+
+describe('throwIfMoreThanOneModuleRegistryCalls', () => {
+  it('throw error if module registry calls more than one', () => {
+    const nativeModuleName = 'moduleName';
+    const callExpressions = [
+      {name: 'callExpression1'},
+      {name: 'callExpression2'},
+    ];
+    const parserType = 'Flow';
+
+    expect(() => {
+      throwIfMoreThanOneModuleRegistryCalls(
+        nativeModuleName,
+        callExpressions,
+        callExpressions.length,
+        parserType,
+      );
+    }).toThrow(MoreThanOneModuleRegistryCallsParserError);
+  });
+  it("don't throw error if single module registry call", () => {
+    const nativeModuleName = 'moduleName';
+    const callExpressions = [{name: 'callExpression1'}];
+    const parserType = 'TypeScript';
+
+    expect(() => {
+      throwIfMoreThanOneModuleRegistryCalls(
+        nativeModuleName,
+        callExpressions,
+        callExpressions.length,
+        parserType,
+      );
+    }).not.toThrow(MoreThanOneModuleRegistryCallsParserError);
+  });
+});
+
+describe('throwIfUnusedModuleInterfaceParserError', () => {
+  it('throw error if unused module', () => {
+    const nativeModuleName = 'moduleName';
+    const callExpressions: Array<$FlowFixMe> = [];
+    const spec = {name: 'Spec'};
+    const parserType = 'Flow';
+    expect(() => {
+      throwIfUnusedModuleInterfaceParserError(
+        nativeModuleName,
+        spec,
+        callExpressions,
+        parserType,
+      );
+    }).toThrow(UnusedModuleInterfaceParserError);
+  });
+
+  it("don't throw error if module is used", () => {
+    const nativeModuleName = 'moduleName';
+    const callExpressions = [{name: 'callExpression1'}];
+    const spec = {name: 'Spec'};
+    const parserType = 'TypeScript';
+    expect(() => {
+      throwIfUnusedModuleInterfaceParserError(
+        nativeModuleName,
+        spec,
+        callExpressions,
+        parserType,
+      );
+    }).not.toThrow(UnusedModuleInterfaceParserError);
+  });
+});
+
+describe('throwErrorIfWrongNumberOfCallExpressionArgs', () => {
+  it('throw error if wrong number of call expression args is used', () => {
+    const nativeModuleName = 'moduleName';
+    const flowCallExpression: {argument: Array<$FlowFixMe>} = {argument: []};
+    const methodName = 'methodName';
+    const numberOfCallExpressionArgs = flowCallExpression.argument.length;
+    const language = 'Flow';
+    expect(() => {
+      throwIfWrongNumberOfCallExpressionArgs(
+        nativeModuleName,
+        flowCallExpression,
+        methodName,
+        numberOfCallExpressionArgs,
+        language,
+      );
+    }).toThrow(IncorrectModuleRegistryCallArityParserError);
+  });
+
+  it("don't throw error if correct number of call expression args is used", () => {
+    const nativeModuleName = 'moduleName';
+    const flowCallExpression = {argument: ['argument']};
+    const methodName = 'methodName';
+    const numberOfCallExpressionArgs = flowCallExpression.argument.length;
+    const language = 'Flow';
+    expect(() => {
+      throwIfWrongNumberOfCallExpressionArgs(
+        nativeModuleName,
+        flowCallExpression,
+        methodName,
+        numberOfCallExpressionArgs,
+        language,
+      );
+    }).not.toThrow(IncorrectModuleRegistryCallArityParserError);
+  });
+});
+
+describe('throwIfUnsupportedFunctionReturnTypeAnnotationParserError', () => {
+  const returnTypeAnnotation = {
+      returnType: '',
+    },
+    nativeModuleName = 'moduleName',
+    invalidReturnType = 'FunctionTypeAnnotation',
+    language = 'Flow';
+
+  it('do not throw error if cxxOnly is true', () => {
+    const cxxOnly = true,
+      returnType = 'FunctionTypeAnnotation';
+
+    expect(() => {
+      throwIfUnsupportedFunctionReturnTypeAnnotationParserError(
+        nativeModuleName,
+        returnTypeAnnotation,
+        invalidReturnType,
+        language,
+        cxxOnly,
+        returnType,
+      );
+    }).not.toThrow(UnsupportedFunctionReturnTypeAnnotationParserError);
+  });
+
+  it('do not throw error if returnTypeAnnotation type is not FunctionTypeAnnotation', () => {
+    const cxxOnly = false,
+      returnType = '';
+
+    expect(() => {
+      throwIfUnsupportedFunctionReturnTypeAnnotationParserError(
+        nativeModuleName,
+        returnTypeAnnotation,
+        invalidReturnType,
+        language,
+        cxxOnly,
+        returnType,
+      );
+    }).not.toThrow(UnsupportedFunctionReturnTypeAnnotationParserError);
+  });
+
+  it('throw error if cxxOnly is false and returnTypeAnnotation type is FunctionTypeAnnotation', () => {
+    const cxxOnly = false,
+      returnType = 'FunctionTypeAnnotation';
+
+    expect(() => {
+      throwIfUnsupportedFunctionReturnTypeAnnotationParserError(
+        nativeModuleName,
+        returnTypeAnnotation,
+        invalidReturnType,
+        language,
+        cxxOnly,
+        returnType,
+      );
+    }).toThrow(UnsupportedFunctionReturnTypeAnnotationParserError);
+  });
+});
+
+describe('throwIfIncorrectModuleRegistryCallTypeParameterParserError', () => {
+  const nativeModuleName = 'moduleName';
+  const methodName = 'methodName';
+  const moduleName = 'moduleName';
+  it('throw error if flowTypeArguments type is incorrect', () => {
+    const flowTypeArguments = {
+      type: '',
+      params: [
+        {
+          type: 'GenericTypeAnnotation',
+          id: {
+            name: 'Spec',
+          },
+        },
+      ],
+    };
+
+    const parserType = 'Flow';
+
+    expect(() => {
+      throwIfIncorrectModuleRegistryCallTypeParameterParserError(
+        nativeModuleName,
+        flowTypeArguments,
+        methodName,
+        moduleName,
+        parserType,
+      );
+    }).toThrow(IncorrectModuleRegistryCallTypeParameterParserError);
+  });
+
+  it('throw error if flowTypeArguments params length is not 1', () => {
+    const flowTypeArguments: $FlowFixMe = {
+      type: 'TypeParameterInstantiation',
+      params: [],
+    };
+
+    const parserType = 'Flow';
+
+    expect(() => {
+      throwIfIncorrectModuleRegistryCallTypeParameterParserError(
+        nativeModuleName,
+        flowTypeArguments,
+        methodName,
+        moduleName,
+        parserType,
+      );
+    }).toThrow(IncorrectModuleRegistryCallTypeParameterParserError);
+  });
+
+  it('throw error if flowTypeArguments params type is not GenericTypeAnnotation', () => {
+    const flowTypeArguments = {
+      type: 'TypeParameterInstantiation',
+      params: [
+        {
+          type: '',
+          id: {
+            name: 'Spec',
+          },
+        },
+      ],
+    };
+
+    const parserType = 'Flow';
+
+    expect(() => {
+      throwIfIncorrectModuleRegistryCallTypeParameterParserError(
+        nativeModuleName,
+        flowTypeArguments,
+        methodName,
+        moduleName,
+        parserType,
+      );
+    }).toThrow(IncorrectModuleRegistryCallTypeParameterParserError);
+  });
+
+  it('throw error if flowTypeArguments params id name is not Spec', () => {
+    const flowTypeArguments = {
+      type: 'TypeParameterInstantiation',
+      params: [
+        {
+          type: 'GenericTypeAnnotation',
+          id: {
+            name: '',
+          },
+        },
+      ],
+    };
+
+    const parserType = 'Flow';
+
+    expect(() => {
+      throwIfIncorrectModuleRegistryCallTypeParameterParserError(
+        nativeModuleName,
+        flowTypeArguments,
+        methodName,
+        moduleName,
+        parserType,
+      );
+    }).toThrow(IncorrectModuleRegistryCallTypeParameterParserError);
+  });
+
+  it('do not throw error if flowTypeArguments are correct', () => {
+    const flowTypeArguments = {
+      type: 'TypeParameterInstantiation',
+      params: [
+        {
+          type: 'GenericTypeAnnotation',
+          id: {
+            name: 'Spec',
+          },
+        },
+      ],
+    };
+
+    const parserType = 'Flow';
+
+    expect(() => {
+      throwIfIncorrectModuleRegistryCallTypeParameterParserError(
+        nativeModuleName,
+        flowTypeArguments,
+        methodName,
+        moduleName,
+        parserType,
+      );
+    }).not.toThrow(IncorrectModuleRegistryCallTypeParameterParserError);
+  });
+
+  it('throw error if typeScriptTypeArguments type not correct', () => {
+    const typeScriptTypeArguments = {
+      type: '',
+      params: [
+        {
+          type: 'TSTypeReference',
+          typeName: {
+            name: 'Spec',
+          },
+        },
+      ],
+    };
+
+    const parserType = 'TypeScript';
+
+    expect(() => {
+      throwIfIncorrectModuleRegistryCallTypeParameterParserError(
+        nativeModuleName,
+        typeScriptTypeArguments,
+        methodName,
+        moduleName,
+        parserType,
+      );
+    }).toThrow(IncorrectModuleRegistryCallTypeParameterParserError);
+  });
+
+  it('throw error if typeScriptTypeArguments params length is not equal to 1', () => {
+    const typeScriptTypeArguments: $FlowFixMe = {
+      type: 'TSTypeParameterInstantiation',
+      params: [],
+    };
+
+    const parserType = 'TypeScript';
+
+    expect(() => {
+      throwIfIncorrectModuleRegistryCallTypeParameterParserError(
+        nativeModuleName,
+        typeScriptTypeArguments,
+        methodName,
+        moduleName,
+        parserType,
+      );
+    }).toThrow(IncorrectModuleRegistryCallTypeParameterParserError);
+  });
+
+  it('throw error if typeScriptTypeArguments params type is not TSTypeReference', () => {
+    const typeScriptTypeArguments = {
+      type: 'TSTypeParameterInstantiation',
+      params: [
+        {
+          type: '',
+          typeName: {
+            name: 'Spec',
+          },
+        },
+      ],
+    };
+
+    const parserType = 'TypeScript';
+
+    expect(() => {
+      throwIfIncorrectModuleRegistryCallTypeParameterParserError(
+        nativeModuleName,
+        typeScriptTypeArguments,
+        methodName,
+        moduleName,
+        parserType,
+      );
+    }).toThrow(IncorrectModuleRegistryCallTypeParameterParserError);
+  });
+
+  it('throw error if typeScriptTypeArguments params typeName name is not Spec', () => {
+    const typeScriptTypeArguments = {
+      type: 'TSTypeParameterInstantiation',
+      params: [
+        {
+          type: 'TSTypeReference',
+          typeName: {
+            name: '',
+          },
+        },
+      ],
+    };
+
+    const parserType = 'TypeScript';
+
+    expect(() => {
+      throwIfIncorrectModuleRegistryCallTypeParameterParserError(
+        nativeModuleName,
+        typeScriptTypeArguments,
+        methodName,
+        moduleName,
+        parserType,
+      );
+    }).toThrow(IncorrectModuleRegistryCallTypeParameterParserError);
+  });
+
+  it('do not throw error if typeScriptTypeArguments are correct', () => {
+    const typeScriptTypeArguments = {
+      type: 'TSTypeParameterInstantiation',
+      params: [
+        {
+          type: 'TSTypeReference',
+          typeName: {
+            name: 'Spec',
+          },
+        },
+      ],
+    };
+
+    const parserType = 'TypeScript';
+
+    expect(() => {
+      throwIfIncorrectModuleRegistryCallTypeParameterParserError(
+        nativeModuleName,
+        typeScriptTypeArguments,
+        methodName,
+        moduleName,
+        parserType,
+      );
+    }).not.toThrow(IncorrectModuleRegistryCallTypeParameterParserError);
+  });
+});
+
+describe('throwIfUntypedModule', () => {
+  const hasteModuleName = 'moduleName';
+  const methodName = 'methodName';
+  const moduleName = 'moduleName';
+  const callExpressions: Array<$FlowFixMe> = [];
+
+  it('should throw error if module does not have a type', () => {
+    const typeArguments = null;
+    const language = 'Flow';
+    expect(() =>
+      throwIfUntypedModule(
+        typeArguments,
+        hasteModuleName,
+        callExpressions,
+        methodName,
+        moduleName,
+        language,
+      ),
+    ).toThrowError(UntypedModuleRegistryCallParserError);
+  });
+
+  it('should not throw error if module have a type', () => {
+    const typeArguments: $FlowFixMe = {
+      type: 'TSTypeParameterInstantiations',
+      params: [],
+    };
+
+    const language = 'TypeScript';
+    expect(() =>
+      throwIfUntypedModule(
+        typeArguments,
+        hasteModuleName,
+        callExpressions,
+        methodName,
+        moduleName,
+        language,
+      ),
+    ).not.toThrowError(UntypedModuleRegistryCallParserError);
+  });
+});
+
+describe('throwIfModuleTypeIsUnsupported', () => {
+  const hasteModuleName = 'moduleName';
+  const property = {value: 'value', key: {name: 'name'}};
+  it("don't throw error if module type is FunctionTypeAnnotation in Flow", () => {
+    const value = {type: 'FunctionTypeAnnotation'};
+    const language = 'Flow';
+
+    expect(() => {
+      throwIfModuleTypeIsUnsupported(
+        hasteModuleName,
+        property.value,
+        property.key.name,
+        value.type,
+        language,
+      );
+    }).not.toThrow(UnsupportedModulePropertyParserError);
+  });
+  it('throw error if module type is unsupported in Flow', () => {
+    const value = {type: ''};
+    const language = 'Flow';
+
+    expect(() => {
+      throwIfModuleTypeIsUnsupported(
+        hasteModuleName,
+        property.value,
+        property.key.name,
+        value.type,
+        language,
+      );
+    }).toThrow(UnsupportedModulePropertyParserError);
+  });
+  it("don't throw error if module type is TSFunctionType in TypeScript", () => {
+    const value = {type: 'TSFunctionType'};
+    const language = 'TypeScript';
+
+    expect(() => {
+      throwIfModuleTypeIsUnsupported(
+        hasteModuleName,
+        property.value,
+        property.key.name,
+        value.type,
+        language,
+      );
+    }).not.toThrow(UnsupportedModulePropertyParserError);
+  });
+  it("don't throw error if module type is TSMethodSignature in TypeScript", () => {
+    const value = {type: 'TSMethodSignature'};
+    const language = 'TypeScript';
+
+    expect(() => {
+      throwIfModuleTypeIsUnsupported(
+        hasteModuleName,
+        property.value,
+        property.key.name,
+        value.type,
+        language,
+      );
+    }).not.toThrow(UnsupportedModulePropertyParserError);
+  });
+  it('throw error if module type is unsupported in TypeScript', () => {
+    const value = {type: ''};
+    const language = 'TypeScript';
+
+    expect(() => {
+      throwIfModuleTypeIsUnsupported(
+        hasteModuleName,
+        property.value,
+        property.key.name,
+        value.type,
+        language,
+      );
+    }).toThrow(UnsupportedModulePropertyParserError);
+  });
+});
+
+describe('throwIfMoreThanOneModuleInterfaceParserError', () => {
+  it("don't throw error if module specs length is <= 1", () => {
+    const nativeModuleName = 'moduleName';
+    const moduleSpecs = [];
+    const parserType = 'Flow';
+
+    expect(() => {
+      throwIfMoreThanOneModuleInterfaceParserError(
+        nativeModuleName,
+        moduleSpecs,
+        parserType,
+      );
+    }).not.toThrow(MoreThanOneModuleInterfaceParserError);
+  });
+  it('throw error if module specs is > 1 ', () => {
+    const nativeModuleName = 'moduleName';
+    const moduleSpecs = [{id: {name: 'Name-1'}}, {id: {name: 'Name-2'}}];
+    const parserType = 'TypeScript';
+
+    expect(() => {
+      throwIfMoreThanOneModuleInterfaceParserError(
+        nativeModuleName,
+        moduleSpecs,
+        parserType,
+      );
+    }).toThrow(MoreThanOneModuleInterfaceParserError);
+  });
+});
+
+describe('throwIfUnsupportedFunctionParamTypeAnnotationParserError', () => {
+  const nativeModuleName = 'moduleName';
+  const languageParamTypeAnnotation = {type: 'VoidTypeAnnotation'};
+  const paramName = 'paramName';
+  it('throws an UnsupportedFunctionParamTypeAnnotationParserError', () => {
+    const paramTypeAnnotationType = 'VoidTypeAnnotation';
+    expect(() => {
+      throwIfUnsupportedFunctionParamTypeAnnotationParserError(
+        nativeModuleName,
+        languageParamTypeAnnotation,
+        paramName,
+        paramTypeAnnotationType,
+      );
+    }).toThrow(UnsupportedFunctionParamTypeAnnotationParserError);
+  });
+});
diff --git a/packages/react-native-codegen/src/parsers/__tests__/parsers-commons-test.js b/packages/react-native-codegen/src/parsers/__tests__/parsers-commons-test.js
new file mode 100644
index 000000000000..7e0237fa924d
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/__tests__/parsers-commons-test.js
@@ -0,0 +1,708 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall react_native
+ */
+
+'use-strict';
+
+import {assertGenericTypeAnnotationHasExactlyOneTypeParameter} from '../parsers-commons';
+import type {ParserType} from '../errors';
+const {
+  wrapNullable,
+  unwrapNullable,
+  emitMixedTypeAnnotation,
+  emitUnionTypeAnnotation,
+} = require('../parsers-commons.js');
+const {UnsupportedUnionTypeAnnotationParserError} = require('../errors');
+import type {UnionTypeAnnotationMemberType} from '../../CodegenSchema';
+
+describe('wrapNullable', () => {
+  describe('when nullable is true', () => {
+    it('returns nullable type annotation', () => {
+      const result = wrapNullable(true, {
+        type: 'BooleanTypeAnnotation',
+      });
+      const expected = {
+        type: 'NullableTypeAnnotation',
+        typeAnnotation: {
+          type: 'BooleanTypeAnnotation',
+        },
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+  describe('when nullable is false', () => {
+    it('returns non nullable type annotation', () => {
+      const result = wrapNullable(false, {
+        type: 'BooleanTypeAnnotation',
+      });
+      const expected = {
+        type: 'BooleanTypeAnnotation',
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+});
+
+describe('unwrapNullable', () => {
+  describe('when type annotation is nullable', () => {
+    it('returns original type annotation', () => {
+      const result = unwrapNullable({
+        type: 'NullableTypeAnnotation',
+        typeAnnotation: {
+          type: 'BooleanTypeAnnotation',
+        },
+      });
+      const expected = [
+        {
+          type: 'BooleanTypeAnnotation',
+        },
+        true,
+      ];
+
+      expect(result).toEqual(expected);
+    });
+  });
+  describe('when type annotation is not nullable', () => {
+    it('returns original type annotation', () => {
+      const result = unwrapNullable({
+        type: 'BooleanTypeAnnotation',
+      });
+      const expected = [
+        {
+          type: 'BooleanTypeAnnotation',
+        },
+        false,
+      ];
+
+      expect(result).toEqual(expected);
+    });
+  });
+});
+
+describe('assertGenericTypeAnnotationHasExactlyOneTypeParameter', () => {
+  const moduleName = 'testModuleName';
+
+  it("doesn't throw any Error when typeAnnotation has exactly one typeParameter", () => {
+    const typeAnnotation = {
+      typeParameters: {
+        type: 'TypeParameterInstantiation',
+        params: [1],
+      },
+    };
+    expect(() =>
+      assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+        moduleName,
+        typeAnnotation,
+        'Flow',
+      ),
+    ).not.toThrow();
+  });
+
+  it('throws an IncorrectlyParameterizedGenericParserError if typeParameters is null', () => {
+    const typeAnnotation = {
+      typeParameters: null,
+      id: {
+        name: 'typeAnnotationName',
+      },
+    };
+    expect(() =>
+      assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+        moduleName,
+        typeAnnotation,
+        'Flow',
+      ),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Module testModuleName: Generic 'typeAnnotationName' must have type parameters."`,
+    );
+  });
+
+  it('throws an error if typeAnnotation.typeParameters.type is not TypeParameterInstantiation when language is Flow', () => {
+    const flowTypeAnnotation = {
+      typeParameters: {
+        type: 'wrongType',
+        params: [1],
+      },
+      id: {
+        name: 'typeAnnotationName',
+      },
+    };
+    expect(() =>
+      assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+        moduleName,
+        flowTypeAnnotation,
+        'Flow',
+      ),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"assertGenericTypeAnnotationHasExactlyOneTypeParameter: Type parameters must be an AST node of type 'TypeParameterInstantiation'"`,
+    );
+  });
+
+  it('throws an error if typeAnnotation.typeParameters.type is not TSTypeParameterInstantiation when language is TypeScript', () => {
+    const typeScriptTypeAnnotation = {
+      typeParameters: {
+        type: 'wrongType',
+        params: [1],
+      },
+      typeName: {
+        name: 'typeAnnotationName',
+      },
+    };
+    expect(() =>
+      assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+        moduleName,
+        typeScriptTypeAnnotation,
+        'TypeScript',
+      ),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"assertGenericTypeAnnotationHasExactlyOneTypeParameter: Type parameters must be an AST node of type 'TSTypeParameterInstantiation'"`,
+    );
+  });
+
+  it("throws an IncorrectlyParameterizedGenericParserError if typeParameters don't have 1 exactly parameter for Flow", () => {
+    const language: ParserType = 'Flow';
+    const typeAnnotationWithTwoParams = {
+      typeParameters: {
+        params: [1, 2],
+        type: 'TypeParameterInstantiation',
+      },
+      id: {
+        name: 'typeAnnotationName',
+      },
+    };
+    expect(() =>
+      assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+        moduleName,
+        typeAnnotationWithTwoParams,
+        language,
+      ),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Module testModuleName: Generic 'typeAnnotationName' must have exactly one type parameter."`,
+    );
+
+    const typeAnnotationWithNoParams = {
+      typeParameters: {
+        params: [],
+        type: 'TypeParameterInstantiation',
+      },
+      id: {
+        name: 'typeAnnotationName',
+      },
+    };
+    expect(() =>
+      assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+        moduleName,
+        typeAnnotationWithNoParams,
+        language,
+      ),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Module testModuleName: Generic 'typeAnnotationName' must have exactly one type parameter."`,
+    );
+  });
+
+  it("throws an IncorrectlyParameterizedGenericParserError if typeParameters don't have 1 exactly parameter for TS", () => {
+    const language: ParserType = 'TypeScript';
+    const typeAnnotationWithTwoParams = {
+      typeParameters: {
+        params: [1, 2],
+        type: 'TSTypeParameterInstantiation',
+      },
+      typeName: {
+        name: 'typeAnnotationName',
+      },
+    };
+    expect(() =>
+      assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+        moduleName,
+        typeAnnotationWithTwoParams,
+        language,
+      ),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Module testModuleName: Generic 'typeAnnotationName' must have exactly one type parameter."`,
+    );
+
+    const typeAnnotationWithNoParams = {
+      typeParameters: {
+        params: [],
+        type: 'TSTypeParameterInstantiation',
+      },
+      typeName: {
+        name: 'typeAnnotationName',
+      },
+    };
+    expect(() =>
+      assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+        moduleName,
+        typeAnnotationWithNoParams,
+        language,
+      ),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Module testModuleName: Generic 'typeAnnotationName' must have exactly one type parameter."`,
+    );
+  });
+});
+
+describe('emitMixedTypeAnnotation', () => {
+  describe('when nullable is true', () => {
+    it('returns nullable type annotation', () => {
+      const result = emitMixedTypeAnnotation(true);
+      const expected = {
+        type: 'NullableTypeAnnotation',
+        typeAnnotation: {
+          type: 'MixedTypeAnnotation',
+        },
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+  describe('when nullable is false', () => {
+    it('returns non nullable type annotation', () => {
+      const result = emitMixedTypeAnnotation(false);
+      const expected = {
+        type: 'MixedTypeAnnotation',
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+});
+
+describe('emitUnionTypeAnnotation', () => {
+  const hasteModuleName = 'SampleTurboModule';
+
+  describe('when language is flow', () => {
+    const language: ParserType = 'Flow';
+
+    describe('when members type is numeric', () => {
+      const typeAnnotation = {
+        type: 'UnionTypeAnnotation',
+        types: [
+          {type: 'NumberLiteralTypeAnnotation'},
+          {type: 'NumberLiteralTypeAnnotation'},
+        ],
+      };
+      describe('when nullable is true', () => {
+        it('returns nullable type annotation', () => {
+          const result = emitUnionTypeAnnotation(
+            true,
+            hasteModuleName,
+            typeAnnotation,
+            language,
+          );
+
+          const expected = {
+            type: 'NullableTypeAnnotation',
+            typeAnnotation: {
+              type: 'UnionTypeAnnotation',
+              memberType: 'NumberTypeAnnotation',
+            },
+          };
+
+          expect(result).toEqual(expected);
+        });
+      });
+
+      describe('when nullable is false', () => {
+        it('returns non nullable type annotation', () => {
+          const result = emitUnionTypeAnnotation(
+            false,
+            hasteModuleName,
+            typeAnnotation,
+            language,
+          );
+
+          const expected = {
+            type: 'UnionTypeAnnotation',
+            memberType: 'NumberTypeAnnotation',
+          };
+
+          expect(result).toEqual(expected);
+        });
+      });
+    });
+
+    describe('when members type is string', () => {
+      const typeAnnotation = {
+        type: 'UnionTypeAnnotation',
+        types: [
+          {type: 'StringLiteralTypeAnnotation'},
+          {type: 'StringLiteralTypeAnnotation'},
+        ],
+      };
+      describe('when nullable is true', () => {
+        it('returns nullable type annotation', () => {
+          const result = emitUnionTypeAnnotation(
+            true,
+            hasteModuleName,
+            typeAnnotation,
+            language,
+          );
+
+          const expected = {
+            type: 'NullableTypeAnnotation',
+            typeAnnotation: {
+              type: 'UnionTypeAnnotation',
+              memberType: 'StringTypeAnnotation',
+            },
+          };
+
+          expect(result).toEqual(expected);
+        });
+      });
+
+      describe('when nullable is false', () => {
+        it('returns non nullable type annotation', () => {
+          const result = emitUnionTypeAnnotation(
+            false,
+            hasteModuleName,
+            typeAnnotation,
+            language,
+          );
+
+          const expected = {
+            type: 'UnionTypeAnnotation',
+            memberType: 'StringTypeAnnotation',
+          };
+
+          expect(result).toEqual(expected);
+        });
+      });
+    });
+
+    describe('when members type is object', () => {
+      const typeAnnotation = {
+        type: 'UnionTypeAnnotation',
+        types: [{type: 'ObjectTypeAnnotation'}, {type: 'ObjectTypeAnnotation'}],
+      };
+      describe('when nullable is true', () => {
+        it('returns nullable type annotation', () => {
+          const result = emitUnionTypeAnnotation(
+            true,
+            hasteModuleName,
+            typeAnnotation,
+            language,
+          );
+
+          const expected = {
+            type: 'NullableTypeAnnotation',
+            typeAnnotation: {
+              type: 'UnionTypeAnnotation',
+              memberType: 'ObjectTypeAnnotation',
+            },
+          };
+
+          expect(result).toEqual(expected);
+        });
+      });
+
+      describe('when nullable is false', () => {
+        it('returns non nullable type annotation', () => {
+          const result = emitUnionTypeAnnotation(
+            false,
+            hasteModuleName,
+            typeAnnotation,
+            language,
+          );
+
+          const expected = {
+            type: 'UnionTypeAnnotation',
+            memberType: 'ObjectTypeAnnotation',
+          };
+
+          expect(result).toEqual(expected);
+        });
+      });
+    });
+
+    describe('when members type is mixed', () => {
+      const typeAnnotation = {
+        type: 'UnionTypeAnnotation',
+        types: [
+          {type: 'NumberLiteralTypeAnnotation'},
+          {type: 'StringLiteralTypeAnnotation'},
+          {type: 'ObjectTypeAnnotation'},
+        ],
+      };
+      const unionTypes: UnionTypeAnnotationMemberType[] = [
+        'NumberTypeAnnotation',
+        'StringTypeAnnotation',
+        'ObjectTypeAnnotation',
+      ];
+      describe('when nullable is true', () => {
+        it('throws an excpetion', () => {
+          const expected = new UnsupportedUnionTypeAnnotationParserError(
+            hasteModuleName,
+            typeAnnotation,
+            unionTypes,
+            language,
+          );
+
+          expect(() => {
+            emitUnionTypeAnnotation(
+              true,
+              hasteModuleName,
+              typeAnnotation,
+              language,
+            );
+          }).toThrow(expected);
+        });
+      });
+
+      describe('when nullable is false', () => {
+        it('throws an excpetion', () => {
+          const expected = new UnsupportedUnionTypeAnnotationParserError(
+            hasteModuleName,
+            typeAnnotation,
+            unionTypes,
+            language,
+          );
+
+          expect(() => {
+            emitUnionTypeAnnotation(
+              false,
+              hasteModuleName,
+              typeAnnotation,
+              language,
+            );
+          }).toThrow(expected);
+        });
+      });
+    });
+  });
+
+  describe('when language is typescript', () => {
+    const language: ParserType = 'TypeScript';
+
+    describe('when members type is numeric', () => {
+      const typeAnnotation = {
+        type: 'TSUnionType',
+        types: [
+          {
+            type: 'TSLiteralType',
+            literal: {type: 'NumericLiteral'},
+          },
+          {
+            type: 'TSLiteralType',
+            literal: {type: 'NumericLiteral'},
+          },
+        ],
+      };
+      describe('when nullable is true', () => {
+        it('returns nullable type annotation', () => {
+          const result = emitUnionTypeAnnotation(
+            true,
+            hasteModuleName,
+            typeAnnotation,
+            language,
+          );
+
+          const expected = {
+            type: 'NullableTypeAnnotation',
+            typeAnnotation: {
+              type: 'UnionTypeAnnotation',
+              memberType: 'NumberTypeAnnotation',
+            },
+          };
+
+          expect(result).toEqual(expected);
+        });
+      });
+
+      describe('when nullable is false', () => {
+        it('returns non nullable type annotation', () => {
+          const result = emitUnionTypeAnnotation(
+            false,
+            hasteModuleName,
+            typeAnnotation,
+            language,
+          );
+
+          const expected = {
+            type: 'UnionTypeAnnotation',
+            memberType: 'NumberTypeAnnotation',
+          };
+
+          expect(result).toEqual(expected);
+        });
+      });
+    });
+
+    describe('when members type is string', () => {
+      const typeAnnotation = {
+        type: 'TSUnionType',
+        types: [
+          {
+            type: 'TSLiteralType',
+            literal: {type: 'StringLiteral'},
+          },
+          {
+            type: 'TSLiteralType',
+            literal: {type: 'StringLiteral'},
+          },
+        ],
+      };
+      describe('when nullable is true', () => {
+        it('returns nullable type annotation', () => {
+          const result = emitUnionTypeAnnotation(
+            true,
+            hasteModuleName,
+            typeAnnotation,
+            language,
+          );
+
+          const expected = {
+            type: 'NullableTypeAnnotation',
+            typeAnnotation: {
+              type: 'UnionTypeAnnotation',
+              memberType: 'StringTypeAnnotation',
+            },
+          };
+
+          expect(result).toEqual(expected);
+        });
+      });
+
+      describe('when nullable is false', () => {
+        it('returns non nullable type annotation', () => {
+          const result = emitUnionTypeAnnotation(
+            false,
+            hasteModuleName,
+            typeAnnotation,
+            language,
+          );
+
+          const expected = {
+            type: 'UnionTypeAnnotation',
+            memberType: 'StringTypeAnnotation',
+          };
+
+          expect(result).toEqual(expected);
+        });
+      });
+    });
+
+    describe('when members type is object', () => {
+      const typeAnnotation = {
+        type: 'TSUnionType',
+        types: [
+          {
+            type: 'TSLiteralType',
+          },
+          {
+            type: 'TSLiteralType',
+          },
+        ],
+      };
+      describe('when nullable is true', () => {
+        it('returns nullable type annotation', () => {
+          const result = emitUnionTypeAnnotation(
+            true,
+            hasteModuleName,
+            typeAnnotation,
+            language,
+          );
+
+          const expected = {
+            type: 'NullableTypeAnnotation',
+            typeAnnotation: {
+              type: 'UnionTypeAnnotation',
+              memberType: 'ObjectTypeAnnotation',
+            },
+          };
+
+          expect(result).toEqual(expected);
+        });
+      });
+
+      describe('when nullable is false', () => {
+        it('returns non nullable type annotation', () => {
+          const result = emitUnionTypeAnnotation(
+            false,
+            hasteModuleName,
+            typeAnnotation,
+            language,
+          );
+
+          const expected = {
+            type: 'UnionTypeAnnotation',
+            memberType: 'ObjectTypeAnnotation',
+          };
+
+          expect(result).toEqual(expected);
+        });
+      });
+    });
+
+    describe('when members type is mixed', () => {
+      const typeAnnotation = {
+        type: 'TSUnionType',
+        types: [
+          {
+            type: 'TSLiteralType',
+            literal: {type: 'NumericLiteral'},
+          },
+          {
+            type: 'TSLiteralType',
+            literal: {type: 'StringLiteral'},
+          },
+          {
+            type: 'TSLiteralType',
+          },
+        ],
+      };
+      const unionTypes = [
+        'NumberTypeAnnotation',
+        'StringTypeAnnotation',
+        'ObjectTypeAnnotation',
+      ];
+      describe('when nullable is true', () => {
+        it('throws an excpetion', () => {
+          const expected = new UnsupportedUnionTypeAnnotationParserError(
+            hasteModuleName,
+            typeAnnotation,
+            unionTypes,
+            language,
+          );
+
+          expect(() => {
+            emitUnionTypeAnnotation(
+              true,
+              hasteModuleName,
+              typeAnnotation,
+              language,
+            );
+          }).toThrow(expected);
+        });
+      });
+
+      describe('when nullable is false', () => {
+        it('throws an excpetion', () => {
+          const expected = new UnsupportedUnionTypeAnnotationParserError(
+            hasteModuleName,
+            typeAnnotation,
+            unionTypes,
+            language,
+          );
+
+          expect(() => {
+            emitUnionTypeAnnotation(
+              false,
+              hasteModuleName,
+              typeAnnotation,
+              language,
+            );
+          }).toThrow(expected);
+        });
+      });
+    });
+  });
+});
diff --git a/packages/react-native-codegen/src/parsers/__tests__/parsers-primitives-test.js b/packages/react-native-codegen/src/parsers/__tests__/parsers-primitives-test.js
new file mode 100644
index 000000000000..b64c48f776a3
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/__tests__/parsers-primitives-test.js
@@ -0,0 +1,454 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall react_native
+ */
+
+'use-strict';
+
+const {
+  emitBoolean,
+  emitDouble,
+  emitFloat,
+  emitNumber,
+  emitInt32,
+  emitObject,
+  emitPromise,
+  emitRootTag,
+  emitVoid,
+  emitString,
+  emitStringish,
+  typeAliasResolution,
+} = require('../parsers-primitives.js');
+
+describe('emitBoolean', () => {
+  describe('when nullable is true', () => {
+    it('returns nullable type annotation', () => {
+      const result = emitBoolean(true);
+      const expected = {
+        type: 'NullableTypeAnnotation',
+        typeAnnotation: {
+          type: 'BooleanTypeAnnotation',
+        },
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+  describe('when nullable is false', () => {
+    it('returns non nullable type annotation', () => {
+      const result = emitBoolean(false);
+      const expected = {
+        type: 'BooleanTypeAnnotation',
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+});
+
+describe('emitInt32', () => {
+  describe('when nullable is true', () => {
+    it('returns nullable type annotation', () => {
+      const result = emitInt32(true);
+      const expected = {
+        type: 'NullableTypeAnnotation',
+        typeAnnotation: {
+          type: 'Int32TypeAnnotation',
+        },
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+  describe('when nullable is false', () => {
+    it('returns non nullable type annotation', () => {
+      const result = emitInt32(false);
+      const expected = {
+        type: 'Int32TypeAnnotation',
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+});
+
+describe('emitNumber', () => {
+  describe('when nullable is true', () => {
+    it('returns nullable type annotation', () => {
+      const result = emitNumber(true);
+      const expected = {
+        type: 'NullableTypeAnnotation',
+        typeAnnotation: {
+          type: 'NumberTypeAnnotation',
+        },
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+  describe('when nullable is false', () => {
+    it('returns non nullable type annotation', () => {
+      const result = emitNumber(false);
+      const expected = {
+        type: 'NumberTypeAnnotation',
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+});
+
+describe('emitRootTag', () => {
+  const reservedTypeAnnotation = {
+    type: 'ReservedTypeAnnotation',
+    name: 'RootTag',
+  };
+
+  describe('when nullable is true', () => {
+    it('returns nullable type annotation', () => {
+      const result = emitRootTag(true);
+
+      expect(result).toEqual({
+        type: 'NullableTypeAnnotation',
+        typeAnnotation: reservedTypeAnnotation,
+      });
+    });
+  });
+
+  describe('when nullable is false', () => {
+    it('returns non nullable type annotation', () => {
+      const result = emitRootTag(false);
+
+      expect(result).toEqual(reservedTypeAnnotation);
+    });
+  });
+});
+
+describe('emitStringish', () => {
+  describe('when nullable is true', () => {
+    it('returns nullable type annotation', () => {
+      const result = emitStringish(true);
+      const expected = {
+        type: 'NullableTypeAnnotation',
+        typeAnnotation: {
+          type: 'StringTypeAnnotation',
+        },
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+
+  describe('when nullable is false', () => {
+    it('returns non nullable type annotation', () => {
+      const result = emitStringish(false);
+      const expected = {
+        type: 'StringTypeAnnotation',
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+});
+
+describe('emitString', () => {
+  describe('when nullable is true', () => {
+    it('returns nullable type annotation', () => {
+      const result = emitString(true);
+      const expected = {
+        type: 'NullableTypeAnnotation',
+        typeAnnotation: {
+          type: 'StringTypeAnnotation',
+        },
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+
+  describe('when nullable is false', () => {
+    it('returns non nullable type annotation', () => {
+      const result = emitString(false);
+      const expected = {
+        type: 'StringTypeAnnotation',
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+});
+
+describe('emitDouble', () => {
+  describe('when nullable is true', () => {
+    it('returns nullable type annotation', () => {
+      const result = emitDouble(true);
+      const expected = {
+        type: 'NullableTypeAnnotation',
+        typeAnnotation: {
+          type: 'DoubleTypeAnnotation',
+        },
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+  describe('when nullable is false', () => {
+    it('returns non nullable type annotation', () => {
+      const result = emitDouble(false);
+      const expected = {
+        type: 'DoubleTypeAnnotation',
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+});
+
+describe('emitVoid', () => {
+  describe('when nullable is true', () => {
+    it('returns nullable type annotation', () => {
+      const result = emitVoid(true);
+      const expected = {
+        type: 'NullableTypeAnnotation',
+        typeAnnotation: {
+          type: 'VoidTypeAnnotation',
+        },
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+  describe('when nullable is false', () => {
+    it('returns non nullable type annotation', () => {
+      const result = emitVoid(false);
+      const expected = {
+        type: 'VoidTypeAnnotation',
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+});
+
+describe('typeAliasResolution', () => {
+  const objectTypeAnnotation = {
+    type: 'ObjectTypeAnnotation',
+    properties: [
+      {
+        name: 'Foo',
+        optional: false,
+        typeAnnotation: {
+          type: 'StringTypeAnnotation',
+        },
+      },
+    ],
+  };
+
+  describe('when typeAliasResolutionStatus is successful', () => {
+    const typeAliasResolutionStatus = {successful: true, aliasName: 'Foo'};
+
+    describe('when nullable is true', () => {
+      it('returns nullable TypeAliasTypeAnnotation and map it in aliasMap', () => {
+        const aliasMap = {};
+        const result = typeAliasResolution(
+          typeAliasResolutionStatus,
+          objectTypeAnnotation,
+          aliasMap,
+          true,
+        );
+
+        expect(aliasMap).toEqual({Foo: objectTypeAnnotation});
+        expect(result).toEqual({
+          type: 'NullableTypeAnnotation',
+          typeAnnotation: {
+            type: 'TypeAliasTypeAnnotation',
+            name: 'Foo',
+          },
+        });
+      });
+    });
+
+    describe('when nullable is false', () => {
+      it('returns non nullable TypeAliasTypeAnnotation and map it in aliasMap', () => {
+        const aliasMap = {};
+        const result = typeAliasResolution(
+          typeAliasResolutionStatus,
+          objectTypeAnnotation,
+          aliasMap,
+          false,
+        );
+
+        expect(aliasMap).toEqual({Foo: objectTypeAnnotation});
+        expect(result).toEqual({
+          type: 'TypeAliasTypeAnnotation',
+          name: 'Foo',
+        });
+      });
+    });
+  });
+
+  describe('when typeAliasResolutionStatus is not successful', () => {
+    const typeAliasResolutionStatus = {successful: false};
+
+    describe('when nullable is true', () => {
+      it('returns nullable ObjectTypeAnnotation', () => {
+        const aliasMap = {};
+        const result = typeAliasResolution(
+          typeAliasResolutionStatus,
+          objectTypeAnnotation,
+          aliasMap,
+          true,
+        );
+
+        expect(aliasMap).toEqual({});
+        expect(result).toEqual({
+          type: 'NullableTypeAnnotation',
+          typeAnnotation: objectTypeAnnotation,
+        });
+      });
+    });
+
+    describe('when nullable is false', () => {
+      it('returns non nullable ObjectTypeAnnotation', () => {
+        const aliasMap = {};
+        const result = typeAliasResolution(
+          typeAliasResolutionStatus,
+          objectTypeAnnotation,
+          aliasMap,
+          false,
+        );
+
+        expect(aliasMap).toEqual({});
+        expect(result).toEqual(objectTypeAnnotation);
+      });
+    });
+  });
+});
+
+describe('emitPromise', () => {
+  const moduleName = 'testModuleName';
+  const language = 'Flow';
+  describe("when typeAnnotation doesn't have exactly one typeParameter", () => {
+    const typeAnnotation = {
+      typeParameters: {
+        params: [1, 2],
+        type: 'TypeParameterInstantiation',
+      },
+      id: {
+        name: 'typeAnnotationName',
+      },
+    };
+    it('throws an IncorrectlyParameterizedGenericParserError error', () => {
+      const nullable = false;
+      expect(() =>
+        emitPromise(moduleName, typeAnnotation, language, nullable),
+      ).toThrow();
+    });
+  });
+
+  describe("when typeAnnotation doesn't has exactly one typeParameter", () => {
+    const typeAnnotation = {
+      typeParameters: {
+        params: [1],
+        type: 'TypeParameterInstantiation',
+      },
+      id: {
+        name: 'typeAnnotationName',
+      },
+    };
+
+    describe('when nullable is true', () => {
+      const nullable = true;
+      it('returns nullable type annotation', () => {
+        const result = emitPromise(
+          moduleName,
+          typeAnnotation,
+          language,
+          nullable,
+        );
+        const expected = {
+          type: 'NullableTypeAnnotation',
+          typeAnnotation: {
+            type: 'PromiseTypeAnnotation',
+          },
+        };
+
+        expect(result).toEqual(expected);
+      });
+    });
+    describe('when nullable is false', () => {
+      const nullable = false;
+      it('returns non nullable type annotation', () => {
+        const result = emitPromise(
+          moduleName,
+          typeAnnotation,
+          language,
+          nullable,
+        );
+        const expected = {
+          type: 'PromiseTypeAnnotation',
+        };
+
+        expect(result).toEqual(expected);
+      });
+    });
+  });
+});
+
+describe('emitObject', () => {
+  describe('when nullable is true', () => {
+    it('returns nullable type annotation', () => {
+      const result = emitObject(true);
+      const expected = {
+        type: 'NullableTypeAnnotation',
+        typeAnnotation: {
+          type: 'GenericObjectTypeAnnotation',
+        },
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+  describe('when nullable is false', () => {
+    it('returns non nullable type annotation', () => {
+      const result = emitObject(false);
+      const expected = {
+        type: 'GenericObjectTypeAnnotation',
+      };
+
+      expect(result).toEqual(expected);
+    });
+  });
+
+  describe('emitFloat', () => {
+    describe('when nullable is true', () => {
+      it('returns nullable type annotation', () => {
+        const result = emitFloat(true);
+        const expected = {
+          type: 'NullableTypeAnnotation',
+          typeAnnotation: {
+            type: 'FloatTypeAnnotation',
+          },
+        };
+
+        expect(result).toEqual(expected);
+      });
+    });
+    describe('when nullable is false', () => {
+      it('returns non nullable type annotation', () => {
+        const result = emitFloat(false);
+        const expected = {
+          type: 'FloatTypeAnnotation',
+        };
+
+        expect(result).toEqual(expected);
+      });
+    });
+  });
+});
diff --git a/packages/react-native-codegen/src/parsers/__tests__/utils-test.js b/packages/react-native-codegen/src/parsers/__tests__/utils-test.js
new file mode 100644
index 000000000000..caf08e01f603
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/__tests__/utils-test.js
@@ -0,0 +1,584 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall react_native
+ */
+
+'use strict';
+
+const {
+  extractNativeModuleName,
+  createParserErrorCapturer,
+  verifyPlatforms,
+  visit,
+  buildSchemaFromConfigType,
+  isModuleRegistryCall,
+} = require('../utils.js');
+const {ParserError} = require('../errors');
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
+describe('extractnativeModuleName', () => {
+  it('return filename when it ends with .js', () => {
+    const filename = '/some_folder/NativeModule.js';
+    const nativeModuleName = extractNativeModuleName(filename);
+    expect(nativeModuleName).toBe('NativeModule');
+  });
+  it('return filename when it ends with .ts', () => {
+    const filename = '/some_folder/NativeModule.ts';
+    const nativeModuleName = extractNativeModuleName(filename);
+    expect(nativeModuleName).toBe('NativeModule');
+  });
+  it('return filename when it ends with .tsx', () => {
+    const filename = '/some_folder/NativeModule.tsx';
+    const nativeModuleName = extractNativeModuleName(filename);
+    expect(nativeModuleName).toBe('NativeModule');
+  });
+  it('return filename when it ends with .android.js', () => {
+    const filename = '/some_folder/NativeModule.android.js';
+    const nativeModuleName = extractNativeModuleName(filename);
+    expect(nativeModuleName).toBe('NativeModule');
+  });
+  it('return filename when it ends with .android.ts', () => {
+    const filename = '/some_folder/NativeModule.android.ts';
+    const nativeModuleName = extractNativeModuleName(filename);
+    expect(nativeModuleName).toBe('NativeModule');
+  });
+  it('return filename when it ends with .android.tsx', () => {
+    const filename = '/some_folder/NativeModule.android.tsx';
+    const nativeModuleName = extractNativeModuleName(filename);
+    expect(nativeModuleName).toBe('NativeModule');
+  });
+  it('return filename when it ends with .ios.js', () => {
+    const filename = '/some_folder/NativeModule.ios.ts';
+    const nativeModuleName = extractNativeModuleName(filename);
+    expect(nativeModuleName).toBe('NativeModule');
+  });
+  it('return filename when it ends with .ios.ts', () => {
+    const filename = '/some_folder/NativeModule.ios.ts';
+    const nativeModuleName = extractNativeModuleName(filename);
+    expect(nativeModuleName).toBe('NativeModule');
+  });
+  it('return filename when it ends with .ios.tsx', () => {
+    const filename = '/some_folder/NativeModule.ios.tsx';
+    const nativeModuleName = extractNativeModuleName(filename);
+    expect(nativeModuleName).toBe('NativeModule');
+  });
+  it('return filename when it ends with .windows.js', () => {
+    const filename = '/some_folder/NativeModule.windows.js';
+    const nativeModuleName = extractNativeModuleName(filename);
+    expect(nativeModuleName).toBe('NativeModule');
+  });
+});
+
+describe('createParserErrorCapturer', () => {
+  describe("when function doesn't throw", () => {
+    it("returns result and doesn't change errors array", () => {
+      const [errors, guard] = createParserErrorCapturer();
+      const fn = () => 'result';
+
+      const result = guard(fn);
+      expect(result).toBe('result');
+      expect(errors).toHaveLength(0);
+    });
+  });
+
+  describe('when function throws a ParserError', () => {
+    it('returns null and adds the error in errors array instead of throwing it', () => {
+      const [errors, guard] = createParserErrorCapturer();
+      const ErrorThrown = new ParserError(
+        'moduleName',
+        null,
+        'Something went wrong :(',
+      );
+      const fn = () => {
+        throw ErrorThrown;
+      };
+
+      const result = guard(fn);
+      expect(result).toBe(null);
+      expect(errors).toHaveLength(1);
+      expect(errors[0]).toEqual(ErrorThrown);
+      expect(() => guard(fn)).not.toThrow();
+    });
+  });
+
+  describe('when function throws another error', () => {
+    it("throws the error and doesn't change errors array", () => {
+      const [errors, guard] = createParserErrorCapturer();
+      const errorMessage = 'Something else went wrong :(';
+      const fn = () => {
+        throw new Error(errorMessage);
+      };
+
+      expect(() => guard(fn)).toThrow(errorMessage);
+      expect(errors).toHaveLength(0);
+    });
+  });
+});
+
+describe('verifyPlatforms', () => {
+  it('exclude android given an iOS only module', () => {
+    let result = verifyPlatforms('NativeSampleTurboModule', [
+      'SampleTurboModuleIOS',
+    ]);
+
+    expect(result.cxxOnly).toBe(false);
+    expect(result.excludedPlatforms).toEqual(['android']);
+
+    result = verifyPlatforms('NativeSampleTurboModuleIOS', [
+      'SampleTurboModule',
+    ]);
+    expect(result.cxxOnly).toBe(false);
+    expect(result.excludedPlatforms).toEqual(['android']);
+
+    result = verifyPlatforms('NativeSampleTurboModuleIOS', [
+      'SampleTurboModuleIOS',
+    ]);
+    expect(result.cxxOnly).toBe(false);
+    expect(result.excludedPlatforms).toEqual(['android']);
+  });
+
+  it('exclude iOS given an android only module', () => {
+    let result = verifyPlatforms('NativeSampleTurboModule', [
+      'SampleTurboModuleAndroid',
+    ]);
+
+    expect(result.cxxOnly).toBe(false);
+    expect(result.excludedPlatforms).toEqual(['iOS']);
+
+    result = verifyPlatforms('NativeSampleTurboModuleAndroid', [
+      'SampleTurboModule',
+    ]);
+    expect(result.cxxOnly).toBe(false);
+    expect(result.excludedPlatforms).toEqual(['iOS']);
+
+    result = verifyPlatforms('NativeSampleTurboModuleAndroid', [
+      'SampleTurboModuleAndroid',
+    ]);
+    expect(result.cxxOnly).toBe(false);
+    expect(result.excludedPlatforms).toEqual(['iOS']);
+  });
+
+  it('exclude iOS and android given a Cxx only module', () => {
+    let result = verifyPlatforms('NativeSampleTurboModule', [
+      'SampleTurboModuleCxx',
+    ]);
+
+    expect(result.cxxOnly).toBe(true);
+    expect(result.excludedPlatforms).toEqual(['iOS', 'android']);
+
+    result = verifyPlatforms('NativeSampleTurboModuleCxx', [
+      'SampleTurboModule',
+    ]);
+    expect(result.cxxOnly).toBe(true);
+    expect(result.excludedPlatforms).toEqual(['iOS', 'android']);
+
+    result = verifyPlatforms('NativeSampleTurboModuleCxx', [
+      'SampleTurboModuleCxx',
+    ]);
+    expect(result.cxxOnly).toBe(true);
+    expect(result.excludedPlatforms).toEqual(['iOS', 'android']);
+  });
+});
+
+describe('visit', () => {
+  describe('when the astNode is null', () => {
+    it("doesn't call the visitor function", () => {
+      const visitorFunction = jest.fn();
+      const visitor = {
+        itemType: visitorFunction,
+      };
+
+      const astNode = null;
+
+      visit(astNode, visitor);
+
+      expect(visitorFunction).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('when the astNode is not an object', () => {
+    it("doesn't call the visitor function", () => {
+      const visitorFunction = jest.fn();
+      const visitor = {
+        itemType: visitorFunction,
+      };
+
+      const astNode = 'astNode';
+
+      visit(astNode, visitor);
+
+      expect(visitorFunction).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('when the astNode is an object', () => {
+    describe("when the astNode has a string type that doesn't exist in the visitor object", () => {
+      it("doesn't call the visitor function", () => {
+        const visitorFunction = jest.fn();
+        const visitor = {
+          itemType: visitorFunction,
+        };
+
+        const astNode = {type: 'itemTypeNotInVisitor'};
+
+        visit(astNode, visitor);
+
+        expect(visitorFunction).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('when the astNode has a string type that exists in the visitor object', () => {
+      it("doesn't call the visitor function", () => {
+        const visitorFunction = jest.fn();
+        const visitor = {
+          itemType: visitorFunction,
+        };
+
+        const astNode = {type: 'itemType'};
+
+        visit(astNode, visitor);
+
+        expect(visitorFunction).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    describe("when the astNode doesn't have a string type", () => {
+      it('iterates on every values of the astNode', () => {
+        const visitorFunction = jest.fn();
+        const visitor = {
+          itemType1: visitorFunction,
+          itemType2: visitorFunction,
+        };
+
+        const astNode = {
+          firstChildNode: {type: 'itemType1'},
+          secondChildNode: {type: 'itemType2'},
+          thirdChildNode: {type: 'itemType3'},
+        };
+
+        visit(astNode, visitor);
+
+        expect(visitorFunction).toHaveBeenCalledTimes(2);
+      });
+    });
+  });
+
+  describe('when the astNode is an array', () => {
+    it('iterates on every values of the astNode', () => {
+      const visitorFunction = jest.fn();
+      const visitor = {
+        itemType1: visitorFunction,
+        itemType2: visitorFunction,
+      };
+
+      const astNode = [
+        {type: 'itemType1'},
+        {type: 'itemType2'},
+        {type: 'itemType3'},
+      ];
+
+      visit(astNode, visitor);
+
+      expect(visitorFunction).toHaveBeenCalledTimes(2);
+    });
+  });
+});
+
+describe('buildSchemaFromConfigType', () => {
+  const astMock = {
+    type: 'Program',
+    loc: {
+      source: null,
+      start: {line: 2, column: 10},
+      end: {line: 16, column: 62},
+    },
+    range: [11, 373],
+    body: [],
+    comments: [],
+    errors: [],
+  };
+
+  const componentSchemaMock = {
+    filename: 'filename',
+    componentName: 'componentName',
+    extendsProps: [],
+    events: [],
+    props: [],
+    commands: [],
+  };
+
+  const moduleSchemaMock = {
+    type: 'NativeModule',
+    aliases: {},
+    spec: {properties: []},
+    moduleNames: [],
+  };
+
+  const wrapComponentSchemaMock = jest.fn();
+  const buildComponentSchemaMock = jest.fn(() => componentSchemaMock);
+  const wrapModuleSchemaMock = jest.spyOn(
+    require('../parsers-commons'),
+    'wrapModuleSchema',
+  );
+  const buildModuleSchemaMock = jest.fn(() => moduleSchemaMock);
+
+  const buildSchemaFromConfigTypeHelper = (
+    configType: 'module' | 'component' | 'none',
+    filename: ?string,
+  ) =>
+    buildSchemaFromConfigType(
+      configType,
+      filename,
+      astMock,
+      wrapComponentSchemaMock,
+      buildComponentSchemaMock,
+      buildModuleSchemaMock,
+    );
+
+  describe('when configType is none', () => {
+    it('returns an empty schema', () => {
+      const schema = buildSchemaFromConfigTypeHelper('none');
+
+      expect(schema).toEqual({modules: {}});
+    });
+  });
+
+  describe('when configType is component', () => {
+    it('calls buildComponentSchema with ast and wrapComponentSchema with the result', () => {
+      buildSchemaFromConfigTypeHelper('component');
+
+      expect(buildComponentSchemaMock).toHaveBeenCalledTimes(1);
+      expect(buildComponentSchemaMock).toHaveBeenCalledWith(astMock);
+      expect(wrapComponentSchemaMock).toHaveBeenCalledTimes(1);
+      expect(wrapComponentSchemaMock).toHaveBeenCalledWith(componentSchemaMock);
+
+      expect(buildModuleSchemaMock).not.toHaveBeenCalled();
+      expect(wrapModuleSchemaMock).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('when configType is module', () => {
+    describe('when filename is undefined', () => {
+      it('throws an error', () => {
+        expect(() => buildSchemaFromConfigTypeHelper('module')).toThrow(
+          'Filepath expected while parasing a module',
+        );
+      });
+    });
+
+    describe('when filename is null', () => {
+      it('throws an error', () => {
+        expect(() => buildSchemaFromConfigTypeHelper('module', null)).toThrow(
+          'Filepath expected while parasing a module',
+        );
+      });
+    });
+
+    describe('when filename is defined and not null', () => {
+      describe('when buildModuleSchema throws', () => {
+        it('throws the error', () => {
+          const parserError = new ParserError(
+            'moduleName',
+            astMock,
+            'Something went wrong',
+          );
+          buildModuleSchemaMock.mockImplementationOnce(() => {
+            throw parserError;
+          });
+
+          expect(() =>
+            buildSchemaFromConfigTypeHelper('module', 'filename'),
+          ).toThrow(parserError);
+        });
+      });
+
+      describe('when buildModuleSchema returns null', () => {
+        it('throws an error', () => {
+          // $FlowIgnore[incompatible-call] - This is to test an invariant
+          buildModuleSchemaMock.mockReturnValueOnce(null);
+
+          expect(() =>
+            buildSchemaFromConfigTypeHelper('module', 'filename'),
+          ).toThrow(
+            'When there are no parsing errors, the schema should not be null',
+          );
+        });
+      });
+
+      describe('when buildModuleSchema returns a schema', () => {
+        it('calls buildModuleSchema with ast and wrapModuleSchema with the result', () => {
+          buildSchemaFromConfigTypeHelper('module', 'filename');
+
+          expect(buildModuleSchemaMock).toHaveBeenCalledTimes(1);
+          expect(buildModuleSchemaMock).toHaveBeenCalledWith(
+            'filename',
+            astMock,
+            expect.any(Function),
+          );
+          expect(wrapModuleSchemaMock).toHaveBeenCalledTimes(1);
+          expect(wrapModuleSchemaMock).toHaveBeenCalledWith(
+            moduleSchemaMock,
+            'filename',
+          );
+
+          expect(buildComponentSchemaMock).not.toHaveBeenCalled();
+          expect(wrapComponentSchemaMock).not.toHaveBeenCalled();
+        });
+      });
+    });
+  });
+
+  describe('isModuleRegistryCall', () => {
+    describe('when node is not of CallExpression type', () => {
+      it('returns false', () => {
+        const node = {
+          type: 'NotCallExpression',
+        };
+        expect(isModuleRegistryCall(node)).toBe(false);
+      });
+    });
+
+    describe('when node is of CallExpressionType', () => {
+      describe('when callee type is not of MemberExpression type', () => {
+        it('returns false', () => {
+          const node = {
+            type: 'CallExpression',
+            callee: {
+              type: 'NotMemberExpression',
+            },
+          };
+          expect(isModuleRegistryCall(node)).toBe(false);
+        });
+      });
+
+      describe('when callee type is of MemberExpression type', () => {
+        describe('when memberExpression has an object of type different than "Identifier"', () => {
+          it('returns false', () => {
+            const node = {
+              type: 'CallExpression',
+              callee: {
+                type: 'MemberExpression',
+                object: {
+                  type: 'NotIdentifier',
+                  name: 'TurboModuleRegistry',
+                },
+              },
+            };
+            expect(isModuleRegistryCall(node)).toBe(false);
+          });
+        });
+
+        describe('when memberExpression has an object of name different than "TurboModuleRegistry"', () => {
+          it('returns false', () => {
+            const node = {
+              type: 'CallExpression',
+              callee: {
+                type: 'MemberExpression',
+                object: {
+                  type: 'Identifier',
+                  name: 'NotTurboModuleRegistry',
+                },
+              },
+            };
+            expect(isModuleRegistryCall(node)).toBe(false);
+          });
+        });
+
+        describe('when memberExpression has an object of type "Identifier" and name "TurboModuleRegistry', () => {
+          describe('when memberExpression has a property of type different than "Identifier"', () => {
+            it('returns false', () => {
+              const node = {
+                type: 'CallExpression',
+                callee: {
+                  type: 'MemberExpression',
+                  object: {
+                    type: 'Identifier',
+                    name: 'TurboModuleRegistry',
+                  },
+                  property: {
+                    type: 'NotIdentifier',
+                    name: 'get',
+                  },
+                },
+              };
+              expect(isModuleRegistryCall(node)).toBe(false);
+            });
+          });
+
+          describe('when memberExpression has a property of name different than "get" or "getEnforcing', () => {
+            it('returns false', () => {
+              const node = {
+                type: 'CallExpression',
+                callee: {
+                  type: 'MemberExpression',
+                  object: {
+                    type: 'Identifier',
+                    name: 'TurboModuleRegistry',
+                  },
+                  property: {
+                    type: 'Identifier',
+                    name: 'NotGet',
+                  },
+                },
+              };
+              expect(isModuleRegistryCall(node)).toBe(false);
+            });
+          });
+
+          describe('when memberExpression has a property of type "Identifier" and of name "get" or "getEnforcing', () => {
+            describe('when memberExpression is computed', () => {
+              it('returns false', () => {
+                const node = {
+                  type: 'CallExpression',
+                  callee: {
+                    type: 'MemberExpression',
+                    object: {
+                      type: 'Identifier',
+                      name: 'TurboModuleRegistry',
+                    },
+                    property: {
+                      type: 'Identifier',
+                      name: 'get',
+                    },
+                    computed: true,
+                  },
+                };
+                expect(isModuleRegistryCall(node)).toBe(false);
+              });
+            });
+
+            describe('when memberExpression is not computed', () => {
+              it('returns true', () => {
+                const node = {
+                  type: 'CallExpression',
+                  callee: {
+                    type: 'MemberExpression',
+                    object: {
+                      type: 'Identifier',
+                      name: 'TurboModuleRegistry',
+                    },
+                    property: {
+                      type: 'Identifier',
+                      name: 'get',
+                    },
+                    computed: false,
+                  },
+                };
+                expect(isModuleRegistryCall(node)).toBe(true);
+              });
+            });
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/packages/react-native-codegen/src/parsers/consistency/__tests__/checkComponentSnaps-test.js b/packages/react-native-codegen/src/parsers/consistency/__tests__/checkComponentSnaps-test.js
new file mode 100644
index 000000000000..c1088b1f0b0c
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/consistency/__tests__/checkComponentSnaps-test.js
@@ -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.
+ *
+ * @format
+ * @oncall react_native
+ */
+
+'use strict';
+
+const {compareSnaps, compareTsArraySnaps} = require('../compareSnaps.js');
+
+const flowFixtures = require('../../flow/components/__test_fixtures__/fixtures.js');
+const flowSnaps = require('../../../../src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap');
+const flowExtraCases = [];
+const tsFixtures = require('../../typescript/components/__test_fixtures__/fixtures.js');
+const tsSnaps = require('../../../../src/parsers/typescript/components/__tests__/__snapshots__/typescript-component-parser-test.js.snap');
+const tsExtraCases = [
+  'ARRAY2_PROP_TYPES_NO_EVENTS',
+  'PROPS_AND_EVENTS_WITH_INTERFACES',
+];
+const ignoredCases = ['ARRAY_PROP_TYPES_NO_EVENTS'];
+
+compareSnaps(
+  flowFixtures,
+  flowSnaps,
+  flowExtraCases,
+  tsFixtures,
+  tsSnaps,
+  tsExtraCases,
+  ignoredCases,
+);
+compareTsArraySnaps(tsSnaps, tsExtraCases);
diff --git a/packages/react-native-codegen/src/parsers/consistency/__tests__/checkModuleSnaps-test.js b/packages/react-native-codegen/src/parsers/consistency/__tests__/checkModuleSnaps-test.js
new file mode 100644
index 000000000000..1e392b8dde6b
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/consistency/__tests__/checkModuleSnaps-test.js
@@ -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.
+ *
+ * @format
+ * @oncall react_native
+ */
+
+'use strict';
+
+const {compareSnaps, compareTsArraySnaps} = require('../compareSnaps.js');
+
+const flowFixtures = require('../../flow/modules/__test_fixtures__/fixtures.js');
+const flowSnaps = require('../../../../src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap');
+const flowExtraCases = [];
+const tsFixtures = require('../../typescript/modules/__test_fixtures__/fixtures.js');
+const tsSnaps = require('../../../../src/parsers/typescript/modules/__tests__/__snapshots__/typescript-module-parser-snapshot-test.js.snap');
+const tsExtraCases = [
+  'NATIVE_MODULE_WITH_ARRAY2_WITH_ALIAS',
+  'NATIVE_MODULE_WITH_ARRAY2_WITH_UNION_AND_TOUPLE',
+  'NATIVE_MODULE_WITH_BASIC_ARRAY2',
+  'NATIVE_MODULE_WITH_COMPLEX_ARRAY2',
+];
+const ignoredCases = [];
+
+compareSnaps(
+  flowFixtures,
+  flowSnaps,
+  flowExtraCases,
+  tsFixtures,
+  tsSnaps,
+  tsExtraCases,
+  ignoredCases,
+);
+compareTsArraySnaps(tsSnaps, tsExtraCases);
diff --git a/packages/react-native-codegen/src/parsers/consistency/compareSnaps.js b/packages/react-native-codegen/src/parsers/consistency/compareSnaps.js
new file mode 100644
index 000000000000..51e1b740ce96
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/consistency/compareSnaps.js
@@ -0,0 +1,92 @@
+/**
+ * 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
+ * @oncall react_native
+ */
+
+'use strict';
+
+function compareSnaps(
+  flowFixtures,
+  flowSnaps,
+  flowExtraCases,
+  tsFixtures,
+  tsSnaps,
+  tsExtraCases,
+  ignoredCases,
+) {
+  const flowCases = Object.keys(flowFixtures).sort();
+  const tsCases = Object.keys(tsFixtures).sort();
+  const commonCases = flowCases.filter(name => tsCases.indexOf(name) !== -1);
+
+  describe('RN Codegen Parsers', () => {
+    it('should not unintentionally contains test case for Flow but not for TypeScript', () => {
+      expect(
+        flowCases.filter(name => commonCases.indexOf(name) === -1),
+      ).toEqual(flowExtraCases);
+    });
+
+    it('should not unintentionally contains test case for TypeScript but not for Flow', () => {
+      expect(tsCases.filter(name => commonCases.indexOf(name) === -1)).toEqual(
+        tsExtraCases,
+      );
+    });
+
+    for (const commonCase of commonCases) {
+      const flowSnap =
+        flowSnaps[
+          `RN Codegen Flow Parser can generate fixture ${commonCase} 1`
+        ];
+      const tsSnap =
+        tsSnaps[
+          `RN Codegen TypeScript Parser can generate fixture ${commonCase} 1`
+        ];
+
+      it(`should be able to find the snapshot for Flow for case ${commonCase}`, () => {
+        expect(typeof flowSnap).toEqual('string');
+      });
+
+      it(`should be able to find the snapshot for TypeScript for case ${commonCase}`, () => {
+        expect(typeof tsSnap).toEqual('string');
+      });
+
+      if (ignoredCases.indexOf(commonCase) === -1) {
+        it(`should generate the same snapshot from Flow and TypeScript for fixture ${commonCase}`, () => {
+          expect(flowSnap).toEqual(tsSnap);
+        });
+      } else {
+        it(`should generate the different snapshot from Flow and TypeScript for fixture ${commonCase}`, () => {
+          expect(flowSnap).not.toEqual(tsSnap);
+        });
+      }
+    }
+  });
+}
+
+function compareTsArraySnaps(tsSnaps, tsExtraCases) {
+  for (const array2Case of tsExtraCases.filter(
+    name => name.indexOf('ARRAY2') !== -1,
+  )) {
+    const arrayCase = array2Case.replace('ARRAY2', 'ARRAY');
+    it(`should generate the same snap from fixture ${arrayCase} and ${array2Case}`, () => {
+      expect(
+        tsSnaps[
+          `RN Codegen TypeScript Parser can generate fixture ${arrayCase}`
+        ],
+      ).toEqual(
+        tsSnaps[
+          `RN Codegen TypeScript Parser can generate fixture ${array2Case}`
+        ],
+      );
+    });
+  }
+}
+
+module.exports = {
+  compareSnaps,
+  compareTsArraySnaps,
+};
diff --git a/packages/react-native-codegen/src/parsers/error-utils.js b/packages/react-native-codegen/src/parsers/error-utils.js
new file mode 100644
index 000000000000..2d53c82c9e6f
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/error-utils.js
@@ -0,0 +1,281 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+import type {NativeModuleTypeAnnotation} from '../CodegenSchema';
+import type {ParserType} from './errors';
+
+const {
+  MisnamedModuleInterfaceParserError,
+  UnsupportedFunctionReturnTypeAnnotationParserError,
+  ModuleInterfaceNotFoundParserError,
+  MoreThanOneModuleRegistryCallsParserError,
+  UnusedModuleInterfaceParserError,
+  IncorrectModuleRegistryCallArityParserError,
+  IncorrectModuleRegistryCallTypeParameterParserError,
+  UnsupportedObjectPropertyValueTypeAnnotationParserError,
+  UntypedModuleRegistryCallParserError,
+  UnsupportedModulePropertyParserError,
+  MoreThanOneModuleInterfaceParserError,
+  UnsupportedFunctionParamTypeAnnotationParserError,
+} = require('./errors.js');
+
+function throwIfModuleInterfaceIsMisnamed(
+  nativeModuleName: string,
+  moduleSpecId: $FlowFixMe,
+  parserType: ParserType,
+) {
+  if (moduleSpecId.name !== 'Spec') {
+    throw new MisnamedModuleInterfaceParserError(
+      nativeModuleName,
+      moduleSpecId,
+      parserType,
+    );
+  }
+}
+
+function throwIfModuleInterfaceNotFound(
+  numberOfModuleSpecs: number,
+  nativeModuleName: string,
+  ast: $FlowFixMe,
+  parserType: ParserType,
+) {
+  if (numberOfModuleSpecs === 0) {
+    throw new ModuleInterfaceNotFoundParserError(
+      nativeModuleName,
+      ast,
+      parserType,
+    );
+  }
+}
+
+function throwIfMoreThanOneModuleRegistryCalls(
+  hasteModuleName: string,
+  callExpressions: $FlowFixMe,
+  callExpressionsLength: number,
+  language: ParserType,
+) {
+  if (callExpressions.length > 1) {
+    throw new MoreThanOneModuleRegistryCallsParserError(
+      hasteModuleName,
+      callExpressions,
+      callExpressionsLength,
+      language,
+    );
+  }
+}
+
+function throwIfUnusedModuleInterfaceParserError(
+  nativeModuleName: string,
+  moduleSpec: $FlowFixMe,
+  callExpressions: $FlowFixMe,
+  language: ParserType,
+) {
+  if (callExpressions.length === 0) {
+    throw new UnusedModuleInterfaceParserError(
+      nativeModuleName,
+      moduleSpec,
+      language,
+    );
+  }
+}
+
+function throwIfWrongNumberOfCallExpressionArgs(
+  nativeModuleName: string,
+  flowCallExpression: $FlowFixMe,
+  methodName: string,
+  numberOfCallExpressionArgs: number,
+  language: ParserType,
+) {
+  if (numberOfCallExpressionArgs !== 1) {
+    throw new IncorrectModuleRegistryCallArityParserError(
+      nativeModuleName,
+      flowCallExpression,
+      methodName,
+      numberOfCallExpressionArgs,
+      language,
+    );
+  }
+}
+
+function throwIfIncorrectModuleRegistryCallTypeParameterParserError(
+  nativeModuleName: string,
+  typeArguments: $FlowFixMe,
+  methodName: string,
+  moduleName: string,
+  language: ParserType,
+) {
+  function throwError() {
+    throw new IncorrectModuleRegistryCallTypeParameterParserError(
+      nativeModuleName,
+      typeArguments,
+      methodName,
+      moduleName,
+      language,
+    );
+  }
+
+  if (language === 'Flow') {
+    if (
+      typeArguments.type !== 'TypeParameterInstantiation' ||
+      typeArguments.params.length !== 1 ||
+      typeArguments.params[0].type !== 'GenericTypeAnnotation' ||
+      typeArguments.params[0].id.name !== 'Spec'
+    ) {
+      throwError();
+    }
+  } else if (language === 'TypeScript') {
+    if (
+      typeArguments.type !== 'TSTypeParameterInstantiation' ||
+      typeArguments.params.length !== 1 ||
+      typeArguments.params[0].type !== 'TSTypeReference' ||
+      typeArguments.params[0].typeName.name !== 'Spec'
+    ) {
+      throwError();
+    }
+  }
+}
+
+function throwIfUnsupportedFunctionReturnTypeAnnotationParserError(
+  nativeModuleName: string,
+  returnTypeAnnotation: $FlowFixMe,
+  invalidReturnType: string,
+  language: ParserType,
+  cxxOnly: boolean,
+  returnType: string,
+) {
+  if (!cxxOnly && returnType === 'FunctionTypeAnnotation') {
+    throw new UnsupportedFunctionReturnTypeAnnotationParserError(
+      nativeModuleName,
+      returnTypeAnnotation.returnType,
+      'FunctionTypeAnnotation',
+      language,
+    );
+  }
+}
+
+function throwIfUntypedModule(
+  typeArguments: $FlowFixMe,
+  hasteModuleName: string,
+  callExpression: $FlowFixMe,
+  methodName: string,
+  $moduleName: string,
+  language: ParserType,
+) {
+  if (typeArguments == null) {
+    throw new UntypedModuleRegistryCallParserError(
+      hasteModuleName,
+      callExpression,
+      methodName,
+      $moduleName,
+      language,
+    );
+  }
+}
+
+function throwIfModuleTypeIsUnsupported(
+  nativeModuleName: string,
+  propertyValue: $FlowFixMe,
+  propertyName: string,
+  propertyValueType: string,
+  language: ParserType,
+) {
+  if (language === 'Flow' && propertyValueType !== 'FunctionTypeAnnotation') {
+    throw new UnsupportedModulePropertyParserError(
+      nativeModuleName,
+      propertyValue,
+      propertyName,
+      propertyValueType,
+      language,
+    );
+  } else if (
+    language === 'TypeScript' &&
+    propertyValueType !== 'TSFunctionType' &&
+    propertyValueType !== 'TSMethodSignature'
+  ) {
+    throw new UnsupportedModulePropertyParserError(
+      nativeModuleName,
+      propertyValue,
+      propertyName,
+      propertyValueType,
+      language,
+    );
+  }
+}
+
+const UnsupportedObjectPropertyTypeToInvalidPropertyValueTypeMap = {
+  FunctionTypeAnnotation: 'FunctionTypeAnnotation',
+  VoidTypeAnnotation: 'void',
+  PromiseTypeAnnotation: 'Promise',
+};
+
+function throwIfPropertyValueTypeIsUnsupported(
+  moduleName: string,
+  propertyValue: $FlowFixMe,
+  propertyKey: string,
+  type: string,
+  language: ParserType,
+) {
+  const invalidPropertyValueType =
+    UnsupportedObjectPropertyTypeToInvalidPropertyValueTypeMap[type];
+
+  throw new UnsupportedObjectPropertyValueTypeAnnotationParserError(
+    moduleName,
+    propertyValue,
+    propertyKey,
+    invalidPropertyValueType,
+    language,
+  );
+}
+
+function throwIfMoreThanOneModuleInterfaceParserError(
+  nativeModuleName: string,
+  moduleSpecs: $ReadOnlyArray<$FlowFixMe>,
+  parserType: ParserType,
+) {
+  if (moduleSpecs.length > 1) {
+    throw new MoreThanOneModuleInterfaceParserError(
+      nativeModuleName,
+      moduleSpecs,
+      moduleSpecs.map(node => node.id.name),
+      parserType,
+    );
+  }
+}
+
+function throwIfUnsupportedFunctionParamTypeAnnotationParserError(
+  nativeModuleName: string,
+  languageParamTypeAnnotation: $FlowFixMe,
+  paramName: string,
+  paramTypeAnnotationType: NativeModuleTypeAnnotation['type'],
+) {
+  throw new UnsupportedFunctionParamTypeAnnotationParserError(
+    nativeModuleName,
+    languageParamTypeAnnotation,
+    paramName,
+    paramTypeAnnotationType,
+  );
+}
+
+module.exports = {
+  throwIfModuleInterfaceIsMisnamed,
+  throwIfUnsupportedFunctionReturnTypeAnnotationParserError,
+  throwIfModuleInterfaceNotFound,
+  throwIfMoreThanOneModuleRegistryCalls,
+  throwIfPropertyValueTypeIsUnsupported,
+  throwIfUnusedModuleInterfaceParserError,
+  throwIfWrongNumberOfCallExpressionArgs,
+  throwIfIncorrectModuleRegistryCallTypeParameterParserError,
+  throwIfUntypedModule,
+  throwIfModuleTypeIsUnsupported,
+  throwIfMoreThanOneModuleInterfaceParserError,
+  throwIfUnsupportedFunctionParamTypeAnnotationParserError,
+};
diff --git a/packages/react-native-codegen/src/parsers/errors.js b/packages/react-native-codegen/src/parsers/errors.js
new file mode 100644
index 000000000000..b736a5979b14
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/errors.js
@@ -0,0 +1,441 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {UnionTypeAnnotationMemberType} from '../CodegenSchema';
+
+import type {Parser} from './parser';
+export type ParserType = 'Flow' | 'TypeScript';
+
+class ParserError extends Error {
+  nodes: $ReadOnlyArray<$FlowFixMe>;
+  constructor(
+    nativeModuleName: string,
+    astNodeOrNodes: $FlowFixMe,
+    message: string,
+  ) {
+    super(`Module ${nativeModuleName}: ${message}`);
+
+    this.nodes = Array.isArray(astNodeOrNodes)
+      ? astNodeOrNodes
+      : [astNodeOrNodes];
+
+    // assign the error class name in your custom error (as a shortcut)
+    this.name = this.constructor.name;
+
+    // capturing the stack trace keeps the reference to your error class
+    Error.captureStackTrace(this, this.constructor);
+  }
+}
+class MisnamedModuleInterfaceParserError extends ParserError {
+  constructor(nativeModuleName: string, id: $FlowFixMe, language: ParserType) {
+    super(
+      nativeModuleName,
+      id,
+      `All ${language} interfaces extending TurboModule must be called 'Spec'. Please rename ${language} interface '${id.name}' to 'Spec'.`,
+    );
+  }
+}
+
+class ModuleInterfaceNotFoundParserError extends ParserError {
+  constructor(nativeModuleName: string, ast: $FlowFixMe, language: ParserType) {
+    super(
+      nativeModuleName,
+      ast,
+      `No ${language} interfaces extending TurboModule were detected in this NativeModule spec.`,
+    );
+  }
+}
+
+class MoreThanOneModuleInterfaceParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    flowModuleInterfaces: $ReadOnlyArray<$FlowFixMe>,
+    names: $ReadOnlyArray<string>,
+    language: ParserType,
+  ) {
+    const finalName = names[names.length - 1];
+    const allButLastName = names.slice(0, -1);
+    const quote = (x: string) => `'${x}'`;
+
+    const nameStr =
+      allButLastName.map(quote).join(', ') + ', and ' + quote(finalName);
+
+    super(
+      nativeModuleName,
+      flowModuleInterfaces,
+      `Every NativeModule spec file must declare exactly one NativeModule ${language} interface. This file declares ${names.length}: ${nameStr}. Please remove the extraneous ${language} interface declarations.`,
+    );
+  }
+}
+
+class UnsupportedModulePropertyParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    propertyValue: $FlowFixMe,
+    propertyName: string,
+    invalidPropertyValueType: string,
+    language: ParserType,
+  ) {
+    super(
+      nativeModuleName,
+      propertyValue,
+      `${language} interfaces extending TurboModule must only contain 'FunctionTypeAnnotation's. Property '${propertyName}' refers to a '${invalidPropertyValueType}'.`,
+    );
+  }
+}
+
+class UnsupportedTypeAnnotationParserError extends ParserError {
+  +typeAnnotationType: string;
+  constructor(
+    nativeModuleName: string,
+    typeAnnotation: $FlowFixMe,
+    language: ParserType,
+  ) {
+    super(
+      nativeModuleName,
+      typeAnnotation,
+      `${language} type annotation '${typeAnnotation.type}' is unsupported in NativeModule specs.`,
+    );
+
+    this.typeAnnotationType = typeAnnotation.type;
+  }
+}
+
+class UnsupportedGenericParserError extends ParserError {
+  // +genericName: string;
+  constructor(
+    nativeModuleName: string,
+    genericTypeAnnotation: $FlowFixMe,
+    parser: Parser,
+  ) {
+    const genericName = parser.nameForGenericTypeAnnotation(
+      genericTypeAnnotation,
+    );
+    super(
+      nativeModuleName,
+      genericTypeAnnotation,
+      `Unrecognized generic type '${genericName}' in NativeModule spec.`,
+    );
+
+    // this.genericName = genericName;
+  }
+}
+
+class MissingTypeParameterGenericParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    genericTypeAnnotation: $FlowFixMe,
+    language: ParserType,
+  ) {
+    const genericName =
+      language === 'TypeScript'
+        ? genericTypeAnnotation.typeName.name
+        : genericTypeAnnotation.id.name;
+
+    super(
+      nativeModuleName,
+      genericTypeAnnotation,
+      `Generic '${genericName}' must have type parameters.`,
+    );
+  }
+}
+
+class MoreThanOneTypeParameterGenericParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    genericTypeAnnotation: $FlowFixMe,
+    language: ParserType,
+  ) {
+    const genericName =
+      language === 'TypeScript'
+        ? genericTypeAnnotation.typeName.name
+        : genericTypeAnnotation.id.name;
+
+    super(
+      nativeModuleName,
+      genericTypeAnnotation,
+      `Generic '${genericName}' must have exactly one type parameter.`,
+    );
+  }
+}
+
+/**
+ * Array parsing errors
+ */
+
+class UnsupportedArrayElementTypeAnnotationParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    arrayElementTypeAST: $FlowFixMe,
+    arrayType: 'Array' | '$ReadOnlyArray' | 'ReadonlyArray',
+    invalidArrayElementType: string,
+    language: ParserType,
+  ) {
+    super(
+      nativeModuleName,
+      arrayElementTypeAST,
+      `${arrayType} element types cannot be '${invalidArrayElementType}'.`,
+    );
+  }
+}
+
+/**
+ * Object parsing errors
+ */
+
+class UnsupportedObjectPropertyTypeAnnotationParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    propertyAST: $FlowFixMe,
+    invalidPropertyType: string,
+    language: ParserType,
+  ) {
+    let message = `'ObjectTypeAnnotation' cannot contain '${invalidPropertyType}'.`;
+
+    if (
+      invalidPropertyType === 'ObjectTypeSpreadProperty' &&
+      language !== 'TypeScript'
+    ) {
+      message = "Object spread isn't supported in 'ObjectTypeAnnotation's.";
+    }
+
+    super(nativeModuleName, propertyAST, message);
+  }
+}
+
+class UnsupportedObjectPropertyValueTypeAnnotationParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    propertyValueAST: $FlowFixMe,
+    propertyName: string,
+    invalidPropertyValueType: string,
+    language: ParserType,
+  ) {
+    super(
+      nativeModuleName,
+      propertyValueAST,
+      `Object property '${propertyName}' cannot have type '${invalidPropertyValueType}'.`,
+    );
+  }
+}
+
+/**
+ * Function parsing errors
+ */
+
+class UnnamedFunctionParamParserError extends ParserError {
+  constructor(
+    functionParam: $FlowFixMe,
+    nativeModuleName: string,
+    language: ParserType,
+  ) {
+    super(
+      nativeModuleName,
+      functionParam,
+      'All function parameters must be named.',
+    );
+  }
+}
+
+class UnsupportedFunctionParamTypeAnnotationParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    flowParamTypeAnnotation: $FlowFixMe,
+    paramName: string,
+    invalidParamType: string,
+  ) {
+    super(
+      nativeModuleName,
+      flowParamTypeAnnotation,
+      `Function parameter '${paramName}' cannot have type '${invalidParamType}'.`,
+    );
+  }
+}
+
+class UnsupportedFunctionReturnTypeAnnotationParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    flowReturnTypeAnnotation: $FlowFixMe,
+    invalidReturnType: string,
+    language: ParserType,
+  ) {
+    super(
+      nativeModuleName,
+      flowReturnTypeAnnotation,
+      `Function return cannot have type '${invalidReturnType}'.`,
+    );
+  }
+}
+
+/**
+ * Enum parsing errors
+ */
+
+class UnsupportedEnumDeclarationParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    arrayElementTypeAST: $FlowFixMe,
+    memberType: string,
+    language: ParserType,
+  ) {
+    super(
+      nativeModuleName,
+      arrayElementTypeAST,
+      `Unexpected enum member type ${memberType}. Only string and number enum members are supported`,
+    );
+  }
+}
+
+/**
+ * Union parsing errors
+ */
+
+class UnsupportedUnionTypeAnnotationParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    arrayElementTypeAST: $FlowFixMe,
+    types: UnionTypeAnnotationMemberType[],
+    language: ParserType,
+  ) {
+    super(
+      nativeModuleName,
+      arrayElementTypeAST,
+      `Union members must be of the same type, but multiple types were found ${types.join(
+        ', ',
+      )}'.`,
+    );
+  }
+}
+
+/**
+ * Module parsing errors
+ */
+
+class UnusedModuleInterfaceParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    flowInterface: $FlowFixMe,
+    language: ParserType,
+  ) {
+    super(
+      nativeModuleName,
+      flowInterface,
+      "Unused NativeModule spec. Please load the NativeModule by calling TurboModuleRegistry.get<Spec>('<moduleName>').",
+    );
+  }
+}
+
+class MoreThanOneModuleRegistryCallsParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    flowCallExpressions: $FlowFixMe,
+    numCalls: number,
+    language: ParserType,
+  ) {
+    super(
+      nativeModuleName,
+      flowCallExpressions,
+      `Every NativeModule spec file must contain exactly one NativeModule load. This file contains ${numCalls}. Please simplify this spec file, splitting it as necessary, to remove the extraneous loads.`,
+    );
+  }
+}
+
+class UntypedModuleRegistryCallParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    flowCallExpression: $FlowFixMe,
+    methodName: string,
+    moduleName: string,
+    language: ParserType,
+  ) {
+    super(
+      nativeModuleName,
+      flowCallExpression,
+      `Please type this NativeModule load: TurboModuleRegistry.${methodName}<Spec>('${moduleName}').`,
+    );
+  }
+}
+
+class IncorrectModuleRegistryCallTypeParameterParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    flowTypeArguments: $FlowFixMe,
+    methodName: string,
+    moduleName: string,
+    language: ParserType,
+  ) {
+    super(
+      nativeModuleName,
+      flowTypeArguments,
+      `Please change these type arguments to reflect TurboModuleRegistry.${methodName}<Spec>('${moduleName}').`,
+    );
+  }
+}
+
+class IncorrectModuleRegistryCallArityParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    flowCallExpression: $FlowFixMe,
+    methodName: string,
+    incorrectArity: number,
+    language: ParserType,
+  ) {
+    super(
+      nativeModuleName,
+      flowCallExpression,
+      `Please call TurboModuleRegistry.${methodName}<Spec>() with exactly one argument. Detected ${incorrectArity}.`,
+    );
+  }
+}
+
+class IncorrectModuleRegistryCallArgumentTypeParserError extends ParserError {
+  constructor(
+    nativeModuleName: string,
+    flowArgument: $FlowFixMe,
+    methodName: string,
+    type: string,
+    language: ParserType,
+  ) {
+    const a = /[aeiouy]/.test(type.toLowerCase()) ? 'an' : 'a';
+    super(
+      nativeModuleName,
+      flowArgument,
+      `Please call TurboModuleRegistry.${methodName}<Spec>() with a string literal. Detected ${a} '${type}'`,
+    );
+  }
+}
+
+module.exports = {
+  ParserError,
+  MissingTypeParameterGenericParserError,
+  MoreThanOneTypeParameterGenericParserError,
+  MisnamedModuleInterfaceParserError,
+  ModuleInterfaceNotFoundParserError,
+  MoreThanOneModuleInterfaceParserError,
+  UnnamedFunctionParamParserError,
+  UnsupportedArrayElementTypeAnnotationParserError,
+  UnsupportedGenericParserError,
+  UnsupportedTypeAnnotationParserError,
+  UnsupportedFunctionParamTypeAnnotationParserError,
+  UnsupportedFunctionReturnTypeAnnotationParserError,
+  UnsupportedEnumDeclarationParserError,
+  UnsupportedUnionTypeAnnotationParserError,
+  UnsupportedModulePropertyParserError,
+  UnsupportedObjectPropertyTypeAnnotationParserError,
+  UnsupportedObjectPropertyValueTypeAnnotationParserError,
+  UnusedModuleInterfaceParserError,
+  MoreThanOneModuleRegistryCallsParserError,
+  UntypedModuleRegistryCallParserError,
+  IncorrectModuleRegistryCallTypeParameterParserError,
+  IncorrectModuleRegistryCallArityParserError,
+  IncorrectModuleRegistryCallArgumentTypeParserError,
+};
diff --git a/packages/react-native-codegen/src/parsers/flow/components/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/parsers/flow/components/__test_fixtures__/fixtures.js
index 6c94f1065b0c..c597a2d1f5df 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/__test_fixtures__/fixtures.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/__test_fixtures__/fixtures.js
@@ -939,7 +939,7 @@ export default (codegenNativeComponent<ModuleProps>(
 ): NativeType);
 `;
 
-const COMMANDS_AND_EVENTS_TYPES_EXPORTED = `
+const COMMANDS_EVENTS_TYPES_EXPORTED = `
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
@@ -1009,7 +1009,7 @@ module.exports = {
   EVENTS_DEFINED_INLINE_WITH_ALL_TYPES,
   EVENTS_DEFINED_AS_NULL_INLINE,
   PROPS_AND_EVENTS_TYPES_EXPORTED,
-  COMMANDS_AND_EVENTS_TYPES_EXPORTED,
+  COMMANDS_EVENTS_TYPES_EXPORTED,
   COMMANDS_DEFINED_WITH_ALL_TYPES,
   PROPS_AS_EXTERNAL_TYPES,
   COMMANDS_WITH_EXTERNAL_TYPES,
diff --git a/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap b/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap
index 5f52a06d5438..abfa4a1f7e36 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap
@@ -24,7 +24,7 @@ exports[`RN Codegen Flow Parser Fails with error message PROP_ARRAY_MIXED_ENUM 1
 
 exports[`RN Codegen Flow Parser Fails with error message PROP_ENUM_BOOLEAN 1`] = `"Unsupported union type for \\"someProp\\", received \\"BooleanLiteralTypeAnnotation\\""`;
 
-exports[`RN Codegen Flow Parser Fails with error message PROP_MIXED_ENUM 1`] = `"Mixed types are not supported (see \\"someProp\\")"`;
+exports[`RN Codegen Flow Parser Fails with error message PROP_MIXED_ENUM 1`] = `"Mixed types are not supported (see \\"someProp\\")."`;
 
 exports[`RN Codegen Flow Parser Fails with error message PROP_NUMBER_TYPE 1`] = `"Cannot use \\"NumberTypeAnnotation\\" type annotation for \\"someProp\\": must use a specific numeric type like Int32, Double, or Float"`;
 
@@ -1256,7 +1256,110 @@ exports[`RN Codegen Flow Parser can generate fixture ARRAY_PROP_TYPES_NO_EVENTS
 }"
 `;
 
-exports[`RN Codegen Flow Parser can generate fixture COMMANDS_AND_EVENTS_TYPES_EXPORTED 1`] = `
+exports[`RN Codegen Flow Parser can generate fixture COMMANDS_DEFINED_WITH_ALL_TYPES 1`] = `
+"{
+  'modules': {
+    'Module': {
+      'type': 'Component',
+      'components': {
+        'Module': {
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
+            }
+          ],
+          'events': [],
+          'props': [],
+          'commands': [
+            {
+              'name': 'handleRootTag',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'params': [
+                  {
+                    'name': 'rootTag',
+                    'typeAnnotation': {
+                      'type': 'ReservedTypeAnnotation',
+                      'name': 'RootTag'
+                    }
+                  }
+                ],
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'hotspotUpdate',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'params': [
+                  {
+                    'name': 'x',
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation'
+                    }
+                  },
+                  {
+                    'name': 'y',
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation'
+                    }
+                  }
+                ],
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'scrollTo',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'params': [
+                  {
+                    'name': 'x',
+                    'typeAnnotation': {
+                      'type': 'FloatTypeAnnotation'
+                    }
+                  },
+                  {
+                    'name': 'y',
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation'
+                    }
+                  },
+                  {
+                    'name': 'z',
+                    'typeAnnotation': {
+                      'type': 'DoubleTypeAnnotation'
+                    }
+                  },
+                  {
+                    'name': 'animated',
+                    'typeAnnotation': {
+                      'type': 'BooleanTypeAnnotation'
+                    }
+                  }
+                ],
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                }
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
+`;
+
+exports[`RN Codegen Flow Parser can generate fixture COMMANDS_EVENTS_TYPES_EXPORTED 1`] = `
 "{
   'modules': {
     'Module': {
@@ -2819,109 +2922,6 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_AND_EVENTS_TYPES_E
 }"
 `;
 
-exports[`RN Codegen Flow Parser can generate fixture COMMANDS_DEFINED_WITH_ALL_TYPES 1`] = `
-"{
-  'modules': {
-    'Module': {
-      'type': 'Component',
-      'components': {
-        'Module': {
-          'extendsProps': [
-            {
-              'type': 'ReactNativeBuiltInType',
-              'knownTypeName': 'ReactNativeCoreViewProps'
-            }
-          ],
-          'events': [],
-          'props': [],
-          'commands': [
-            {
-              'name': 'handleRootTag',
-              'optional': false,
-              'typeAnnotation': {
-                'type': 'FunctionTypeAnnotation',
-                'params': [
-                  {
-                    'name': 'rootTag',
-                    'typeAnnotation': {
-                      'type': 'ReservedTypeAnnotation',
-                      'name': 'RootTag'
-                    }
-                  }
-                ],
-                'returnTypeAnnotation': {
-                  'type': 'VoidTypeAnnotation'
-                }
-              }
-            },
-            {
-              'name': 'hotspotUpdate',
-              'optional': false,
-              'typeAnnotation': {
-                'type': 'FunctionTypeAnnotation',
-                'params': [
-                  {
-                    'name': 'x',
-                    'typeAnnotation': {
-                      'type': 'Int32TypeAnnotation'
-                    }
-                  },
-                  {
-                    'name': 'y',
-                    'typeAnnotation': {
-                      'type': 'Int32TypeAnnotation'
-                    }
-                  }
-                ],
-                'returnTypeAnnotation': {
-                  'type': 'VoidTypeAnnotation'
-                }
-              }
-            },
-            {
-              'name': 'scrollTo',
-              'optional': false,
-              'typeAnnotation': {
-                'type': 'FunctionTypeAnnotation',
-                'params': [
-                  {
-                    'name': 'x',
-                    'typeAnnotation': {
-                      'type': 'FloatTypeAnnotation'
-                    }
-                  },
-                  {
-                    'name': 'y',
-                    'typeAnnotation': {
-                      'type': 'Int32TypeAnnotation'
-                    }
-                  },
-                  {
-                    'name': 'z',
-                    'typeAnnotation': {
-                      'type': 'DoubleTypeAnnotation'
-                    }
-                  },
-                  {
-                    'name': 'animated',
-                    'typeAnnotation': {
-                      'type': 'BooleanTypeAnnotation'
-                    }
-                  }
-                ],
-                'returnTypeAnnotation': {
-                  'type': 'VoidTypeAnnotation'
-                }
-              }
-            }
-          ]
-        }
-      }
-    }
-  }
-}"
-`;
-
 exports[`RN Codegen Flow Parser can generate fixture COMMANDS_WITH_EXTERNAL_TYPES 1`] = `
 "{
   'modules': {
diff --git a/packages/react-native-codegen/src/parsers/flow/components/__tests__/component-parser-test.js b/packages/react-native-codegen/src/parsers/flow/components/__tests__/component-parser-test.js
index 8c5a3c3457a8..384b0af5b2c8 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/__tests__/component-parser-test.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/__tests__/component-parser-test.js
@@ -4,18 +4,26 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
 const FlowParser = require('../../index.js');
+const {parseFile} = require('../../../utils.js');
 const fixtures = require('../__test_fixtures__/fixtures.js');
 const failureFixtures = require('../__test_fixtures__/failures.js');
 jest.mock('fs', () => ({
-  readFileSync: filename => fixtures[filename] || failureFixtures[filename],
+  readFileSync: filename => {
+    // Jest in the OSS does not allow to capture variables in closures.
+    // Therefore, we have to bring the variables inside the closure.
+    // see: https://github.com/facebook/jest/issues/2567
+    const readFileFixtures = require('../__test_fixtures__/fixtures.js');
+    const readFileFailureFixtures = require('../__test_fixtures__/failures.js');
+    return readFileFixtures[filename] || readFileFailureFixtures[filename];
+  },
 }));
 
 describe('RN Codegen Flow Parser', () => {
@@ -23,7 +31,7 @@ describe('RN Codegen Flow Parser', () => {
     .sort()
     .forEach(fixtureName => {
       it(`can generate fixture ${fixtureName}`, () => {
-        const schema = FlowParser.parseFile(fixtureName);
+        const schema = parseFile(fixtureName, FlowParser.buildSchema);
         const serializedSchema = JSON.stringify(schema, null, 2).replace(
           /"/g,
           "'",
@@ -37,7 +45,7 @@ describe('RN Codegen Flow Parser', () => {
     .forEach(fixtureName => {
       it(`Fails with error message ${fixtureName}`, () => {
         expect(() => {
-          FlowParser.parseFile(fixtureName);
+          parseFile(fixtureName, FlowParser.buildSchema);
         }).toThrowErrorMatchingSnapshot();
       });
     });
diff --git a/packages/react-native-codegen/src/parsers/flow/components/commands.js b/packages/react-native-codegen/src/parsers/flow/components/commands.js
index 163b5feb5e67..e829582ce311 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/commands.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/commands.js
@@ -14,7 +14,7 @@ import type {
   NamedShape,
   CommandTypeAnnotation,
 } from '../../../CodegenSchema.js';
-import type {TypeDeclarationMap} from '../utils.js';
+import type {TypeDeclarationMap} from '../../utils';
 
 const {getValueFromTypes} = require('../utils.js');
 
diff --git a/packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js b/packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js
new file mode 100644
index 000000000000..c448decc42d9
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js
@@ -0,0 +1,496 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+import type {ASTNode} from '../utils';
+import type {NamedShape} from '../../../CodegenSchema.js';
+const {getValueFromTypes} = require('../utils.js');
+import type {TypeDeclarationMap} from '../../utils';
+
+function getProperties(
+  typeName: string,
+  types: TypeDeclarationMap,
+): $FlowFixMe {
+  const typeAlias = types[typeName];
+  try {
+    return typeAlias.right.typeParameters.params[0].properties;
+  } catch (e) {
+    throw new Error(
+      `Failed to find type definition for "${typeName}", please check that you have a valid codegen flow file`,
+    );
+  }
+}
+
+function getTypeAnnotationForArray<+T>(
+  name: string,
+  typeAnnotation: $FlowFixMe,
+  defaultValue: $FlowFixMe | null,
+  types: TypeDeclarationMap,
+  buildSchema: (property: PropAST, types: TypeDeclarationMap) => ?NamedShape<T>,
+): $FlowFixMe {
+  const extractedTypeAnnotation = getValueFromTypes(typeAnnotation, types);
+  if (extractedTypeAnnotation.type === 'NullableTypeAnnotation') {
+    throw new Error(
+      'Nested optionals such as "$ReadOnlyArray<?boolean>" are not supported, please declare optionals at the top level of value definitions as in "?$ReadOnlyArray<boolean>"',
+    );
+  }
+
+  if (
+    extractedTypeAnnotation.type === 'GenericTypeAnnotation' &&
+    extractedTypeAnnotation.id.name === 'WithDefault'
+  ) {
+    throw new Error(
+      'Nested defaults such as "$ReadOnlyArray<WithDefault<boolean, false>>" are not supported, please declare defaults at the top level of value definitions as in "WithDefault<$ReadOnlyArray<boolean>, false>"',
+    );
+  }
+
+  if (extractedTypeAnnotation.type === 'GenericTypeAnnotation') {
+    // Resolve the type alias if it's not defined inline
+    const objectType = getValueFromTypes(extractedTypeAnnotation, types);
+
+    if (objectType.id.name === '$ReadOnly') {
+      return {
+        type: 'ObjectTypeAnnotation',
+        properties: flattenProperties(
+          objectType.typeParameters.params[0].properties,
+          types,
+        )
+          .map(prop => buildSchema(prop, types))
+          .filter(Boolean),
+      };
+    }
+
+    if (objectType.id.name === '$ReadOnlyArray') {
+      // We need to go yet another level deeper to resolve
+      // types that may be defined in a type alias
+      const nestedObjectType = getValueFromTypes(
+        objectType.typeParameters.params[0],
+        types,
+      );
+
+      return {
+        type: 'ArrayTypeAnnotation',
+        elementType: {
+          type: 'ObjectTypeAnnotation',
+          properties: flattenProperties(
+            nestedObjectType.typeParameters.params[0].properties,
+            types,
+          )
+            .map(prop => buildSchema(prop, types))
+            .filter(Boolean),
+        },
+      };
+    }
+  }
+
+  const type =
+    extractedTypeAnnotation.type === 'GenericTypeAnnotation'
+      ? extractedTypeAnnotation.id.name
+      : extractedTypeAnnotation.type;
+
+  switch (type) {
+    case 'ImageSource':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'ImageSourcePrimitive',
+      };
+    case 'ImageRequest':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'ImageRequestPrimitive',
+      };
+    case 'ColorValue':
+    case 'ProcessedColorValue':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'ColorPrimitive',
+      };
+    case 'PointValue':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'PointPrimitive',
+      };
+    case 'EdgeInsetsValue':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'EdgeInsetsPrimitive',
+      };
+    case 'Stringish':
+      return {
+        type: 'StringTypeAnnotation',
+      };
+    case 'Int32':
+      return {
+        type: 'Int32TypeAnnotation',
+      };
+    case 'Double':
+      return {
+        type: 'DoubleTypeAnnotation',
+      };
+    case 'Float':
+      return {
+        type: 'FloatTypeAnnotation',
+      };
+    case 'BooleanTypeAnnotation':
+      return {
+        type: 'BooleanTypeAnnotation',
+      };
+    case 'StringTypeAnnotation':
+      return {
+        type: 'StringTypeAnnotation',
+      };
+    case 'UnionTypeAnnotation':
+      typeAnnotation.types.reduce((lastType, currType) => {
+        if (lastType && currType.type !== lastType.type) {
+          throw new Error(`Mixed types are not supported (see "${name}")`);
+        }
+        return currType;
+      });
+
+      if (defaultValue === null) {
+        throw new Error(`A default enum value is required for "${name}"`);
+      }
+
+      const unionType = typeAnnotation.types[0].type;
+      if (unionType === 'StringLiteralTypeAnnotation') {
+        return {
+          type: 'StringEnumTypeAnnotation',
+          default: (defaultValue: string),
+          options: typeAnnotation.types.map(option => option.value),
+        };
+      } else if (unionType === 'NumberLiteralTypeAnnotation') {
+        throw new Error(
+          `Arrays of int enums are not supported (see: "${name}")`,
+        );
+      } else {
+        throw new Error(
+          `Unsupported union type for "${name}", received "${unionType}"`,
+        );
+      }
+    default:
+      (type: empty);
+      throw new Error(`Unknown property type for "${name}": ${type}`);
+  }
+}
+
+function flattenProperties(
+  typeDefinition: $ReadOnlyArray<PropAST>,
+  types: TypeDeclarationMap,
+): $ReadOnlyArray<PropAST> {
+  return typeDefinition
+    .map(property => {
+      if (property.type === 'ObjectTypeProperty') {
+        return property;
+      } else if (property.type === 'ObjectTypeSpreadProperty') {
+        return flattenProperties(
+          getProperties(property.argument.id.name, types),
+          types,
+        );
+      }
+    })
+    .reduce((acc, item) => {
+      if (Array.isArray(item)) {
+        item.forEach(prop => {
+          verifyPropNotAlreadyDefined(acc, prop);
+        });
+        return acc.concat(item);
+      } else {
+        verifyPropNotAlreadyDefined(acc, item);
+        acc.push(item);
+        return acc;
+      }
+    }, [])
+    .filter(Boolean);
+}
+
+function verifyPropNotAlreadyDefined(
+  props: $ReadOnlyArray<PropAST>,
+  needleProp: PropAST,
+) {
+  const propName = needleProp.key.name;
+  const foundProp = props.some(prop => prop.key.name === propName);
+  if (foundProp) {
+    throw new Error(`A prop was already defined with the name ${propName}`);
+  }
+}
+
+function getTypeAnnotation<+T>(
+  name: string,
+  annotation: $FlowFixMe | ASTNode,
+  defaultValue: $FlowFixMe | null,
+  withNullDefault: boolean,
+  types: TypeDeclarationMap,
+  buildSchema: (property: PropAST, types: TypeDeclarationMap) => ?NamedShape<T>,
+): $FlowFixMe {
+  const typeAnnotation = getValueFromTypes(annotation, types);
+
+  if (
+    typeAnnotation.type === 'GenericTypeAnnotation' &&
+    typeAnnotation.id.name === '$ReadOnlyArray'
+  ) {
+    return {
+      type: 'ArrayTypeAnnotation',
+      elementType: getTypeAnnotationForArray(
+        name,
+        typeAnnotation.typeParameters.params[0],
+        defaultValue,
+        types,
+        buildSchema,
+      ),
+    };
+  }
+
+  if (
+    typeAnnotation.type === 'GenericTypeAnnotation' &&
+    typeAnnotation.id.name === '$ReadOnly'
+  ) {
+    return {
+      type: 'ObjectTypeAnnotation',
+      properties: flattenProperties(
+        typeAnnotation.typeParameters.params[0].properties,
+        types,
+      )
+        .map(prop => buildSchema(prop, types))
+        .filter(Boolean),
+    };
+  }
+
+  const type =
+    typeAnnotation.type === 'GenericTypeAnnotation'
+      ? typeAnnotation.id.name
+      : typeAnnotation.type;
+
+  switch (type) {
+    case 'ImageSource':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'ImageSourcePrimitive',
+      };
+    case 'ImageRequest':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'ImageRequestPrimitive',
+      };
+    case 'ColorValue':
+    case 'ProcessedColorValue':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'ColorPrimitive',
+      };
+    case 'ColorArrayValue':
+      return {
+        type: 'ArrayTypeAnnotation',
+        elementType: {
+          type: 'ReservedPropTypeAnnotation',
+          name: 'ColorPrimitive',
+        },
+      };
+    case 'PointValue':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'PointPrimitive',
+      };
+    case 'EdgeInsetsValue':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'EdgeInsetsPrimitive',
+      };
+    case 'Int32':
+      return {
+        type: 'Int32TypeAnnotation',
+        default: ((defaultValue ? defaultValue : 0): number),
+      };
+    case 'Double':
+      return {
+        type: 'DoubleTypeAnnotation',
+        default: ((defaultValue ? defaultValue : 0): number),
+      };
+    case 'Float':
+      return {
+        type: 'FloatTypeAnnotation',
+        default: withNullDefault
+          ? (defaultValue: number | null)
+          : ((defaultValue ? defaultValue : 0): number),
+      };
+    case 'BooleanTypeAnnotation':
+      return {
+        type: 'BooleanTypeAnnotation',
+        default: withNullDefault
+          ? (defaultValue: boolean | null)
+          : ((defaultValue == null ? false : defaultValue): boolean),
+      };
+    case 'StringTypeAnnotation':
+      if (typeof defaultValue !== 'undefined') {
+        return {
+          type: 'StringTypeAnnotation',
+          default: (defaultValue: string | null),
+        };
+      }
+      throw new Error(`A default string (or null) is required for "${name}"`);
+    case 'Stringish':
+      if (typeof defaultValue !== 'undefined') {
+        return {
+          type: 'StringTypeAnnotation',
+          default: (defaultValue: string | null),
+        };
+      }
+      throw new Error(`A default string (or null) is required for "${name}"`);
+    case 'UnionTypeAnnotation':
+      typeAnnotation.types.reduce((lastType, currType) => {
+        if (lastType && currType.type !== lastType.type) {
+          throw new Error(`Mixed types are not supported (see "${name}").`);
+        }
+        return currType;
+      });
+
+      if (defaultValue === null) {
+        throw new Error(`A default enum value is required for "${name}"`);
+      }
+
+      const unionType = typeAnnotation.types[0].type;
+      if (unionType === 'StringLiteralTypeAnnotation') {
+        return {
+          type: 'StringEnumTypeAnnotation',
+          default: (defaultValue: string),
+          options: typeAnnotation.types.map(option => option.value),
+        };
+      } else if (unionType === 'NumberLiteralTypeAnnotation') {
+        return {
+          type: 'Int32EnumTypeAnnotation',
+          default: (defaultValue: number),
+          options: typeAnnotation.types.map(option => option.value),
+        };
+      } else {
+        throw new Error(
+          `Unsupported union type for "${name}", received "${unionType}"`,
+        );
+      }
+    case 'ObjectTypeAnnotation':
+      throw new Error(
+        `Cannot use "${type}" type annotation for "${name}": object types must be declared using $ReadOnly<>`,
+      );
+    case 'NumberTypeAnnotation':
+      throw new Error(
+        `Cannot use "${type}" type annotation for "${name}": must use a specific numeric type like Int32, Double, or Float`,
+      );
+    default:
+      (type: empty);
+      throw new Error(
+        `Unknown property type for "${name}": "${type}" in the State`,
+      );
+  }
+}
+
+type SchemaInfo = {
+  name: string,
+  optional: boolean,
+  typeAnnotation: $FlowFixMe,
+  defaultValue: $FlowFixMe,
+  withNullDefault: boolean,
+};
+
+function getSchemaInfo(
+  property: PropAST,
+  types: TypeDeclarationMap,
+): ?SchemaInfo {
+  const name = property.key.name;
+
+  const value = getValueFromTypes(property.value, types);
+  let typeAnnotation =
+    value.type === 'NullableTypeAnnotation' ? value.typeAnnotation : value;
+
+  const optional =
+    value.type === 'NullableTypeAnnotation' ||
+    property.optional ||
+    (value.type === 'GenericTypeAnnotation' &&
+      typeAnnotation.id.name === 'WithDefault');
+
+  if (
+    !property.optional &&
+    value.type === 'GenericTypeAnnotation' &&
+    typeAnnotation.id.name === 'WithDefault'
+  ) {
+    throw new Error(
+      `key ${name} must be optional if used with WithDefault<> annotation`,
+    );
+  }
+  if (
+    value.type === 'NullableTypeAnnotation' &&
+    typeAnnotation.type === 'GenericTypeAnnotation' &&
+    typeAnnotation.id.name === 'WithDefault'
+  ) {
+    throw new Error(
+      'WithDefault<> is optional and does not need to be marked as optional. Please remove the ? annotation in front of it.',
+    );
+  }
+
+  let type = typeAnnotation.type;
+  if (
+    type === 'GenericTypeAnnotation' &&
+    (typeAnnotation.id.name === 'DirectEventHandler' ||
+      typeAnnotation.id.name === 'BubblingEventHandler')
+  ) {
+    return null;
+  }
+
+  if (
+    name === 'style' &&
+    type === 'GenericTypeAnnotation' &&
+    typeAnnotation.id.name === 'ViewStyleProp'
+  ) {
+    return null;
+  }
+
+  let defaultValue = null;
+  let withNullDefault = false;
+  if (
+    type === 'GenericTypeAnnotation' &&
+    typeAnnotation.id.name === 'WithDefault'
+  ) {
+    if (typeAnnotation.typeParameters.params.length === 1) {
+      throw new Error(
+        `WithDefault requires two parameters, did you forget to provide a default value for "${name}"?`,
+      );
+    }
+
+    defaultValue = typeAnnotation.typeParameters.params[1].value;
+    const defaultValueType = typeAnnotation.typeParameters.params[1].type;
+
+    typeAnnotation = typeAnnotation.typeParameters.params[0];
+    type =
+      typeAnnotation.type === 'GenericTypeAnnotation'
+        ? typeAnnotation.id.name
+        : typeAnnotation.type;
+
+    if (defaultValueType === 'NullLiteralTypeAnnotation') {
+      defaultValue = null;
+      withNullDefault = true;
+    }
+  }
+
+  return {
+    name,
+    optional,
+    typeAnnotation,
+    defaultValue,
+    withNullDefault,
+  };
+}
+
+// $FlowFixMe[unclear-type] there's no flowtype for ASTs
+type PropAST = Object;
+
+module.exports = {
+  getProperties,
+  getSchemaInfo,
+  getTypeAnnotation,
+  flattenProperties,
+};
diff --git a/packages/react-native-codegen/src/parsers/flow/components/events.js b/packages/react-native-codegen/src/parsers/flow/components/events.js
index a6a788a467d8..8384edd789b8 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/events.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/events.js
@@ -104,7 +104,11 @@ function findEventArgumentsAndType(
   types: TypeMap,
   bubblingType: void | 'direct' | 'bubble',
   paperName: ?$FlowFixMe,
-) {
+): {
+  argumentProps: $FlowFixMe,
+  bubblingType: ?('direct' | 'bubble'),
+  paperTopLevelNameDeprecated: ?$FlowFixMe,
+} {
   if (!typeAnnotation.id) {
     throw new Error("typeAnnotation of event doesn't have a name");
   }
diff --git a/packages/react-native-codegen/src/parsers/flow/components/extends.js b/packages/react-native-codegen/src/parsers/flow/components/extends.js
index 5cd021512f1d..6f81f7b45408 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/extends.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/extends.js
@@ -11,7 +11,7 @@
 'use strict';
 
 import type {ExtendsPropsShape} from '../../../CodegenSchema.js';
-import type {TypeDeclarationMap} from '../utils.js';
+import type {TypeDeclarationMap} from '../../utils';
 
 function extendsForProp(prop: PropsAST, types: TypeDeclarationMap) {
   if (!prop.argument) {
diff --git a/packages/react-native-codegen/src/parsers/flow/components/index.js b/packages/react-native-codegen/src/parsers/flow/components/index.js
index e488635d9430..a0b1eda6cdaa 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/index.js
@@ -9,7 +9,7 @@
  */
 
 'use strict';
-import type {TypeDeclarationMap} from '../utils';
+import type {TypeDeclarationMap} from '../../utils';
 import type {CommandOptions} from './options';
 import type {ComponentSchemaBuilderConfig} from './schema.js';
 
@@ -18,7 +18,8 @@ const {getCommands} = require('./commands');
 const {getEvents} = require('./events');
 const {getExtendsProps, removeKnownExtends} = require('./extends');
 const {getCommandOptions, getOptions} = require('./options');
-const {getPropProperties, getProps} = require('./props');
+const {getProps} = require('./props');
+const {getProperties} = require('./componentsUtils.js');
 
 /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
  * LTI update could not be added via codemod */
@@ -192,7 +193,7 @@ function buildComponentSchema(ast): ComponentSchemaBuilderConfig {
 
   const types = getTypes(ast);
 
-  const propProperties = getPropProperties(propsTypeName, types);
+  const propProperties = getProperties(propsTypeName, types);
   const commandOptions = getCommandOptions(commandOptionsExpression);
 
   const commandProperties = getCommandProperties(
diff --git a/packages/react-native-codegen/src/parsers/flow/components/props.js b/packages/react-native-codegen/src/parsers/flow/components/props.js
index 003f47bed2e2..05cdf06b0223 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/props.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/props.js
@@ -9,409 +9,28 @@
  */
 
 'use strict';
-import type {ASTNode} from '../utils';
 
-const {getValueFromTypes} = require('../utils.js');
+const {
+  flattenProperties,
+  getSchemaInfo,
+  getTypeAnnotation,
+} = require('./componentsUtils.js');
 
 import type {NamedShape, PropTypeAnnotation} from '../../../CodegenSchema.js';
-import type {TypeDeclarationMap} from '../utils.js';
+import type {TypeDeclarationMap} from '../../utils';
 
-function getPropProperties(
-  propsTypeName: string,
-  types: TypeDeclarationMap,
-): $FlowFixMe {
-  const typeAlias = types[propsTypeName];
-  try {
-    return typeAlias.right.typeParameters.params[0].properties;
-  } catch (e) {
-    throw new Error(
-      `Failed to find type definition for "${propsTypeName}", please check that you have a valid codegen flow file`,
-    );
-  }
-}
-
-function getTypeAnnotationForArray(
-  name: string,
-  typeAnnotation: $FlowFixMe,
-  defaultValue: $FlowFixMe | null,
-  types: TypeDeclarationMap,
-) {
-  const extractedTypeAnnotation = getValueFromTypes(typeAnnotation, types);
-  if (extractedTypeAnnotation.type === 'NullableTypeAnnotation') {
-    throw new Error(
-      'Nested optionals such as "$ReadOnlyArray<?boolean>" are not supported, please declare optionals at the top level of value definitions as in "?$ReadOnlyArray<boolean>"',
-    );
-  }
-
-  if (
-    extractedTypeAnnotation.type === 'GenericTypeAnnotation' &&
-    extractedTypeAnnotation.id.name === 'WithDefault'
-  ) {
-    throw new Error(
-      'Nested defaults such as "$ReadOnlyArray<WithDefault<boolean, false>>" are not supported, please declare defaults at the top level of value definitions as in "WithDefault<$ReadOnlyArray<boolean>, false>"',
-    );
-  }
-
-  if (extractedTypeAnnotation.type === 'GenericTypeAnnotation') {
-    // Resolve the type alias if it's not defined inline
-    const objectType = getValueFromTypes(extractedTypeAnnotation, types);
-
-    if (objectType.id.name === '$ReadOnly') {
-      return {
-        type: 'ObjectTypeAnnotation',
-        properties: flattenProperties(
-          objectType.typeParameters.params[0].properties,
-          types,
-        )
-          .map(prop => buildPropSchema(prop, types))
-          .filter(Boolean),
-      };
-    }
-
-    if (objectType.id.name === '$ReadOnlyArray') {
-      // We need to go yet another level deeper to resolve
-      // types that may be defined in a type alias
-      const nestedObjectType = getValueFromTypes(
-        objectType.typeParameters.params[0],
-        types,
-      );
-
-      return {
-        type: 'ArrayTypeAnnotation',
-        elementType: {
-          type: 'ObjectTypeAnnotation',
-          properties: flattenProperties(
-            nestedObjectType.typeParameters.params[0].properties,
-            types,
-          )
-            .map(prop => buildPropSchema(prop, types))
-            .filter(Boolean),
-        },
-      };
-    }
-  }
-
-  const type =
-    extractedTypeAnnotation.type === 'GenericTypeAnnotation'
-      ? extractedTypeAnnotation.id.name
-      : extractedTypeAnnotation.type;
-
-  switch (type) {
-    case 'ImageSource':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'ImageSourcePrimitive',
-      };
-    case 'ColorValue':
-    case 'ProcessedColorValue':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'ColorPrimitive',
-      };
-    case 'PointValue':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'PointPrimitive',
-      };
-    case 'EdgeInsetsValue':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'EdgeInsetsPrimitive',
-      };
-    case 'Stringish':
-      return {
-        type: 'StringTypeAnnotation',
-      };
-    case 'Int32':
-      return {
-        type: 'Int32TypeAnnotation',
-      };
-    case 'Double':
-      return {
-        type: 'DoubleTypeAnnotation',
-      };
-    case 'Float':
-      return {
-        type: 'FloatTypeAnnotation',
-      };
-    case 'BooleanTypeAnnotation':
-      return {
-        type: 'BooleanTypeAnnotation',
-      };
-    case 'StringTypeAnnotation':
-      return {
-        type: 'StringTypeAnnotation',
-      };
-    case 'UnionTypeAnnotation':
-      typeAnnotation.types.reduce((lastType, currType) => {
-        if (lastType && currType.type !== lastType.type) {
-          throw new Error(`Mixed types are not supported (see "${name}")`);
-        }
-        return currType;
-      });
-
-      if (defaultValue === null) {
-        throw new Error(`A default enum value is required for "${name}"`);
-      }
-
-      const unionType = typeAnnotation.types[0].type;
-      if (unionType === 'StringLiteralTypeAnnotation') {
-        return {
-          type: 'StringEnumTypeAnnotation',
-          default: (defaultValue: string),
-          options: typeAnnotation.types.map(option => option.value),
-        };
-      } else if (unionType === 'NumberLiteralTypeAnnotation') {
-        throw new Error(
-          `Arrays of int enums are not supported (see: "${name}")`,
-        );
-      } else {
-        throw new Error(
-          `Unsupported union type for "${name}", received "${unionType}"`,
-        );
-      }
-    default:
-      (type: empty);
-      throw new Error(`Unknown prop type for "${name}": ${type}`);
-  }
-}
-
-function getTypeAnnotation(
-  name: string,
-  annotation: $FlowFixMe | ASTNode,
-  defaultValue: $FlowFixMe | null,
-  withNullDefault: boolean,
-  types: TypeDeclarationMap,
-) {
-  const typeAnnotation = getValueFromTypes(annotation, types);
-
-  if (
-    typeAnnotation.type === 'GenericTypeAnnotation' &&
-    typeAnnotation.id.name === '$ReadOnlyArray'
-  ) {
-    return {
-      type: 'ArrayTypeAnnotation',
-      elementType: getTypeAnnotationForArray(
-        name,
-        typeAnnotation.typeParameters.params[0],
-        defaultValue,
-        types,
-      ),
-    };
-  }
-
-  if (
-    typeAnnotation.type === 'GenericTypeAnnotation' &&
-    typeAnnotation.id.name === '$ReadOnly'
-  ) {
-    return {
-      type: 'ObjectTypeAnnotation',
-      properties: flattenProperties(
-        typeAnnotation.typeParameters.params[0].properties,
-        types,
-      )
-        .map(prop => buildPropSchema(prop, types))
-        .filter(Boolean),
-    };
-  }
-
-  const type =
-    typeAnnotation.type === 'GenericTypeAnnotation'
-      ? typeAnnotation.id.name
-      : typeAnnotation.type;
-
-  switch (type) {
-    case 'ImageSource':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'ImageSourcePrimitive',
-      };
-    case 'ColorValue':
-    case 'ProcessedColorValue':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'ColorPrimitive',
-      };
-    case 'ColorArrayValue':
-      return {
-        type: 'ArrayTypeAnnotation',
-        elementType: {
-          type: 'ReservedPropTypeAnnotation',
-          name: 'ColorPrimitive',
-        },
-      };
-    case 'PointValue':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'PointPrimitive',
-      };
-    case 'EdgeInsetsValue':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'EdgeInsetsPrimitive',
-      };
-    case 'Int32':
-      return {
-        type: 'Int32TypeAnnotation',
-        default: ((defaultValue ? defaultValue : 0): number),
-      };
-    case 'Double':
-      return {
-        type: 'DoubleTypeAnnotation',
-        default: ((defaultValue ? defaultValue : 0): number),
-      };
-    case 'Float':
-      return {
-        type: 'FloatTypeAnnotation',
-        default: withNullDefault
-          ? (defaultValue: number | null)
-          : ((defaultValue ? defaultValue : 0): number),
-      };
-    case 'BooleanTypeAnnotation':
-      return {
-        type: 'BooleanTypeAnnotation',
-        default: withNullDefault
-          ? (defaultValue: boolean | null)
-          : ((defaultValue == null ? false : defaultValue): boolean),
-      };
-    case 'StringTypeAnnotation':
-      if (typeof defaultValue !== 'undefined') {
-        return {
-          type: 'StringTypeAnnotation',
-          default: (defaultValue: string | null),
-        };
-      }
-      throw new Error(`A default string (or null) is required for "${name}"`);
-    case 'Stringish':
-      if (typeof defaultValue !== 'undefined') {
-        return {
-          type: 'StringTypeAnnotation',
-          default: (defaultValue: string | null),
-        };
-      }
-      throw new Error(`A default string (or null) is required for "${name}"`);
-    case 'UnionTypeAnnotation':
-      typeAnnotation.types.reduce((lastType, currType) => {
-        if (lastType && currType.type !== lastType.type) {
-          throw new Error(`Mixed types are not supported (see "${name}")`);
-        }
-        return currType;
-      });
-
-      if (defaultValue === null) {
-        throw new Error(`A default enum value is required for "${name}"`);
-      }
-
-      const unionType = typeAnnotation.types[0].type;
-      if (unionType === 'StringLiteralTypeAnnotation') {
-        return {
-          type: 'StringEnumTypeAnnotation',
-          default: (defaultValue: string),
-          options: typeAnnotation.types.map(option => option.value),
-        };
-      } else if (unionType === 'NumberLiteralTypeAnnotation') {
-        return {
-          type: 'Int32EnumTypeAnnotation',
-          default: (defaultValue: number),
-          options: typeAnnotation.types.map(option => option.value),
-        };
-      } else {
-        throw new Error(
-          `Unsupported union type for "${name}", received "${unionType}"`,
-        );
-      }
-    case 'ObjectTypeAnnotation':
-      throw new Error(
-        `Cannot use "${type}" type annotation for "${name}": object types must be declared using $ReadOnly<>`,
-      );
-    case 'NumberTypeAnnotation':
-      throw new Error(
-        `Cannot use "${type}" type annotation for "${name}": must use a specific numeric type like Int32, Double, or Float`,
-      );
-    default:
-      (type: empty);
-      throw new Error(`Unknown prop type for "${name}": "${type}"`);
-  }
-}
+// $FlowFixMe[unclear-type] there's no flowtype for ASTs
+type PropAST = Object;
 
 function buildPropSchema(
   property: PropAST,
   types: TypeDeclarationMap,
 ): ?NamedShape<PropTypeAnnotation> {
-  const name = property.key.name;
-
-  const value = getValueFromTypes(property.value, types);
-  let typeAnnotation =
-    value.type === 'NullableTypeAnnotation' ? value.typeAnnotation : value;
-
-  const optional =
-    value.type === 'NullableTypeAnnotation' ||
-    property.optional ||
-    (value.type === 'GenericTypeAnnotation' &&
-      typeAnnotation.id.name === 'WithDefault');
-
-  if (
-    !property.optional &&
-    value.type === 'GenericTypeAnnotation' &&
-    typeAnnotation.id.name === 'WithDefault'
-  ) {
-    throw new Error(
-      `key ${name} must be optional if used with WithDefault<> annotation`,
-    );
-  }
-  if (
-    value.type === 'NullableTypeAnnotation' &&
-    typeAnnotation.type === 'GenericTypeAnnotation' &&
-    typeAnnotation.id.name === 'WithDefault'
-  ) {
-    throw new Error(
-      'WithDefault<> is optional and does not need to be marked as optional. Please remove the ? annotation in front of it.',
-    );
-  }
-
-  let type = typeAnnotation.type;
-  if (
-    type === 'GenericTypeAnnotation' &&
-    (typeAnnotation.id.name === 'DirectEventHandler' ||
-      typeAnnotation.id.name === 'BubblingEventHandler')
-  ) {
+  const info = getSchemaInfo(property, types);
+  if (info == null) {
     return null;
   }
-
-  if (
-    name === 'style' &&
-    type === 'GenericTypeAnnotation' &&
-    typeAnnotation.id.name === 'ViewStyleProp'
-  ) {
-    return null;
-  }
-
-  let defaultValue = null;
-  let withNullDefault = false;
-  if (
-    type === 'GenericTypeAnnotation' &&
-    typeAnnotation.id.name === 'WithDefault'
-  ) {
-    if (typeAnnotation.typeParameters.params.length === 1) {
-      throw new Error(
-        `WithDefault requires two parameters, did you forget to provide a default value for "${name}"?`,
-      );
-    }
-
-    defaultValue = typeAnnotation.typeParameters.params[1].value;
-    const defaultValueType = typeAnnotation.typeParameters.params[1].type;
-
-    typeAnnotation = typeAnnotation.typeParameters.params[0];
-    type =
-      typeAnnotation.type === 'GenericTypeAnnotation'
-        ? typeAnnotation.id.name
-        : typeAnnotation.type;
-
-    if (defaultValueType === 'NullLiteralTypeAnnotation') {
-      defaultValue = null;
-      withNullDefault = true;
-    }
-  }
+  const {name, optional, typeAnnotation, defaultValue, withNullDefault} = info;
 
   return {
     name,
@@ -422,54 +41,11 @@ function buildPropSchema(
       defaultValue,
       withNullDefault,
       types,
+      buildPropSchema,
     ),
   };
 }
 
-// $FlowFixMe[unclear-type] there's no flowtype for ASTs
-type PropAST = Object;
-
-function verifyPropNotAlreadyDefined(
-  props: $ReadOnlyArray<PropAST>,
-  needleProp: PropAST,
-) {
-  const propName = needleProp.key.name;
-  const foundProp = props.some(prop => prop.key.name === propName);
-  if (foundProp) {
-    throw new Error(`A prop was already defined with the name ${propName}`);
-  }
-}
-
-function flattenProperties(
-  typeDefinition: $ReadOnlyArray<PropAST>,
-  types: TypeDeclarationMap,
-) {
-  return typeDefinition
-    .map(property => {
-      if (property.type === 'ObjectTypeProperty') {
-        return property;
-      } else if (property.type === 'ObjectTypeSpreadProperty') {
-        return flattenProperties(
-          getPropProperties(property.argument.id.name, types),
-          types,
-        );
-      }
-    })
-    .reduce((acc, item) => {
-      if (Array.isArray(item)) {
-        item.forEach(prop => {
-          verifyPropNotAlreadyDefined(acc, prop);
-        });
-        return acc.concat(item);
-      } else {
-        verifyPropNotAlreadyDefined(acc, item);
-        acc.push(item);
-        return acc;
-      }
-    }, [])
-    .filter(Boolean);
-}
-
 function getProps(
   typeDefinition: $ReadOnlyArray<PropAST>,
   types: TypeDeclarationMap,
@@ -481,5 +57,4 @@ function getProps(
 
 module.exports = {
   getProps,
-  getPropProperties,
 };
diff --git a/packages/react-native-codegen/src/parsers/flow/components/schema.js b/packages/react-native-codegen/src/parsers/flow/components/schema.js
index ed6223c3347b..ab165031cd25 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/schema.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/schema.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow strict-local
+ * @flow strict
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/parsers/flow/errors.js b/packages/react-native-codegen/src/parsers/flow/errors.js
deleted file mode 100644
index 41fc7f8ca4ee..000000000000
--- a/packages/react-native-codegen/src/parsers/flow/errors.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-'use strict';
-
-class ParserError extends Error {
-  nodes: $ReadOnlyArray<$FlowFixMe>;
-  constructor(
-    hasteModuleName: string,
-    astNodeOrNodes: $FlowFixMe,
-    message: string,
-  ) {
-    super(`Module ${hasteModuleName}: ${message}`);
-
-    this.nodes = Array.isArray(astNodeOrNodes)
-      ? astNodeOrNodes
-      : [astNodeOrNodes];
-
-    // assign the error class name in your custom error (as a shortcut)
-    this.name = this.constructor.name;
-
-    // capturing the stack trace keeps the reference to your error class
-    Error.captureStackTrace(this, this.constructor);
-  }
-}
-
-module.exports = {
-  ParserError,
-};
diff --git a/packages/react-native-codegen/src/parsers/flow/index.js b/packages/react-native-codegen/src/parsers/flow/index.js
index 516025223e76..2dfd5ff37ccd 100644
--- a/packages/react-native-codegen/src/parsers/flow/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/index.js
@@ -11,61 +11,39 @@
 'use strict';
 
 import type {SchemaType} from '../../CodegenSchema.js';
+
 // $FlowFixMe[untyped-import] there's no flowtype flow-parser
 const flowParser = require('flow-parser');
 const fs = require('fs');
-const path = require('path');
+const {
+  buildSchemaFromConfigType,
+  getConfigType,
+  isModuleRegistryCall,
+} = require('../utils');
 const {buildComponentSchema} = require('./components');
 const {wrapComponentSchema} = require('./components/schema');
 const {buildModuleSchema} = require('./modules');
-const {wrapModuleSchema} = require('./modules/schema');
-const {
-  createParserErrorCapturer,
-  visit,
-  isModuleRegistryCall,
-} = require('./utils');
-const invariant = require('invariant');
-
-function getConfigType(
-  // TODO(T71778680): Flow-type this node.
-  ast: $FlowFixMe,
-): 'module' | 'component' | 'none' {
-  let isComponent = false;
-  let isModule = false;
 
-  visit(ast, {
-    CallExpression(node) {
+function Visitor(infoMap: {isComponent: boolean, isModule: boolean}) {
+  return {
+    CallExpression(node: $FlowFixMe) {
       if (
         node.callee.type === 'Identifier' &&
         node.callee.name === 'codegenNativeComponent'
       ) {
-        isComponent = true;
+        infoMap.isComponent = true;
       }
 
       if (isModuleRegistryCall(node)) {
-        isModule = true;
+        infoMap.isModule = true;
       }
     },
-    InterfaceExtends(node) {
+    InterfaceExtends(node: $FlowFixMe) {
       if (node.id.name === 'TurboModule') {
-        isModule = true;
+        infoMap.isModule = true;
       }
     },
-  });
-
-  if (isModule && isComponent) {
-    throw new Error(
-      'Found type extending "TurboModule" and exported "codegenNativeComponent" declaration in one file. Split them into separated files.',
-    );
-  }
-
-  if (isModule) {
-    return 'module';
-  } else if (isComponent) {
-    return 'component';
-  } else {
-    return 'none';
-  }
+  };
 }
 
 function buildSchema(contents: string, filename: ?string): SchemaType {
@@ -77,52 +55,17 @@ function buildSchema(contents: string, filename: ?string): SchemaType {
     return {modules: {}};
   }
 
-  const ast = flowParser.parse(contents);
-  const configType = getConfigType(ast);
-
-  switch (configType) {
-    case 'component': {
-      return wrapComponentSchema(buildComponentSchema(ast));
-    }
-    case 'module': {
-      if (filename === undefined || filename === null) {
-        throw new Error('Filepath expected while parasing a module');
-      }
-      const hasteModuleName = path.basename(filename).replace(/\.js$/, '');
-
-      const [parsingErrors, tryParse] = createParserErrorCapturer();
-      const schema = tryParse(() =>
-        buildModuleSchema(hasteModuleName, ast, tryParse),
-      );
-
-      if (parsingErrors.length > 0) {
-        /**
-         * TODO(T77968131): We have two options:
-         *  - Throw the first error, but indicate there are more then one errors.
-         *  - Display all errors, nicely formatted.
-         *
-         * For the time being, we're just throw the first error.
-         **/
-
-        throw parsingErrors[0];
-      }
-
-      invariant(
-        schema != null,
-        'When there are no parsing errors, the schema should not be null',
-      );
-
-      return wrapModuleSchema(schema, hasteModuleName);
-    }
-    default:
-      return {modules: {}};
-  }
-}
-
-function parseFile(filename: string): SchemaType {
-  const contents = fs.readFileSync(filename, 'utf8');
-
-  return buildSchema(contents, filename);
+  const ast = flowParser.parse(contents, {enums: true});
+  const configType = getConfigType(ast, Visitor);
+
+  return buildSchemaFromConfigType(
+    configType,
+    filename,
+    ast,
+    wrapComponentSchema,
+    buildComponentSchema,
+    buildModuleSchema,
+  );
 }
 
 function parseModuleFixture(filename: string): SchemaType {
@@ -136,7 +79,7 @@ function parseString(contents: string, filename: ?string): SchemaType {
 }
 
 module.exports = {
-  parseFile,
+  buildSchema,
   parseModuleFixture,
   parseString,
 };
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js
index cbbc156c29f9..e8668947ce28 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js
@@ -569,8 +569,29 @@ const IOS_ONLY_NATIVE_MODULE = `
 import type {TurboModule} from '../RCTExport';
 import * as TurboModuleRegistry from '../TurboModuleRegistry';
 
+export enum Quality {
+  SD,
+  HD,
+}
+
+export enum Resolution {
+  Low = 720,
+  High = 1080,
+}
+
+export enum Floppy {
+  LowDensity = 0.72,
+  HighDensity = 1.44,
+}
+
+export enum StringOptions {
+  One = 'one',
+  Two = 'two',
+  Three = 'three',
+}
+
 export interface Spec extends TurboModule {
-  // no methods
+  +getEnums: (quality: Quality, resolution?: Resolution, floppy: Floppy, stringOptions: StringOptions) => string;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModuleIOS');
@@ -593,9 +614,39 @@ const CXX_ONLY_NATIVE_MODULE = `
 import type {TurboModule} from '../RCTExport';
 import * as TurboModuleRegistry from '../TurboModuleRegistry';
 
+export type ChooseInt = 1 | 2 | 3;
+export type ChooseFloat = 1.44 | 2.88 | 5.76;
+export type ChooseObject = {} | {low: string};
+export type ChooseString = 'One' | 'Two' | 'Three';
+
+export enum Quality {
+  SD,
+  HD,
+}
+
+export enum Resolution {
+  Low = 720,
+  High = 1080,
+}
+
+export enum Floppy {
+  LowDensity = 0.72,
+  HighDensity = 1.44,
+}
+
+export enum StringOptions {
+  One = 'one',
+  Two = 'two',
+  Three = 'three',
+}
+
 export interface Spec extends TurboModule {
   +getCallback: () => () => void;
   +getMixed: (arg: mixed) => mixed;
+  +getEnums: (quality: Quality, resolution?: Resolution, floppy: Floppy, stringOptions: StringOptions) => string;
+  +getMap: (arg: {[a: string]: ?number}) => {[b: string]: ?number};
+  +getAnotherMap: (arg: {[string]: string}) => {[string]: string};
+  +getUnion: (chooseInt: ChooseInt, chooseFloat: ChooseFloat, chooseObject: ChooseObject, chooseString: ChooseString) => ChooseObject;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModuleCxx');
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
index aef18a0ef6c7..8f308ace82dc 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
@@ -77,6 +77,169 @@ exports[`RN Codegen Flow Parser can generate fixture CXX_ONLY_NATIVE_MODULE 1`]
                 }
               ]
             }
+          },
+          {
+            'name': 'getEnums',
+            'optional': false,
+            'typeAnnotation': {
+              'type': 'FunctionTypeAnnotation',
+              'returnTypeAnnotation': {
+                'type': 'StringTypeAnnotation'
+              },
+              'params': [
+                {
+                  'name': 'quality',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'StringTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'resolution',
+                  'optional': true,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'NumberTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'floppy',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'NumberTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'stringOptions',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'StringTypeAnnotation'
+                  }
+                }
+              ]
+            }
+          },
+          {
+            'name': 'getMap',
+            'optional': false,
+            'typeAnnotation': {
+              'type': 'FunctionTypeAnnotation',
+              'returnTypeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
+                  {
+                    'name': 'b',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'GenericObjectTypeAnnotation'
+                    }
+                  }
+                ]
+              },
+              'params': [
+                {
+                  'name': 'arg',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'ObjectTypeAnnotation',
+                    'properties': [
+                      {
+                        'name': 'a',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'GenericObjectTypeAnnotation'
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
+          },
+          {
+            'name': 'getAnotherMap',
+            'optional': false,
+            'typeAnnotation': {
+              'type': 'FunctionTypeAnnotation',
+              'returnTypeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
+                  {
+                    'name': 'key',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'GenericObjectTypeAnnotation'
+                    }
+                  }
+                ]
+              },
+              'params': [
+                {
+                  'name': 'arg',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'ObjectTypeAnnotation',
+                    'properties': [
+                      {
+                        'name': 'key',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'GenericObjectTypeAnnotation'
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
+          },
+          {
+            'name': 'getUnion',
+            'optional': false,
+            'typeAnnotation': {
+              'type': 'FunctionTypeAnnotation',
+              'returnTypeAnnotation': {
+                'type': 'UnionTypeAnnotation',
+                'memberType': 'ObjectTypeAnnotation'
+              },
+              'params': [
+                {
+                  'name': 'chooseInt',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'UnionTypeAnnotation',
+                    'memberType': 'NumberTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'chooseFloat',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'UnionTypeAnnotation',
+                    'memberType': 'NumberTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'chooseObject',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'UnionTypeAnnotation',
+                    'memberType': 'ObjectTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'chooseString',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'UnionTypeAnnotation',
+                    'memberType': 'StringTypeAnnotation'
+                  }
+                }
+              ]
+            }
           }
         ]
       },
@@ -116,7 +279,52 @@ exports[`RN Codegen Flow Parser can generate fixture IOS_ONLY_NATIVE_MODULE 1`]
       'type': 'NativeModule',
       'aliases': {},
       'spec': {
-        'properties': []
+        'properties': [
+          {
+            'name': 'getEnums',
+            'optional': false,
+            'typeAnnotation': {
+              'type': 'FunctionTypeAnnotation',
+              'returnTypeAnnotation': {
+                'type': 'StringTypeAnnotation'
+              },
+              'params': [
+                {
+                  'name': 'quality',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'StringTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'resolution',
+                  'optional': true,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'NumberTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'floppy',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'NumberTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'stringOptions',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'StringTypeAnnotation'
+                  }
+                }
+              ]
+            }
+          }
+        ]
       },
       'moduleNames': [
         'SampleTurboModuleIOS'
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
index 25c9d178d7d0..c1f959b7a884 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
@@ -16,13 +16,13 @@ import type {
 } from '../../../../CodegenSchema';
 
 const {parseString} = require('../../index.js');
-const {unwrapNullable} = require('../utils');
+const {unwrapNullable} = require('../../../parsers-commons');
 const {
-  UnsupportedFlowGenericParserError,
-  UnsupportedFlowTypeAnnotationParserError,
+  UnsupportedGenericParserError,
+  UnsupportedTypeAnnotationParserError,
   UnnamedFunctionParamParserError,
-  IncorrectlyParameterizedFlowGenericParserError,
-} = require('../errors');
+  MissingTypeParameterGenericParserError,
+} = require('../../../errors');
 const invariant = require('invariant');
 
 type PrimitiveTypeAnnotationType =
@@ -87,7 +87,7 @@ describe('Flow Module Parser', () => {
           export default TurboModuleRegistry.get<Spec>('Foo');
         `);
 
-      expect(parser).toThrow(UnsupportedFlowTypeAnnotationParserError);
+      expect(parser).toThrow(UnsupportedTypeAnnotationParserError);
     });
 
     it('should fail parsing when a function param type is unamed', () => {
@@ -173,7 +173,7 @@ describe('Flow Module Parser', () => {
         () => {
           it(`should not parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Function'`, () => {
             expect(() => parseParamType('arg', 'Function')).toThrow(
-              UnsupportedFlowGenericParserError,
+              UnsupportedGenericParserError,
             );
           });
 
@@ -212,7 +212,7 @@ describe('Flow Module Parser', () => {
           describe('Array Types', () => {
             it(`should not parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Array'`, () => {
               expect(() => parseParamType('arg', 'Array')).toThrow(
-                IncorrectlyParameterizedFlowGenericParserError,
+                MissingTypeParameterGenericParserError,
               );
             });
 
@@ -510,7 +510,7 @@ describe('Flow Module Parser', () => {
                   it(`should not parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Array`, () => {
                     expect(() =>
                       parseParamTypeObjectLiteralProp('prop', 'Array'),
-                    ).toThrow(IncorrectlyParameterizedFlowGenericParserError);
+                    ).toThrow(MissingTypeParameterGenericParserError);
                   });
 
                   function parseArrayElementType(
@@ -782,7 +782,7 @@ describe('Flow Module Parser', () => {
           describe('Array Types', () => {
             it(`should not parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Array'`, () => {
               expect(() => parseReturnType('Array')).toThrow(
-                IncorrectlyParameterizedFlowGenericParserError,
+                MissingTypeParameterGenericParserError,
               );
             });
 
@@ -816,8 +816,7 @@ describe('Flow Module Parser', () => {
             describe('Primitive Element Types', () => {
               PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
                 it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Array<${FLOW_TYPE}>'`, () => {
-                  const [elementType, module] =
-                    parseArrayElementReturnType(FLOW_TYPE);
+                  const [elementType] = parseArrayElementReturnType(FLOW_TYPE);
                   expect(elementType.type).toBe(PARSED_TYPE_NAME);
                 });
               });
@@ -885,7 +884,7 @@ describe('Flow Module Parser', () => {
 
           it(`should not parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Function'`, () => {
             expect(() => parseReturnType('Function')).toThrow(
-              UnsupportedFlowGenericParserError,
+              UnsupportedGenericParserError,
             );
           });
 
@@ -1051,7 +1050,7 @@ describe('Flow Module Parser', () => {
                     it(`should not parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Array`, () => {
                       expect(() =>
                         parseObjectLiteralReturnTypeProp('prop', 'Array'),
-                      ).toThrow(IncorrectlyParameterizedFlowGenericParserError);
+                      ).toThrow(MissingTypeParameterGenericParserError);
                     });
 
                     function parseArrayElementType(
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-snapshot-test.js b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-snapshot-test.js
index 103c80e8c1e0..f260240b7fda 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-snapshot-test.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-snapshot-test.js
@@ -4,18 +4,27 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
 const FlowParser = require('../../index.js');
+
 const fixtures = require('../__test_fixtures__/fixtures.js');
 const failureFixtures = require('../__test_fixtures__/failures.js');
+
 jest.mock('fs', () => ({
-  readFileSync: filename => fixtures[filename] || failureFixtures[filename],
+  readFileSync: filename => {
+    // Jest in the OSS does not allow to capture variables in closures.
+    // Therefore, we have to bring the variables inside the closure.
+    // see: https://github.com/facebook/jest/issues/2567
+    const readFileFixtures = require('../__test_fixtures__/fixtures.js');
+    const readFileFailureFixtures = require('../__test_fixtures__/failures.js');
+    return readFileFixtures[filename] || readFileFailureFixtures[filename];
+  },
 }));
 
 describe('RN Codegen Flow Parser', () => {
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/errors.js b/packages/react-native-codegen/src/parsers/flow/modules/errors.js
deleted file mode 100644
index c8bb4253885e..000000000000
--- a/packages/react-native-codegen/src/parsers/flow/modules/errors.js
+++ /dev/null
@@ -1,335 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-'use strict';
-
-const invariant = require('invariant');
-const {ParserError} = require('../errors');
-
-class MisnamedModuleFlowInterfaceParserError extends ParserError {
-  constructor(hasteModuleName: string, id: $FlowFixMe) {
-    super(
-      hasteModuleName,
-      id,
-      `All Flow interfaces extending TurboModule must be called 'Spec'. Please rename Flow interface '${id.name}' to 'Spec'.`,
-    );
-  }
-}
-
-class ModuleFlowInterfaceNotFoundParserError extends ParserError {
-  constructor(hasteModuleName: string, ast: $FlowFixMe) {
-    super(
-      hasteModuleName,
-      ast,
-      'No Flow interfaces extending TurboModule were detected in this NativeModule spec.',
-    );
-  }
-}
-
-class MoreThanOneModuleFlowInterfaceParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowModuleInterfaces: $ReadOnlyArray<$FlowFixMe>,
-    names: $ReadOnlyArray<string>,
-  ) {
-    const finalName = names[names.length - 1];
-    const allButLastName = names.slice(0, -1);
-    const quote = (x: string) => `'${x}'`;
-
-    const nameStr =
-      allButLastName.map(quote).join(', ') + ', and ' + quote(finalName);
-
-    super(
-      hasteModuleName,
-      flowModuleInterfaces,
-      `Every NativeModule spec file must declare exactly one NativeModule Flow interface. This file declares ${names.length}: ${nameStr}. Please remove the extraneous Flow interface declarations.`,
-    );
-  }
-}
-
-class UnsupportedModulePropertyParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    propertyValue: $FlowFixMe,
-    propertyName: string,
-    invalidPropertyValueType: string,
-  ) {
-    super(
-      hasteModuleName,
-      propertyValue,
-      `Flow interfaces extending TurboModule must only contain 'FunctionTypeAnnotation's. Property '${propertyName}' refers to a '${invalidPropertyValueType}'.`,
-    );
-  }
-}
-
-class UnsupportedFlowTypeAnnotationParserError extends ParserError {
-  +typeAnnotationType: string;
-  constructor(hasteModuleName: string, typeAnnotation: $FlowFixMe) {
-    super(
-      hasteModuleName,
-      typeAnnotation,
-      `Flow type annotation '${typeAnnotation.type}' is unsupported in NativeModule specs.`,
-    );
-
-    this.typeAnnotationType = typeAnnotation.type;
-  }
-}
-
-class UnsupportedFlowGenericParserError extends ParserError {
-  +genericName: string;
-  constructor(hasteModuleName: string, genericTypeAnnotation: $FlowFixMe) {
-    const genericName = genericTypeAnnotation.id.name;
-    super(
-      hasteModuleName,
-      genericTypeAnnotation,
-      `Unrecognized generic type '${genericName}' in NativeModule spec.`,
-    );
-
-    this.genericName = genericName;
-  }
-}
-
-class IncorrectlyParameterizedFlowGenericParserError extends ParserError {
-  +genericName: string;
-  +numTypeParameters: number;
-
-  constructor(hasteModuleName: string, genericTypeAnnotation: $FlowFixMe) {
-    if (genericTypeAnnotation.typeParameters == null) {
-      super(
-        hasteModuleName,
-        genericTypeAnnotation,
-        `Generic '${genericTypeAnnotation.id.name}' must have type parameters.`,
-      );
-      return;
-    }
-
-    if (
-      genericTypeAnnotation.typeParameters.type ===
-        'TypeParameterInstantiation' &&
-      genericTypeAnnotation.typeParameters.params.length !== 1
-    ) {
-      super(
-        hasteModuleName,
-        genericTypeAnnotation.typeParameters,
-        `Generic '${genericTypeAnnotation.id.name}' must have exactly one type parameter.`,
-      );
-      return;
-    }
-
-    invariant(
-      false,
-      "Couldn't create IncorrectlyParameterizedFlowGenericParserError",
-    );
-  }
-}
-
-/**
- * Array parsing errors
- */
-
-class UnsupportedArrayElementTypeAnnotationParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    arrayElementTypeAST: $FlowFixMe,
-    arrayType: 'Array' | '$ReadOnlyArray',
-    invalidArrayElementType: string,
-  ) {
-    super(
-      hasteModuleName,
-      arrayElementTypeAST,
-      `${arrayType} element types cannot be '${invalidArrayElementType}'.`,
-    );
-  }
-}
-
-/**
- * Object parsing errors
- */
-
-class UnsupportedObjectPropertyTypeAnnotationParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    propertyAST: $FlowFixMe,
-    invalidPropertyType: string,
-  ) {
-    let message = `'ObjectTypeAnnotation' cannot contain '${invalidPropertyType}'.`;
-
-    if (invalidPropertyType === 'ObjectTypeSpreadProperty') {
-      message = "Object spread isn't supported in 'ObjectTypeAnnotation's.";
-    }
-
-    super(hasteModuleName, propertyAST, message);
-  }
-}
-
-class UnsupportedObjectPropertyValueTypeAnnotationParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    propertyValueAST: $FlowFixMe,
-    propertyName: string,
-    invalidPropertyValueType: string,
-  ) {
-    super(
-      hasteModuleName,
-      propertyValueAST,
-      `Object property '${propertyName}' cannot have type '${invalidPropertyValueType}'.`,
-    );
-  }
-}
-
-/**
- * Function parsing errors
- */
-
-class UnnamedFunctionParamParserError extends ParserError {
-  constructor(functionParam: $FlowFixMe, hasteModuleName: string) {
-    super(
-      hasteModuleName,
-      functionParam,
-      'All function parameters must be named.',
-    );
-  }
-}
-
-class UnsupportedFunctionParamTypeAnnotationParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowParamTypeAnnotation: $FlowFixMe,
-    paramName: string,
-    invalidParamType: string,
-  ) {
-    super(
-      hasteModuleName,
-      flowParamTypeAnnotation,
-      `Function parameter '${paramName}' cannot have type '${invalidParamType}'.`,
-    );
-  }
-}
-
-class UnsupportedFunctionReturnTypeAnnotationParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowReturnTypeAnnotation: $FlowFixMe,
-    invalidReturnType: string,
-  ) {
-    super(
-      hasteModuleName,
-      flowReturnTypeAnnotation,
-      `Function return cannot have type '${invalidReturnType}'.`,
-    );
-  }
-}
-
-class UnusedModuleFlowInterfaceParserError extends ParserError {
-  constructor(hasteModuleName: string, flowInterface: $FlowFixMe) {
-    super(
-      hasteModuleName,
-      flowInterface,
-      "Unused NativeModule spec. Please load the NativeModule by calling TurboModuleRegistry.get<Spec>('<moduleName>').",
-    );
-  }
-}
-
-class MoreThanOneModuleRegistryCallsParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowCallExpressions: $FlowFixMe,
-    numCalls: number,
-  ) {
-    super(
-      hasteModuleName,
-      flowCallExpressions,
-      `Every NativeModule spec file must contain exactly one NativeModule load. This file contains ${numCalls}. Please simplify this spec file, splitting it as necessary, to remove the extraneous loads.`,
-    );
-  }
-}
-
-class UntypedModuleRegistryCallParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowCallExpression: $FlowFixMe,
-    methodName: string,
-    moduleName: string,
-  ) {
-    super(
-      hasteModuleName,
-      flowCallExpression,
-      `Please type this NativeModule load: TurboModuleRegistry.${methodName}<Spec>('${moduleName}').`,
-    );
-  }
-}
-
-class IncorrectModuleRegistryCallTypeParameterParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowTypeArguments: $FlowFixMe,
-    methodName: string,
-    moduleName: string,
-  ) {
-    super(
-      hasteModuleName,
-      flowTypeArguments,
-      `Please change these type arguments to reflect TurboModuleRegistry.${methodName}<Spec>('${moduleName}').`,
-    );
-  }
-}
-
-class IncorrectModuleRegistryCallArityParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowCallExpression: $FlowFixMe,
-    methodName: string,
-    incorrectArity: number,
-  ) {
-    super(
-      hasteModuleName,
-      flowCallExpression,
-      `Please call TurboModuleRegistry.${methodName}<Spec>() with exactly one argument. Detected ${incorrectArity}.`,
-    );
-  }
-}
-
-class IncorrectModuleRegistryCallArgumentTypeParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowArgument: $FlowFixMe,
-    methodName: string,
-    type: string,
-  ) {
-    const a = /[aeiouy]/.test(type.toLowerCase()) ? 'an' : 'a';
-    super(
-      hasteModuleName,
-      flowArgument,
-      `Please call TurboModuleRegistry.${methodName}<Spec>() with a string literal. Detected ${a} '${type}'`,
-    );
-  }
-}
-
-module.exports = {
-  IncorrectlyParameterizedFlowGenericParserError,
-  MisnamedModuleFlowInterfaceParserError,
-  ModuleFlowInterfaceNotFoundParserError,
-  MoreThanOneModuleFlowInterfaceParserError,
-  UnnamedFunctionParamParserError,
-  UnsupportedArrayElementTypeAnnotationParserError,
-  UnsupportedFlowGenericParserError,
-  UnsupportedFlowTypeAnnotationParserError,
-  UnsupportedFunctionParamTypeAnnotationParserError,
-  UnsupportedFunctionReturnTypeAnnotationParserError,
-  UnsupportedModulePropertyParserError,
-  UnsupportedObjectPropertyTypeAnnotationParserError,
-  UnsupportedObjectPropertyValueTypeAnnotationParserError,
-  UnusedModuleFlowInterfaceParserError,
-  MoreThanOneModuleRegistryCallsParserError,
-  UntypedModuleRegistryCallParserError,
-  IncorrectModuleRegistryCallTypeParameterParserError,
-  IncorrectModuleRegistryCallArityParserError,
-  IncorrectModuleRegistryCallArgumentTypeParserError,
-};
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/index.js b/packages/react-native-codegen/src/parsers/flow/modules/index.js
index 38ce80db4e74..cd6e2f3e4401 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/index.js
@@ -22,43 +22,144 @@ import type {
   Nullable,
 } from '../../../CodegenSchema.js';
 
-import type {TypeDeclarationMap} from '../utils.js';
-import type {ParserErrorCapturer} from '../utils';
+import type {ParserErrorCapturer, TypeDeclarationMap} from '../../utils';
 import type {NativeModuleTypeAnnotation} from '../../../CodegenSchema.js';
+const {nullGuard} = require('../../parsers-utils');
 
+const {throwIfMoreThanOneModuleRegistryCalls} = require('../../error-utils');
+const {visit, isModuleRegistryCall} = require('../../utils');
+const {resolveTypeAnnotation, getTypes} = require('../utils.js');
 const {
-  resolveTypeAnnotation,
-  getTypes,
-  visit,
-  isModuleRegistryCall,
-} = require('../utils.js');
-const {unwrapNullable, wrapNullable} = require('./utils');
+  unwrapNullable,
+  wrapNullable,
+  assertGenericTypeAnnotationHasExactlyOneTypeParameter,
+  emitMixedTypeAnnotation,
+  emitUnionTypeAnnotation,
+  translateDefault,
+} = require('../../parsers-commons');
+const {
+  emitBoolean,
+  emitDouble,
+  emitFloat,
+  emitFunction,
+  emitNumber,
+  emitInt32,
+  emitObject,
+  emitPromise,
+  emitRootTag,
+  emitVoid,
+  emitString,
+  emitStringish,
+  typeAliasResolution,
+} = require('../../parsers-primitives');
+
 const {
-  IncorrectlyParameterizedFlowGenericParserError,
-  MisnamedModuleFlowInterfaceParserError,
-  ModuleFlowInterfaceNotFoundParserError,
-  MoreThanOneModuleFlowInterfaceParserError,
   UnnamedFunctionParamParserError,
   UnsupportedArrayElementTypeAnnotationParserError,
-  UnsupportedFlowGenericParserError,
-  UnsupportedFlowTypeAnnotationParserError,
-  UnsupportedFunctionParamTypeAnnotationParserError,
-  UnsupportedFunctionReturnTypeAnnotationParserError,
-  UnsupportedModulePropertyParserError,
+  UnsupportedTypeAnnotationParserError,
   UnsupportedObjectPropertyTypeAnnotationParserError,
-  UnsupportedObjectPropertyValueTypeAnnotationParserError,
-  UnusedModuleFlowInterfaceParserError,
-  MoreThanOneModuleRegistryCallsParserError,
-  UntypedModuleRegistryCallParserError,
-  IncorrectModuleRegistryCallTypeParameterParserError,
-  IncorrectModuleRegistryCallArityParserError,
   IncorrectModuleRegistryCallArgumentTypeParserError,
-} = require('./errors.js');
+} = require('../../errors.js');
+
+const {verifyPlatforms} = require('../../utils');
 
-const invariant = require('invariant');
+const {
+  throwIfUnsupportedFunctionReturnTypeAnnotationParserError,
+  throwIfModuleInterfaceNotFound,
+  throwIfModuleInterfaceIsMisnamed,
+  throwIfPropertyValueTypeIsUnsupported,
+  throwIfUnusedModuleInterfaceParserError,
+  throwIfWrongNumberOfCallExpressionArgs,
+  throwIfIncorrectModuleRegistryCallTypeParameterParserError,
+  throwIfUntypedModule,
+  throwIfModuleTypeIsUnsupported,
+  throwIfMoreThanOneModuleInterfaceParserError,
+  throwIfUnsupportedFunctionParamTypeAnnotationParserError,
+} = require('../../error-utils');
+
+const {FlowParser} = require('../parser.js');
+const {getKeyName} = require('../../parsers-commons');
+
+const language = 'Flow';
+const parser = new FlowParser();
+
+function translateArrayTypeAnnotation(
+  hasteModuleName: string,
+  types: TypeDeclarationMap,
+  aliasMap: {...NativeModuleAliasMap},
+  cxxOnly: boolean,
+  flowArrayType: 'Array' | '$ReadOnlyArray',
+  flowElementType: $FlowFixMe,
+  nullable: boolean,
+): Nullable<NativeModuleTypeAnnotation> {
+  try {
+    /**
+     * TODO(T72031674): Migrate all our NativeModule specs to not use
+     * invalid Array ElementTypes. Then, make the elementType a required
+     * parameter.
+     */
+    const [elementType, isElementTypeNullable] = unwrapNullable(
+      translateTypeAnnotation(
+        hasteModuleName,
+        flowElementType,
+        types,
+        aliasMap,
+        /**
+         * TODO(T72031674): Ensure that all ParsingErrors that are thrown
+         * while parsing the array element don't get captured and collected.
+         * Why? If we detect any parsing error while parsing the element,
+         * we should default it to null down the line, here. This is
+         * the correct behaviour until we migrate all our NativeModule specs
+         * to be parseable.
+         */
+        nullGuard,
+        cxxOnly,
+      ),
+    );
 
-function nullGuard<T>(fn: () => T): ?T {
-  return fn();
+    if (elementType.type === 'VoidTypeAnnotation') {
+      throw new UnsupportedArrayElementTypeAnnotationParserError(
+        hasteModuleName,
+        flowElementType,
+        flowArrayType,
+        'void',
+        language,
+      );
+    }
+
+    if (elementType.type === 'PromiseTypeAnnotation') {
+      throw new UnsupportedArrayElementTypeAnnotationParserError(
+        hasteModuleName,
+        flowElementType,
+        flowArrayType,
+        'Promise',
+        language,
+      );
+    }
+
+    if (elementType.type === 'FunctionTypeAnnotation') {
+      throw new UnsupportedArrayElementTypeAnnotationParserError(
+        hasteModuleName,
+        flowElementType,
+        flowArrayType,
+        'FunctionTypeAnnotation',
+        language,
+      );
+    }
+
+    const finalTypeAnnotation: NativeModuleArrayTypeAnnotation<
+      Nullable<NativeModuleBaseTypeAnnotation>,
+    > = {
+      type: 'ArrayTypeAnnotation',
+      elementType: wrapNullable(isElementTypeNullable, elementType),
+    };
+
+    return wrapNullable(nullable, finalTypeAnnotation);
+  } catch (ex) {
+    return wrapNullable(nullable, {
+      type: 'ArrayTypeAnnotation',
+    });
+  }
 }
 
 function translateTypeAnnotation(
@@ -79,98 +180,39 @@ function translateTypeAnnotation(
     case 'GenericTypeAnnotation': {
       switch (typeAnnotation.id.name) {
         case 'RootTag': {
-          return wrapNullable(nullable, {
-            type: 'ReservedTypeAnnotation',
-            name: 'RootTag',
-          });
+          return emitRootTag(nullable);
         }
         case 'Promise': {
-          assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+          return emitPromise(
             hasteModuleName,
             typeAnnotation,
+            language,
+            nullable,
           );
-
-          return wrapNullable(nullable, {
-            type: 'PromiseTypeAnnotation',
-          });
         }
         case 'Array':
         case '$ReadOnlyArray': {
           assertGenericTypeAnnotationHasExactlyOneTypeParameter(
             hasteModuleName,
             typeAnnotation,
+            language,
           );
 
-          try {
-            /**
-             * TODO(T72031674): Migrate all our NativeModule specs to not use
-             * invalid Array ElementTypes. Then, make the elementType a required
-             * parameter.
-             */
-            const [elementType, isElementTypeNullable] = unwrapNullable(
-              translateTypeAnnotation(
-                hasteModuleName,
-                typeAnnotation.typeParameters.params[0],
-                types,
-                aliasMap,
-                /**
-                 * TODO(T72031674): Ensure that all ParsingErrors that are thrown
-                 * while parsing the array element don't get captured and collected.
-                 * Why? If we detect any parsing error while parsing the element,
-                 * we should default it to null down the line, here. This is
-                 * the correct behaviour until we migrate all our NativeModule specs
-                 * to be parseable.
-                 */
-                nullGuard,
-                cxxOnly,
-              ),
-            );
-
-            if (elementType.type === 'VoidTypeAnnotation') {
-              throw new UnsupportedArrayElementTypeAnnotationParserError(
-                hasteModuleName,
-                typeAnnotation.typeParameters.params[0],
-                typeAnnotation.type,
-                'void',
-              );
-            }
-
-            if (elementType.type === 'PromiseTypeAnnotation') {
-              throw new UnsupportedArrayElementTypeAnnotationParserError(
-                hasteModuleName,
-                typeAnnotation.typeParameters.params[0],
-                typeAnnotation.type,
-                'Promise',
-              );
-            }
-
-            if (elementType.type === 'FunctionTypeAnnotation') {
-              throw new UnsupportedArrayElementTypeAnnotationParserError(
-                hasteModuleName,
-                typeAnnotation.typeParameters.params[0],
-                typeAnnotation.type,
-                'FunctionTypeAnnotation',
-              );
-            }
-
-            const finalTypeAnnotation: NativeModuleArrayTypeAnnotation<
-              Nullable<NativeModuleBaseTypeAnnotation>,
-            > = {
-              type: 'ArrayTypeAnnotation',
-              elementType: wrapNullable(isElementTypeNullable, elementType),
-            };
-
-            return wrapNullable(nullable, finalTypeAnnotation);
-          } catch (ex) {
-            return wrapNullable(nullable, {
-              type: 'ArrayTypeAnnotation',
-            });
-          }
+          return translateArrayTypeAnnotation(
+            hasteModuleName,
+            types,
+            aliasMap,
+            cxxOnly,
+            typeAnnotation.type,
+            typeAnnotation.typeParameters.params[0],
+            nullable,
+          );
         }
         case '$ReadOnly': {
           assertGenericTypeAnnotationHasExactlyOneTypeParameter(
             hasteModuleName,
             typeAnnotation,
+            language,
           );
 
           const [paramType, isParamNullable] = unwrapNullable(
@@ -187,35 +229,28 @@ function translateTypeAnnotation(
           return wrapNullable(nullable || isParamNullable, paramType);
         }
         case 'Stringish': {
-          return wrapNullable(nullable, {
-            type: 'StringTypeAnnotation',
-          });
+          return emitStringish(nullable);
         }
         case 'Int32': {
-          return wrapNullable(nullable, {
-            type: 'Int32TypeAnnotation',
-          });
+          return emitInt32(nullable);
         }
         case 'Double': {
-          return wrapNullable(nullable, {
-            type: 'DoubleTypeAnnotation',
-          });
+          return emitDouble(nullable);
         }
         case 'Float': {
-          return wrapNullable(nullable, {
-            type: 'FloatTypeAnnotation',
-          });
+          return emitFloat(nullable);
         }
         case 'UnsafeObject':
         case 'Object': {
-          return wrapNullable(nullable, {
-            type: 'GenericObjectTypeAnnotation',
-          });
+          return emitObject(nullable);
         }
         default: {
-          throw new UnsupportedFlowGenericParserError(
+          return translateDefault(
             hasteModuleName,
             typeAnnotation,
+            types,
+            nullable,
+            parser,
           );
         }
       }
@@ -224,20 +259,34 @@ function translateTypeAnnotation(
       const objectTypeAnnotation = {
         type: 'ObjectTypeAnnotation',
         // $FlowFixMe[missing-type-arg]
-        properties: (typeAnnotation.properties: Array<$FlowFixMe>)
+        properties: ([
+          ...typeAnnotation.properties,
+          ...typeAnnotation.indexers,
+        ]: Array<$FlowFixMe>)
           .map<?NamedShape<Nullable<NativeModuleBaseTypeAnnotation>>>(
             property => {
               return tryParse(() => {
-                if (property.type !== 'ObjectTypeProperty') {
+                if (
+                  property.type !== 'ObjectTypeProperty' &&
+                  property.type !== 'ObjectTypeIndexer'
+                ) {
                   throw new UnsupportedObjectPropertyTypeAnnotationParserError(
                     hasteModuleName,
                     property,
                     property.type,
+                    language,
                   );
                 }
 
-                const {optional, key} = property;
-
+                const {optional = false} = property;
+                const name = getKeyName(property, hasteModuleName, language);
+                if (property.type === 'ObjectTypeIndexer') {
+                  return {
+                    name,
+                    optional,
+                    typeAnnotation: emitObject(nullable),
+                  };
+                }
                 const [propertyTypeAnnotation, isPropertyNullable] =
                   unwrapNullable(
                     translateTypeAnnotation(
@@ -250,113 +299,55 @@ function translateTypeAnnotation(
                     ),
                   );
 
-                if (propertyTypeAnnotation.type === 'FunctionTypeAnnotation') {
-                  throw new UnsupportedObjectPropertyValueTypeAnnotationParserError(
+                if (
+                  propertyTypeAnnotation.type === 'FunctionTypeAnnotation' ||
+                  propertyTypeAnnotation.type === 'PromiseTypeAnnotation' ||
+                  propertyTypeAnnotation.type === 'VoidTypeAnnotation'
+                ) {
+                  throwIfPropertyValueTypeIsUnsupported(
                     hasteModuleName,
                     property.value,
                     property.key,
                     propertyTypeAnnotation.type,
+                    language,
                   );
+                } else {
+                  return {
+                    name,
+                    optional,
+                    typeAnnotation: wrapNullable(
+                      isPropertyNullable,
+                      propertyTypeAnnotation,
+                    ),
+                  };
                 }
-
-                if (propertyTypeAnnotation.type === 'VoidTypeAnnotation') {
-                  throw new UnsupportedObjectPropertyValueTypeAnnotationParserError(
-                    hasteModuleName,
-                    property.value,
-                    property.key,
-                    'void',
-                  );
-                }
-
-                if (propertyTypeAnnotation.type === 'PromiseTypeAnnotation') {
-                  throw new UnsupportedObjectPropertyValueTypeAnnotationParserError(
-                    hasteModuleName,
-                    property.value,
-                    property.key,
-                    'Promise',
-                  );
-                }
-
-                return {
-                  name: key.name,
-                  optional,
-                  typeAnnotation: wrapNullable(
-                    isPropertyNullable,
-                    propertyTypeAnnotation,
-                  ),
-                };
               });
             },
           )
           .filter(Boolean),
       };
 
-      if (!typeAliasResolutionStatus.successful) {
-        return wrapNullable(nullable, objectTypeAnnotation);
-      }
-
-      /**
-       * All aliases RHS are required.
-       */
-      aliasMap[typeAliasResolutionStatus.aliasName] = objectTypeAnnotation;
-
-      /**
-       * Nullability of type aliases is transitive.
-       *
-       * Consider this case:
-       *
-       * type Animal = ?{
-       *   name: string,
-       * };
-       *
-       * type B = Animal
-       *
-       * export interface Spec extends TurboModule {
-       *   +greet: (animal: B) => void;
-       * }
-       *
-       * In this case, we follow B to Animal, and then Animal to ?{name: string}.
-       *
-       * We:
-       *   1. Replace `+greet: (animal: B) => void;` with `+greet: (animal: ?Animal) => void;`,
-       *   2. Pretend that Animal = {name: string}.
-       *
-       * Why do we do this?
-       *  1. In ObjC, we need to generate a struct called Animal, not B.
-       *  2. This design is simpler than managing nullability within both the type alias usage, and the type alias RHS.
-       *  3. What does it mean for a C++ struct, which is what this type alias RHS will generate, to be nullable? ¯\_(ツ)_/¯
-       *     Nullability is a concept that only makes sense when talking about instances (i.e: usages) of the C++ structs.
-       *     Hence, it's better to manage nullability within the actual TypeAliasTypeAnnotation nodes, and not the
-       *     associated ObjectTypeAnnotations.
-       */
-      return wrapNullable(nullable, {
-        type: 'TypeAliasTypeAnnotation',
-        name: typeAliasResolutionStatus.aliasName,
-      });
+      return typeAliasResolution(
+        typeAliasResolutionStatus,
+        objectTypeAnnotation,
+        aliasMap,
+        nullable,
+      );
     }
     case 'BooleanTypeAnnotation': {
-      return wrapNullable(nullable, {
-        type: 'BooleanTypeAnnotation',
-      });
+      return emitBoolean(nullable);
     }
     case 'NumberTypeAnnotation': {
-      return wrapNullable(nullable, {
-        type: 'NumberTypeAnnotation',
-      });
+      return emitNumber(nullable);
     }
     case 'VoidTypeAnnotation': {
-      return wrapNullable(nullable, {
-        type: 'VoidTypeAnnotation',
-      });
+      return emitVoid(nullable);
     }
     case 'StringTypeAnnotation': {
-      return wrapNullable(nullable, {
-        type: 'StringTypeAnnotation',
-      });
+      return emitString(nullable);
     }
     case 'FunctionTypeAnnotation': {
-      return wrapNullable(
-        nullable,
+      const translateFunctionTypeAnnotationValue: NativeModuleFunctionTypeAnnotation =
         translateFunctionTypeAnnotation(
           hasteModuleName,
           typeAnnotation,
@@ -364,53 +355,36 @@ function translateTypeAnnotation(
           aliasMap,
           tryParse,
           cxxOnly,
-        ),
-      );
+        );
+      return emitFunction(nullable, translateFunctionTypeAnnotationValue);
+    }
+    case 'UnionTypeAnnotation': {
+      if (cxxOnly) {
+        return emitUnionTypeAnnotation(
+          nullable,
+          hasteModuleName,
+          typeAnnotation,
+          language,
+        );
+      }
+      // Fallthrough
     }
     case 'MixedTypeAnnotation': {
       if (cxxOnly) {
-        return wrapNullable(nullable, {
-          type: 'MixedTypeAnnotation',
-        });
+        return emitMixedTypeAnnotation(nullable);
       }
       // Fallthrough
     }
     default: {
-      throw new UnsupportedFlowTypeAnnotationParserError(
+      throw new UnsupportedTypeAnnotationParserError(
         hasteModuleName,
         typeAnnotation,
+        language,
       );
     }
   }
 }
 
-function assertGenericTypeAnnotationHasExactlyOneTypeParameter(
-  moduleName: string,
-  /**
-   * TODO(T71778680): This is a GenericTypeAnnotation. Flow type this node
-   */
-  typeAnnotation: $FlowFixMe,
-) {
-  if (typeAnnotation.typeParameters == null) {
-    throw new IncorrectlyParameterizedFlowGenericParserError(
-      moduleName,
-      typeAnnotation,
-    );
-  }
-
-  invariant(
-    typeAnnotation.typeParameters.type === 'TypeParameterInstantiation',
-    "assertGenericTypeAnnotationHasExactlyOneTypeParameter: Type parameters must be an AST node of type 'TypeParameterInstantiation'",
-  );
-
-  if (typeAnnotation.typeParameters.params.length !== 1) {
-    throw new IncorrectlyParameterizedFlowGenericParserError(
-      moduleName,
-      typeAnnotation,
-    );
-  }
-}
-
 function translateFunctionTypeAnnotation(
   hasteModuleName: string,
   // TODO(T71778680): This is a FunctionTypeAnnotation. Type this.
@@ -426,7 +400,11 @@ function translateFunctionTypeAnnotation(
   for (const flowParam of (flowFunctionTypeAnnotation.params: $ReadOnlyArray<$FlowFixMe>)) {
     const parsedParam = tryParse(() => {
       if (flowParam.name == null) {
-        throw new UnnamedFunctionParamParserError(flowParam, hasteModuleName);
+        throw new UnnamedFunctionParamParserError(
+          flowParam,
+          hasteModuleName,
+          language,
+        );
       }
 
       const paramName = flowParam.name.name;
@@ -442,21 +420,15 @@ function translateFunctionTypeAnnotation(
           ),
         );
 
-      if (paramTypeAnnotation.type === 'VoidTypeAnnotation') {
-        throw new UnsupportedFunctionParamTypeAnnotationParserError(
-          hasteModuleName,
-          flowParam.typeAnnotation,
-          paramName,
-          'void',
-        );
-      }
-
-      if (paramTypeAnnotation.type === 'PromiseTypeAnnotation') {
-        throw new UnsupportedFunctionParamTypeAnnotationParserError(
+      if (
+        paramTypeAnnotation.type === 'VoidTypeAnnotation' ||
+        paramTypeAnnotation.type === 'PromiseTypeAnnotation'
+      ) {
+        return throwIfUnsupportedFunctionParamTypeAnnotationParserError(
           hasteModuleName,
           flowParam.typeAnnotation,
           paramName,
-          'Promise',
+          paramTypeAnnotation.type,
         );
       }
 
@@ -486,13 +458,14 @@ function translateFunctionTypeAnnotation(
     ),
   );
 
-  if (!cxxOnly && returnTypeAnnotation.type === 'FunctionTypeAnnotation') {
-    throw new UnsupportedFunctionReturnTypeAnnotationParserError(
-      hasteModuleName,
-      flowFunctionTypeAnnotation.returnType,
-      'FunctionTypeAnnotation',
-    );
-  }
+  throwIfUnsupportedFunctionReturnTypeAnnotationParserError(
+    hasteModuleName,
+    flowFunctionTypeAnnotation,
+    'FunctionTypeAnnotation',
+    language,
+    cxxOnly,
+    returnTypeAnnotation.type,
+  );
 
   return {
     type: 'FunctionTypeAnnotation',
@@ -523,14 +496,13 @@ function buildPropertySchema(
 
   ({nullable, typeAnnotation: value} = resolveTypeAnnotation(value, types));
 
-  if (value.type !== 'FunctionTypeAnnotation') {
-    throw new UnsupportedModulePropertyParserError(
-      hasteModuleName,
-      property.value,
-      property.key.name,
-      value.type,
-    );
-  }
+  throwIfModuleTypeIsUnsupported(
+    hasteModuleName,
+    property.value,
+    property.key.name,
+    value.type,
+    language,
+  );
 
   return {
     name: methodName,
@@ -571,26 +543,22 @@ function buildModuleSchema(
     isModuleInterface,
   );
 
-  if (moduleSpecs.length === 0) {
-    throw new ModuleFlowInterfaceNotFoundParserError(hasteModuleName, ast);
-  }
+  throwIfModuleInterfaceNotFound(
+    moduleSpecs.length,
+    hasteModuleName,
+    ast,
+    language,
+  );
 
-  if (moduleSpecs.length > 1) {
-    throw new MoreThanOneModuleFlowInterfaceParserError(
-      hasteModuleName,
-      moduleSpecs,
-      moduleSpecs.map(node => node.id.name),
-    );
-  }
+  throwIfMoreThanOneModuleInterfaceParserError(
+    hasteModuleName,
+    moduleSpecs,
+    language,
+  );
 
   const [moduleSpec] = moduleSpecs;
 
-  if (moduleSpec.id.name !== 'Spec') {
-    throw new MisnamedModuleFlowInterfaceParserError(
-      hasteModuleName,
-      moduleSpec.id,
-    );
-  }
+  throwIfModuleInterfaceIsMisnamed(hasteModuleName, moduleSpec.id, language);
 
   // Parse Module Names
   const moduleName = tryParse((): string => {
@@ -603,33 +571,31 @@ function buildModuleSchema(
       },
     });
 
-    if (callExpressions.length === 0) {
-      throw new UnusedModuleFlowInterfaceParserError(
-        hasteModuleName,
-        moduleSpec,
-      );
-    }
+    throwIfUnusedModuleInterfaceParserError(
+      hasteModuleName,
+      moduleSpec,
+      callExpressions,
+      language,
+    );
 
-    if (callExpressions.length > 1) {
-      throw new MoreThanOneModuleRegistryCallsParserError(
-        hasteModuleName,
-        callExpressions,
-        callExpressions.length,
-      );
-    }
+    throwIfMoreThanOneModuleRegistryCalls(
+      hasteModuleName,
+      callExpressions,
+      callExpressions.length,
+      language,
+    );
 
     const [callExpression] = callExpressions;
     const {typeArguments} = callExpression;
     const methodName = callExpression.callee.property.name;
 
-    if (callExpression.arguments.length !== 1) {
-      throw new IncorrectModuleRegistryCallArityParserError(
-        hasteModuleName,
-        callExpression,
-        methodName,
-        callExpression.arguments.length,
-      );
-    }
+    throwIfWrongNumberOfCallExpressionArgs(
+      hasteModuleName,
+      callExpression,
+      methodName,
+      callExpression.arguments.length,
+      language,
+    );
 
     if (callExpression.arguments[0].type !== 'Literal') {
       const {type} = callExpression.arguments[0];
@@ -638,33 +604,28 @@ function buildModuleSchema(
         callExpression.arguments[0],
         methodName,
         type,
+        language,
       );
     }
 
     const $moduleName = callExpression.arguments[0].value;
 
-    if (typeArguments == null) {
-      throw new UntypedModuleRegistryCallParserError(
-        hasteModuleName,
-        callExpression,
-        methodName,
-        $moduleName,
-      );
-    }
+    throwIfUntypedModule(
+      typeArguments,
+      hasteModuleName,
+      callExpression,
+      methodName,
+      $moduleName,
+      language,
+    );
 
-    if (
-      typeArguments.type !== 'TypeParameterInstantiation' ||
-      typeArguments.params.length !== 1 ||
-      typeArguments.params[0].type !== 'GenericTypeAnnotation' ||
-      typeArguments.params[0].id.name !== 'Spec'
-    ) {
-      throw new IncorrectModuleRegistryCallTypeParameterParserError(
-        hasteModuleName,
-        typeArguments,
-        methodName,
-        $moduleName,
-      );
-    }
+    throwIfIncorrectModuleRegistryCallTypeParameterParserError(
+      hasteModuleName,
+      typeArguments,
+      methodName,
+      $moduleName,
+      language,
+    );
 
     return $moduleName;
   });
@@ -675,19 +636,10 @@ function buildModuleSchema(
   // Eventually this should be made explicit in the Flow type itself.
   // Also check the hasteModuleName for platform suffix.
   // Note: this shape is consistent with ComponentSchema.
-  let cxxOnly = false;
-  const excludedPlatforms = [];
-  const namesToValidate = [...moduleNames, hasteModuleName];
-  namesToValidate.forEach(name => {
-    if (name.endsWith('Android')) {
-      excludedPlatforms.push('iOS');
-    } else if (name.endsWith('IOS')) {
-      excludedPlatforms.push('android');
-    } else if (name.endsWith('Cxx')) {
-      cxxOnly = true;
-      excludedPlatforms.push('iOS', 'android');
-    }
-  });
+  const {cxxOnly, excludedPlatforms} = verifyPlatforms(
+    hasteModuleName,
+    moduleNames,
+  );
 
   // $FlowFixMe[missing-type-arg]
   return (moduleSpec.body.properties: $ReadOnlyArray<$FlowFixMe>)
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/schema.js b/packages/react-native-codegen/src/parsers/flow/modules/schema.js
deleted file mode 100644
index 4e3fda6bea4a..000000000000
--- a/packages/react-native-codegen/src/parsers/flow/modules/schema.js
+++ /dev/null
@@ -1,28 +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';
-
-import type {SchemaType, NativeModuleSchema} from '../../../CodegenSchema.js';
-
-function wrapModuleSchema(
-  nativeModuleSchema: NativeModuleSchema,
-  hasteModuleName: string,
-): SchemaType {
-  return {
-    modules: {
-      [hasteModuleName]: nativeModuleSchema,
-    },
-  };
-}
-
-module.exports = {
-  wrapModuleSchema,
-};
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/utils.js b/packages/react-native-codegen/src/parsers/flow/modules/utils.js
deleted file mode 100644
index b013f76c8ce5..000000000000
--- a/packages/react-native-codegen/src/parsers/flow/modules/utils.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-'use strict';
-
-import type {
-  NativeModuleTypeAnnotation,
-  Nullable,
-} from '../../../CodegenSchema.js';
-
-function unwrapNullable<+T: NativeModuleTypeAnnotation>(
-  x: Nullable<T>,
-): [T, boolean] {
-  if (x.type === 'NullableTypeAnnotation') {
-    return [x.typeAnnotation, true];
-  }
-
-  return [x, false];
-}
-
-function wrapNullable<+T: NativeModuleTypeAnnotation>(
-  nullable: boolean,
-  typeAnnotation: T,
-): Nullable<T> {
-  if (!nullable) {
-    return typeAnnotation;
-  }
-
-  return {
-    type: 'NullableTypeAnnotation',
-    typeAnnotation,
-  };
-}
-
-module.exports = {
-  unwrapNullable,
-  wrapNullable,
-};
diff --git a/packages/react-native-codegen/src/parsers/flow/parser.js b/packages/react-native-codegen/src/parsers/flow/parser.js
new file mode 100644
index 000000000000..5315411ecf49
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/flow/parser.js
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {ParserType} from '../errors';
+import type {Parser} from '../parser';
+
+class FlowParser implements Parser {
+  getMaybeEnumMemberType(maybeEnumDeclaration: $FlowFixMe): string {
+    return maybeEnumDeclaration.body.type
+      .replace('EnumNumberBody', 'NumberTypeAnnotation')
+      .replace('EnumStringBody', 'StringTypeAnnotation');
+  }
+
+  isEnumDeclaration(maybeEnumDeclaration: $FlowFixMe): boolean {
+    return maybeEnumDeclaration.type === 'EnumDeclaration';
+  }
+
+  language(): ParserType {
+    return 'Flow';
+  }
+
+  nameForGenericTypeAnnotation(typeAnnotation: $FlowFixMe): string {
+    return typeAnnotation.id.name;
+  }
+}
+
+module.exports = {
+  FlowParser,
+};
diff --git a/packages/react-native-codegen/src/parsers/flow/utils.js b/packages/react-native-codegen/src/parsers/flow/utils.js
index 86547dc9b855..86c663db5bd2 100644
--- a/packages/react-native-codegen/src/parsers/flow/utils.js
+++ b/packages/react-native-codegen/src/parsers/flow/utils.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-const {ParserError} = require('./errors');
+import type {TypeAliasResolutionStatus, TypeDeclarationMap} from '../utils';
 
 /**
  * This FlowFixMe is supposed to refer to an InterfaceDeclaration or TypeAlias
@@ -20,20 +20,28 @@ const {ParserError} = require('./errors');
  *
  * TODO(T71778680): Flow type AST Nodes
  */
-export type TypeDeclarationMap = {[declarationName: string]: $FlowFixMe};
 
 function getTypes(ast: $FlowFixMe): TypeDeclarationMap {
   return ast.body.reduce((types, node) => {
     if (node.type === 'ExportNamedDeclaration' && node.exportKind === 'type') {
       if (
-        node.declaration.type === 'TypeAlias' ||
-        node.declaration.type === 'InterfaceDeclaration'
+        node.declaration != null &&
+        (node.declaration.type === 'TypeAlias' ||
+          node.declaration.type === 'InterfaceDeclaration')
       ) {
         types[node.declaration.id.name] = node.declaration;
       }
+    } else if (
+      node.type === 'ExportNamedDeclaration' &&
+      node.exportKind === 'value' &&
+      node.declaration &&
+      node.declaration.type === 'EnumDeclaration'
+    ) {
+      types[node.declaration.id.name] = node.declaration;
     } else if (
       node.type === 'TypeAlias' ||
-      node.type === 'InterfaceDeclaration'
+      node.type === 'InterfaceDeclaration' ||
+      node.type === 'EnumDeclaration'
     ) {
       types[node.id.name] = node;
     }
@@ -46,15 +54,6 @@ export type ASTNode = Object;
 
 const invariant = require('invariant');
 
-type TypeAliasResolutionStatus =
-  | $ReadOnly<{
-      successful: true,
-      aliasName: string,
-    }>
-  | $ReadOnly<{
-      successful: false,
-    }>;
-
 function resolveTypeAnnotation(
   // TODO(T71778680): This is an Flow TypeAnnotation. Flow-type this
   typeAnnotation: $FlowFixMe,
@@ -85,7 +84,10 @@ function resolveTypeAnnotation(
         aliasName: node.id.name,
       };
       const resolvedTypeAnnotation = types[node.id.name];
-      if (resolvedTypeAnnotation == null) {
+      if (
+        resolvedTypeAnnotation == null ||
+        resolvedTypeAnnotation.type === 'EnumDeclaration'
+      ) {
         break;
       }
 
@@ -114,102 +116,8 @@ function getValueFromTypes(value: ASTNode, types: TypeDeclarationMap): ASTNode {
   return value;
 }
 
-export type ParserErrorCapturer = <T>(fn: () => T) => ?T;
-
-function createParserErrorCapturer(): [
-  Array<ParserError>,
-  ParserErrorCapturer,
-] {
-  const errors = [];
-  function guard<T>(fn: () => T): ?T {
-    try {
-      return fn();
-    } catch (error) {
-      if (!(error instanceof ParserError)) {
-        throw error;
-      }
-      errors.push(error);
-
-      return null;
-    }
-  }
-
-  return [errors, guard];
-}
-
-// TODO(T71778680): Flow-type ASTNodes.
-function visit(
-  astNode: $FlowFixMe,
-  visitor: {
-    [type: string]: (node: $FlowFixMe) => void,
-  },
-) {
-  const queue = [astNode];
-  while (queue.length !== 0) {
-    let item = queue.shift();
-
-    if (!(typeof item === 'object' && item != null)) {
-      continue;
-    }
-
-    if (
-      typeof item.type === 'string' &&
-      typeof visitor[item.type] === 'function'
-    ) {
-      // Don't visit any children
-      visitor[item.type](item);
-    } else if (Array.isArray(item)) {
-      queue.push(...item);
-    } else {
-      queue.push(...Object.values(item));
-    }
-  }
-}
-
-// TODO(T71778680): Flow-type ASTNodes.
-function isModuleRegistryCall(node: $FlowFixMe): boolean {
-  if (node.type !== 'CallExpression') {
-    return false;
-  }
-
-  const callExpression = node;
-
-  if (callExpression.callee.type !== 'MemberExpression') {
-    return false;
-  }
-
-  const memberExpression = callExpression.callee;
-  if (
-    !(
-      memberExpression.object.type === 'Identifier' &&
-      memberExpression.object.name === 'TurboModuleRegistry'
-    )
-  ) {
-    return false;
-  }
-
-  if (
-    !(
-      memberExpression.property.type === 'Identifier' &&
-      (memberExpression.property.name === 'get' ||
-        memberExpression.property.name === 'getEnforcing')
-    )
-  ) {
-    return false;
-  }
-
-  if (memberExpression.computed) {
-    return false;
-  }
-
-  return true;
-}
-
 module.exports = {
   getValueFromTypes,
   resolveTypeAnnotation,
-  createParserErrorCapturer,
   getTypes,
-  visit,
-  isModuleRegistryCall,
 };
diff --git a/packages/react-native-codegen/src/parsers/parser.js b/packages/react-native-codegen/src/parsers/parser.js
new file mode 100644
index 000000000000..eec4faea60b7
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/parser.js
@@ -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.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {ParserType} from './errors';
+
+/**
+ * This is the main interface for Parsers of various languages.
+ * It exposes all the methods that contain language-specific logic.
+ */
+export interface Parser {
+  /**
+   * Given a type declaration, it possibly returns the name of the Enum type.
+   * @parameter maybeEnumDeclaration: an object possibly containing an Enum declaration.
+   * @returns: the name of the Enum type.
+   */
+  getMaybeEnumMemberType(maybeEnumDeclaration: $FlowFixMe): string;
+  /**
+   * Given a type declaration, it returns a boolean specifying if is an Enum declaration.
+   * @parameter maybeEnumDeclaration: an object possibly containing an Enum declaration.
+   * @returns: a boolean specifying if is an Enum declaration.
+   */
+  isEnumDeclaration(maybeEnumDeclaration: $FlowFixMe): boolean;
+  /**
+   * @returns: the Parser language.
+   */
+  language(): ParserType;
+  /**
+   * Given a type annotation for a generic type, it returns the type name.
+   * @parameter typeAnnotation: the annotation for a type in the AST.
+   * @returns: the name of the type.
+   */
+  nameForGenericTypeAnnotation(typeAnnotation: $FlowFixMe): string;
+}
diff --git a/packages/react-native-codegen/src/parsers/parsers-commons.js b/packages/react-native-codegen/src/parsers/parsers-commons.js
new file mode 100644
index 000000000000..28ac2725e264
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/parsers-commons.js
@@ -0,0 +1,240 @@
+/**
+ * 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';
+
+import type {
+  SchemaType,
+  NativeModuleSchema,
+  NativeModuleTypeAnnotation,
+  Nullable,
+  NativeModuleMixedTypeAnnotation,
+  UnionTypeAnnotationMemberType,
+  NativeModuleUnionTypeAnnotation,
+} from '../CodegenSchema.js';
+const {
+  MissingTypeParameterGenericParserError,
+  MoreThanOneTypeParameterGenericParserError,
+  UnsupportedUnionTypeAnnotationParserError,
+} = require('./errors');
+import type {ParserType} from './errors';
+const {
+  UnsupportedObjectPropertyTypeAnnotationParserError,
+} = require('./errors');
+const invariant = require('invariant');
+import type {TypeDeclarationMap} from './utils';
+const {
+  UnsupportedEnumDeclarationParserError,
+  UnsupportedGenericParserError,
+} = require('./errors');
+import type {Parser} from './parser';
+import type {NativeModuleEnumDeclaration} from '../CodegenSchema';
+
+function wrapModuleSchema(
+  nativeModuleSchema: NativeModuleSchema,
+  hasteModuleName: string,
+): SchemaType {
+  return {
+    modules: {
+      [hasteModuleName]: nativeModuleSchema,
+    },
+  };
+}
+
+function unwrapNullable<+T: NativeModuleTypeAnnotation>(
+  x: Nullable<T>,
+): [T, boolean] {
+  if (x.type === 'NullableTypeAnnotation') {
+    return [x.typeAnnotation, true];
+  }
+
+  return [x, false];
+}
+
+function wrapNullable<+T: NativeModuleTypeAnnotation>(
+  nullable: boolean,
+  typeAnnotation: T,
+): Nullable<T> {
+  if (!nullable) {
+    return typeAnnotation;
+  }
+
+  return {
+    type: 'NullableTypeAnnotation',
+    typeAnnotation,
+  };
+}
+
+function assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+  moduleName: string,
+  /**
+   * TODO(T108222691): Use flow-types for @babel/parser
+   */
+  typeAnnotation: $FlowFixMe,
+  language: ParserType,
+) {
+  if (typeAnnotation.typeParameters == null) {
+    throw new MissingTypeParameterGenericParserError(
+      moduleName,
+      typeAnnotation,
+      language,
+    );
+  }
+
+  const typeAnnotationType =
+    language === 'TypeScript'
+      ? 'TSTypeParameterInstantiation'
+      : 'TypeParameterInstantiation';
+
+  invariant(
+    typeAnnotation.typeParameters.type === typeAnnotationType,
+    `assertGenericTypeAnnotationHasExactlyOneTypeParameter: Type parameters must be an AST node of type '${typeAnnotationType}'`,
+  );
+
+  if (typeAnnotation.typeParameters.params.length !== 1) {
+    throw new MoreThanOneTypeParameterGenericParserError(
+      moduleName,
+      typeAnnotation,
+      language,
+    );
+  }
+}
+
+function emitMixedTypeAnnotation(
+  nullable: boolean,
+): Nullable<NativeModuleMixedTypeAnnotation> {
+  return wrapNullable(nullable, {
+    type: 'MixedTypeAnnotation',
+  });
+}
+
+function remapUnionTypeAnnotationMemberNames(
+  types: $FlowFixMe,
+  language: ParserType,
+): UnionTypeAnnotationMemberType[] {
+  const remapLiteral = (item: $FlowFixMe) => {
+    if (language === 'Flow') {
+      return item.type
+        .replace('NumberLiteralTypeAnnotation', 'NumberTypeAnnotation')
+        .replace('StringLiteralTypeAnnotation', 'StringTypeAnnotation');
+    }
+
+    return item.literal
+      ? item.literal.type
+          .replace('NumericLiteral', 'NumberTypeAnnotation')
+          .replace('StringLiteral', 'StringTypeAnnotation')
+      : 'ObjectTypeAnnotation';
+  };
+
+  return types
+    .map(remapLiteral)
+    .filter((value, index, self) => self.indexOf(value) === index);
+}
+
+function emitUnionTypeAnnotation(
+  nullable: boolean,
+  hasteModuleName: string,
+  typeAnnotation: $FlowFixMe,
+  language: ParserType,
+): Nullable<NativeModuleUnionTypeAnnotation> {
+  const unionTypes = remapUnionTypeAnnotationMemberNames(
+    typeAnnotation.types,
+    language,
+  );
+
+  // Only support unionTypes of the same kind
+  if (unionTypes.length > 1) {
+    throw new UnsupportedUnionTypeAnnotationParserError(
+      hasteModuleName,
+      typeAnnotation,
+      unionTypes,
+      language,
+    );
+  }
+
+  return wrapNullable(nullable, {
+    type: 'UnionTypeAnnotation',
+    memberType: unionTypes[0],
+  });
+}
+
+function translateDefault(
+  hasteModuleName: string,
+  typeAnnotation: $FlowFixMe,
+  types: TypeDeclarationMap,
+  nullable: boolean,
+  parser: Parser,
+): Nullable<NativeModuleEnumDeclaration> {
+  const maybeEnumDeclaration =
+    types[parser.nameForGenericTypeAnnotation(typeAnnotation)];
+
+  if (maybeEnumDeclaration && parser.isEnumDeclaration(maybeEnumDeclaration)) {
+    const memberType = parser.getMaybeEnumMemberType(maybeEnumDeclaration);
+
+    if (
+      memberType === 'NumberTypeAnnotation' ||
+      memberType === 'StringTypeAnnotation'
+    ) {
+      return wrapNullable(nullable, {
+        type: 'EnumDeclaration',
+        memberType: memberType,
+      });
+    } else {
+      throw new UnsupportedEnumDeclarationParserError(
+        hasteModuleName,
+        typeAnnotation,
+        memberType,
+        parser.language(),
+      );
+    }
+  }
+
+  throw new UnsupportedGenericParserError(
+    hasteModuleName,
+    typeAnnotation,
+    parser,
+  );
+}
+
+function getKeyName(
+  propertyOrIndex: $FlowFixMe,
+  hasteModuleName: string,
+  language: ParserType,
+): string {
+  switch (propertyOrIndex.type) {
+    case 'ObjectTypeProperty':
+    case 'TSPropertySignature':
+      return propertyOrIndex.key.name;
+    case 'ObjectTypeIndexer':
+      // flow index name is optional
+      return propertyOrIndex.id?.name ?? 'key';
+    case 'TSIndexSignature':
+      // TypeScript index name is mandatory
+      return propertyOrIndex.parameters[0].name;
+    default:
+      throw new UnsupportedObjectPropertyTypeAnnotationParserError(
+        hasteModuleName,
+        propertyOrIndex,
+        propertyOrIndex.type,
+        language,
+      );
+  }
+}
+
+module.exports = {
+  wrapModuleSchema,
+  unwrapNullable,
+  wrapNullable,
+  assertGenericTypeAnnotationHasExactlyOneTypeParameter,
+  emitMixedTypeAnnotation,
+  emitUnionTypeAnnotation,
+  getKeyName,
+  translateDefault,
+};
diff --git a/packages/react-native-codegen/src/parsers/parsers-primitives.js b/packages/react-native-codegen/src/parsers/parsers-primitives.js
new file mode 100644
index 000000000000..1b450d044ee9
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/parsers-primitives.js
@@ -0,0 +1,197 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+import type {
+  Nullable,
+  NativeModuleAliasMap,
+  NativeModuleBaseTypeAnnotation,
+  NativeModuleFunctionTypeAnnotation,
+  NativeModuleTypeAliasTypeAnnotation,
+  NativeModuleNumberTypeAnnotation,
+  BooleanTypeAnnotation,
+  DoubleTypeAnnotation,
+  Int32TypeAnnotation,
+  NativeModuleGenericObjectTypeAnnotation,
+  ReservedTypeAnnotation,
+  ObjectTypeAnnotation,
+  NativeModulePromiseTypeAnnotation,
+  StringTypeAnnotation,
+  VoidTypeAnnotation,
+  NativeModuleFloatTypeAnnotation,
+} from '../CodegenSchema';
+import type {ParserType} from './errors';
+import type {TypeAliasResolutionStatus} from './utils';
+
+const {
+  wrapNullable,
+  assertGenericTypeAnnotationHasExactlyOneTypeParameter,
+} = require('./parsers-commons');
+
+function emitBoolean(nullable: boolean): Nullable<BooleanTypeAnnotation> {
+  return wrapNullable(nullable, {
+    type: 'BooleanTypeAnnotation',
+  });
+}
+
+function emitInt32(nullable: boolean): Nullable<Int32TypeAnnotation> {
+  return wrapNullable(nullable, {
+    type: 'Int32TypeAnnotation',
+  });
+}
+
+function emitNumber(
+  nullable: boolean,
+): Nullable<NativeModuleNumberTypeAnnotation> {
+  return wrapNullable(nullable, {
+    type: 'NumberTypeAnnotation',
+  });
+}
+
+function emitRootTag(nullable: boolean): Nullable<ReservedTypeAnnotation> {
+  return wrapNullable(nullable, {
+    type: 'ReservedTypeAnnotation',
+    name: 'RootTag',
+  });
+}
+
+function emitDouble(nullable: boolean): Nullable<DoubleTypeAnnotation> {
+  return wrapNullable(nullable, {
+    type: 'DoubleTypeAnnotation',
+  });
+}
+
+function emitVoid(nullable: boolean): Nullable<VoidTypeAnnotation> {
+  return wrapNullable(nullable, {
+    type: 'VoidTypeAnnotation',
+  });
+}
+
+function emitStringish(nullable: boolean): Nullable<StringTypeAnnotation> {
+  return wrapNullable(nullable, {
+    type: 'StringTypeAnnotation',
+  });
+}
+function emitFunction(
+  nullable: boolean,
+  translateFunctionTypeAnnotationValue: NativeModuleFunctionTypeAnnotation,
+): Nullable<NativeModuleFunctionTypeAnnotation> {
+  return wrapNullable(nullable, translateFunctionTypeAnnotationValue);
+}
+
+function emitString(nullable: boolean): Nullable<StringTypeAnnotation> {
+  return wrapNullable(nullable, {
+    type: 'StringTypeAnnotation',
+  });
+}
+
+function typeAliasResolution(
+  typeAliasResolutionStatus: TypeAliasResolutionStatus,
+  objectTypeAnnotation: ObjectTypeAnnotation<
+    Nullable<NativeModuleBaseTypeAnnotation>,
+  >,
+  aliasMap: {...NativeModuleAliasMap},
+  nullable: boolean,
+):
+  | Nullable<NativeModuleTypeAliasTypeAnnotation>
+  | Nullable<ObjectTypeAnnotation<Nullable<NativeModuleBaseTypeAnnotation>>> {
+  if (!typeAliasResolutionStatus.successful) {
+    return wrapNullable(nullable, objectTypeAnnotation);
+  }
+
+  /**
+   * All aliases RHS are required.
+   */
+  aliasMap[typeAliasResolutionStatus.aliasName] = objectTypeAnnotation;
+
+  /**
+   * Nullability of type aliases is transitive.
+   *
+   * Consider this case:
+   *
+   * type Animal = ?{
+   *   name: string,
+   * };
+   *
+   * type B = Animal
+   *
+   * export interface Spec extends TurboModule {
+   *   +greet: (animal: B) => void;
+   * }
+   *
+   * In this case, we follow B to Animal, and then Animal to ?{name: string}.
+   *
+   * We:
+   *   1. Replace `+greet: (animal: B) => void;` with `+greet: (animal: ?Animal) => void;`,
+   *   2. Pretend that Animal = {name: string}.
+   *
+   * Why do we do this?
+   *  1. In ObjC, we need to generate a struct called Animal, not B.
+   *  2. This design is simpler than managing nullability within both the type alias usage, and the type alias RHS.
+   *  3. What does it mean for a C++ struct, which is what this type alias RHS will generate, to be nullable? ¯\_(ツ)_/¯
+   *     Nullability is a concept that only makes sense when talking about instances (i.e: usages) of the C++ structs.
+   *     Hence, it's better to manage nullability within the actual TypeAliasTypeAnnotation nodes, and not the
+   *     associated ObjectTypeAnnotations.
+   */
+  return wrapNullable(nullable, {
+    type: 'TypeAliasTypeAnnotation',
+    name: typeAliasResolutionStatus.aliasName,
+  });
+}
+
+function emitPromise(
+  hasteModuleName: string,
+  typeAnnotation: $FlowFixMe,
+  language: ParserType,
+  nullable: boolean,
+): Nullable<NativeModulePromiseTypeAnnotation> {
+  assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+    hasteModuleName,
+    typeAnnotation,
+    language,
+  );
+
+  return wrapNullable(nullable, {
+    type: 'PromiseTypeAnnotation',
+  });
+}
+
+function emitObject(
+  nullable: boolean,
+): Nullable<NativeModuleGenericObjectTypeAnnotation> {
+  return wrapNullable(nullable, {
+    type: 'GenericObjectTypeAnnotation',
+  });
+}
+
+function emitFloat(
+  nullable: boolean,
+): Nullable<NativeModuleFloatTypeAnnotation> {
+  return wrapNullable(nullable, {
+    type: 'FloatTypeAnnotation',
+  });
+}
+
+module.exports = {
+  emitBoolean,
+  emitDouble,
+  emitFloat,
+  emitFunction,
+  emitInt32,
+  emitNumber,
+  emitObject,
+  emitPromise,
+  emitRootTag,
+  emitVoid,
+  emitString,
+  emitStringish,
+  typeAliasResolution,
+};
diff --git a/packages/react-native-codegen/src/parsers/parsers-utils.js b/packages/react-native-codegen/src/parsers/parsers-utils.js
new file mode 100644
index 000000000000..696d308c990d
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/parsers-utils.js
@@ -0,0 +1,19 @@
+/**
+ * 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';
+
+function nullGuard<T>(fn: () => T): ?T {
+  return fn();
+}
+
+module.exports = {
+  nullGuard,
+};
diff --git a/packages/react-native-codegen/src/parsers/typescript/components/__test_fixtures__/failures.js b/packages/react-native-codegen/src/parsers/typescript/components/__test_fixtures__/failures.js
index e473d9a3d82e..eefd9e316f18 100644
--- a/packages/react-native-codegen/src/parsers/typescript/components/__test_fixtures__/failures.js
+++ b/packages/react-native-codegen/src/parsers/typescript/components/__test_fixtures__/failures.js
@@ -141,7 +141,7 @@ import type {ViewProps} from 'ViewPropTypes';
 import type {HostComponent} from 'react-native';
 
 interface NativeCommands {
-  readonly hotspotUpdate: (viewRef: React.Ref<'RCTView'> | null | void, x: Int32, y: Int32) => void;
+  readonly hotspotUpdate: (viewRef: React.Ref<'RCTView'> | null | undefined, x: Int32, y: Int32) => void;
 }
 
 export interface ModuleProps extends ViewProps {
@@ -249,7 +249,7 @@ import type {ViewProps} from 'ViewPropTypes';
 import type {HostComponent} from 'react-native';
 
 export interface ModuleProps extends ViewProps {
-  nullable_with_default: WithDefault<Float, 1.0> | null | void;
+  nullable_with_default: WithDefault<Float, 1.0> | null | undefined;
 }
 
 export default codegenNativeComponent<ModuleProps>(
diff --git a/packages/react-native-codegen/src/parsers/typescript/components/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/parsers/typescript/components/__test_fixtures__/fixtures.js
index 136a95e48ce8..4005574ba68d 100644
--- a/packages/react-native-codegen/src/parsers/typescript/components/__test_fixtures__/fixtures.js
+++ b/packages/react-native-codegen/src/parsers/typescript/components/__test_fixtures__/fixtures.js
@@ -15,33 +15,33 @@
 const EVENT_DEFINITION = `
   boolean_required: boolean;
   boolean_optional_key?: boolean;
-  boolean_optional_value: boolean | null | void;
-  boolean_optional_both?: boolean | null | void;
+  boolean_optional_value: boolean | null | undefined;
+  boolean_optional_both?: boolean | null | undefined;
 
   string_required: string;
-  string_optional_key?: string;
-  string_optional_value: string | null | void;
-  string_optional_both?: string | null | void;
+  string_optional_key?: (string);
+  string_optional_value: (string) | null | undefined;
+  string_optional_both?: (string | null | undefined);
 
   double_required: Double;
   double_optional_key?: Double;
-  double_optional_value: Double | null | void;
-  double_optional_both?: Double | null | void;
+  double_optional_value: Double | null | undefined;
+  double_optional_both?: Double | null | undefined;
 
   float_required: Float;
   float_optional_key?: Float;
-  float_optional_value: Float | null | void;
-  float_optional_both?: Float | null | void;
+  float_optional_value: Float | null | undefined;
+  float_optional_both?: Float | null | undefined;
 
   int32_required: Int32;
   int32_optional_key?: Int32;
-  int32_optional_value: Int32 | null | void;
-  int32_optional_both?: Int32 | null | void;
+  int32_optional_value: Int32 | null | undefined;
+  int32_optional_both?: Int32 | null | undefined;
 
   enum_required: 'small' | 'large';
   enum_optional_key?: 'small' | 'large';
-  enum_optional_value: ('small' | 'large') | null | void;
-  enum_optional_both?: ('small' | 'large') | null | void;
+  enum_optional_value: ('small' | 'large') | null | undefined;
+  enum_optional_both?: ('small' | 'large') | null | undefined;
 
   object_required: {
     boolean_required: boolean;
@@ -52,21 +52,21 @@ const EVENT_DEFINITION = `
   };
 
   object_optional_value: {
-    float_optional_value: Float | null | void;
-  } | null | void;
+    float_optional_value: Float | null | undefined;
+  } | null | undefined;
 
   object_optional_both?: {
-    int32_optional_both?: Int32 | null | void;
-  } | null | void;
+    int32_optional_both?: Int32 | null | undefined;
+  } | null | undefined;
 
   object_required_nested_2_layers: {
     object_optional_nested_1_layer?: {
       boolean_required: Int32;
       string_optional_key?: string;
-      double_optional_value: Double | null | void;
-      float_optional_value: Float | null | void;
-      int32_optional_both?: Int32 | null | void;
-    } | null | void;
+      double_optional_value: Double | null | undefined;
+      float_optional_value: Float | null | undefined;
+      int32_optional_both?: Int32 | null | undefined;
+    } | null | undefined;
   };
 
   object_readonly_required: Readonly<{
@@ -78,12 +78,12 @@ const EVENT_DEFINITION = `
   }>;
 
   object_readonly_optional_value: Readonly<{
-    float_optional_value: Float | null | void;
-  }> | null | void;
+    float_optional_value: Float | null | undefined;
+  }> | null | undefined;
 
   object_readonly_optional_both?: Readonly<{
-    int32_optional_both?: Int32 | null | void;
-  }> | null | void;
+    int32_optional_both?: Int32 | null | undefined;
+  }> | null | undefined;
 `;
 
 const ONE_OF_EACH_PROP_EVENT_DEFAULT_AND_OPTIONS = `
@@ -265,43 +265,43 @@ export interface ModuleProps extends ViewProps {
 
   // Object props
   object_optional_key?: Readonly<{prop: string}>;
-  object_optional_both?: Readonly<{prop: string} | null | void>;
-  object_optional_value: Readonly<{prop: string} | null | void>;
+  object_optional_both?: Readonly<{prop: string} | null | undefined>;
+  object_optional_value: Readonly<{prop: string} | null | undefined>;
 
   // ImageSource props
   image_required: ImageSource;
-  image_optional_value: ImageSource | null | void;
-  image_optional_both?: ImageSource | null | void;
+  image_optional_value: ImageSource | null | undefined;
+  image_optional_both?: ImageSource | null | undefined;
 
   // ColorValue props
   color_required: ColorValue;
   color_optional_key?: ColorValue;
-  color_optional_value: ColorValue | null | void;
-  color_optional_both?: ColorValue | null | void;
+  color_optional_value: ColorValue | null | undefined;
+  color_optional_both?: ColorValue | null | undefined;
 
   // ColorArrayValue props
   color_array_required: ColorArrayValue;
   color_array_optional_key?: ColorArrayValue;
-  color_array_optional_value: ColorArrayValue | null | void;
-  color_array_optional_both?: ColorArrayValue | null | void;
+  color_array_optional_value: ColorArrayValue | null | undefined;
+  color_array_optional_both?: ColorArrayValue | null | undefined;
 
   // ProcessedColorValue props
   processed_color_required: ProcessedColorValue;
   processed_color_optional_key?: ProcessedColorValue;
-  processed_color_optional_value: ProcessedColorValue | null | void;
-  processed_color_optional_both?: ProcessedColorValue | null | void;
+  processed_color_optional_value: ProcessedColorValue | null | undefined;
+  processed_color_optional_both?: ProcessedColorValue | null | undefined;
 
   // PointValue props
   point_required: PointValue;
   point_optional_key?: PointValue;
-  point_optional_value: PointValue | null | void;
-  point_optional_both?: PointValue | null | void;
+  point_optional_value: PointValue | null | undefined;
+  point_optional_both?: PointValue | null | undefined;
 
   // EdgeInsets props
   insets_required: EdgeInsetsValue;
   insets_optional_key?: EdgeInsetsValue;
-  insets_optional_value: EdgeInsetsValue | null | void;
-  insets_optional_both?: EdgeInsetsValue | null | void;
+  insets_optional_value: EdgeInsetsValue | null | undefined;
+  insets_optional_both?: EdgeInsetsValue | null | undefined;
 }
 
 export default codegenNativeComponent<ModuleProps>(
@@ -342,32 +342,32 @@ export interface ModuleProps extends ViewProps {
   // Boolean props
   array_boolean_required: ReadonlyArray<boolean>;
   array_boolean_optional_key?: ReadonlyArray<boolean>;
-  array_boolean_optional_value: ReadonlyArray<boolean> | null | void;
-  array_boolean_optional_both?: ReadonlyArray<boolean> | null | void;
+  array_boolean_optional_value: ReadonlyArray<boolean> | null | undefined;
+  array_boolean_optional_both?: ReadonlyArray<boolean> | null | undefined;
 
   // String props
   array_string_required: ReadonlyArray<string>;
   array_string_optional_key?: ReadonlyArray<string>;
-  array_string_optional_value: ReadonlyArray<string> | null | void;
-  array_string_optional_both?: ReadonlyArray<string> | null | void;
+  array_string_optional_value: ReadonlyArray<string> | null | undefined;
+  array_string_optional_both?: ReadonlyArray<string> | null | undefined;
 
   // Double props
   array_double_required: ReadonlyArray<Double>;
   array_double_optional_key?: ReadonlyArray<Double>;
-  array_double_optional_value: ReadonlyArray<Double> | null | void;
-  array_double_optional_both?: ReadonlyArray<Double> | null | void;
+  array_double_optional_value: ReadonlyArray<Double> | null | undefined;
+  array_double_optional_both?: ReadonlyArray<Double> | null | undefined;
 
   // Float props
   array_float_required: ReadonlyArray<Float>;
   array_float_optional_key?: ReadonlyArray<Float>;
-  array_float_optional_value: ReadonlyArray<Float> | null | void;
-  array_float_optional_both?: ReadonlyArray<Float> | null | void;
+  array_float_optional_value: ReadonlyArray<Float> | null | undefined;
+  array_float_optional_both?: ReadonlyArray<Float> | null | undefined;
 
   // Int32 props
   array_int32_required: ReadonlyArray<Int32>;
   array_int32_optional_key?: ReadonlyArray<Int32>;
-  array_int32_optional_value: ReadonlyArray<Int32> | null | void;
-  array_int32_optional_both?: ReadonlyArray<Int32> | null | void;
+  array_int32_optional_value: ReadonlyArray<Int32> | null | undefined;
+  array_int32_optional_both?: ReadonlyArray<Int32> | null | undefined;
 
   // String enum props
   array_enum_optional_key?: WithDefault<
@@ -382,32 +382,32 @@ export interface ModuleProps extends ViewProps {
   // ImageSource props
   array_image_required: ReadonlyArray<ImageSource>;
   array_image_optional_key?: ReadonlyArray<ImageSource>;
-  array_image_optional_value: ReadonlyArray<ImageSource> | null | void;
-  array_image_optional_both?: ReadonlyArray<ImageSource> | null | void;
+  array_image_optional_value: ReadonlyArray<ImageSource> | null | undefined;
+  array_image_optional_both?: ReadonlyArray<ImageSource> | null | undefined;
 
   // ColorValue props
   array_color_required: ReadonlyArray<ColorValue>;
   array_color_optional_key?: ReadonlyArray<ColorValue>;
-  array_color_optional_value: ReadonlyArray<ColorValue> | null | void;
-  array_color_optional_both?: ReadonlyArray<ColorValue> | null | void;
+  array_color_optional_value: ReadonlyArray<ColorValue> | null | undefined;
+  array_color_optional_both?: ReadonlyArray<ColorValue> | null | undefined;
 
   // PointValue props
   array_point_required: ReadonlyArray<PointValue>;
   array_point_optional_key?: ReadonlyArray<PointValue>;
-  array_point_optional_value: ReadonlyArray<PointValue> | null | void;
-  array_point_optional_both?: ReadonlyArray<PointValue> | null | void;
+  array_point_optional_value: ReadonlyArray<PointValue> | null | undefined;
+  array_point_optional_both?: ReadonlyArray<PointValue> | null | undefined;
 
   // EdgeInsetsValue props
   array_insets_required: ReadonlyArray<EdgeInsetsValue>;
   array_insets_optional_key?: ReadonlyArray<EdgeInsetsValue>;
-  array_insets_optional_value: ReadonlyArray<EdgeInsetsValue> | null | void;
-  array_insets_optional_both?: ReadonlyArray<EdgeInsetsValue> | null | void;
+  array_insets_optional_value: ReadonlyArray<EdgeInsetsValue> | null | undefined;
+  array_insets_optional_both?: ReadonlyArray<EdgeInsetsValue> | null | undefined;
 
   // Object props
   array_object_required: ReadonlyArray<Readonly<{prop: string}>>;
   array_object_optional_key?: ReadonlyArray<Readonly<{prop: string}>>;
-  array_object_optional_value: ArrayObjectType | null | void;
-  array_object_optional_both?: ReadonlyArray<ObjectType> | null | void;
+  array_object_optional_value: ArrayObjectType | null | undefined;
+  array_object_optional_both?: ReadonlyArray<ObjectType> | null | undefined;
 
   // Nested array object types
   array_of_array_object_required: ReadonlyArray<
@@ -426,18 +426,18 @@ export interface ModuleProps extends ViewProps {
     Readonly<{
       // This needs to be the same name as the top level array above
       array_object_optional_value: ReadonlyArray<
-        Readonly<{prop: string | null | void}>
+        Readonly<{prop: string | null | undefined}>
       >;
     }>
-  > | null | void;
+  > | null | undefined;
   array_of_array_object_optional_both?: ReadonlyArray<
     Readonly<{
       // This needs to be the same name as the top level array above
       array_object_optional_both: ReadonlyArray<
-        Readonly<{prop?: string | null | void}>
+        Readonly<{prop?: string | null | undefined}>
       >;
     }>
-  > | null | void;
+  > | null | undefined;
 
   // Nested array of array of object types
   array_of_array_of_object_required: ReadonlyArray<
@@ -459,6 +459,138 @@ export default codegenNativeComponent<ModuleProps>(
 ) as HostComponent<ModuleProps>;
 `;
 
+const ARRAY2_PROP_TYPES_NO_EVENTS = `
+/**
+ * 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
+ */
+
+'use strict';
+
+const codegenNativeComponent = require('codegenNativeComponent');
+
+import type {Int32, Double, Float, WithDefault} from 'CodegenTypes';
+import type {ImageSource} from 'ImageSource';
+import type {
+  ColorValue,
+  ColorArrayValue,
+  PointValue,
+  EdgeInsetsValue,
+} from 'StyleSheetTypes';
+import type {ViewProps} from 'ViewPropTypes';
+import type {HostComponent} from 'react-native';
+
+type ObjectType = Readonly<{prop: string}>;
+type ArrayObjectType = readonly Readonly<{prop: string}>[];
+
+export interface ModuleProps extends ViewProps {
+  // Props
+  // Boolean props
+  array_boolean_required: readonly boolean[];
+  array_boolean_optional_key?: readonly boolean[];
+  array_boolean_optional_value: readonly boolean[] | null | undefined;
+  array_boolean_optional_both?: readonly boolean[] | null | undefined;
+
+  // String props
+  array_string_required: readonly string[];
+  array_string_optional_key?: readonly string[];
+  array_string_optional_value: readonly string[] | null | undefined;
+  array_string_optional_both?: readonly string[] | null | undefined;
+
+  // Double props
+  array_double_required: readonly Double[];
+  array_double_optional_key?: readonly Double[];
+  array_double_optional_value: readonly Double[] | null | undefined;
+  array_double_optional_both?: readonly Double[] | null | undefined;
+
+  // Float props
+  array_float_required: readonly Float[];
+  array_float_optional_key?: readonly Float[];
+  array_float_optional_value: readonly Float[] | null | undefined;
+  array_float_optional_both?: readonly Float[] | null | undefined;
+
+  // Int32 props
+  array_int32_required: readonly Int32[];
+  array_int32_optional_key?: readonly Int32[];
+  array_int32_optional_value: readonly Int32[] | null | undefined;
+  array_int32_optional_both?: readonly Int32[] | null | undefined;
+
+  // String enum props
+  array_enum_optional_key?: WithDefault<
+    readonly ('small' | 'large')[],
+    'small'
+  >;
+  array_enum_optional_both?: WithDefault<
+    readonly ('small' | 'large')[],
+    'small'
+  >;
+
+  // ImageSource props
+  array_image_required: readonly ImageSource[];
+  array_image_optional_key?: readonly ImageSource[];
+  array_image_optional_value: readonly ImageSource[] | null | undefined;
+  array_image_optional_both?: readonly ImageSource[] | null | undefined;
+
+  // ColorValue props
+  array_color_required: readonly ColorValue[];
+  array_color_optional_key?: readonly ColorValue[];
+  array_color_optional_value: readonly ColorValue[] | null | undefined;
+  array_color_optional_both?: readonly ColorValue[] | null | undefined;
+
+  // PointValue props
+  array_point_required: readonly PointValue[];
+  array_point_optional_key?: readonly PointValue[];
+  array_point_optional_value: readonly PointValue[] | null | undefined;
+  array_point_optional_both?: readonly PointValue[] | null | undefined;
+
+  // EdgeInsetsValue props
+  array_insets_required: readonly EdgeInsetsValue[];
+  array_insets_optional_key?: readonly EdgeInsetsValue[];
+  array_insets_optional_value: readonly EdgeInsetsValue[] | null | undefined;
+  array_insets_optional_both?: readonly EdgeInsetsValue[] | null | undefined;
+
+  // Object props
+  array_object_required: readonly Readonly<{prop: string}>[];
+  array_object_optional_key?: readonly Readonly<{prop: string}>[];
+  array_object_optional_value: ArrayObjectType | null | undefined;
+  array_object_optional_both?: readonly ObjectType[] | null | undefined;
+
+  // Nested array object types
+  array_of_array_object_required: readonly Readonly<{
+      // This needs to be the same name as the top level array above
+      array_object_required: readonly Readonly<{prop: string}>[];
+    }>[];
+  array_of_array_object_optional_key?: readonly Readonly<{
+      // This needs to be the same name as the top level array above
+      array_object_optional_key: readonly Readonly<{prop?: string}>[];
+    }>[];
+  array_of_array_object_optional_value: readonly Readonly<{
+      // This needs to be the same name as the top level array above
+      array_object_optional_value: readonly Readonly<{prop: string | null | undefined}>[];
+    }>[] | null | undefined;
+  array_of_array_object_optional_both?: readonly Readonly<{
+      // This needs to be the same name as the top level array above
+      array_object_optional_both: readonly Readonly<{prop?: string | null | undefined}>[];
+    }>[] | null | undefined;
+
+  // Nested array of array of object types
+  array_of_array_of_object_required: readonly Readonly<{
+        prop: string;
+      }>[][];
+
+  // Nested array of array of object types (in file)
+  array_of_array_of_object_required_in_file: readonly ObjectType[][];
+}
+
+export default codegenNativeComponent<ModuleProps>(
+  'Module',
+) as HostComponent<ModuleProps>;
+`;
+
 const OBJECT_PROP_TYPES_NO_EVENTS = `
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
@@ -514,46 +646,46 @@ export interface ModuleProps extends ViewProps {
   // ImageSource props
   image_required: Readonly<{prop: ImageSource}>;
   image_optional_key: Readonly<{prop?: ImageSource}>;
-  image_optional_value: Readonly<{prop: ImageSource | null | void}>;
-  image_optional_both: Readonly<{prop?: ImageSource | null | void}>;
+  image_optional_value: Readonly<{prop: ImageSource | null | undefined}>;
+  image_optional_both: Readonly<{prop?: ImageSource | null | undefined}>;
 
   // ColorValue props
   color_required: Readonly<{prop: ColorValue}>;
   color_optional_key: Readonly<{prop?: ColorValue}>;
-  color_optional_value: Readonly<{prop: ColorValue | null | void}>;
-  color_optional_both: Readonly<{prop?: ColorValue | null | void}>;
+  color_optional_value: Readonly<{prop: ColorValue | null | undefined}>;
+  color_optional_both: Readonly<{prop?: ColorValue | null | undefined}>;
 
   // ProcessedColorValue props
   processed_color_required: Readonly<{prop: ProcessedColorValue}>;
   processed_color_optional_key: Readonly<{prop?: ProcessedColorValue}>;
   processed_color_optional_value: Readonly<{
-    prop: ProcessedColorValue | null | void;
+    prop: ProcessedColorValue | null | undefined;
   }>;
   processed_color_optional_both: Readonly<{
-    prop?: ProcessedColorValue | null | void;
+    prop?: ProcessedColorValue | null | undefined;
   }>;
 
   // PointValue props
   point_required: Readonly<{prop: PointValue}>;
   point_optional_key: Readonly<{prop?: PointValue}>;
-  point_optional_value: Readonly<{prop: PointValue | null | void}>;
-  point_optional_both: Readonly<{prop?: PointValue | null | void}>;
+  point_optional_value: Readonly<{prop: PointValue | null | undefined}>;
+  point_optional_both: Readonly<{prop?: PointValue | null | undefined}>;
 
   // EdgeInsetsValue props
   insets_required: Readonly<{prop: EdgeInsetsValue}>;
   insets_optional_key: Readonly<{prop?: EdgeInsetsValue}>;
-  insets_optional_value: Readonly<{prop: EdgeInsetsValue | null | void}>;
-  insets_optional_both: Readonly<{prop?: EdgeInsetsValue | null | void}>;
+  insets_optional_value: Readonly<{prop: EdgeInsetsValue | null | undefined}>;
+  insets_optional_both: Readonly<{prop?: EdgeInsetsValue | null | undefined}>;
 
   // Nested object props
   object_required: Readonly<{prop: Readonly<{nestedProp: string}>}>;
   object_optional_key?: Readonly<{prop: Readonly<{nestedProp: string}>}>;
   object_optional_value: Readonly<{
     prop: Readonly<{nestedProp: string}>;
-  }> | null | void;
+  }> | null | undefined;
   object_optional_both?: Readonly<{
     prop: Readonly<{nestedProp: string}>;
-  }> | null | void;
+  }> | null | undefined;
 }
 
 export default codegenNativeComponent<ModuleProps>(
@@ -632,30 +764,30 @@ export interface ModuleProps extends ViewProps {
     }>
   >;
 
-  onDirectEventDefinedInlineOptionalKey?: DirectEventHandler<
+  onDirectEventDefinedInlineOptionalKey?: (DirectEventHandler<
     Readonly<{
       ${EVENT_DEFINITION}
     }>
-  >;
+  >);
 
-  onDirectEventDefinedInlineOptionalValue: DirectEventHandler<
+  onDirectEventDefinedInlineOptionalValue: (DirectEventHandler<
     Readonly<{
       ${EVENT_DEFINITION}
     }>
-  > | null | void;
+  >) | null | undefined;
 
-  onDirectEventDefinedInlineOptionalBoth?: DirectEventHandler<
+  onDirectEventDefinedInlineOptionalBoth?: (DirectEventHandler<
     Readonly<{
       ${EVENT_DEFINITION}
     }>
-  > | null | void;
+  > | null | undefined);
 
   onDirectEventDefinedInlineWithPaperName?: DirectEventHandler<
     Readonly<{
       ${EVENT_DEFINITION}
     }>,
     'paperDirectEventDefinedInlineWithPaperName'
-  > | null | void;
+  > | null | undefined;
 
   onBubblingEventDefinedInline: BubblingEventHandler<
     Readonly<{
@@ -673,20 +805,20 @@ export interface ModuleProps extends ViewProps {
     Readonly<{
       ${EVENT_DEFINITION}
     }>
-  > | null | void;
+  > | null | undefined;
 
   onBubblingEventDefinedInlineOptionalBoth?: BubblingEventHandler<
     Readonly<{
       ${EVENT_DEFINITION}
     }>
-  > | null | void;
+  > | null | undefined;
 
   onBubblingEventDefinedInlineWithPaperName?: BubblingEventHandler<
     Readonly<{
       ${EVENT_DEFINITION}
     }>,
     'paperBubblingEventDefinedInlineWithPaperName'
-  > | null | void;
+  > | null | undefined;
 }
 
 export default codegenNativeComponent<ModuleProps>(
@@ -718,21 +850,21 @@ export interface ModuleProps extends ViewProps {
   // Events defined inline
   onDirectEventDefinedInlineNull: DirectEventHandler<null>;
   onDirectEventDefinedInlineNullOptionalKey?: DirectEventHandler<null>;
-  onDirectEventDefinedInlineNullOptionalValue: DirectEventHandler<null> | null | void;
+  onDirectEventDefinedInlineNullOptionalValue: DirectEventHandler<null> | null | undefined;
   onDirectEventDefinedInlineNullOptionalBoth?: DirectEventHandler<null>;
   onDirectEventDefinedInlineNullWithPaperName?: DirectEventHandler<
     null,
     'paperDirectEventDefinedInlineNullWithPaperName'
-  > | null | void;
+  > | null | undefined;
 
-  onBubblingEventDefinedInlineNull: BubblingEventHandler<null>;
-  onBubblingEventDefinedInlineNullOptionalKey?: BubblingEventHandler<null>;
-  onBubblingEventDefinedInlineNullOptionalValue: BubblingEventHandler<null> | null | void;
-  onBubblingEventDefinedInlineNullOptionalBoth?: BubblingEventHandler<null> | null | void;
+  onBubblingEventDefinedInlineNull: BubblingEventHandler<undefined>;
+  onBubblingEventDefinedInlineNullOptionalKey?: BubblingEventHandler<undefined>;
+  onBubblingEventDefinedInlineNullOptionalValue: BubblingEventHandler<undefined> | null | undefined;
+  onBubblingEventDefinedInlineNullOptionalBoth?: BubblingEventHandler<undefined> | null | undefined;
   onBubblingEventDefinedInlineNullWithPaperName?: BubblingEventHandler<
-    null,
+  undefined,
     'paperBubblingEventDefinedInlineNullWithPaperName'
-  > | null | void;
+  > | null | undefined;
 }
 
 export default codegenNativeComponent<ModuleProps>(
@@ -902,7 +1034,7 @@ export default codegenNativeComponent<ModuleProps>('Module') as NativeType;
 
 `;
 
-const COMMANDS_AND_EVENTS_TYPES_EXPORTED = `
+const COMMANDS_EVENTS_TYPES_EXPORTED = `
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
@@ -939,6 +1071,13 @@ export interface ModuleProps extends ViewProps {
   onDirectEventDefinedInlineWithPaperName: DirectEventHandler<EventInFile, 'paperDirectEventDefinedInlineWithPaperName'>,
 }
 
+// Add state here
+export interface ModuleNativeState {
+  boolean_required: boolean,
+  boolean_optional_key?: WithDefault<boolean, true>,
+  boolean_optional_both?: WithDefault<boolean, true>,
+}
+
 type NativeType = HostComponent<ModuleProps>;
 
 export type ScrollTo = (viewRef: React.ElementRef<NativeType>, y: Int, animated: Boolean) => Void;
@@ -956,9 +1095,53 @@ export default codegenNativeComponent<ModuleProps>(
 ) as NativeType;
 `;
 
+const PROPS_AND_EVENTS_WITH_INTERFACES = `
+import type {
+  BubblingEventHandler,
+  DirectEventHandler,
+  Int32,
+} from 'CodegenTypes';
+import type {ViewProps} from 'ViewPropTypes';
+import type {HostComponent} from 'react-native';
+
+const codegenNativeComponent = require('codegenNativeComponent');
+
+export interface Base1 {
+  readonly x: string;
+}
+
+export interface Base2 {
+  readonly y: Int32;
+}
+
+export interface Derived extends Base1, Base2 {
+  readonly z: boolean;
+}
+
+export interface ModuleProps extends ViewProps {
+  // Props
+  ordinary_prop: Derived;
+  readonly_prop: Readonly<Derived>;
+  ordinary_array_prop?: readonly Derived[];
+  readonly_array_prop?: readonly Readonly<Derived>[];
+  ordinary_nested_array_prop?: readonly Derived[][];
+  readonly_nested_array_prop?: readonly Readonly<Derived>[][];
+
+  // Events
+  onDirect: DirectEventHandler<Derived>;
+  onBubbling: BubblingEventHandler<Readonly<Derived>>;
+}
+
+export default codegenNativeComponent<ModuleProps>('Module', {
+  interfaceOnly: true,
+  paperComponentName: 'RCTModule',
+}) as HostComponent<ModuleProps>;
+`;
+
 module.exports = {
   ALL_PROP_TYPES_NO_EVENTS,
   ARRAY_PROP_TYPES_NO_EVENTS,
+  ARRAY2_PROP_TYPES_NO_EVENTS,
   OBJECT_PROP_TYPES_NO_EVENTS,
   PROPS_ALIASED_LOCALLY,
   ONE_OF_EACH_PROP_EVENT_DEFAULT_AND_OPTIONS,
@@ -967,8 +1150,9 @@ module.exports = {
   EVENTS_DEFINED_INLINE_WITH_ALL_TYPES,
   EVENTS_DEFINED_AS_NULL_INLINE,
   PROPS_AND_EVENTS_TYPES_EXPORTED,
-  COMMANDS_AND_EVENTS_TYPES_EXPORTED,
+  COMMANDS_EVENTS_TYPES_EXPORTED,
   COMMANDS_DEFINED_WITH_ALL_TYPES,
   PROPS_AS_EXTERNAL_TYPES,
   COMMANDS_WITH_EXTERNAL_TYPES,
+  PROPS_AND_EVENTS_WITH_INTERFACES,
 };
diff --git a/packages/react-native-codegen/src/parsers/typescript/components/__tests__/__snapshots__/typescript-component-parser-test.js.snap b/packages/react-native-codegen/src/parsers/typescript/components/__tests__/__snapshots__/typescript-component-parser-test.js.snap
index bfaa95fdbf98..90947e1af64d 100644
--- a/packages/react-native-codegen/src/parsers/typescript/components/__tests__/__snapshots__/typescript-component-parser-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/typescript/components/__tests__/__snapshots__/typescript-component-parser-test.js.snap
@@ -14,7 +14,7 @@ exports[`RN Codegen TypeScript Parser Fails with error message COMMANDS_DEFINED_
 
 exports[`RN Codegen TypeScript Parser Fails with error message NON_OPTIONAL_KEY_WITH_DEFAULT_VALUE 1`] = `"key required_key_with_default must be optional if used with WithDefault<> annotation"`;
 
-exports[`RN Codegen TypeScript Parser Fails with error message NULLABLE_WITH_DEFAULT 1`] = `"WithDefault<> is optional and does not need to be marked as optional. Please remove the union of void and/or null"`;
+exports[`RN Codegen TypeScript Parser Fails with error message NULLABLE_WITH_DEFAULT 1`] = `"WithDefault<> is optional and does not need to be marked as optional. Please remove the union of undefined and/or null"`;
 
 exports[`RN Codegen TypeScript Parser Fails with error message PROP_ARRAY_ENUM_BOOLEAN 1`] = `"Unsupported union type for \\"someProp\\", received \\"BooleanLiteral\\""`;
 
@@ -1231,7 +1231,794 @@ exports[`RN Codegen TypeScript Parser can generate fixture ARRAY_PROP_TYPES_NO_E
 }"
 `;
 
-exports[`RN Codegen TypeScript Parser can generate fixture COMMANDS_AND_EVENTS_TYPES_EXPORTED 1`] = `
+exports[`RN Codegen TypeScript Parser can generate fixture ARRAY2_PROP_TYPES_NO_EVENTS 1`] = `
+"{
+  'modules': {
+    'Module': {
+      'type': 'Component',
+      'components': {
+        'Module': {
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
+            }
+          ],
+          'events': [],
+          'props': [
+            {
+              'name': 'array_boolean_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'BooleanTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_boolean_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'BooleanTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_boolean_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'BooleanTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_boolean_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'BooleanTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_string_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'StringTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_string_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'StringTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_string_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'StringTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_string_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'StringTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_double_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'DoubleTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_double_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'DoubleTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_double_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'DoubleTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_double_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'DoubleTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_float_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'FloatTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_float_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'FloatTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_float_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'FloatTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_float_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'FloatTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_int32_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'Int32TypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_int32_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'Int32TypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_int32_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'Int32TypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_int32_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'Int32TypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'array_enum_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'StringEnumTypeAnnotation',
+                  'default': 'small',
+                  'options': [
+                    'small',
+                    'large'
+                  ]
+                }
+              }
+            },
+            {
+              'name': 'array_enum_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'StringEnumTypeAnnotation',
+                  'default': 'small',
+                  'options': [
+                    'small',
+                    'large'
+                  ]
+                }
+              }
+            },
+            {
+              'name': 'array_image_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ImageSourcePrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_image_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ImageSourcePrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_image_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ImageSourcePrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_image_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ImageSourcePrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_color_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ColorPrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_color_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ColorPrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_color_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ColorPrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_color_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ColorPrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_point_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'PointPrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_point_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'PointPrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_point_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'PointPrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_point_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'PointPrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_insets_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'EdgeInsetsPrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_insets_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'EdgeInsetsPrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_insets_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'EdgeInsetsPrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_insets_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'EdgeInsetsPrimitive'
+                }
+              }
+            },
+            {
+              'name': 'array_object_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
+                    {
+                      'name': 'prop',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation',
+                        'default': null
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              'name': 'array_object_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
+                    {
+                      'name': 'prop',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation',
+                        'default': null
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              'name': 'array_object_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
+                    {
+                      'name': 'prop',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation',
+                        'default': null
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              'name': 'array_object_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
+                    {
+                      'name': 'prop',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation',
+                        'default': null
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              'name': 'array_of_array_object_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
+                    {
+                      'name': 'array_object_required',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'ArrayTypeAnnotation',
+                        'elementType': {
+                          'type': 'ObjectTypeAnnotation',
+                          'properties': [
+                            {
+                              'name': 'prop',
+                              'optional': false,
+                              'typeAnnotation': {
+                                'type': 'StringTypeAnnotation',
+                                'default': null
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              'name': 'array_of_array_object_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
+                    {
+                      'name': 'array_object_optional_key',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'ArrayTypeAnnotation',
+                        'elementType': {
+                          'type': 'ObjectTypeAnnotation',
+                          'properties': [
+                            {
+                              'name': 'prop',
+                              'optional': true,
+                              'typeAnnotation': {
+                                'type': 'StringTypeAnnotation',
+                                'default': null
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              'name': 'array_of_array_object_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
+                    {
+                      'name': 'array_object_optional_value',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'ArrayTypeAnnotation',
+                        'elementType': {
+                          'type': 'ObjectTypeAnnotation',
+                          'properties': [
+                            {
+                              'name': 'prop',
+                              'optional': true,
+                              'typeAnnotation': {
+                                'type': 'StringTypeAnnotation',
+                                'default': null
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              'name': 'array_of_array_object_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
+                    {
+                      'name': 'array_object_optional_both',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'ArrayTypeAnnotation',
+                        'elementType': {
+                          'type': 'ObjectTypeAnnotation',
+                          'properties': [
+                            {
+                              'name': 'prop',
+                              'optional': true,
+                              'typeAnnotation': {
+                                'type': 'StringTypeAnnotation',
+                                'default': null
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              'name': 'array_of_array_of_object_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ArrayTypeAnnotation',
+                  'elementType': {
+                    'type': 'ObjectTypeAnnotation',
+                    'properties': [
+                      {
+                        'name': 'prop',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'StringTypeAnnotation',
+                          'default': null
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            },
+            {
+              'name': 'array_of_array_of_object_required_in_file',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ArrayTypeAnnotation',
+                  'elementType': {
+                    'type': 'ObjectTypeAnnotation',
+                    'properties': [
+                      {
+                        'name': 'prop',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'StringTypeAnnotation',
+                          'default': null
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+          ],
+          'commands': []
+        }
+      }
+    }
+  }
+}"
+`;
+
+exports[`RN Codegen TypeScript Parser can generate fixture COMMANDS_DEFINED_WITH_ALL_TYPES 1`] = `
+"{
+  'modules': {
+    'Module': {
+      'type': 'Component',
+      'components': {
+        'Module': {
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
+            }
+          ],
+          'events': [],
+          'props': [],
+          'commands': [
+            {
+              'name': 'handleRootTag',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'params': [
+                  {
+                    'name': 'rootTag',
+                    'typeAnnotation': {
+                      'type': 'ReservedTypeAnnotation',
+                      'name': 'RootTag'
+                    }
+                  }
+                ],
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'hotspotUpdate',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'params': [
+                  {
+                    'name': 'x',
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation'
+                    }
+                  },
+                  {
+                    'name': 'y',
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation'
+                    }
+                  }
+                ],
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                }
+              }
+            },
+            {
+              'name': 'scrollTo',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'params': [
+                  {
+                    'name': 'x',
+                    'typeAnnotation': {
+                      'type': 'FloatTypeAnnotation'
+                    }
+                  },
+                  {
+                    'name': 'y',
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation'
+                    }
+                  },
+                  {
+                    'name': 'z',
+                    'typeAnnotation': {
+                      'type': 'DoubleTypeAnnotation'
+                    }
+                  },
+                  {
+                    'name': 'animated',
+                    'typeAnnotation': {
+                      'type': 'BooleanTypeAnnotation'
+                    }
+                  }
+                ],
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                }
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
+`;
+
+exports[`RN Codegen TypeScript Parser can generate fixture COMMANDS_EVENTS_TYPES_EXPORTED 1`] = `
 "{
   'modules': {
     'Module': {
@@ -2752,131 +3539,28 @@ exports[`RN Codegen TypeScript Parser can generate fixture COMMANDS_AND_EVENTS_T
                               'type': 'Int32TypeAnnotation'
                             }
                           }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              }
-            }
-          ],
-          'props': [],
-          'commands': [
-            {
-              'name': 'scrollTo',
-              'optional': false,
-              'typeAnnotation': {
-                'type': 'FunctionTypeAnnotation',
-                'params': [
-                  {
-                    'name': 'y',
-                    'typeAnnotation': {
-                      'type': 'Int32TypeAnnotation'
-                    }
-                  },
-                  {
-                    'name': 'animated',
-                    'typeAnnotation': {
-                      'type': 'BooleanTypeAnnotation'
-                    }
-                  }
-                ],
-                'returnTypeAnnotation': {
-                  'type': 'VoidTypeAnnotation'
-                }
-              }
-            }
-          ]
-        }
-      }
-    }
-  }
-}"
-`;
-
-exports[`RN Codegen TypeScript Parser can generate fixture COMMANDS_DEFINED_WITH_ALL_TYPES 1`] = `
-"{
-  'modules': {
-    'Module': {
-      'type': 'Component',
-      'components': {
-        'Module': {
-          'extendsProps': [
-            {
-              'type': 'ReactNativeBuiltInType',
-              'knownTypeName': 'ReactNativeCoreViewProps'
-            }
-          ],
-          'events': [],
-          'props': [],
-          'commands': [
-            {
-              'name': 'handleRootTag',
-              'optional': false,
-              'typeAnnotation': {
-                'type': 'FunctionTypeAnnotation',
-                'params': [
-                  {
-                    'name': 'rootTag',
-                    'typeAnnotation': {
-                      'type': 'ReservedTypeAnnotation',
-                      'name': 'RootTag'
-                    }
-                  }
-                ],
-                'returnTypeAnnotation': {
-                  'type': 'VoidTypeAnnotation'
-                }
-              }
-            },
-            {
-              'name': 'hotspotUpdate',
-              'optional': false,
-              'typeAnnotation': {
-                'type': 'FunctionTypeAnnotation',
-                'params': [
-                  {
-                    'name': 'x',
-                    'typeAnnotation': {
-                      'type': 'Int32TypeAnnotation'
-                    }
-                  },
-                  {
-                    'name': 'y',
-                    'typeAnnotation': {
-                      'type': 'Int32TypeAnnotation'
+                        ]
+                      }
                     }
-                  }
-                ],
-                'returnTypeAnnotation': {
-                  'type': 'VoidTypeAnnotation'
+                  ]
                 }
               }
-            },
+            }
+          ],
+          'props': [],
+          'commands': [
             {
               'name': 'scrollTo',
               'optional': false,
               'typeAnnotation': {
                 'type': 'FunctionTypeAnnotation',
                 'params': [
-                  {
-                    'name': 'x',
-                    'typeAnnotation': {
-                      'type': 'FloatTypeAnnotation'
-                    }
-                  },
                   {
                     'name': 'y',
                     'typeAnnotation': {
                       'type': 'Int32TypeAnnotation'
                     }
                   },
-                  {
-                    'name': 'z',
-                    'typeAnnotation': {
-                      'type': 'DoubleTypeAnnotation'
-                    }
-                  },
                   {
                     'name': 'animated',
                     'typeAnnotation': {
@@ -9037,320 +9721,631 @@ exports[`RN Codegen TypeScript Parser can generate fixture PROPS_AND_EVENTS_TYPE
                       }
                     },
                     {
-                      'name': 'double_required',
+                      'name': 'double_required',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
+                    },
+                    {
+                      'name': 'double_optional_key',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
+                    },
+                    {
+                      'name': 'double_optional_value',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
+                    },
+                    {
+                      'name': 'double_optional_both',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'DoubleTypeAnnotation'
+                      }
+                    },
+                    {
+                      'name': 'float_required',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
+                    },
+                    {
+                      'name': 'float_optional_key',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
+                    },
+                    {
+                      'name': 'float_optional_value',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
+                    },
+                    {
+                      'name': 'float_optional_both',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'FloatTypeAnnotation'
+                      }
+                    },
+                    {
+                      'name': 'int32_required',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
+                    },
+                    {
+                      'name': 'int32_optional_key',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
+                    },
+                    {
+                      'name': 'int32_optional_value',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
+                    },
+                    {
+                      'name': 'int32_optional_both',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'Int32TypeAnnotation'
+                      }
+                    },
+                    {
+                      'name': 'enum_required',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
+                    },
+                    {
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
+                    },
+                    {
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
+                    },
+                    {
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'options': [
+                          'small',
+                          'large'
+                        ]
+                      }
+                    },
+                    {
+                      'name': 'object_required',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'object_optional_nested_1_layer',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'ObjectTypeAnnotation',
+                              'properties': [
+                                {
+                                  'name': 'boolean_required',
+                                  'optional': false,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'string_optional_key',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'StringTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'double_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'DoubleTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'float_optional_value',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'FloatTypeAnnotation'
+                                  }
+                                },
+                                {
+                                  'name': 'int32_optional_both',
+                                  'optional': true,
+                                  'typeAnnotation': {
+                                    'type': 'Int32TypeAnnotation'
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        ]
+                      }
+                    },
+                    {
+                      'name': 'object_readonly_required',
                       'optional': false,
                       'typeAnnotation': {
-                        'type': 'DoubleTypeAnnotation'
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'boolean_required',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
                       }
                     },
                     {
-                      'name': 'double_optional_key',
+                      'name': 'object_readonly_optional_key',
                       'optional': true,
                       'typeAnnotation': {
-                        'type': 'DoubleTypeAnnotation'
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'string_optional_key',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'StringTypeAnnotation'
+                            }
+                          }
+                        ]
                       }
                     },
                     {
-                      'name': 'double_optional_value',
+                      'name': 'object_readonly_optional_value',
                       'optional': true,
                       'typeAnnotation': {
-                        'type': 'DoubleTypeAnnotation'
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'float_optional_value',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'FloatTypeAnnotation'
+                            }
+                          }
+                        ]
                       }
                     },
                     {
-                      'name': 'double_optional_both',
+                      'name': 'object_readonly_optional_both',
                       'optional': true,
                       'typeAnnotation': {
-                        'type': 'DoubleTypeAnnotation'
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
+                          {
+                            'name': 'int32_optional_both',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'Int32TypeAnnotation'
+                            }
+                          }
+                        ]
                       }
-                    },
+                    }
+                  ]
+                }
+              }
+            }
+          ],
+          'props': [],
+          'commands': []
+        }
+      }
+    }
+  }
+}"
+`;
+
+exports[`RN Codegen TypeScript Parser can generate fixture PROPS_AND_EVENTS_WITH_INTERFACES 1`] = `
+"{
+  'modules': {
+    'Module': {
+      'type': 'Component',
+      'components': {
+        'Module': {
+          'interfaceOnly': true,
+          'paperComponentName': 'RCTModule',
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
+            }
+          ],
+          'events': [
+            {
+              'name': 'onDirect',
+              'optional': false,
+              'bubblingType': 'direct',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      'name': 'float_required',
+                      'name': 'x',
                       'optional': false,
                       'typeAnnotation': {
-                        'type': 'FloatTypeAnnotation'
-                      }
-                    },
-                    {
-                      'name': 'float_optional_key',
-                      'optional': true,
-                      'typeAnnotation': {
-                        'type': 'FloatTypeAnnotation'
-                      }
-                    },
-                    {
-                      'name': 'float_optional_value',
-                      'optional': true,
-                      'typeAnnotation': {
-                        'type': 'FloatTypeAnnotation'
-                      }
-                    },
-                    {
-                      'name': 'float_optional_both',
-                      'optional': true,
-                      'typeAnnotation': {
-                        'type': 'FloatTypeAnnotation'
+                        'type': 'StringTypeAnnotation'
                       }
                     },
                     {
-                      'name': 'int32_required',
+                      'name': 'y',
                       'optional': false,
                       'typeAnnotation': {
                         'type': 'Int32TypeAnnotation'
                       }
                     },
                     {
-                      'name': 'int32_optional_key',
-                      'optional': true,
+                      'name': 'z',
+                      'optional': false,
                       'typeAnnotation': {
-                        'type': 'Int32TypeAnnotation'
+                        'type': 'BooleanTypeAnnotation'
                       }
-                    },
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              'name': 'onBubbling',
+              'optional': false,
+              'bubblingType': 'bubble',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      'name': 'int32_optional_value',
-                      'optional': true,
+                      'name': 'x',
+                      'optional': false,
                       'typeAnnotation': {
-                        'type': 'Int32TypeAnnotation'
+                        'type': 'StringTypeAnnotation'
                       }
                     },
                     {
-                      'name': 'int32_optional_both',
-                      'optional': true,
+                      'name': 'y',
+                      'optional': false,
                       'typeAnnotation': {
                         'type': 'Int32TypeAnnotation'
                       }
                     },
                     {
-                      'name': 'enum_required',
+                      'name': 'z',
                       'optional': false,
                       'typeAnnotation': {
-                        'type': 'StringEnumTypeAnnotation',
-                        'options': [
-                          'small',
-                          'large'
-                        ]
-                      }
-                    },
-                    {
-                      'name': 'enum_optional_key',
-                      'optional': true,
-                      'typeAnnotation': {
-                        'type': 'StringEnumTypeAnnotation',
-                        'options': [
-                          'small',
-                          'large'
-                        ]
-                      }
-                    },
-                    {
-                      'name': 'enum_optional_value',
-                      'optional': true,
-                      'typeAnnotation': {
-                        'type': 'StringEnumTypeAnnotation',
-                        'options': [
-                          'small',
-                          'large'
-                        ]
-                      }
-                    },
-                    {
-                      'name': 'enum_optional_both',
-                      'optional': true,
-                      'typeAnnotation': {
-                        'type': 'StringEnumTypeAnnotation',
-                        'options': [
-                          'small',
-                          'large'
-                        ]
+                        'type': 'BooleanTypeAnnotation'
                       }
-                    },
+                    }
+                  ]
+                }
+              }
+            }
+          ],
+          'props': [
+            {
+              'name': 'ordinary_prop',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
+                  {
+                    'name': 'x',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'StringTypeAnnotation',
+                      'default': null
+                    }
+                  },
+                  {
+                    'name': 'y',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation',
+                      'default': 0
+                    }
+                  },
+                  {
+                    'name': 'z',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'BooleanTypeAnnotation',
+                      'default': false
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              'name': 'readonly_prop',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
+                  {
+                    'name': 'x',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'StringTypeAnnotation',
+                      'default': null
+                    }
+                  },
+                  {
+                    'name': 'y',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation',
+                      'default': 0
+                    }
+                  },
+                  {
+                    'name': 'z',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'BooleanTypeAnnotation',
+                      'default': false
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              'name': 'ordinary_array_prop',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      'name': 'object_required',
+                      'name': 'x',
                       'optional': false,
                       'typeAnnotation': {
-                        'type': 'ObjectTypeAnnotation',
-                        'properties': [
-                          {
-                            'name': 'boolean_required',
-                            'optional': false,
-                            'typeAnnotation': {
-                              'type': 'BooleanTypeAnnotation'
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      'name': 'object_optional_key',
-                      'optional': true,
-                      'typeAnnotation': {
-                        'type': 'ObjectTypeAnnotation',
-                        'properties': [
-                          {
-                            'name': 'string_optional_key',
-                            'optional': true,
-                            'typeAnnotation': {
-                              'type': 'StringTypeAnnotation'
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      'name': 'object_optional_value',
-                      'optional': true,
-                      'typeAnnotation': {
-                        'type': 'ObjectTypeAnnotation',
-                        'properties': [
-                          {
-                            'name': 'float_optional_value',
-                            'optional': true,
-                            'typeAnnotation': {
-                              'type': 'FloatTypeAnnotation'
-                            }
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      'name': 'object_optional_both',
-                      'optional': true,
-                      'typeAnnotation': {
-                        'type': 'ObjectTypeAnnotation',
-                        'properties': [
-                          {
-                            'name': 'int32_optional_both',
-                            'optional': true,
-                            'typeAnnotation': {
-                              'type': 'Int32TypeAnnotation'
-                            }
-                          }
-                        ]
+                        'type': 'StringTypeAnnotation',
+                        'default': null
                       }
                     },
                     {
-                      'name': 'object_required_nested_2_layers',
+                      'name': 'y',
                       'optional': false,
                       'typeAnnotation': {
-                        'type': 'ObjectTypeAnnotation',
-                        'properties': [
-                          {
-                            'name': 'object_optional_nested_1_layer',
-                            'optional': true,
-                            'typeAnnotation': {
-                              'type': 'ObjectTypeAnnotation',
-                              'properties': [
-                                {
-                                  'name': 'boolean_required',
-                                  'optional': false,
-                                  'typeAnnotation': {
-                                    'type': 'Int32TypeAnnotation'
-                                  }
-                                },
-                                {
-                                  'name': 'string_optional_key',
-                                  'optional': true,
-                                  'typeAnnotation': {
-                                    'type': 'StringTypeAnnotation'
-                                  }
-                                },
-                                {
-                                  'name': 'double_optional_value',
-                                  'optional': true,
-                                  'typeAnnotation': {
-                                    'type': 'DoubleTypeAnnotation'
-                                  }
-                                },
-                                {
-                                  'name': 'float_optional_value',
-                                  'optional': true,
-                                  'typeAnnotation': {
-                                    'type': 'FloatTypeAnnotation'
-                                  }
-                                },
-                                {
-                                  'name': 'int32_optional_both',
-                                  'optional': true,
-                                  'typeAnnotation': {
-                                    'type': 'Int32TypeAnnotation'
-                                  }
-                                }
-                              ]
-                            }
-                          }
-                        ]
+                        'type': 'Int32TypeAnnotation',
+                        'default': 0
                       }
                     },
                     {
-                      'name': 'object_readonly_required',
+                      'name': 'z',
                       'optional': false,
                       'typeAnnotation': {
-                        'type': 'ObjectTypeAnnotation',
-                        'properties': [
-                          {
-                            'name': 'boolean_required',
-                            'optional': false,
-                            'typeAnnotation': {
-                              'type': 'BooleanTypeAnnotation'
-                            }
-                          }
-                        ]
+                        'type': 'BooleanTypeAnnotation',
+                        'default': false
                       }
-                    },
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              'name': 'readonly_array_prop',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      'name': 'object_readonly_optional_key',
-                      'optional': true,
+                      'name': 'x',
+                      'optional': false,
                       'typeAnnotation': {
-                        'type': 'ObjectTypeAnnotation',
-                        'properties': [
-                          {
-                            'name': 'string_optional_key',
-                            'optional': true,
-                            'typeAnnotation': {
-                              'type': 'StringTypeAnnotation'
-                            }
-                          }
-                        ]
+                        'type': 'StringTypeAnnotation',
+                        'default': null
                       }
                     },
                     {
-                      'name': 'object_readonly_optional_value',
-                      'optional': true,
+                      'name': 'y',
+                      'optional': false,
                       'typeAnnotation': {
-                        'type': 'ObjectTypeAnnotation',
-                        'properties': [
-                          {
-                            'name': 'float_optional_value',
-                            'optional': true,
-                            'typeAnnotation': {
-                              'type': 'FloatTypeAnnotation'
-                            }
-                          }
-                        ]
+                        'type': 'Int32TypeAnnotation',
+                        'default': 0
                       }
                     },
                     {
-                      'name': 'object_readonly_optional_both',
-                      'optional': true,
+                      'name': 'z',
+                      'optional': false,
                       'typeAnnotation': {
-                        'type': 'ObjectTypeAnnotation',
-                        'properties': [
-                          {
-                            'name': 'int32_optional_both',
-                            'optional': true,
-                            'typeAnnotation': {
-                              'type': 'Int32TypeAnnotation'
-                            }
-                          }
-                        ]
+                        'type': 'BooleanTypeAnnotation',
+                        'default': false
                       }
                     }
                   ]
                 }
               }
+            },
+            {
+              'name': 'ordinary_nested_array_prop',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ArrayTypeAnnotation',
+                  'elementType': {
+                    'type': 'ObjectTypeAnnotation',
+                    'properties': [
+                      {
+                        'name': 'x',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'StringTypeAnnotation',
+                          'default': null
+                        }
+                      },
+                      {
+                        'name': 'y',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'Int32TypeAnnotation',
+                          'default': 0
+                        }
+                      },
+                      {
+                        'name': 'z',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'BooleanTypeAnnotation',
+                          'default': false
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            },
+            {
+              'name': 'readonly_nested_array_prop',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ArrayTypeAnnotation',
+                  'elementType': {
+                    'type': 'ObjectTypeAnnotation',
+                    'properties': [
+                      {
+                        'name': 'x',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'StringTypeAnnotation',
+                          'default': null
+                        }
+                      },
+                      {
+                        'name': 'y',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'Int32TypeAnnotation',
+                          'default': 0
+                        }
+                      },
+                      {
+                        'name': 'z',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'BooleanTypeAnnotation',
+                          'default': false
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
             }
           ],
-          'props': [],
           'commands': []
         }
       }
diff --git a/packages/react-native-codegen/src/parsers/typescript/components/__tests__/typescript-component-parser-test.js b/packages/react-native-codegen/src/parsers/typescript/components/__tests__/typescript-component-parser-test.js
index 223c7d558efb..19a49a6b8ad2 100644
--- a/packages/react-native-codegen/src/parsers/typescript/components/__tests__/typescript-component-parser-test.js
+++ b/packages/react-native-codegen/src/parsers/typescript/components/__tests__/typescript-component-parser-test.js
@@ -4,18 +4,26 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
 const TypeScriptParser = require('../../index.js');
+const {parseFile} = require('../../../utils.js');
 const fixtures = require('../__test_fixtures__/fixtures.js');
 const failureFixtures = require('../__test_fixtures__/failures.js');
 jest.mock('fs', () => ({
-  readFileSync: filename => fixtures[filename] || failureFixtures[filename],
+  readFileSync: filename => {
+    // Jest in the OSS does not allow to capture variables in closures.
+    // Therefore, we have to bring the variables inside the closure.
+    // see: https://github.com/facebook/jest/issues/2567
+    const readFileFixtures = require('../__test_fixtures__/fixtures.js');
+    const readFileFailureFixtures = require('../__test_fixtures__/failures.js');
+    return readFileFixtures[filename] || readFileFailureFixtures[filename];
+  },
 }));
 
 describe('RN Codegen TypeScript Parser', () => {
@@ -23,7 +31,7 @@ describe('RN Codegen TypeScript Parser', () => {
     .sort()
     .forEach(fixtureName => {
       it(`can generate fixture ${fixtureName}`, () => {
-        const schema = TypeScriptParser.parseFile(fixtureName);
+        const schema = parseFile(fixtureName, TypeScriptParser.buildSchema);
         const serializedSchema = JSON.stringify(schema, null, 2).replace(
           /"/g,
           "'",
@@ -37,7 +45,7 @@ describe('RN Codegen TypeScript Parser', () => {
     .forEach(fixtureName => {
       it(`Fails with error message ${fixtureName}`, () => {
         expect(() => {
-          TypeScriptParser.parseFile(fixtureName);
+          parseFile(fixtureName, TypeScriptParser.buildSchema);
         }).toThrowErrorMatchingSnapshot();
       });
     });
diff --git a/packages/react-native-codegen/src/parsers/typescript/components/commands.js b/packages/react-native-codegen/src/parsers/typescript/components/commands.js
index c8b56c205dd0..23e300c39e2f 100644
--- a/packages/react-native-codegen/src/parsers/typescript/components/commands.js
+++ b/packages/react-native-codegen/src/parsers/typescript/components/commands.js
@@ -14,20 +14,19 @@ import type {
   NamedShape,
   CommandTypeAnnotation,
 } from '../../../CodegenSchema.js';
-import type {TypeDeclarationMap} from '../utils.js';
-
-const {getValueFromTypes} = require('../utils.js');
+import type {TypeDeclarationMap} from '../../utils';
+const {parseTopLevelType} = require('../parseTopLevelType');
 
 type EventTypeAST = Object;
 
 function buildCommandSchema(property: EventTypeAST, types: TypeDeclarationMap) {
-  const name = property.key.name;
-  const optional = property.optional || false;
-  const value = getValueFromTypes(
+  const topLevelType = parseTopLevelType(
     property.typeAnnotation.typeAnnotation,
     types,
   );
-
+  const name = property.key.name;
+  const optional = property.optional || topLevelType.optional;
+  const value = topLevelType.type;
   const firstParam = value.parameters[0].typeAnnotation;
 
   if (
@@ -45,10 +44,10 @@ function buildCommandSchema(property: EventTypeAST, types: TypeDeclarationMap) {
 
   const params = value.parameters.slice(1).map(param => {
     const paramName = param.name;
-    const paramValue = getValueFromTypes(
+    const paramValue = parseTopLevelType(
       param.typeAnnotation.typeAnnotation,
       types,
-    );
+    ).type;
 
     const type =
       paramValue.type === 'TSTypeReference'
diff --git a/packages/react-native-codegen/src/parsers/typescript/components/componentsUtils.js b/packages/react-native-codegen/src/parsers/typescript/components/componentsUtils.js
new file mode 100644
index 000000000000..0d84786df8f2
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/typescript/components/componentsUtils.js
@@ -0,0 +1,528 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+import type {ASTNode} from '../utils';
+import type {NamedShape} from '../../../CodegenSchema.js';
+const {parseTopLevelType} = require('../parseTopLevelType');
+import type {TypeDeclarationMap} from '../../utils';
+
+function getProperties(
+  typeName: string,
+  types: TypeDeclarationMap,
+): $FlowFixMe {
+  const alias = types[typeName];
+  if (!alias) {
+    throw new Error(
+      `Failed to find definition for "${typeName}", please check that you have a valid codegen typescript file`,
+    );
+  }
+  const aliasKind =
+    alias.type === 'TSInterfaceDeclaration' ? 'interface' : 'type';
+
+  try {
+    if (aliasKind === 'interface') {
+      return [...(alias.extends ?? []), ...alias.body.body];
+    }
+
+    return (
+      alias.typeAnnotation.members ||
+      alias.typeAnnotation.typeParameters.params[0].members ||
+      alias.typeAnnotation.typeParameters.params
+    );
+  } catch (e) {
+    throw new Error(
+      `Failed to find ${aliasKind} definition for "${typeName}", please check that you have a valid codegen typescript file`,
+    );
+  }
+}
+
+function getUnionOfLiterals(
+  name: string,
+  forArray: boolean,
+  elementTypes: $FlowFixMe[],
+  defaultValue: $FlowFixMe | void,
+  types: TypeDeclarationMap,
+) {
+  elementTypes.reduce((lastType, currType) => {
+    const lastFlattenedType =
+      lastType && lastType.type === 'TSLiteralType'
+        ? lastType.literal.type
+        : lastType.type;
+    const currFlattenedType =
+      currType.type === 'TSLiteralType' ? currType.literal.type : currType.type;
+
+    if (lastFlattenedType && currFlattenedType !== lastFlattenedType) {
+      throw new Error(`Mixed types are not supported (see "${name}")`);
+    }
+    return currType;
+  });
+
+  if (defaultValue === undefined) {
+    throw new Error(`A default enum value is required for "${name}"`);
+  }
+
+  const unionType = elementTypes[0].type;
+  if (
+    unionType === 'TSLiteralType' &&
+    elementTypes[0].literal?.type === 'StringLiteral'
+  ) {
+    return {
+      type: 'StringEnumTypeAnnotation',
+      default: (defaultValue: string),
+      options: elementTypes.map(option => option.literal.value),
+    };
+  } else if (
+    unionType === 'TSLiteralType' &&
+    elementTypes[0].literal?.type === 'NumericLiteral'
+  ) {
+    if (forArray) {
+      throw new Error(`Arrays of int enums are not supported (see: "${name}")`);
+    } else {
+      return {
+        type: 'Int32EnumTypeAnnotation',
+        default: (defaultValue: number),
+        options: elementTypes.map(option => option.literal.value),
+      };
+    }
+  } else {
+    throw new Error(
+      `Unsupported union type for "${name}", received "${
+        unionType === 'TSLiteralType'
+          ? elementTypes[0].literal?.type
+          : unionType
+      }"`,
+    );
+  }
+}
+
+function detectArrayType<T>(
+  name: string,
+  typeAnnotation: $FlowFixMe | ASTNode,
+  defaultValue: $FlowFixMe | void,
+  types: TypeDeclarationMap,
+  buildSchema: (property: PropAST, types: TypeDeclarationMap) => ?NamedShape<T>,
+): $FlowFixMe {
+  // Covers: readonly T[]
+  if (
+    typeAnnotation.type === 'TSTypeOperator' &&
+    typeAnnotation.operator === 'readonly' &&
+    typeAnnotation.typeAnnotation.type === 'TSArrayType'
+  ) {
+    return {
+      type: 'ArrayTypeAnnotation',
+      elementType: getTypeAnnotationForArray(
+        name,
+        typeAnnotation.typeAnnotation.elementType,
+        defaultValue,
+        types,
+        buildSchema,
+      ),
+    };
+  }
+
+  // Covers: T[]
+  if (typeAnnotation.type === 'TSArrayType') {
+    return {
+      type: 'ArrayTypeAnnotation',
+      elementType: getTypeAnnotationForArray(
+        name,
+        typeAnnotation.elementType,
+        defaultValue,
+        types,
+        buildSchema,
+      ),
+    };
+  }
+
+  // Covers: Array<T> and ReadonlyArray<T>
+  if (
+    typeAnnotation.type === 'TSTypeReference' &&
+    (typeAnnotation.typeName.name === 'ReadonlyArray' ||
+      typeAnnotation.typeName.name === 'Array')
+  ) {
+    return {
+      type: 'ArrayTypeAnnotation',
+      elementType: getTypeAnnotationForArray(
+        name,
+        typeAnnotation.typeParameters.params[0],
+        defaultValue,
+        types,
+        buildSchema,
+      ),
+    };
+  }
+
+  return null;
+}
+
+function getTypeAnnotationForArray<T>(
+  name: string,
+  typeAnnotation: $FlowFixMe,
+  defaultValue: $FlowFixMe | void,
+  types: TypeDeclarationMap,
+  buildSchema: (property: PropAST, types: TypeDeclarationMap) => ?NamedShape<T>,
+): $FlowFixMe {
+  // unpack WithDefault, (T) or T|U
+  const topLevelType = parseTopLevelType(typeAnnotation, types);
+  if (topLevelType.defaultValue !== undefined) {
+    throw new Error(
+      'Nested optionals such as "ReadonlyArray<boolean | null | undefined>" are not supported, please declare optionals at the top level of value definitions as in "ReadonlyArray<boolean> | null | undefined"',
+    );
+  }
+  if (topLevelType.optional) {
+    throw new Error(
+      'Nested optionals such as "ReadonlyArray<boolean | null | undefined>" are not supported, please declare optionals at the top level of value definitions as in "ReadonlyArray<boolean> | null | undefined"',
+    );
+  }
+
+  const extractedTypeAnnotation = topLevelType.type;
+  const arrayType = detectArrayType(
+    name,
+    extractedTypeAnnotation,
+    defaultValue,
+    types,
+    buildSchema,
+  );
+  if (arrayType) {
+    if (arrayType.elementType.type !== 'ObjectTypeAnnotation') {
+      throw new Error(
+        `Only array of array of object is supported for "${name}".`,
+      );
+    }
+    return arrayType;
+  }
+
+  const type =
+    extractedTypeAnnotation.elementType === 'TSTypeReference'
+      ? extractedTypeAnnotation.elementType.typeName.name
+      : extractedTypeAnnotation.elementType?.type ||
+        extractedTypeAnnotation.typeName?.name ||
+        extractedTypeAnnotation.type;
+
+  switch (type) {
+    case 'TSTypeLiteral':
+    case 'TSInterfaceDeclaration': {
+      const rawProperties =
+        type === 'TSInterfaceDeclaration'
+          ? [extractedTypeAnnotation]
+          : extractedTypeAnnotation.members;
+      if (rawProperties === undefined) {
+        throw new Error(type);
+      }
+      return {
+        type: 'ObjectTypeAnnotation',
+        properties: flattenProperties(rawProperties, types)
+          .map(prop => buildSchema(prop, types))
+          .filter(Boolean),
+      };
+    }
+    case 'TSNumberKeyword':
+      return {
+        type: 'FloatTypeAnnotation',
+      };
+    case 'ImageSource':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'ImageSourcePrimitive',
+      };
+    case 'ImageRequest':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'ImageRequestPrimitive',
+      };
+    case 'ColorValue':
+    case 'ProcessedColorValue':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'ColorPrimitive',
+      };
+    case 'PointValue':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'PointPrimitive',
+      };
+    case 'EdgeInsetsValue':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'EdgeInsetsPrimitive',
+      };
+    case 'Stringish':
+      return {
+        type: 'StringTypeAnnotation',
+      };
+    case 'Int32':
+      return {
+        type: 'Int32TypeAnnotation',
+      };
+    case 'Double':
+      return {
+        type: 'DoubleTypeAnnotation',
+      };
+    case 'Float':
+      return {
+        type: 'FloatTypeAnnotation',
+      };
+    case 'TSBooleanKeyword':
+      return {
+        type: 'BooleanTypeAnnotation',
+      };
+    case 'TSStringKeyword':
+      return {
+        type: 'StringTypeAnnotation',
+      };
+    case 'TSUnionType':
+      return getUnionOfLiterals(
+        name,
+        true,
+        extractedTypeAnnotation.types,
+        defaultValue,
+        types,
+      );
+    default:
+      (type: empty);
+      throw new Error(`Unknown prop type for "${name}": ${type}`);
+  }
+}
+
+function getTypeAnnotation<T>(
+  name: string,
+  annotation: $FlowFixMe | ASTNode,
+  defaultValue: $FlowFixMe | void,
+  types: TypeDeclarationMap,
+  buildSchema: (property: PropAST, types: TypeDeclarationMap) => ?NamedShape<T>,
+): $FlowFixMe {
+  // unpack WithDefault, (T) or T|U
+  const topLevelType = parseTopLevelType(annotation, types);
+  const typeAnnotation = topLevelType.type;
+  const arrayType = detectArrayType(
+    name,
+    typeAnnotation,
+    defaultValue,
+    types,
+    buildSchema,
+  );
+  if (arrayType) {
+    return arrayType;
+  }
+
+  const type =
+    typeAnnotation.type === 'TSTypeReference' ||
+    typeAnnotation.type === 'TSTypeAliasDeclaration'
+      ? typeAnnotation.typeName.name
+      : typeAnnotation.type;
+
+  switch (type) {
+    case 'TSTypeLiteral':
+    case 'TSInterfaceDeclaration': {
+      const rawProperties =
+        type === 'TSInterfaceDeclaration'
+          ? [typeAnnotation]
+          : typeAnnotation.members;
+      const flattenedProperties = flattenProperties(rawProperties, types);
+      const properties = flattenedProperties
+        .map(prop => buildSchema(prop, types))
+        .filter(Boolean);
+
+      return {
+        type: 'ObjectTypeAnnotation',
+        properties,
+      };
+    }
+    case 'ImageSource':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'ImageSourcePrimitive',
+      };
+    case 'ImageRequest':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'ImageRequestPrimitive',
+      };
+    case 'ColorValue':
+    case 'ProcessedColorValue':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'ColorPrimitive',
+      };
+    case 'ColorArrayValue':
+      return {
+        type: 'ArrayTypeAnnotation',
+        elementType: {
+          type: 'ReservedPropTypeAnnotation',
+          name: 'ColorPrimitive',
+        },
+      };
+    case 'PointValue':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'PointPrimitive',
+      };
+    case 'EdgeInsetsValue':
+      return {
+        type: 'ReservedPropTypeAnnotation',
+        name: 'EdgeInsetsPrimitive',
+      };
+    case 'Int32':
+      return {
+        type: 'Int32TypeAnnotation',
+        default: ((defaultValue ? defaultValue : 0): number),
+      };
+    case 'Double':
+      return {
+        type: 'DoubleTypeAnnotation',
+        default: ((defaultValue ? defaultValue : 0): number),
+      };
+    case 'Float':
+      return {
+        type: 'FloatTypeAnnotation',
+        default: ((defaultValue === null
+          ? null
+          : defaultValue
+          ? defaultValue
+          : 0): number | null),
+      };
+    case 'TSBooleanKeyword':
+      return {
+        type: 'BooleanTypeAnnotation',
+        default: defaultValue === null ? null : !!defaultValue,
+      };
+    case 'TSStringKeyword':
+      return {
+        type: 'StringTypeAnnotation',
+        default: ((defaultValue === undefined ? null : defaultValue):
+          | string
+          | null),
+      };
+    case 'Stringish':
+      return {
+        type: 'StringTypeAnnotation',
+        default: ((defaultValue === undefined ? null : defaultValue):
+          | string
+          | null),
+      };
+    case 'TSNumberKeyword':
+      throw new Error(
+        `Cannot use "${type}" type annotation for "${name}": must use a specific numeric type like Int32, Double, or Float`,
+      );
+    case 'TSUnionType':
+      return getUnionOfLiterals(
+        name,
+        false,
+        typeAnnotation.types,
+        defaultValue,
+        types,
+      );
+    default:
+      (type: empty);
+      throw new Error(`Unknown prop type for "${name}": "${type}"`);
+  }
+}
+
+type SchemaInfo = {
+  name: string,
+  optional: boolean,
+  typeAnnotation: $FlowFixMe,
+  defaultValue: $FlowFixMe,
+};
+
+function getSchemaInfo(
+  property: PropAST,
+  types: TypeDeclarationMap,
+): SchemaInfo {
+  // unpack WithDefault, (T) or T|U
+  const topLevelType = parseTopLevelType(
+    property.typeAnnotation.typeAnnotation,
+    types,
+  );
+
+  const name = property.key.name;
+
+  if (!property.optional && topLevelType.defaultValue !== undefined) {
+    throw new Error(
+      `key ${name} must be optional if used with WithDefault<> annotation`,
+    );
+  }
+
+  return {
+    name,
+    optional: property.optional || topLevelType.optional,
+    typeAnnotation: topLevelType.type,
+    defaultValue: topLevelType.defaultValue,
+  };
+}
+
+// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
+type PropAST = Object;
+
+function verifyPropNotAlreadyDefined(
+  props: $ReadOnlyArray<PropAST>,
+  needleProp: PropAST,
+) {
+  const propName = needleProp.key.name;
+  const foundProp = props.some(prop => prop.key.name === propName);
+  if (foundProp) {
+    throw new Error(`A prop was already defined with the name ${propName}`);
+  }
+}
+
+function flattenProperties(
+  typeDefinition: $ReadOnlyArray<PropAST>,
+  types: TypeDeclarationMap,
+): $ReadOnlyArray<PropAST> {
+  return typeDefinition
+    .map(property => {
+      if (property.type === 'TSPropertySignature') {
+        return property;
+      } else if (property.type === 'TSTypeReference') {
+        return flattenProperties(
+          getProperties(property.typeName.name, types),
+          types,
+        );
+      } else if (
+        property.type === 'TSExpressionWithTypeArguments' ||
+        property.type === 'TSInterfaceHeritage'
+      ) {
+        return flattenProperties(
+          getProperties(property.expression.name, types),
+          types,
+        );
+      } else if (property.type === 'TSTypeLiteral') {
+        return flattenProperties(property.members, types);
+      } else if (property.type === 'TSInterfaceDeclaration') {
+        return flattenProperties(getProperties(property.id.name, types), types);
+      } else {
+        throw new Error(
+          `${property.type} is not a supported object literal type.`,
+        );
+      }
+    })
+    .filter(Boolean)
+    .reduce((acc, item) => {
+      if (Array.isArray(item)) {
+        item.forEach(prop => {
+          verifyPropNotAlreadyDefined(acc, prop);
+        });
+        return acc.concat(item);
+      } else {
+        verifyPropNotAlreadyDefined(acc, item);
+        acc.push(item);
+        return acc;
+      }
+    }, [])
+    .filter(Boolean);
+}
+
+module.exports = {
+  getProperties,
+  getSchemaInfo,
+  getTypeAnnotation,
+  flattenProperties,
+};
diff --git a/packages/react-native-codegen/src/parsers/typescript/components/events.js b/packages/react-native-codegen/src/parsers/typescript/components/events.js
index 6f05b5059e97..0fbfb4b71f44 100644
--- a/packages/react-native-codegen/src/parsers/typescript/components/events.js
+++ b/packages/react-native-codegen/src/parsers/typescript/components/events.js
@@ -15,16 +15,22 @@ import type {
   NamedShape,
   EventTypeAnnotation,
 } from '../../../CodegenSchema.js';
+import type {TypeDeclarationMap} from '../../utils';
+const {flattenProperties} = require('./componentsUtils');
+const {parseTopLevelType} = require('../parseTopLevelType');
 
 function getPropertyType(
   /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
    * LTI update could not be added via codemod */
   name,
-  optional: boolean,
+  optionalProperty: boolean,
   /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
    * LTI update could not be added via codemod */
-  typeAnnotation,
+  annotation,
 ): NamedShape<EventTypeAnnotation> {
+  const topLevelType = parseTopLevelType(annotation);
+  const typeAnnotation = topLevelType.type;
+  const optional = optionalProperty || topLevelType.optional;
   const type =
     typeAnnotation.type === 'TSTypeReference'
       ? typeAnnotation.typeName.name
@@ -71,13 +77,6 @@ function getPropertyType(
           type: 'FloatTypeAnnotation',
         },
       };
-    case 'Readonly':
-      return getPropertyType(
-        name,
-        optional,
-        typeAnnotation.typeParameters.params[0],
-      );
-
     case 'TSTypeLiteral':
       return {
         name,
@@ -89,24 +88,6 @@ function getPropertyType(
       };
 
     case 'TSUnionType':
-      // Check for <T | null | void>
-      if (
-        typeAnnotation.types.some(
-          t => t.type === 'TSNullKeyword' || t.type === 'TSVoidKeyword',
-        )
-      ) {
-        const optionalType = typeAnnotation.types.filter(
-          t => t.type !== 'TSNullKeyword' && t.type !== 'TSVoidKeyword',
-        )[0];
-
-        // Check for <(T | T2) | null | void>
-        if (optionalType.type === 'TSParenthesizedType') {
-          return getPropertyType(name, true, optionalType.typeAnnotation);
-        }
-
-        return getPropertyType(name, true, optionalType);
-      }
-
       return {
         name,
         optional,
@@ -123,20 +104,37 @@ function getPropertyType(
 
 function findEventArgumentsAndType(
   typeAnnotation: $FlowFixMe,
-  types: TypeMap,
+  types: TypeDeclarationMap,
   bubblingType: void | 'direct' | 'bubble',
   paperName: ?$FlowFixMe,
 ) {
+  if (typeAnnotation.type === 'TSInterfaceDeclaration') {
+    return {
+      argumentProps: flattenProperties([typeAnnotation], types),
+      paperTopLevelNameDeprecated: paperName,
+      bubblingType,
+    };
+  }
+
+  if (typeAnnotation.type === 'TSTypeLiteral') {
+    return {
+      argumentProps: typeAnnotation.members,
+      paperTopLevelNameDeprecated: paperName,
+      bubblingType,
+    };
+  }
+
   if (!typeAnnotation.typeName) {
     throw new Error("typeAnnotation of event doesn't have a name");
   }
   const name = typeAnnotation.typeName.name;
   if (name === 'Readonly') {
-    return {
-      argumentProps: typeAnnotation.typeParameters.params[0].members,
-      paperTopLevelNameDeprecated: paperName,
+    return findEventArgumentsAndType(
+      typeAnnotation.typeParameters.params[0],
+      types,
       bubblingType,
-    };
+      paperName,
+    );
   } else if (name === 'BubblingEventHandler' || name === 'DirectEventHandler') {
     const eventType = name === 'BubblingEventHandler' ? 'bubble' : 'direct';
     const paperTopLevelNameDeprecated =
@@ -144,22 +142,29 @@ function findEventArgumentsAndType(
         ? typeAnnotation.typeParameters.params[1].literal.value
         : null;
 
-    if (typeAnnotation.typeParameters.params[0].type === 'TSNullKeyword') {
-      return {
-        argumentProps: [],
-        bubblingType: eventType,
-        paperTopLevelNameDeprecated,
-      };
+    switch (typeAnnotation.typeParameters.params[0].type) {
+      case 'TSNullKeyword':
+      case 'TSUndefinedKeyword':
+        return {
+          argumentProps: [],
+          bubblingType: eventType,
+          paperTopLevelNameDeprecated,
+        };
+      default:
+        return findEventArgumentsAndType(
+          typeAnnotation.typeParameters.params[0],
+          types,
+          eventType,
+          paperTopLevelNameDeprecated,
+        );
     }
-    return findEventArgumentsAndType(
-      typeAnnotation.typeParameters.params[0],
-      types,
-      eventType,
-      paperTopLevelNameDeprecated,
-    );
   } else if (types[name]) {
+    let elementType = types[name];
+    if (elementType.type === 'TSTypeAliasDeclaration') {
+      elementType = elementType.typeAnnotation;
+    }
     return findEventArgumentsAndType(
-      types[name].typeAnnotation,
+      elementType,
       types,
       bubblingType,
       paperName,
@@ -192,40 +197,30 @@ function getEventArgument(argumentProps, name: $FlowFixMe) {
   };
 }
 
+// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
+type EventTypeAST = Object;
+
 function buildEventSchema(
-  types: TypeMap,
+  types: TypeDeclarationMap,
   property: EventTypeAST,
-): ?EventTypeShape {
-  const name = property.key.name;
-
-  let optional = property.optional || false;
-  let typeAnnotation = property.typeAnnotation.typeAnnotation;
-
-  // Check for T | null | void
-  if (
-    typeAnnotation.type === 'TSUnionType' &&
-    typeAnnotation.types.some(
-      t => t.type === 'TSNullKeyword' || t.type === 'TSVoidKeyword',
-    )
-  ) {
-    typeAnnotation = typeAnnotation.types.filter(
-      t => t.type !== 'TSNullKeyword' && t.type !== 'TSVoidKeyword',
-    )[0];
-    optional = true;
-  }
-
-  if (
-    typeAnnotation.type !== 'TSTypeReference' ||
-    (typeAnnotation.typeName.name !== 'BubblingEventHandler' &&
-      typeAnnotation.typeName.name !== 'DirectEventHandler')
-  ) {
-    return null;
-  }
+): EventTypeShape {
+  // unpack WithDefault, (T) or T|U
+  const topLevelType = parseTopLevelType(
+    property.typeAnnotation.typeAnnotation,
+    types,
+  );
 
+  const name = property.key.name;
+  const typeAnnotation = topLevelType.type;
+  const optional = property.optional || topLevelType.optional;
   const {argumentProps, bubblingType, paperTopLevelNameDeprecated} =
     findEventArgumentsAndType(typeAnnotation, types);
 
-  if (bubblingType && argumentProps) {
+  if (!argumentProps) {
+    throw new Error(`Unable to determine event arguments for "${name}"`);
+  } else if (!bubblingType) {
+    throw new Error(`Unable to determine event bubbling type for "${name}"`);
+  } else {
     if (paperTopLevelNameDeprecated != null) {
       return {
         name,
@@ -249,33 +244,13 @@ function buildEventSchema(
       },
     };
   }
-
-  if (argumentProps === null) {
-    throw new Error(`Unable to determine event arguments for "${name}"`);
-  }
-
-  if (bubblingType === null) {
-    throw new Error(`Unable to determine event arguments for "${name}"`);
-  }
 }
 
-// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
-type EventTypeAST = Object;
-
-type TypeMap = {
-  // $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
-  [string]: Object,
-  ...
-};
-
 function getEvents(
   eventTypeAST: $ReadOnlyArray<EventTypeAST>,
-  types: TypeMap,
+  types: TypeDeclarationMap,
 ): $ReadOnlyArray<EventTypeShape> {
-  return eventTypeAST
-    .filter(property => property.type === 'TSPropertySignature')
-    .map(property => buildEventSchema(types, property))
-    .filter(Boolean);
+  return eventTypeAST.map(property => buildEventSchema(types, property));
 }
 
 module.exports = {
diff --git a/packages/react-native-codegen/src/parsers/typescript/components/extends.js b/packages/react-native-codegen/src/parsers/typescript/components/extends.js
index 2b16a91a5d14..e9fda8c46ee7 100644
--- a/packages/react-native-codegen/src/parsers/typescript/components/extends.js
+++ b/packages/react-native-codegen/src/parsers/typescript/components/extends.js
@@ -11,7 +11,9 @@
 'use strict';
 
 import type {ExtendsPropsShape} from '../../../CodegenSchema.js';
-import type {TypeDeclarationMap} from '../utils.js';
+import type {TypeDeclarationMap} from '../../utils';
+const {parseTopLevelType} = require('../parseTopLevelType');
+const {flattenProperties} = require('./componentsUtils.js');
 
 function extendsForProp(prop: PropsAST, types: TypeDeclarationMap) {
   if (!prop.expression) {
@@ -36,31 +38,66 @@ function extendsForProp(prop: PropsAST, types: TypeDeclarationMap) {
   }
 }
 
-function removeKnownExtends(
-  typeDefinition: $ReadOnlyArray<PropsAST>,
-  types: TypeDeclarationMap,
-): $ReadOnlyArray<PropsAST> {
-  return typeDefinition.filter(
-    prop =>
-      prop.type !== 'TSExpressionWithTypeArguments' ||
-      extendsForProp(prop, types) === null,
-  );
+function isEvent(typeAnnotation: $FlowFixMe): boolean {
+  if (typeAnnotation.type !== 'TSTypeReference') {
+    return false;
+  }
+  const eventNames = new Set(['BubblingEventHandler', 'DirectEventHandler']);
+  return eventNames.has(typeAnnotation.typeName.name);
+}
+
+function isProp(name: string, typeAnnotation: $FlowFixMe): boolean {
+  if (typeAnnotation.type !== 'TSTypeReference') {
+    return true;
+  }
+  const isStyle =
+    name === 'style' &&
+    typeAnnotation.type === 'GenericTypeAnnotation' &&
+    typeAnnotation.typeName.name === 'ViewStyleProp';
+  return !isStyle;
 }
 
 // $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
 type PropsAST = Object;
 
-function getExtendsProps(
+function categorizeProps(
   typeDefinition: $ReadOnlyArray<PropsAST>,
   types: TypeDeclarationMap,
-): $ReadOnlyArray<ExtendsPropsShape> {
-  return typeDefinition
-    .filter(prop => prop.type === 'TSExpressionWithTypeArguments')
-    .map(prop => extendsForProp(prop, types))
-    .filter(Boolean);
+  extendsProps: Array<ExtendsPropsShape>,
+  props: Array<PropsAST>,
+  events: Array<PropsAST>,
+): void {
+  const remaining: Array<PropsAST> = [];
+  for (const prop of typeDefinition) {
+    // find extends
+    if (prop.type === 'TSExpressionWithTypeArguments') {
+      const extend = extendsForProp(prop, types);
+      if (extend) {
+        extendsProps.push(extend);
+        continue;
+      }
+    }
+
+    remaining.push(prop);
+  }
+
+  // find events and props
+  for (const prop of flattenProperties(remaining, types)) {
+    if (prop.type === 'TSPropertySignature') {
+      const topLevelType = parseTopLevelType(
+        prop.typeAnnotation.typeAnnotation,
+        types,
+      );
+
+      if (isEvent(topLevelType.type)) {
+        events.push(prop);
+      } else if (isProp(prop.key.name, prop)) {
+        props.push(prop);
+      }
+    }
+  }
 }
 
 module.exports = {
-  getExtendsProps,
-  removeKnownExtends,
+  categorizeProps,
 };
diff --git a/packages/react-native-codegen/src/parsers/typescript/components/index.js b/packages/react-native-codegen/src/parsers/typescript/components/index.js
index 77258ed4b9c2..46cbba5dd505 100644
--- a/packages/react-native-codegen/src/parsers/typescript/components/index.js
+++ b/packages/react-native-codegen/src/parsers/typescript/components/index.js
@@ -9,16 +9,18 @@
  */
 
 'use strict';
-import type {TypeDeclarationMap} from '../utils';
+import type {ExtendsPropsShape} from '../../../CodegenSchema.js';
+import type {TypeDeclarationMap} from '../../utils';
 import type {CommandOptions} from './options';
 import type {ComponentSchemaBuilderConfig} from './schema.js';
 
 const {getTypes} = require('../utils');
 const {getCommands} = require('./commands');
 const {getEvents} = require('./events');
-const {getExtendsProps, removeKnownExtends} = require('./extends');
+const {categorizeProps} = require('./extends');
 const {getCommandOptions, getOptions} = require('./options');
-const {getPropProperties, getProps} = require('./props');
+const {getProps} = require('./props');
+const {getProperties} = require('./componentsUtils.js');
 
 /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
  * LTI update could not be added via codemod */
@@ -179,6 +181,9 @@ function getCommandProperties(
   return properties;
 }
 
+// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
+type PropsAST = Object;
+
 // $FlowFixMe[signature-verification-failure] TODO(T108222691): Use flow-types for @babel/parser
 /* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
  * LTI update could not be added via codemod */
@@ -193,7 +198,7 @@ function buildComponentSchema(ast): ComponentSchemaBuilderConfig {
 
   const types = getTypes(ast);
 
-  const propProperties = getPropProperties(propsTypeName, types);
+  const propProperties = getProperties(propsTypeName, types);
   const commandOptions = getCommandOptions(commandOptionsExpression);
 
   const commandProperties = getCommandProperties(
@@ -202,12 +207,20 @@ function buildComponentSchema(ast): ComponentSchemaBuilderConfig {
     commandOptions,
   );
 
-  const extendsProps = getExtendsProps(propProperties, types);
   const options = getOptions(optionsExpression);
 
-  const nonExtendsProps = removeKnownExtends(propProperties, types);
-  const props = getProps(nonExtendsProps, types);
-  const events = getEvents(propProperties, types);
+  const extendsProps: Array<ExtendsPropsShape> = [];
+  const componentPropAsts: Array<PropsAST> = [];
+  const componentEventAsts: Array<PropsAST> = [];
+  categorizeProps(
+    propProperties,
+    types,
+    extendsProps,
+    componentPropAsts,
+    componentEventAsts,
+  );
+  const props = getProps(componentPropAsts, types);
+  const events = getEvents(componentEventAsts, types);
   const commands = getCommands(commandProperties, types);
 
   return {
diff --git a/packages/react-native-codegen/src/parsers/typescript/components/props.js b/packages/react-native-codegen/src/parsers/typescript/components/props.js
index 1d58f0d2445a..a2b1bcfad482 100644
--- a/packages/react-native-codegen/src/parsers/typescript/components/props.js
+++ b/packages/react-native-codegen/src/parsers/typescript/components/props.js
@@ -9,551 +9,20 @@
  */
 
 'use strict';
-import type {ASTNode} from '../utils';
-
-const {getValueFromTypes} = require('../utils.js');
+const {getSchemaInfo, getTypeAnnotation} = require('./componentsUtils.js');
 
 import type {NamedShape, PropTypeAnnotation} from '../../../CodegenSchema.js';
-import type {TypeDeclarationMap} from '../utils.js';
-
-function getPropProperties(
-  propsTypeName: string,
-  types: TypeDeclarationMap,
-): $FlowFixMe {
-  const alias = types[propsTypeName];
-  const aliasKind =
-    alias.type === 'TSInterfaceDeclaration' ? 'interface' : 'type';
-
-  try {
-    if (aliasKind === 'interface') {
-      return [...(alias.extends ?? []), ...alias.body.body];
-    }
-
-    return (
-      alias.typeAnnotation.members ||
-      alias.typeAnnotation.typeParameters.params[0].members ||
-      alias.typeAnnotation.typeParameters.params
-    );
-  } catch (e) {
-    throw new Error(
-      `Failed to find ${aliasKind} definition for "${propsTypeName}", please check that you have a valid codegen typescript file`,
-    );
-  }
-}
-
-function getTypeAnnotationForArray(
-  name: string,
-  typeAnnotation: $FlowFixMe,
-  defaultValue: $FlowFixMe | null,
-  types: TypeDeclarationMap,
-) {
-  const extractedTypeAnnotation = getValueFromTypes(typeAnnotation, types);
-
-  if (
-    extractedTypeAnnotation.type === 'TSUnionType' &&
-    extractedTypeAnnotation.types.some(
-      t => t.type === 'TSNullKeyword' || t.type === 'TSVoidKeyword',
-    )
-  ) {
-    throw new Error(
-      'Nested optionals such as "ReadonlyArray<boolean | null | void>" are not supported, please declare optionals at the top level of value definitions as in "ReadonlyArray<boolean> | null | void"',
-    );
-  }
-
-  if (
-    extractedTypeAnnotation.type === 'TSTypeReference' &&
-    extractedTypeAnnotation.typeName.name === 'WithDefault'
-  ) {
-    throw new Error(
-      'Nested defaults such as "ReadonlyArray<WithDefault<boolean, false>>" are not supported, please declare defaults at the top level of value definitions as in "WithDefault<ReadonlyArray<boolean>, false>"',
-    );
-  }
-
-  if (extractedTypeAnnotation.type === 'TSTypeReference') {
-    // Resolve the type alias if it's not defined inline
-    const objectType = getValueFromTypes(extractedTypeAnnotation, types);
-
-    if (objectType.typeName.name === 'Readonly') {
-      return {
-        type: 'ObjectTypeAnnotation',
-        properties: flattenProperties(
-          objectType.typeParameters.params[0].members ||
-            objectType.typeParameters.params,
-          types,
-        )
-          .map(prop => buildPropSchema(prop, types))
-          .filter(Boolean),
-      };
-    }
-
-    if (objectType.typeName.name === 'ReadonlyArray') {
-      // We need to go yet another level deeper to resolve
-      // types that may be defined in a type alias
-      const nestedObjectType = getValueFromTypes(
-        objectType.typeParameters.params[0],
-        types,
-      );
-
-      return {
-        type: 'ArrayTypeAnnotation',
-        elementType: {
-          type: 'ObjectTypeAnnotation',
-          properties: flattenProperties(
-            nestedObjectType.typeParameters.params[0].members ||
-              nestedObjectType.typeParameters.params,
-            types,
-          )
-            .map(prop => buildPropSchema(prop, types))
-            .filter(Boolean),
-        },
-      };
-    }
-  }
-
-  const type =
-    extractedTypeAnnotation.elementType === 'TSTypeReference'
-      ? extractedTypeAnnotation.elementType.typeName.name
-      : extractedTypeAnnotation.elementType?.type ||
-        extractedTypeAnnotation.typeName?.name ||
-        extractedTypeAnnotation.type;
-
-  switch (type) {
-    case 'TSNumberKeyword':
-      return {
-        type: 'FloatTypeAnnotation',
-      };
-    case 'ImageSource':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'ImageSourcePrimitive',
-      };
-    case 'ColorValue':
-    case 'ProcessedColorValue':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'ColorPrimitive',
-      };
-    case 'PointValue':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'PointPrimitive',
-      };
-    case 'EdgeInsetsValue':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'EdgeInsetsPrimitive',
-      };
-    case 'Stringish':
-      return {
-        type: 'StringTypeAnnotation',
-      };
-    case 'Int32':
-      return {
-        type: 'Int32TypeAnnotation',
-      };
-    case 'Double':
-      return {
-        type: 'DoubleTypeAnnotation',
-      };
-    case 'Float':
-      return {
-        type: 'FloatTypeAnnotation',
-      };
-    case 'TSBooleanKeyword':
-      return {
-        type: 'BooleanTypeAnnotation',
-      };
-    case 'TSStringKeyword':
-      return {
-        type: 'StringTypeAnnotation',
-      };
-    case 'TSUnionType':
-      typeAnnotation.types.reduce((lastType, currType) => {
-        const lastFlattenedType =
-          lastType && lastType.type === 'TSLiteralType'
-            ? lastType.literal.type
-            : lastType.type;
-        const currFlattenedType =
-          currType.type === 'TSLiteralType'
-            ? currType.literal.type
-            : currType.type;
-
-        if (lastFlattenedType && currFlattenedType !== lastFlattenedType) {
-          throw new Error(`Mixed types are not supported (see "${name}")`);
-        }
-        return currType;
-      });
-
-      if (defaultValue === null) {
-        throw new Error(`A default enum value is required for "${name}"`);
-      }
-
-      const unionType = typeAnnotation.types[0].type;
-      if (
-        unionType === 'TSLiteralType' &&
-        typeAnnotation.types[0].literal?.type === 'StringLiteral'
-      ) {
-        return {
-          type: 'StringEnumTypeAnnotation',
-          default: (defaultValue: string),
-          options: typeAnnotation.types.map(option => option.literal.value),
-        };
-      } else if (
-        unionType === 'TSLiteralType' &&
-        typeAnnotation.types[0].literal?.type === 'NumericLiteral'
-      ) {
-        throw new Error(
-          `Arrays of int enums are not supported (see: "${name}")`,
-        );
-      } else {
-        throw new Error(
-          `Unsupported union type for "${name}", received "${
-            unionType === 'TSLiteralType'
-              ? typeAnnotation.types[0].literal?.type
-              : unionType
-          }"`,
-        );
-      }
-    default:
-      (type: empty);
-      throw new Error(`Unknown prop type for "${name}": ${type}`);
-  }
-}
-
-function getTypeAnnotation(
-  name: string,
-  annotation: $FlowFixMe | ASTNode,
-  defaultValue: $FlowFixMe | null,
-  withNullDefault: boolean,
-  types: TypeDeclarationMap,
-) {
-  const typeAnnotation = getValueFromTypes(annotation, types);
-
-  // Covers: readonly T[]
-  if (
-    typeAnnotation.type === 'TSTypeOperator' &&
-    typeAnnotation.operator === 'readonly' &&
-    typeAnnotation.typeAnnotation.type === 'TSArrayType'
-  ) {
-    return {
-      type: 'ArrayTypeAnnotation',
-      elementType: getTypeAnnotationForArray(
-        name,
-        typeAnnotation.typeAnnotation,
-        defaultValue,
-        types,
-      ),
-    };
-  }
-
-  // Covers: ReadonlyArray<T>
-  if (
-    typeAnnotation.type === 'TSTypeReference' &&
-    typeAnnotation.typeName.name === 'ReadonlyArray'
-  ) {
-    return {
-      type: 'ArrayTypeAnnotation',
-      elementType: getTypeAnnotationForArray(
-        name,
-        typeAnnotation.typeParameters.params[0],
-        defaultValue,
-        types,
-      ),
-    };
-  }
-
-  // Covers: Readonly<T[]>
-  if (
-    typeAnnotation.type === 'TSTypeReference' &&
-    typeAnnotation.typeName?.name === 'Readonly' &&
-    typeAnnotation.typeParameters.type === 'TSTypeParameterInstantiation' &&
-    typeAnnotation.typeParameters.params[0].type === 'TSArrayType'
-  ) {
-    return {
-      type: 'ArrayTypeAnnotation',
-      elementType: getTypeAnnotationForArray(
-        name,
-        typeAnnotation.typeParameters.params[0],
-        defaultValue,
-        types,
-      ),
-    };
-  }
-
-  if (
-    (typeAnnotation.type === 'TSTypeReference' ||
-      typeAnnotation.type === 'TSTypeLiteral') &&
-    typeAnnotation.typeName?.name === 'Readonly'
-  ) {
-    const rawProperties =
-      typeAnnotation.typeParameters.params[0].members ||
-      (typeAnnotation.typeParameters.params[0].types &&
-        typeAnnotation.typeParameters.params[0].types[0].members) ||
-      typeAnnotation.typeParameters.params;
-
-    const flattenedProperties = flattenProperties(rawProperties, types);
-
-    const properties = flattenedProperties
-      .map(prop => buildPropSchema(prop, types))
-      .filter(Boolean);
-
-    return {
-      type: 'ObjectTypeAnnotation',
-      properties,
-    };
-  }
+import type {TypeDeclarationMap} from '../../utils';
 
-  const type =
-    typeAnnotation.type === 'TSTypeReference' ||
-    typeAnnotation.type === 'TSTypeAliasDeclaration'
-      ? typeAnnotation.typeName.name
-      : typeAnnotation.type;
-
-  switch (type) {
-    case 'ImageSource':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'ImageSourcePrimitive',
-      };
-    case 'ColorValue':
-    case 'ProcessedColorValue':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'ColorPrimitive',
-      };
-    case 'ColorArrayValue':
-      return {
-        type: 'ArrayTypeAnnotation',
-        elementType: {
-          type: 'ReservedPropTypeAnnotation',
-          name: 'ColorPrimitive',
-        },
-      };
-    case 'PointValue':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'PointPrimitive',
-      };
-    case 'EdgeInsetsValue':
-      return {
-        type: 'ReservedPropTypeAnnotation',
-        name: 'EdgeInsetsPrimitive',
-      };
-    case 'Int32':
-      return {
-        type: 'Int32TypeAnnotation',
-        default: ((defaultValue ? defaultValue : 0): number),
-      };
-    case 'Double':
-      return {
-        type: 'DoubleTypeAnnotation',
-        default: ((defaultValue ? defaultValue : 0): number),
-      };
-    case 'Float':
-      return {
-        type: 'FloatTypeAnnotation',
-        default: withNullDefault
-          ? (defaultValue: number | null)
-          : ((defaultValue ? defaultValue : 0): number),
-      };
-    case 'TSBooleanKeyword':
-      return {
-        type: 'BooleanTypeAnnotation',
-        default: withNullDefault
-          ? (defaultValue: boolean | null)
-          : ((defaultValue == null ? false : defaultValue): boolean),
-      };
-    case 'TSStringKeyword':
-      if (typeof defaultValue !== 'undefined') {
-        return {
-          type: 'StringTypeAnnotation',
-          default: (defaultValue: string | null),
-        };
-      }
-      throw new Error(`A default string (or null) is required for "${name}"`);
-    case 'Stringish':
-      if (typeof defaultValue !== 'undefined') {
-        return {
-          type: 'StringTypeAnnotation',
-          default: (defaultValue: string | null),
-        };
-      }
-      throw new Error(`A default string (or null) is required for "${name}"`);
-    case 'TSUnionType':
-      typeAnnotation.types.reduce((lastType, currType) => {
-        const lastFlattenedType =
-          lastType && lastType.type === 'TSLiteralType'
-            ? lastType.literal.type
-            : lastType.type;
-        const currFlattenedType =
-          currType.type === 'TSLiteralType'
-            ? currType.literal.type
-            : currType.type;
-
-        if (lastFlattenedType && currFlattenedType !== lastFlattenedType) {
-          throw new Error(`Mixed types are not supported (see "${name}")`);
-        }
-        return currType;
-      });
-
-      if (defaultValue === null) {
-        throw new Error(`A default enum value is required for "${name}"`);
-      }
-
-      const unionType = typeAnnotation.types[0].type;
-      if (
-        unionType === 'TSLiteralType' &&
-        typeAnnotation.types[0].literal?.type === 'StringLiteral'
-      ) {
-        return {
-          type: 'StringEnumTypeAnnotation',
-          default: (defaultValue: string),
-          options: typeAnnotation.types.map(option => option.literal.value),
-        };
-      } else if (
-        unionType === 'TSLiteralType' &&
-        typeAnnotation.types[0].literal?.type === 'NumericLiteral'
-      ) {
-        return {
-          type: 'Int32EnumTypeAnnotation',
-          default: (defaultValue: number),
-          options: typeAnnotation.types.map(option => option.literal.value),
-        };
-      } else {
-        throw new Error(
-          `Unsupported union type for "${name}", received "${
-            unionType === 'TSLiteralType'
-              ? typeAnnotation.types[0].literal?.type
-              : unionType
-          }"`,
-        );
-      }
-    case 'TSNumberKeyword':
-      throw new Error(
-        `Cannot use "${type}" type annotation for "${name}": must use a specific numeric type like Int32, Double, or Float`,
-      );
-    default:
-      (type: empty);
-      throw new Error(`Unknown prop type for "${name}": "${type}"`);
-  }
-}
+// $FlowFixMe[unclear-type] there's no flowtype for ASTs
+type PropAST = Object;
 
 function buildPropSchema(
   property: PropAST,
   types: TypeDeclarationMap,
-): ?NamedShape<PropTypeAnnotation> {
-  const name = property.key.name;
-
-  const value = getValueFromTypes(
-    property.typeAnnotation.typeAnnotation,
-    types,
-  );
-
-  let typeAnnotation = value;
-  let optional = property.optional || false;
-
-  // Check for optional type in union e.g. T | null | void
-  if (
-    typeAnnotation.type === 'TSUnionType' &&
-    typeAnnotation.types.some(
-      t => t.type === 'TSNullKeyword' || t.type === 'TSVoidKeyword',
-    )
-  ) {
-    typeAnnotation = typeAnnotation.types.filter(
-      t => t.type !== 'TSNullKeyword' && t.type !== 'TSVoidKeyword',
-    )[0];
-    optional = true;
-
-    // Check against optional type inside `WithDefault`
-    if (
-      typeAnnotation.type === 'TSTypeReference' &&
-      typeAnnotation.typeName.name === 'WithDefault'
-    ) {
-      throw new Error(
-        'WithDefault<> is optional and does not need to be marked as optional. Please remove the union of void and/or null',
-      );
-    }
-  }
-
-  // example: WithDefault<string, ''>;
-  if (
-    value.type === 'TSTypeReference' &&
-    typeAnnotation.typeName.name === 'WithDefault'
-  ) {
-    optional = true;
-  }
-
-  // example: Readonly<{prop: string} | null | void>;
-  if (
-    value.type === 'TSTypeReference' &&
-    typeAnnotation.typeParameters?.params[0].type === 'TSUnionType' &&
-    typeAnnotation.typeParameters?.params[0].types.some(
-      element =>
-        element.type === 'TSNullKeyword' || element.type === 'TSVoidKeyword',
-    )
-  ) {
-    optional = true;
-  }
-
-  if (
-    !property.optional &&
-    value.type === 'TSTypeReference' &&
-    typeAnnotation.typeName.name === 'WithDefault'
-  ) {
-    throw new Error(
-      `key ${name} must be optional if used with WithDefault<> annotation`,
-    );
-  }
-
-  let type = typeAnnotation.type;
-  if (
-    type === 'TSTypeReference' &&
-    (typeAnnotation.typeName.name === 'DirectEventHandler' ||
-      typeAnnotation.typeName.name === 'BubblingEventHandler')
-  ) {
-    return null;
-  }
-
-  if (
-    name === 'style' &&
-    type === 'GenericTypeAnnotation' &&
-    typeAnnotation.typeName.name === 'ViewStyleProp'
-  ) {
-    return null;
-  }
-
-  let defaultValue = null;
-  let withNullDefault = false;
-  if (
-    type === 'TSTypeReference' &&
-    typeAnnotation.typeName.name === 'WithDefault'
-  ) {
-    if (typeAnnotation.typeParameters.params.length === 1) {
-      throw new Error(
-        `WithDefault requires two parameters, did you forget to provide a default value for "${name}"?`,
-      );
-    }
-
-    let defaultValueType = typeAnnotation.typeParameters.params[1].type;
-    defaultValue = typeAnnotation.typeParameters.params[1].value;
-
-    if (defaultValueType === 'TSLiteralType') {
-      defaultValueType = typeAnnotation.typeParameters.params[1].literal.type;
-      defaultValue = typeAnnotation.typeParameters.params[1].literal.value;
-    }
-
-    if (defaultValueType === 'TSNullKeyword') {
-      defaultValue = null;
-      withNullDefault = true;
-    }
-
-    typeAnnotation = typeAnnotation.typeParameters.params[0];
-    type =
-      typeAnnotation.type === 'TSTypeReference'
-        ? typeAnnotation.typeName.name
-        : typeAnnotation.type;
-  }
-
+): NamedShape<PropTypeAnnotation> {
+  const info = getSchemaInfo(property, types);
+  const {name, optional, typeAnnotation, defaultValue} = info;
   return {
     name,
     optional,
@@ -561,73 +30,19 @@ function buildPropSchema(
       name,
       typeAnnotation,
       defaultValue,
-      withNullDefault,
       types,
+      buildPropSchema,
     ),
   };
 }
 
-// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
-type PropAST = Object;
-
-function verifyPropNotAlreadyDefined(
-  props: $ReadOnlyArray<PropAST>,
-  needleProp: PropAST,
-) {
-  const propName = needleProp.key.name;
-  const foundProp = props.some(prop => prop.key.name === propName);
-  if (foundProp) {
-    throw new Error(`A prop was already defined with the name ${propName}`);
-  }
-}
-
-function flattenProperties(
-  typeDefinition: $ReadOnlyArray<PropAST>,
-  types: TypeDeclarationMap,
-) {
-  return typeDefinition
-    .map(property => {
-      if (property.type === 'TSPropertySignature') {
-        return property;
-      } else if (property.type === 'TSTypeReference') {
-        return flattenProperties(
-          getPropProperties(property.typeName.name, types),
-          types,
-        );
-      } else if (property.type === 'TSExpressionWithTypeArguments') {
-        return flattenProperties(
-          getPropProperties(property.expression.name, types),
-          types,
-        );
-      }
-    })
-    .reduce((acc, item) => {
-      if (Array.isArray(item)) {
-        item.forEach(prop => {
-          verifyPropNotAlreadyDefined(acc, prop);
-        });
-        return acc.concat(item);
-      } else {
-        verifyPropNotAlreadyDefined(acc, item);
-        acc.push(item);
-        return acc;
-      }
-    }, [])
-    .filter(Boolean);
-}
-
 function getProps(
   typeDefinition: $ReadOnlyArray<PropAST>,
   types: TypeDeclarationMap,
 ): $ReadOnlyArray<NamedShape<PropTypeAnnotation>> {
-  return flattenProperties(typeDefinition, types)
-    .map(property => {
-      return buildPropSchema(property, types);
-    })
-    .filter(Boolean);
+  return typeDefinition.map(property => buildPropSchema(property, types));
 }
 
 module.exports = {
   getProps,
-  getPropProperties,
 };
diff --git a/packages/react-native-codegen/src/parsers/typescript/components/schema.js b/packages/react-native-codegen/src/parsers/typescript/components/schema.js
index ed6223c3347b..ab165031cd25 100644
--- a/packages/react-native-codegen/src/parsers/typescript/components/schema.js
+++ b/packages/react-native-codegen/src/parsers/typescript/components/schema.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow strict-local
+ * @flow strict
  */
 
 'use strict';
diff --git a/packages/react-native-codegen/src/parsers/typescript/errors.js b/packages/react-native-codegen/src/parsers/typescript/errors.js
deleted file mode 100644
index 41fc7f8ca4ee..000000000000
--- a/packages/react-native-codegen/src/parsers/typescript/errors.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-'use strict';
-
-class ParserError extends Error {
-  nodes: $ReadOnlyArray<$FlowFixMe>;
-  constructor(
-    hasteModuleName: string,
-    astNodeOrNodes: $FlowFixMe,
-    message: string,
-  ) {
-    super(`Module ${hasteModuleName}: ${message}`);
-
-    this.nodes = Array.isArray(astNodeOrNodes)
-      ? astNodeOrNodes
-      : [astNodeOrNodes];
-
-    // assign the error class name in your custom error (as a shortcut)
-    this.name = this.constructor.name;
-
-    // capturing the stack trace keeps the reference to your error class
-    Error.captureStackTrace(this, this.constructor);
-  }
-}
-
-module.exports = {
-  ParserError,
-};
diff --git a/packages/react-native-codegen/src/parsers/typescript/index.js b/packages/react-native-codegen/src/parsers/typescript/index.js
index 92f41635cc76..426e4c8eef95 100644
--- a/packages/react-native-codegen/src/parsers/typescript/index.js
+++ b/packages/react-native-codegen/src/parsers/typescript/index.js
@@ -11,67 +11,44 @@
 'use strict';
 
 import type {SchemaType} from '../../CodegenSchema.js';
+
 const babelParser = require('@babel/parser');
 const fs = require('fs');
-const path = require('path');
+const {
+  buildSchemaFromConfigType,
+  getConfigType,
+  isModuleRegistryCall,
+} = require('../utils');
 const {buildComponentSchema} = require('./components');
 const {wrapComponentSchema} = require('./components/schema');
 const {buildModuleSchema} = require('./modules');
-const {wrapModuleSchema} = require('./modules/schema');
-
-const {
-  createParserErrorCapturer,
-  visit,
-  isModuleRegistryCall,
-} = require('./utils');
-const invariant = require('invariant');
-
-function getConfigType(
-  // TODO(T108222691): Use flow-types for @babel/parser
-  ast: $FlowFixMe,
-): 'module' | 'component' | 'none' {
-  let isComponent = false;
-  let isModule = false;
 
-  visit(ast, {
-    CallExpression(node) {
+function Visitor(infoMap: {isComponent: boolean, isModule: boolean}) {
+  return {
+    CallExpression(node: $FlowFixMe) {
       if (
         node.callee.type === 'Identifier' &&
         node.callee.name === 'codegenNativeComponent'
       ) {
-        isComponent = true;
+        infoMap.isComponent = true;
       }
 
       if (isModuleRegistryCall(node)) {
-        isModule = true;
+        infoMap.isModule = true;
       }
     },
 
-    TSInterfaceDeclaration(node) {
+    TSInterfaceDeclaration(node: $FlowFixMe) {
       if (
         Array.isArray(node.extends) &&
         node.extends.some(
           extension => extension.expression.name === 'TurboModule',
         )
       ) {
-        isModule = true;
+        infoMap.isModule = true;
       }
     },
-  });
-
-  if (isModule && isComponent) {
-    throw new Error(
-      'Found type extending "TurboModule" and exported "codegenNativeComponent" declaration in one file. Split them into separated files.',
-    );
-  }
-
-  if (isModule) {
-    return 'module';
-  } else if (isComponent) {
-    return 'component';
-  } else {
-    return 'none';
-  }
+  };
 }
 
 function buildSchema(contents: string, filename: ?string): SchemaType {
@@ -88,52 +65,16 @@ function buildSchema(contents: string, filename: ?string): SchemaType {
     plugins: ['typescript'],
   }).program;
 
-  const configType = getConfigType(ast);
-
-  switch (configType) {
-    case 'component': {
-      return wrapComponentSchema(buildComponentSchema(ast));
-    }
-    case 'module': {
-      if (filename === undefined || filename === null) {
-        throw new Error('Filepath expected while parasing a module');
-      }
-      const hasteModuleName = path.basename(filename).replace(/\.tsx?$/, '');
+  const configType = getConfigType(ast, Visitor);
 
-      const [parsingErrors, tryParse] = createParserErrorCapturer();
-
-      const schema = tryParse(() =>
-        buildModuleSchema(hasteModuleName, ast, tryParse),
-      );
-
-      if (parsingErrors.length > 0) {
-        /**
-         * TODO(T77968131): We have two options:
-         *  - Throw the first error, but indicate there are more then one errors.
-         *  - Display all errors, nicely formatted.
-         *
-         * For the time being, we're just throw the first error.
-         **/
-
-        throw parsingErrors[0];
-      }
-
-      invariant(
-        schema != null,
-        'When there are no parsing errors, the schema should not be null',
-      );
-
-      return wrapModuleSchema(schema, hasteModuleName);
-    }
-    default:
-      return {modules: {}};
-  }
-}
-
-function parseFile(filename: string): SchemaType {
-  const contents = fs.readFileSync(filename, 'utf8');
-
-  return buildSchema(contents, filename);
+  return buildSchemaFromConfigType(
+    configType,
+    filename,
+    ast,
+    wrapComponentSchema,
+    buildComponentSchema,
+    buildModuleSchema,
+  );
 }
 
 function parseModuleFixture(filename: string): SchemaType {
@@ -147,7 +88,7 @@ function parseString(contents: string, filename: ?string): SchemaType {
 }
 
 module.exports = {
-  parseFile,
+  buildSchema,
   parseModuleFixture,
   parseString,
 };
diff --git a/packages/react-native-codegen/src/parsers/typescript/modules/__test_fixtures__/failures.js b/packages/react-native-codegen/src/parsers/typescript/modules/__test_fixtures__/failures.js
index 3015bd715751..f25e8b3d1034 100644
--- a/packages/react-native-codegen/src/parsers/typescript/modules/__test_fixtures__/failures.js
+++ b/packages/react-native-codegen/src/parsers/typescript/modules/__test_fixtures__/failures.js
@@ -148,11 +148,11 @@ import type {TurboModule} from '../RCTExport';
 import * as TurboModuleRegistry from '../TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
-  readonly getSth: (a: number | null | void) => void;
+  readonly getSth: (a: number | null | undefined) => void;
 }
 
 export interface Spec2 extends TurboModule {
-  readonly getSth: (a: number | null | void) => void;
+  readonly getSth: (a: number | null | undefined) => void;
 }
 `;
 
diff --git a/packages/react-native-codegen/src/parsers/typescript/modules/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/parsers/typescript/modules/__test_fixtures__/fixtures.js
index 4530bfe08969..83483075d5ba 100644
--- a/packages/react-native-codegen/src/parsers/typescript/modules/__test_fixtures__/fixtures.js
+++ b/packages/react-native-codegen/src/parsers/typescript/modules/__test_fixtures__/fixtures.js
@@ -84,7 +84,7 @@ export interface Spec extends TurboModule {
       major: number;
       minor: number;
       patch?: number;
-      prerelease: number | null | void;
+      prerelease: number | null | undefined;
     };
     forceTouchAvailable: boolean;
     osVersion: string;
@@ -295,7 +295,7 @@ import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
-  readonly voidFunc: (arg: string | null | void) => void;
+  readonly voidFunc: (arg: string | null | undefined) => void;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');
@@ -315,8 +315,8 @@ import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
-  readonly getArray: (arg: Array<string>) => Array<string>;
-  readonly getArray: (arg: ReadonlyArray<string>) => ReadonlyArray<string>;
+  readonly getArray: (arg: Array<string>) => (Array<(string)>);
+  readonly getArray: (arg: ReadonlyArray<string>) => (ReadonlyArray<(string)>);
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');
@@ -336,8 +336,8 @@ import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
-  readonly getArray: (arg: string[]) => string[];
-  readonly getArray: (arg: readonly string[]) => readonly string[];
+  readonly getArray: (arg: string[]) => ((string)[]);
+  readonly getArray: (arg: readonly string[]) => (readonly (string)[]);
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');
@@ -588,7 +588,30 @@ const IOS_ONLY_NATIVE_MODULE = `
 import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
-export interface Spec extends TurboModule {}
+export enum Quality {
+  SD,
+  HD,
+}
+
+export enum Resolution {
+  Low = 720,
+  High = 1080,
+}
+
+export enum Floppy {
+  LowDensity = 0.72,
+  HighDensity = 1.44,
+}
+
+export enum StringOptions {
+  One = 'one',
+  Two = 'two',
+  Three = 'three',
+}
+
+export interface Spec extends TurboModule {
+  readonly getEnums: (quality: Quality, resolution?: Resolution, floppy: Floppy, stringOptions: StringOptions) => string;
+}
 
 export default TurboModuleRegistry.getEnforcing<Spec>(
   'SampleTurboModuleIOS',
@@ -608,9 +631,39 @@ const CXX_ONLY_NATIVE_MODULE = `
 import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
+export enum Quality {
+  SD,
+  HD,
+}
+
+export enum Resolution {
+  Low = 720,
+  High = 1080,
+}
+
+export enum Floppy {
+  LowDensity = 0.72,
+  HighDensity = 1.44,
+}
+
+export enum StringOptions {
+  One = 'one',
+  Two = 'two',
+  Three = 'three',
+}
+
+export type ChooseInt = 1 | 2 | 3;
+export type ChooseFloat = 1.44 | 2.88 | 5.76;
+export type ChooseObject = {} | {low: string};
+export type ChooseString = 'One' | 'Two' | 'Three';
+
 export interface Spec extends TurboModule {
   readonly getCallback: () => () => void;
   readonly getMixed: (arg: unknown) => unknown;
+  readonly getEnums: (quality: Quality, resolution?: Resolution, floppy: Floppy, stringOptions: StringOptions) => string;
+  readonly getMap: (arg: {[a: string]: number | null;}) => {[b: string]: number | null;};
+  readonly getAnotherMap: (arg: {[key: string]: string}) => {[key: string]: string};
+  readonly getUnion: (chooseInt: ChooseInt, chooseFloat: ChooseFloat, chooseObject: ChooseObject, chooseString: ChooseString) => ChooseObject;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>(
diff --git a/packages/react-native-codegen/src/parsers/typescript/modules/__tests__/__snapshots__/typescript-module-parser-snapshot-test.js.snap b/packages/react-native-codegen/src/parsers/typescript/modules/__tests__/__snapshots__/typescript-module-parser-snapshot-test.js.snap
index 20420a833611..185a836a0667 100644
--- a/packages/react-native-codegen/src/parsers/typescript/modules/__tests__/__snapshots__/typescript-module-parser-snapshot-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/typescript/modules/__tests__/__snapshots__/typescript-module-parser-snapshot-test.js.snap
@@ -75,6 +75,169 @@ exports[`RN Codegen TypeScript Parser can generate fixture CXX_ONLY_NATIVE_MODUL
                 }
               ]
             }
+          },
+          {
+            'name': 'getEnums',
+            'optional': false,
+            'typeAnnotation': {
+              'type': 'FunctionTypeAnnotation',
+              'returnTypeAnnotation': {
+                'type': 'StringTypeAnnotation'
+              },
+              'params': [
+                {
+                  'name': 'quality',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'StringTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'resolution',
+                  'optional': true,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'NumberTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'floppy',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'NumberTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'stringOptions',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'StringTypeAnnotation'
+                  }
+                }
+              ]
+            }
+          },
+          {
+            'name': 'getMap',
+            'optional': false,
+            'typeAnnotation': {
+              'type': 'FunctionTypeAnnotation',
+              'returnTypeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
+                  {
+                    'name': 'b',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'GenericObjectTypeAnnotation'
+                    }
+                  }
+                ]
+              },
+              'params': [
+                {
+                  'name': 'arg',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'ObjectTypeAnnotation',
+                    'properties': [
+                      {
+                        'name': 'a',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'GenericObjectTypeAnnotation'
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
+          },
+          {
+            'name': 'getAnotherMap',
+            'optional': false,
+            'typeAnnotation': {
+              'type': 'FunctionTypeAnnotation',
+              'returnTypeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
+                  {
+                    'name': 'key',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'GenericObjectTypeAnnotation'
+                    }
+                  }
+                ]
+              },
+              'params': [
+                {
+                  'name': 'arg',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'ObjectTypeAnnotation',
+                    'properties': [
+                      {
+                        'name': 'key',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'GenericObjectTypeAnnotation'
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
+          },
+          {
+            'name': 'getUnion',
+            'optional': false,
+            'typeAnnotation': {
+              'type': 'FunctionTypeAnnotation',
+              'returnTypeAnnotation': {
+                'type': 'UnionTypeAnnotation',
+                'memberType': 'ObjectTypeAnnotation'
+              },
+              'params': [
+                {
+                  'name': 'chooseInt',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'UnionTypeAnnotation',
+                    'memberType': 'NumberTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'chooseFloat',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'UnionTypeAnnotation',
+                    'memberType': 'NumberTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'chooseObject',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'UnionTypeAnnotation',
+                    'memberType': 'ObjectTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'chooseString',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'UnionTypeAnnotation',
+                    'memberType': 'StringTypeAnnotation'
+                  }
+                }
+              ]
+            }
           }
         ]
       },
@@ -114,7 +277,52 @@ exports[`RN Codegen TypeScript Parser can generate fixture IOS_ONLY_NATIVE_MODUL
       'type': 'NativeModule',
       'aliases': {},
       'spec': {
-        'properties': []
+        'properties': [
+          {
+            'name': 'getEnums',
+            'optional': false,
+            'typeAnnotation': {
+              'type': 'FunctionTypeAnnotation',
+              'returnTypeAnnotation': {
+                'type': 'StringTypeAnnotation'
+              },
+              'params': [
+                {
+                  'name': 'quality',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'StringTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'resolution',
+                  'optional': true,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'NumberTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'floppy',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'NumberTypeAnnotation'
+                  }
+                },
+                {
+                  'name': 'stringOptions',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'EnumDeclaration',
+                    'memberType': 'StringTypeAnnotation'
+                  }
+                }
+              ]
+            }
+          }
+        ]
       },
       'moduleNames': [
         'SampleTurboModuleIOS'
@@ -369,7 +577,7 @@ exports[`RN Codegen TypeScript Parser can generate fixture NATIVE_MODULE_WITH_AR
 }"
 `;
 
-exports[`RN Codegen TypeScript Parser can generate fixture NATIVE_MODULE_WITH_ARRAY2_WITH_ALIAS 1`] = `
+exports[`RN Codegen TypeScript Parser can generate fixture NATIVE_MODULE_WITH_ARRAY_WITH_UNION_AND_TOUPLE 1`] = `
 "{
   'modules': {
     'NativeSampleTurboModule': {
@@ -383,20 +591,14 @@ exports[`RN Codegen TypeScript Parser can generate fixture NATIVE_MODULE_WITH_AR
             'typeAnnotation': {
               'type': 'FunctionTypeAnnotation',
               'returnTypeAnnotation': {
-                'type': 'ArrayTypeAnnotation',
-                'elementType': {
-                  'type': 'StringTypeAnnotation'
-                }
+                'type': 'ArrayTypeAnnotation'
               },
               'params': [
                 {
                   'name': 'arg',
                   'optional': false,
                   'typeAnnotation': {
-                    'type': 'ArrayTypeAnnotation',
-                    'elementType': {
-                      'type': 'StringTypeAnnotation'
-                    }
+                    'type': 'ArrayTypeAnnotation'
                   }
                 }
               ]
@@ -412,7 +614,7 @@ exports[`RN Codegen TypeScript Parser can generate fixture NATIVE_MODULE_WITH_AR
 }"
 `;
 
-exports[`RN Codegen TypeScript Parser can generate fixture NATIVE_MODULE_WITH_ARRAY_WITH_UNION_AND_TOUPLE 1`] = `
+exports[`RN Codegen TypeScript Parser can generate fixture NATIVE_MODULE_WITH_ARRAY2_WITH_ALIAS 1`] = `
 "{
   'modules': {
     'NativeSampleTurboModule': {
@@ -426,14 +628,20 @@ exports[`RN Codegen TypeScript Parser can generate fixture NATIVE_MODULE_WITH_AR
             'typeAnnotation': {
               'type': 'FunctionTypeAnnotation',
               'returnTypeAnnotation': {
-                'type': 'ArrayTypeAnnotation'
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'StringTypeAnnotation'
+                }
               },
               'params': [
                 {
                   'name': 'arg',
                   'optional': false,
                   'typeAnnotation': {
-                    'type': 'ArrayTypeAnnotation'
+                    'type': 'ArrayTypeAnnotation',
+                    'elementType': {
+                      'type': 'StringTypeAnnotation'
+                    }
                   }
                 }
               ]
diff --git a/packages/react-native-codegen/src/parsers/typescript/modules/__tests__/typescript-module-parser-e2e-test.js b/packages/react-native-codegen/src/parsers/typescript/modules/__tests__/typescript-module-parser-e2e-test.js
index 99b7702f5fd6..92858546206b 100644
--- a/packages/react-native-codegen/src/parsers/typescript/modules/__tests__/typescript-module-parser-e2e-test.js
+++ b/packages/react-native-codegen/src/parsers/typescript/modules/__tests__/typescript-module-parser-e2e-test.js
@@ -16,13 +16,13 @@ import type {
 } from '../../../../CodegenSchema';
 
 const {parseString} = require('../../index.js');
-const {unwrapNullable} = require('../utils');
+const {unwrapNullable} = require('../../../parsers-commons');
 const {
-  UnsupportedTypeScriptGenericParserError,
-  UnsupportedTypeScriptTypeAnnotationParserError,
+  UnsupportedGenericParserError,
+  UnsupportedTypeAnnotationParserError,
   UnnamedFunctionParamParserError,
-  IncorrectlyParameterizedTypeScriptGenericParserError,
-} = require('../errors');
+  MissingTypeParameterGenericParserError,
+} = require('../../../errors');
 const invariant = require('invariant');
 
 type PrimitiveTypeAnnotationType =
@@ -87,7 +87,7 @@ describe('TypeScript Module Parser', () => {
           export default TurboModuleRegistry.get<Spec>('Foo');
         `);
 
-      expect(parser).toThrow(UnsupportedTypeScriptTypeAnnotationParserError);
+      expect(parser).toThrow(UnsupportedTypeAnnotationParserError);
     });
 
     it('should fail parsing when a function param type is unamed', () => {
@@ -173,7 +173,7 @@ describe('TypeScript Module Parser', () => {
         () => {
           it(`should not parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Function'`, () => {
             expect(() => parseParamType('arg', 'Function')).toThrow(
-              UnsupportedTypeScriptGenericParserError,
+              UnsupportedGenericParserError,
             );
           });
 
@@ -212,7 +212,7 @@ describe('TypeScript Module Parser', () => {
           describe('Array Types', () => {
             it(`should not parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Array'`, () => {
               expect(() => parseParamType('arg', 'Array')).toThrow(
-                IncorrectlyParameterizedTypeScriptGenericParserError,
+                MissingTypeParameterGenericParserError,
               );
             });
 
@@ -510,9 +510,7 @@ describe('TypeScript Module Parser', () => {
                   it(`should not parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Array`, () => {
                     expect(() =>
                       parseParamTypeObjectLiteralProp('prop', 'Array'),
-                    ).toThrow(
-                      IncorrectlyParameterizedTypeScriptGenericParserError,
-                    );
+                    ).toThrow(MissingTypeParameterGenericParserError);
                   });
 
                   function parseArrayElementType(
@@ -782,7 +780,7 @@ describe('TypeScript Module Parser', () => {
           describe('Array Types', () => {
             it(`should not parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Array'`, () => {
               expect(() => parseReturnType('Array')).toThrow(
-                IncorrectlyParameterizedTypeScriptGenericParserError,
+                MissingTypeParameterGenericParserError,
               );
             });
 
@@ -885,7 +883,7 @@ describe('TypeScript Module Parser', () => {
 
           it(`should not parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Function'`, () => {
             expect(() => parseReturnType('Function')).toThrow(
-              UnsupportedTypeScriptGenericParserError,
+              UnsupportedGenericParserError,
             );
           });
 
@@ -1051,9 +1049,7 @@ describe('TypeScript Module Parser', () => {
                     it(`should not parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Array`, () => {
                       expect(() =>
                         parseObjectLiteralReturnTypeProp('prop', 'Array'),
-                      ).toThrow(
-                        IncorrectlyParameterizedTypeScriptGenericParserError,
-                      );
+                      ).toThrow(MissingTypeParameterGenericParserError);
                     });
 
                     function parseArrayElementType(
diff --git a/packages/react-native-codegen/src/parsers/typescript/modules/__tests__/typescript-module-parser-snapshot-test.js b/packages/react-native-codegen/src/parsers/typescript/modules/__tests__/typescript-module-parser-snapshot-test.js
index 371e6f7d9c6b..b831c0710631 100644
--- a/packages/react-native-codegen/src/parsers/typescript/modules/__tests__/typescript-module-parser-snapshot-test.js
+++ b/packages/react-native-codegen/src/parsers/typescript/modules/__tests__/typescript-module-parser-snapshot-test.js
@@ -4,9 +4,9 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @flow strict-local
  * @format
+ * @oncall react_native
  */
 
 'use strict';
@@ -14,8 +14,16 @@
 const TypeScriptParser = require('../../index.js');
 const fixtures = require('../__test_fixtures__/fixtures.js');
 const failureFixtures = require('../__test_fixtures__/failures.js');
+
 jest.mock('fs', () => ({
-  readFileSync: filename => fixtures[filename] || failureFixtures[filename],
+  readFileSync: filename => {
+    // Jest in the OSS does not allow to capture variables in closures.
+    // Therefore, we have to bring the variables inside the closure.
+    // see: https://github.com/facebook/jest/issues/2567
+    const readFileFixtures = require('../__test_fixtures__/fixtures.js');
+    const readFileFailureFixtures = require('../__test_fixtures__/failures.js');
+    return readFileFixtures[filename] || readFileFailureFixtures[filename];
+  },
 }));
 
 describe('RN Codegen TypeScript Parser', () => {
diff --git a/packages/react-native-codegen/src/parsers/typescript/modules/errors.js b/packages/react-native-codegen/src/parsers/typescript/modules/errors.js
deleted file mode 100644
index 357135d78757..000000000000
--- a/packages/react-native-codegen/src/parsers/typescript/modules/errors.js
+++ /dev/null
@@ -1,331 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-'use strict';
-
-const invariant = require('invariant');
-const {ParserError} = require('../errors');
-
-class MisnamedModuleTypeScriptInterfaceParserError extends ParserError {
-  constructor(hasteModuleName: string, id: $FlowFixMe) {
-    super(
-      hasteModuleName,
-      id,
-      `All TypeScript interfaces extending TurboModule must be called 'Spec'. Please rename TypeScript interface '${id.name}' to 'Spec'.`,
-    );
-  }
-}
-
-class ModuleTypeScriptInterfaceNotFoundParserError extends ParserError {
-  constructor(hasteModuleName: string, ast: $FlowFixMe) {
-    super(
-      hasteModuleName,
-      ast,
-      'No TypeScript interfaces extending TurboModule were detected in this NativeModule spec.',
-    );
-  }
-}
-
-class MoreThanOneModuleTypeScriptInterfaceParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowModuleInterfaces: $ReadOnlyArray<$FlowFixMe>,
-    names: $ReadOnlyArray<string>,
-  ) {
-    const finalName = names[names.length - 1];
-    const allButLastName = names.slice(0, -1);
-    const quote = (x: string) => `'${x}'`;
-
-    const nameStr =
-      allButLastName.map(quote).join(', ') + ', and ' + quote(finalName);
-
-    super(
-      hasteModuleName,
-      flowModuleInterfaces,
-      `Every NativeModule spec file must declare exactly one NativeModule TypeScript interface. This file declares ${names.length}: ${nameStr}. Please remove the extraneous TypeScript interface declarations.`,
-    );
-  }
-}
-
-class UnsupportedModulePropertyParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    propertyValue: $FlowFixMe,
-    propertyName: string,
-    invalidPropertyValueType: string,
-  ) {
-    super(
-      hasteModuleName,
-      propertyValue,
-      `TypeScript interfaces extending TurboModule must only contain 'FunctionTypeAnnotation's. Property '${propertyName}' refers to a '${invalidPropertyValueType}'.`,
-    );
-  }
-}
-
-class UnsupportedTypeScriptTypeAnnotationParserError extends ParserError {
-  +typeAnnotationType: string;
-  constructor(hasteModuleName: string, typeAnnotation: $FlowFixMe) {
-    super(
-      hasteModuleName,
-      typeAnnotation,
-      `TypeScript type annotation '${typeAnnotation.type}' is unsupported in NativeModule specs.`,
-    );
-
-    this.typeAnnotationType = typeAnnotation.type;
-  }
-}
-
-class UnsupportedTypeScriptGenericParserError extends ParserError {
-  +genericName: string;
-  constructor(hasteModuleName: string, genericTypeAnnotation: $FlowFixMe) {
-    const genericName = genericTypeAnnotation.typeName.name;
-    super(
-      hasteModuleName,
-      genericTypeAnnotation,
-      `Unrecognized generic type '${genericName}' in NativeModule spec.`,
-    );
-
-    this.genericName = genericName;
-  }
-}
-
-class IncorrectlyParameterizedTypeScriptGenericParserError extends ParserError {
-  +genericName: string;
-  +numTypeParameters: number;
-
-  constructor(hasteModuleName: string, genericTypeAnnotation: $FlowFixMe) {
-    if (genericTypeAnnotation.typeParameters == null) {
-      super(
-        hasteModuleName,
-        genericTypeAnnotation,
-        `Generic '${genericTypeAnnotation.typeName.name}' must have type parameters.`,
-      );
-      return;
-    }
-
-    if (
-      genericTypeAnnotation.typeParameters.type ===
-        'TypeParameterInstantiation' &&
-      genericTypeAnnotation.typeParameters.params.length !== 1
-    ) {
-      super(
-        hasteModuleName,
-        genericTypeAnnotation.typeParameters,
-        `Generic '${genericTypeAnnotation.typeName.name}' must have exactly one type parameter.`,
-      );
-      return;
-    }
-
-    invariant(
-      false,
-      "Couldn't create IncorrectlyParameterizedFlowGenericParserError",
-    );
-  }
-}
-
-/**
- * Array parsing errors
- */
-
-class UnsupportedArrayElementTypeAnnotationParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    arrayElementTypeAST: $FlowFixMe,
-    arrayType: 'Array' | 'ReadonlyArray',
-    invalidArrayElementType: string,
-  ) {
-    super(
-      hasteModuleName,
-      arrayElementTypeAST,
-      `${arrayType} element types cannot be '${invalidArrayElementType}'.`,
-    );
-  }
-}
-
-/**
- * Object parsing errors
- */
-
-class UnsupportedObjectPropertyTypeAnnotationParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    propertyAST: $FlowFixMe,
-    invalidPropertyType: string,
-  ) {
-    let message = `'ObjectTypeAnnotation' cannot contain '${invalidPropertyType}'.`;
-
-    super(hasteModuleName, propertyAST, message);
-  }
-}
-
-class UnsupportedObjectPropertyValueTypeAnnotationParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    propertyValueAST: $FlowFixMe,
-    propertyName: string,
-    invalidPropertyValueType: string,
-  ) {
-    super(
-      hasteModuleName,
-      propertyValueAST,
-      `Object property '${propertyName}' cannot have type '${invalidPropertyValueType}'.`,
-    );
-  }
-}
-
-/**
- * Function parsing errors
- */
-
-class UnnamedFunctionParamParserError extends ParserError {
-  constructor(functionParam: $FlowFixMe, hasteModuleName: string) {
-    super(
-      hasteModuleName,
-      functionParam,
-      'All function parameters must be named.',
-    );
-  }
-}
-
-class UnsupportedFunctionParamTypeAnnotationParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowParamTypeAnnotation: $FlowFixMe,
-    paramName: string,
-    invalidParamType: string,
-  ) {
-    super(
-      hasteModuleName,
-      flowParamTypeAnnotation,
-      `Function parameter '${paramName}' cannot have type '${invalidParamType}'.`,
-    );
-  }
-}
-
-class UnsupportedFunctionReturnTypeAnnotationParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowReturnTypeAnnotation: $FlowFixMe,
-    invalidReturnType: string,
-  ) {
-    super(
-      hasteModuleName,
-      flowReturnTypeAnnotation,
-      `Function return cannot have type '${invalidReturnType}'.`,
-    );
-  }
-}
-
-class UnusedModuleTypeScriptInterfaceParserError extends ParserError {
-  constructor(hasteModuleName: string, flowInterface: $FlowFixMe) {
-    super(
-      hasteModuleName,
-      flowInterface,
-      "Unused NativeModule spec. Please load the NativeModule by calling TurboModuleRegistry.get<Spec>('<moduleName>').",
-    );
-  }
-}
-
-class MoreThanOneModuleRegistryCallsParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowCallExpressions: $FlowFixMe,
-    numCalls: number,
-  ) {
-    super(
-      hasteModuleName,
-      flowCallExpressions,
-      `Every NativeModule spec file must contain exactly one NativeModule load. This file contains ${numCalls}. Please simplify this spec file, splitting it as necessary, to remove the extraneous loads.`,
-    );
-  }
-}
-
-class UntypedModuleRegistryCallParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowCallExpression: $FlowFixMe,
-    methodName: string,
-    moduleName: string,
-  ) {
-    super(
-      hasteModuleName,
-      flowCallExpression,
-      `Please type this NativeModule load: TurboModuleRegistry.${methodName}<Spec>('${moduleName}').`,
-    );
-  }
-}
-
-class IncorrectModuleRegistryCallTypeParameterParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowTypeArguments: $FlowFixMe,
-    methodName: string,
-    moduleName: string,
-  ) {
-    super(
-      hasteModuleName,
-      flowTypeArguments,
-      `Please change these type arguments to reflect TurboModuleRegistry.${methodName}<Spec>('${moduleName}').`,
-    );
-  }
-}
-
-class IncorrectModuleRegistryCallArityParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowCallExpression: $FlowFixMe,
-    methodName: string,
-    incorrectArity: number,
-  ) {
-    super(
-      hasteModuleName,
-      flowCallExpression,
-      `Please call TurboModuleRegistry.${methodName}<Spec>() with exactly one argument. Detected ${incorrectArity}.`,
-    );
-  }
-}
-
-class IncorrectModuleRegistryCallArgumentTypeParserError extends ParserError {
-  constructor(
-    hasteModuleName: string,
-    flowArgument: $FlowFixMe,
-    methodName: string,
-    type: string,
-  ) {
-    const a = /[aeiouy]/.test(type.toLowerCase()) ? 'an' : 'a';
-    super(
-      hasteModuleName,
-      flowArgument,
-      `Please call TurboModuleRegistry.${methodName}<Spec>() with a string literal. Detected ${a} '${type}'`,
-    );
-  }
-}
-
-module.exports = {
-  IncorrectlyParameterizedTypeScriptGenericParserError,
-  MisnamedModuleTypeScriptInterfaceParserError,
-  ModuleTypeScriptInterfaceNotFoundParserError,
-  MoreThanOneModuleTypeScriptInterfaceParserError,
-  UnnamedFunctionParamParserError,
-  UnsupportedArrayElementTypeAnnotationParserError,
-  UnsupportedTypeScriptGenericParserError,
-  UnsupportedTypeScriptTypeAnnotationParserError,
-  UnsupportedFunctionParamTypeAnnotationParserError,
-  UnsupportedFunctionReturnTypeAnnotationParserError,
-  UnsupportedModulePropertyParserError,
-  UnsupportedObjectPropertyTypeAnnotationParserError,
-  UnsupportedObjectPropertyValueTypeAnnotationParserError,
-  UnusedModuleTypeScriptInterfaceParserError,
-  MoreThanOneModuleRegistryCallsParserError,
-  UntypedModuleRegistryCallParserError,
-  IncorrectModuleRegistryCallTypeParameterParserError,
-  IncorrectModuleRegistryCallArityParserError,
-  IncorrectModuleRegistryCallArgumentTypeParserError,
-};
diff --git a/packages/react-native-codegen/src/parsers/typescript/modules/index.js b/packages/react-native-codegen/src/parsers/typescript/modules/index.js
index d0e395e31ac0..bc5aae5f65ec 100644
--- a/packages/react-native-codegen/src/parsers/typescript/modules/index.js
+++ b/packages/react-native-codegen/src/parsers/typescript/modules/index.js
@@ -22,44 +22,68 @@ import type {
   Nullable,
 } from '../../../CodegenSchema.js';
 
-import type {TypeDeclarationMap} from '../utils.js';
-import type {ParserErrorCapturer} from '../utils';
+import type {ParserErrorCapturer, TypeDeclarationMap} from '../../utils';
 import type {NativeModuleTypeAnnotation} from '../../../CodegenSchema.js';
+const {nullGuard} = require('../../parsers-utils');
 
 const {
-  resolveTypeAnnotation,
-  getTypes,
-  visit,
-  isModuleRegistryCall,
-} = require('../utils.js');
-const {unwrapNullable, wrapNullable} = require('./utils');
+  throwIfMoreThanOneModuleRegistryCalls,
+  throwIfUnsupportedFunctionParamTypeAnnotationParserError,
+} = require('../../error-utils');
+const {visit, isModuleRegistryCall} = require('../../utils');
+const {resolveTypeAnnotation, getTypes} = require('../utils.js');
+const {
+  unwrapNullable,
+  wrapNullable,
+  assertGenericTypeAnnotationHasExactlyOneTypeParameter,
+  emitMixedTypeAnnotation,
+  emitUnionTypeAnnotation,
+  translateDefault,
+} = require('../../parsers-commons');
+const {
+  emitBoolean,
+  emitDouble,
+  emitFloat,
+  emitFunction,
+  emitNumber,
+  emitInt32,
+  emitObject,
+  emitPromise,
+  emitRootTag,
+  emitVoid,
+  emitString,
+  emitStringish,
+  typeAliasResolution,
+} = require('../../parsers-primitives');
 const {
-  IncorrectlyParameterizedTypeScriptGenericParserError,
-  MisnamedModuleTypeScriptInterfaceParserError,
-  ModuleTypeScriptInterfaceNotFoundParserError,
-  MoreThanOneModuleTypeScriptInterfaceParserError,
   UnnamedFunctionParamParserError,
   UnsupportedArrayElementTypeAnnotationParserError,
-  UnsupportedTypeScriptGenericParserError,
-  UnsupportedTypeScriptTypeAnnotationParserError,
-  UnsupportedFunctionParamTypeAnnotationParserError,
-  UnsupportedFunctionReturnTypeAnnotationParserError,
-  UnsupportedModulePropertyParserError,
+  UnsupportedGenericParserError,
+  UnsupportedTypeAnnotationParserError,
   UnsupportedObjectPropertyTypeAnnotationParserError,
-  UnsupportedObjectPropertyValueTypeAnnotationParserError,
-  UnusedModuleTypeScriptInterfaceParserError,
-  MoreThanOneModuleRegistryCallsParserError,
-  UntypedModuleRegistryCallParserError,
-  IncorrectModuleRegistryCallTypeParameterParserError,
-  IncorrectModuleRegistryCallArityParserError,
   IncorrectModuleRegistryCallArgumentTypeParserError,
-} = require('./errors.js');
+} = require('../../errors.js');
 
-const invariant = require('invariant');
+const {verifyPlatforms} = require('../../utils');
 
-function nullGuard<T>(fn: () => T): ?T {
-  return fn();
-}
+const {
+  throwIfUntypedModule,
+  throwIfPropertyValueTypeIsUnsupported,
+  throwIfModuleTypeIsUnsupported,
+  throwIfUnusedModuleInterfaceParserError,
+  throwIfModuleInterfaceNotFound,
+  throwIfModuleInterfaceIsMisnamed,
+  throwIfWrongNumberOfCallExpressionArgs,
+  throwIfMoreThanOneModuleInterfaceParserError,
+  throwIfIncorrectModuleRegistryCallTypeParameterParserError,
+  throwIfUnsupportedFunctionReturnTypeAnnotationParserError,
+} = require('../../error-utils');
+
+const {TypeScriptParser} = require('../parser');
+const {getKeyName} = require('../../parsers-commons');
+
+const language = 'TypeScript';
+const parser = new TypeScriptParser();
 
 function translateArrayTypeAnnotation(
   hasteModuleName: string,
@@ -68,7 +92,7 @@ function translateArrayTypeAnnotation(
   cxxOnly: boolean,
   tsArrayType: 'Array' | 'ReadonlyArray',
   tsElementType: $FlowFixMe,
-  nullable: $FlowFixMe,
+  nullable: boolean,
 ): Nullable<NativeModuleTypeAnnotation> {
   try {
     /**
@@ -101,6 +125,7 @@ function translateArrayTypeAnnotation(
         tsElementType,
         tsArrayType,
         'void',
+        language,
       );
     }
 
@@ -110,6 +135,7 @@ function translateArrayTypeAnnotation(
         tsElementType,
         tsArrayType,
         'Promise',
+        language,
       );
     }
 
@@ -119,6 +145,7 @@ function translateArrayTypeAnnotation(
         tsElementType,
         tsArrayType,
         'FunctionTypeAnnotation',
+        language,
       );
     }
 
@@ -178,35 +205,32 @@ function translateTypeAnnotation(
           nullable,
         );
       } else {
-        throw new UnsupportedTypeScriptGenericParserError(
+        throw new UnsupportedGenericParserError(
           hasteModuleName,
           typeAnnotation,
+          parser,
         );
       }
     }
     case 'TSTypeReference': {
       switch (typeAnnotation.typeName.name) {
         case 'RootTag': {
-          return wrapNullable(nullable, {
-            type: 'ReservedTypeAnnotation',
-            name: 'RootTag',
-          });
+          return emitRootTag(nullable);
         }
         case 'Promise': {
-          assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+          return emitPromise(
             hasteModuleName,
             typeAnnotation,
+            language,
+            nullable,
           );
-
-          return wrapNullable(nullable, {
-            type: 'PromiseTypeAnnotation',
-          });
         }
         case 'Array':
         case 'ReadonlyArray': {
           assertGenericTypeAnnotationHasExactlyOneTypeParameter(
             hasteModuleName,
             typeAnnotation,
+            language,
           );
 
           return translateArrayTypeAnnotation(
@@ -219,55 +243,29 @@ function translateTypeAnnotation(
             nullable,
           );
         }
-        case 'Readonly': {
-          assertGenericTypeAnnotationHasExactlyOneTypeParameter(
-            hasteModuleName,
-            typeAnnotation,
-          );
-
-          const [paramType, isParamNullable] = unwrapNullable(
-            translateTypeAnnotation(
-              hasteModuleName,
-              typeAnnotation.typeParameters.params[0],
-              types,
-              aliasMap,
-              tryParse,
-              cxxOnly,
-            ),
-          );
-
-          return wrapNullable(nullable || isParamNullable, paramType);
-        }
         case 'Stringish': {
-          return wrapNullable(nullable, {
-            type: 'StringTypeAnnotation',
-          });
+          return emitStringish(nullable);
         }
         case 'Int32': {
-          return wrapNullable(nullable, {
-            type: 'Int32TypeAnnotation',
-          });
+          return emitInt32(nullable);
         }
         case 'Double': {
-          return wrapNullable(nullable, {
-            type: 'DoubleTypeAnnotation',
-          });
+          return emitDouble(nullable);
         }
         case 'Float': {
-          return wrapNullable(nullable, {
-            type: 'FloatTypeAnnotation',
-          });
+          return emitFloat(nullable);
         }
         case 'UnsafeObject':
         case 'Object': {
-          return wrapNullable(nullable, {
-            type: 'GenericObjectTypeAnnotation',
-          });
+          return emitObject(nullable);
         }
         default: {
-          throw new UnsupportedTypeScriptGenericParserError(
+          return translateDefault(
             hasteModuleName,
             typeAnnotation,
+            types,
+            nullable,
+            parser,
           );
         }
       }
@@ -280,16 +278,27 @@ function translateTypeAnnotation(
           .map<?NamedShape<Nullable<NativeModuleBaseTypeAnnotation>>>(
             property => {
               return tryParse(() => {
-                if (property.type !== 'TSPropertySignature') {
+                if (
+                  property.type !== 'TSPropertySignature' &&
+                  property.type !== 'TSIndexSignature'
+                ) {
                   throw new UnsupportedObjectPropertyTypeAnnotationParserError(
                     hasteModuleName,
                     property,
                     property.type,
+                    language,
                   );
                 }
 
-                const {optional = false, key} = property;
-
+                const {optional = false} = property;
+                const name = getKeyName(property, hasteModuleName, language);
+                if (property.type === 'TSIndexSignature') {
+                  return {
+                    name,
+                    optional,
+                    typeAnnotation: emitObject(nullable),
+                  };
+                }
                 const [propertyTypeAnnotation, isPropertyNullable] =
                   unwrapNullable(
                     translateTypeAnnotation(
@@ -302,113 +311,55 @@ function translateTypeAnnotation(
                     ),
                   );
 
-                if (propertyTypeAnnotation.type === 'FunctionTypeAnnotation') {
-                  throw new UnsupportedObjectPropertyValueTypeAnnotationParserError(
+                if (
+                  propertyTypeAnnotation.type === 'FunctionTypeAnnotation' ||
+                  propertyTypeAnnotation.type === 'PromiseTypeAnnotation' ||
+                  propertyTypeAnnotation.type === 'VoidTypeAnnotation'
+                ) {
+                  throwIfPropertyValueTypeIsUnsupported(
                     hasteModuleName,
                     property.typeAnnotation.typeAnnotation,
                     property.key,
                     propertyTypeAnnotation.type,
+                    language,
                   );
+                } else {
+                  return {
+                    name,
+                    optional,
+                    typeAnnotation: wrapNullable(
+                      isPropertyNullable,
+                      propertyTypeAnnotation,
+                    ),
+                  };
                 }
-
-                if (propertyTypeAnnotation.type === 'VoidTypeAnnotation') {
-                  throw new UnsupportedObjectPropertyValueTypeAnnotationParserError(
-                    hasteModuleName,
-                    property.typeAnnotation.typeAnnotation,
-                    property.key,
-                    'void',
-                  );
-                }
-
-                if (propertyTypeAnnotation.type === 'PromiseTypeAnnotation') {
-                  throw new UnsupportedObjectPropertyValueTypeAnnotationParserError(
-                    hasteModuleName,
-                    property.typeAnnotation.typeAnnotation,
-                    property.key,
-                    'Promise',
-                  );
-                }
-
-                return {
-                  name: key.name,
-                  optional,
-                  typeAnnotation: wrapNullable(
-                    isPropertyNullable,
-                    propertyTypeAnnotation,
-                  ),
-                };
               });
             },
           )
           .filter(Boolean),
       };
 
-      if (!typeAliasResolutionStatus.successful) {
-        return wrapNullable(nullable, objectTypeAnnotation);
-      }
-
-      /**
-       * All aliases RHS are required.
-       */
-      aliasMap[typeAliasResolutionStatus.aliasName] = objectTypeAnnotation;
-
-      /**
-       * Nullability of type aliases is transitive.
-       *
-       * Consider this case:
-       *
-       * type Animal = ?{
-       *   name: string,
-       * };
-       *
-       * type B = Animal
-       *
-       * export interface Spec extends TurboModule {
-       *   +greet: (animal: B) => void;
-       * }
-       *
-       * In this case, we follow B to Animal, and then Animal to ?{name: string}.
-       *
-       * We:
-       *   1. Replace `+greet: (animal: B) => void;` with `+greet: (animal: ?Animal) => void;`,
-       *   2. Pretend that Animal = {name: string}.
-       *
-       * Why do we do this?
-       *  1. In ObjC, we need to generate a struct called Animal, not B.
-       *  2. This design is simpler than managing nullability within both the type alias usage, and the type alias RHS.
-       *  3. What does it mean for a C++ struct, which is what this type alias RHS will generate, to be nullable? ¯\_(ツ)_/¯
-       *     Nullability is a concept that only makes sense when talking about instances (i.e: usages) of the C++ structs.
-       *     Hence, it's better to manage nullability within the actual TypeAliasTypeAnnotation nodes, and not the
-       *     associated ObjectTypeAnnotations.
-       */
-      return wrapNullable(nullable, {
-        type: 'TypeAliasTypeAnnotation',
-        name: typeAliasResolutionStatus.aliasName,
-      });
+      return typeAliasResolution(
+        typeAliasResolutionStatus,
+        objectTypeAnnotation,
+        aliasMap,
+        nullable,
+      );
     }
     case 'TSBooleanKeyword': {
-      return wrapNullable(nullable, {
-        type: 'BooleanTypeAnnotation',
-      });
+      return emitBoolean(nullable);
     }
     case 'TSNumberKeyword': {
-      return wrapNullable(nullable, {
-        type: 'NumberTypeAnnotation',
-      });
+      return emitNumber(nullable);
     }
     case 'TSVoidKeyword': {
-      return wrapNullable(nullable, {
-        type: 'VoidTypeAnnotation',
-      });
+      return emitVoid(nullable);
     }
     case 'TSStringKeyword': {
-      return wrapNullable(nullable, {
-        type: 'StringTypeAnnotation',
-      });
+      return emitString(nullable);
     }
     case 'TSFunctionType': {
-      return wrapNullable(
-        nullable,
+      const translateFunctionTypeAnnotationValue: NativeModuleFunctionTypeAnnotation =
         translateFunctionTypeAnnotation(
           hasteModuleName,
           typeAnnotation,
@@ -416,53 +367,37 @@ function translateTypeAnnotation(
           aliasMap,
           tryParse,
           cxxOnly,
-        ),
-      );
+        );
+
+      return emitFunction(nullable, translateFunctionTypeAnnotationValue);
+    }
+    case 'TSUnionType': {
+      if (cxxOnly) {
+        return emitUnionTypeAnnotation(
+          nullable,
+          hasteModuleName,
+          typeAnnotation,
+          language,
+        );
+      }
+      // Fallthrough
     }
     case 'TSUnknownKeyword': {
       if (cxxOnly) {
-        return wrapNullable(nullable, {
-          type: 'MixedTypeAnnotation',
-        });
+        return emitMixedTypeAnnotation(nullable);
       }
       // Fallthrough
     }
     default: {
-      throw new UnsupportedTypeScriptTypeAnnotationParserError(
+      throw new UnsupportedTypeAnnotationParserError(
         hasteModuleName,
         typeAnnotation,
+        language,
       );
     }
   }
 }
 
-function assertGenericTypeAnnotationHasExactlyOneTypeParameter(
-  moduleName: string,
-  /**
-   * TODO(T108222691): Use flow-types for @babel/parser
-   */
-  typeAnnotation: $FlowFixMe,
-) {
-  if (typeAnnotation.typeParameters == null) {
-    throw new IncorrectlyParameterizedTypeScriptGenericParserError(
-      moduleName,
-      typeAnnotation,
-    );
-  }
-
-  invariant(
-    typeAnnotation.typeParameters.type === 'TSTypeParameterInstantiation',
-    "assertGenericTypeAnnotationHasExactlyOneTypeParameter: Type parameters must be an AST node of type 'TSTypeParameterInstantiation'",
-  );
-
-  if (typeAnnotation.typeParameters.params.length !== 1) {
-    throw new IncorrectlyParameterizedTypeScriptGenericParserError(
-      moduleName,
-      typeAnnotation,
-    );
-  }
-}
-
 function translateFunctionTypeAnnotation(
   hasteModuleName: string,
   // TODO(T108222691): Use flow-types for @babel/parser
@@ -481,6 +416,7 @@ function translateFunctionTypeAnnotation(
         throw new UnnamedFunctionParamParserError(
           typeScriptParam,
           hasteModuleName,
+          language,
         );
       }
 
@@ -497,21 +433,15 @@ function translateFunctionTypeAnnotation(
           ),
         );
 
-      if (paramTypeAnnotation.type === 'VoidTypeAnnotation') {
-        throw new UnsupportedFunctionParamTypeAnnotationParserError(
-          hasteModuleName,
-          typeScriptParam.typeAnnotation,
-          paramName,
-          'void',
-        );
-      }
-
-      if (paramTypeAnnotation.type === 'PromiseTypeAnnotation') {
-        throw new UnsupportedFunctionParamTypeAnnotationParserError(
+      if (
+        paramTypeAnnotation.type === 'VoidTypeAnnotation' ||
+        paramTypeAnnotation.type === 'PromiseTypeAnnotation'
+      ) {
+        return throwIfUnsupportedFunctionParamTypeAnnotationParserError(
           hasteModuleName,
           typeScriptParam.typeAnnotation,
           paramName,
-          'Promise',
+          paramTypeAnnotation.type,
         );
       }
 
@@ -541,13 +471,14 @@ function translateFunctionTypeAnnotation(
     ),
   );
 
-  if (!cxxOnly && returnTypeAnnotation.type === 'FunctionTypeAnnotation') {
-    throw new UnsupportedFunctionReturnTypeAnnotationParserError(
-      hasteModuleName,
-      typescriptFunctionTypeAnnotation.returnType,
-      'FunctionTypeAnnotation',
-    );
-  }
+  throwIfUnsupportedFunctionReturnTypeAnnotationParserError(
+    hasteModuleName,
+    typescriptFunctionTypeAnnotation,
+    'FunctionTypeAnnotation',
+    language,
+    cxxOnly,
+    returnTypeAnnotation.type,
+  );
 
   return {
     type: 'FunctionTypeAnnotation',
@@ -576,15 +507,13 @@ function buildPropertySchema(
   const methodName: string = key.name;
 
   ({nullable, typeAnnotation: value} = resolveTypeAnnotation(value, types));
-
-  if (value.type !== 'TSFunctionType' && value.type !== 'TSMethodSignature') {
-    throw new UnsupportedModulePropertyParserError(
-      hasteModuleName,
-      property.value,
-      property.key.name,
-      value.type,
-    );
-  }
+  throwIfModuleTypeIsUnsupported(
+    hasteModuleName,
+    property.value,
+    property.key.name,
+    value.type,
+    language,
+  );
 
   return {
     name: methodName,
@@ -625,29 +554,22 @@ function buildModuleSchema(
     isModuleInterface,
   );
 
-  if (moduleSpecs.length === 0) {
-    throw new ModuleTypeScriptInterfaceNotFoundParserError(
-      hasteModuleName,
-      ast,
-    );
-  }
+  throwIfModuleInterfaceNotFound(
+    moduleSpecs.length,
+    hasteModuleName,
+    ast,
+    language,
+  );
 
-  if (moduleSpecs.length > 1) {
-    throw new MoreThanOneModuleTypeScriptInterfaceParserError(
-      hasteModuleName,
-      moduleSpecs,
-      moduleSpecs.map(node => node.id.name),
-    );
-  }
+  throwIfMoreThanOneModuleInterfaceParserError(
+    hasteModuleName,
+    moduleSpecs,
+    language,
+  );
 
   const [moduleSpec] = moduleSpecs;
 
-  if (moduleSpec.id.name !== 'Spec') {
-    throw new MisnamedModuleTypeScriptInterfaceParserError(
-      hasteModuleName,
-      moduleSpec.id,
-    );
-  }
+  throwIfModuleInterfaceIsMisnamed(hasteModuleName, moduleSpec.id, language);
 
   // Parse Module Names
   const moduleName = tryParse((): string => {
@@ -660,33 +582,31 @@ function buildModuleSchema(
       },
     });
 
-    if (callExpressions.length === 0) {
-      throw new UnusedModuleTypeScriptInterfaceParserError(
-        hasteModuleName,
-        moduleSpec,
-      );
-    }
+    throwIfUnusedModuleInterfaceParserError(
+      hasteModuleName,
+      moduleSpec,
+      callExpressions,
+      language,
+    );
 
-    if (callExpressions.length > 1) {
-      throw new MoreThanOneModuleRegistryCallsParserError(
-        hasteModuleName,
-        callExpressions,
-        callExpressions.length,
-      );
-    }
+    throwIfMoreThanOneModuleRegistryCalls(
+      hasteModuleName,
+      callExpressions,
+      callExpressions.length,
+      language,
+    );
 
     const [callExpression] = callExpressions;
     const {typeParameters} = callExpression;
     const methodName = callExpression.callee.property.name;
 
-    if (callExpression.arguments.length !== 1) {
-      throw new IncorrectModuleRegistryCallArityParserError(
-        hasteModuleName,
-        callExpression,
-        methodName,
-        callExpression.arguments.length,
-      );
-    }
+    throwIfWrongNumberOfCallExpressionArgs(
+      hasteModuleName,
+      callExpression,
+      methodName,
+      callExpression.arguments.length,
+      language,
+    );
 
     if (callExpression.arguments[0].type !== 'StringLiteral') {
       const {type} = callExpression.arguments[0];
@@ -695,33 +615,28 @@ function buildModuleSchema(
         callExpression.arguments[0],
         methodName,
         type,
+        language,
       );
     }
 
     const $moduleName = callExpression.arguments[0].value;
 
-    if (typeParameters == null) {
-      throw new UntypedModuleRegistryCallParserError(
-        hasteModuleName,
-        callExpression,
-        methodName,
-        $moduleName,
-      );
-    }
+    throwIfUntypedModule(
+      typeParameters,
+      hasteModuleName,
+      callExpression,
+      methodName,
+      $moduleName,
+      language,
+    );
 
-    if (
-      typeParameters.type !== 'TSTypeParameterInstantiation' ||
-      typeParameters.params.length !== 1 ||
-      typeParameters.params[0].type !== 'TSTypeReference' ||
-      typeParameters.params[0].typeName.name !== 'Spec'
-    ) {
-      throw new IncorrectModuleRegistryCallTypeParameterParserError(
-        hasteModuleName,
-        typeParameters,
-        methodName,
-        $moduleName,
-      );
-    }
+    throwIfIncorrectModuleRegistryCallTypeParameterParserError(
+      hasteModuleName,
+      typeParameters,
+      methodName,
+      $moduleName,
+      language,
+    );
 
     return $moduleName;
   });
@@ -732,19 +647,10 @@ function buildModuleSchema(
   // Eventually this should be made explicit in the Flow type itself.
   // Also check the hasteModuleName for platform suffix.
   // Note: this shape is consistent with ComponentSchema.
-  let cxxOnly = false;
-  const excludedPlatforms = [];
-  const namesToValidate = [...moduleNames, hasteModuleName];
-  namesToValidate.forEach(name => {
-    if (name.endsWith('Android')) {
-      excludedPlatforms.push('iOS');
-    } else if (name.endsWith('IOS')) {
-      excludedPlatforms.push('android');
-    } else if (name.endsWith('Cxx')) {
-      cxxOnly = true;
-      excludedPlatforms.push('iOS', 'android');
-    }
-  });
+  const {cxxOnly, excludedPlatforms} = verifyPlatforms(
+    hasteModuleName,
+    moduleNames,
+  );
 
   // $FlowFixMe[missing-type-arg]
   return (moduleSpec.body.body: $ReadOnlyArray<$FlowFixMe>)
diff --git a/packages/react-native-codegen/src/parsers/typescript/modules/schema.js b/packages/react-native-codegen/src/parsers/typescript/modules/schema.js
deleted file mode 100644
index 4e3fda6bea4a..000000000000
--- a/packages/react-native-codegen/src/parsers/typescript/modules/schema.js
+++ /dev/null
@@ -1,28 +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';
-
-import type {SchemaType, NativeModuleSchema} from '../../../CodegenSchema.js';
-
-function wrapModuleSchema(
-  nativeModuleSchema: NativeModuleSchema,
-  hasteModuleName: string,
-): SchemaType {
-  return {
-    modules: {
-      [hasteModuleName]: nativeModuleSchema,
-    },
-  };
-}
-
-module.exports = {
-  wrapModuleSchema,
-};
diff --git a/packages/react-native-codegen/src/parsers/typescript/modules/utils.js b/packages/react-native-codegen/src/parsers/typescript/modules/utils.js
deleted file mode 100644
index b013f76c8ce5..000000000000
--- a/packages/react-native-codegen/src/parsers/typescript/modules/utils.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-'use strict';
-
-import type {
-  NativeModuleTypeAnnotation,
-  Nullable,
-} from '../../../CodegenSchema.js';
-
-function unwrapNullable<+T: NativeModuleTypeAnnotation>(
-  x: Nullable<T>,
-): [T, boolean] {
-  if (x.type === 'NullableTypeAnnotation') {
-    return [x.typeAnnotation, true];
-  }
-
-  return [x, false];
-}
-
-function wrapNullable<+T: NativeModuleTypeAnnotation>(
-  nullable: boolean,
-  typeAnnotation: T,
-): Nullable<T> {
-  if (!nullable) {
-    return typeAnnotation;
-  }
-
-  return {
-    type: 'NullableTypeAnnotation',
-    typeAnnotation,
-  };
-}
-
-module.exports = {
-  unwrapNullable,
-  wrapNullable,
-};
diff --git a/packages/react-native-codegen/src/parsers/typescript/parseTopLevelType.js b/packages/react-native-codegen/src/parsers/typescript/parseTopLevelType.js
new file mode 100644
index 000000000000..8ec8580e66c9
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/typescript/parseTopLevelType.js
@@ -0,0 +1,189 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+import type {TypeDeclarationMap} from '../utils';
+
+export type LegalDefaultValues = string | number | boolean | null;
+
+type TopLevelTypeInternal = {
+  unions: Array<$FlowFixMe>,
+  optional: boolean,
+  defaultValue?: LegalDefaultValues,
+};
+
+export type TopLevelType = {
+  type: $FlowFixMe,
+  optional: boolean,
+  defaultValue?: LegalDefaultValues,
+};
+
+function getValueFromTypes(
+  value: $FlowFixMe,
+  types: TypeDeclarationMap,
+): $FlowFixMe {
+  switch (value.type) {
+    case 'TSTypeReference':
+      if (types[value.typeName.name]) {
+        return getValueFromTypes(types[value.typeName.name], types);
+      } else {
+        return value;
+      }
+    case 'TSTypeAliasDeclaration':
+      return getValueFromTypes(value.typeAnnotation, types);
+    default:
+      return value;
+  }
+}
+
+function isNull(t: $FlowFixMe) {
+  return t.type === 'TSNullKeyword' || t.type === 'TSUndefinedKeyword';
+}
+
+function isNullOrVoid(t: $FlowFixMe) {
+  return isNull(t) || t.type === 'TSVoidKeyword';
+}
+
+function couldBeNumericLiteral(type: string) {
+  return type === 'Literal' || type === 'NumericLiteral';
+}
+
+function couldBeSimpleLiteral(type: string) {
+  return (
+    couldBeNumericLiteral(type) ||
+    type === 'StringLiteral' ||
+    type === 'BooleanLiteral'
+  );
+}
+
+function evaluateLiteral(
+  literalNode: $FlowFixMe,
+): string | number | boolean | null {
+  const valueType = literalNode.type;
+  if (valueType === 'TSLiteralType') {
+    const literal = literalNode.literal;
+    if (couldBeSimpleLiteral(literal.type)) {
+      if (
+        typeof literal.value === 'string' ||
+        typeof literal.value === 'number' ||
+        typeof literal.value === 'boolean'
+      ) {
+        return literal.value;
+      }
+    } else if (
+      literal.type === 'UnaryExpression' &&
+      literal.operator === '-' &&
+      couldBeNumericLiteral(literal.argument.type) &&
+      typeof literal.argument.value === 'number'
+    ) {
+      return -literal.argument.value;
+    }
+  } else if (isNull(literalNode)) {
+    return null;
+  }
+
+  throw new Error(
+    'The default value in WithDefault must be string, number, boolean or null .',
+  );
+}
+
+function handleUnionAndParen(
+  type: $FlowFixMe,
+  result: TopLevelTypeInternal,
+  knownTypes?: TypeDeclarationMap,
+): void {
+  switch (type.type) {
+    case 'TSParenthesizedType': {
+      handleUnionAndParen(type.typeAnnotation, result, knownTypes);
+      break;
+    }
+    case 'TSUnionType': {
+      // the order is important
+      // result.optional must be set first
+      for (const t of type.types) {
+        if (isNullOrVoid(t)) {
+          result.optional = true;
+        }
+      }
+      for (const t of type.types) {
+        if (!isNullOrVoid(t)) {
+          handleUnionAndParen(t, result, knownTypes);
+        }
+      }
+      break;
+    }
+    case 'TSTypeReference':
+      if (type.typeName.name === 'Readonly') {
+        handleUnionAndParen(type.typeParameters.params[0], result, knownTypes);
+      } else if (type.typeName.name === 'WithDefault') {
+        if (result.optional) {
+          throw new Error(
+            'WithDefault<> is optional and does not need to be marked as optional. Please remove the union of undefined and/or null',
+          );
+        }
+        if (type.typeParameters.params.length !== 2) {
+          throw new Error(
+            'WithDefault requires two parameters: type and default value.',
+          );
+        }
+        if (result.defaultValue !== undefined) {
+          throw new Error(
+            'Multiple WithDefault is not allowed nested or in a union type.',
+          );
+        }
+        result.optional = true;
+        result.defaultValue = evaluateLiteral(type.typeParameters.params[1]);
+        handleUnionAndParen(type.typeParameters.params[0], result, knownTypes);
+      } else if (!knownTypes) {
+        result.unions.push(type);
+      } else {
+        const resolvedType = getValueFromTypes(type, knownTypes);
+        if (
+          resolvedType.type === 'TSTypeReference' &&
+          resolvedType.typeName.name === type.typeName.name
+        ) {
+          result.unions.push(type);
+        } else {
+          handleUnionAndParen(resolvedType, result, knownTypes);
+        }
+      }
+      break;
+    default:
+      result.unions.push(type);
+  }
+}
+
+function parseTopLevelType(
+  type: $FlowFixMe,
+  knownTypes?: TypeDeclarationMap,
+): TopLevelType {
+  let result: TopLevelTypeInternal = {unions: [], optional: false};
+  handleUnionAndParen(type, result, knownTypes);
+  if (result.unions.length === 0) {
+    throw new Error('Union type could not be just null or undefined.');
+  } else if (result.unions.length === 1) {
+    return {
+      type: result.unions[0],
+      optional: result.optional,
+      defaultValue: result.defaultValue,
+    };
+  } else {
+    return {
+      type: {type: 'TSUnionType', types: result.unions},
+      optional: result.optional,
+      defaultValue: result.defaultValue,
+    };
+  }
+}
+
+module.exports = {
+  parseTopLevelType,
+};
diff --git a/packages/react-native-codegen/src/parsers/typescript/parser.js b/packages/react-native-codegen/src/parsers/typescript/parser.js
new file mode 100644
index 000000000000..3bcf2cdb6415
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/typescript/parser.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
+ */
+
+'use strict';
+
+import type {ParserType} from '../errors';
+import type {Parser} from '../parser';
+
+class TypeScriptParser implements Parser {
+  getMaybeEnumMemberType(maybeEnumDeclaration: $FlowFixMe): string {
+    if (maybeEnumDeclaration.members[0].initializer) {
+      return maybeEnumDeclaration.members[0].initializer.type
+        .replace('NumericLiteral', 'NumberTypeAnnotation')
+        .replace('StringLiteral', 'StringTypeAnnotation');
+    }
+
+    return 'StringTypeAnnotation';
+  }
+
+  isEnumDeclaration(maybeEnumDeclaration: $FlowFixMe): boolean {
+    return maybeEnumDeclaration.type === 'TSEnumDeclaration';
+  }
+
+  language(): ParserType {
+    return 'TypeScript';
+  }
+
+  nameForGenericTypeAnnotation(typeAnnotation: $FlowFixMe): string {
+    return typeAnnotation.typeName.name;
+  }
+}
+module.exports = {
+  TypeScriptParser,
+};
diff --git a/packages/react-native-codegen/src/parsers/typescript/utils.js b/packages/react-native-codegen/src/parsers/typescript/utils.js
index fc435d259fff..73728847e12b 100644
--- a/packages/react-native-codegen/src/parsers/typescript/utils.js
+++ b/packages/react-native-codegen/src/parsers/typescript/utils.js
@@ -10,29 +10,37 @@
 
 'use strict';
 
-const {ParserError} = require('./errors');
+import type {TypeAliasResolutionStatus, TypeDeclarationMap} from '../utils';
+
+const {parseTopLevelType} = require('./parseTopLevelType');
 
 /**
  * TODO(T108222691): Use flow-types for @babel/parser
  */
-export type TypeDeclarationMap = {[declarationName: string]: $FlowFixMe};
 
 function getTypes(ast: $FlowFixMe): TypeDeclarationMap {
   return ast.body.reduce((types, node) => {
-    if (node.type === 'ExportNamedDeclaration' && node.exportKind === 'type') {
-      if (
-        node.declaration.type === 'TSTypeAliasDeclaration' ||
-        node.declaration.type === 'TSInterfaceDeclaration'
-      ) {
-        types[node.declaration.id.name] = node.declaration;
+    switch (node.type) {
+      case 'ExportNamedDeclaration': {
+        if (node.declaration) {
+          switch (node.declaration.type) {
+            case 'TSTypeAliasDeclaration':
+            case 'TSInterfaceDeclaration':
+            case 'TSEnumDeclaration': {
+              types[node.declaration.id.name] = node.declaration;
+              break;
+            }
+          }
+        }
+        break;
+      }
+      case 'TSTypeAliasDeclaration':
+      case 'TSInterfaceDeclaration':
+      case 'TSEnumDeclaration': {
+        types[node.id.name] = node;
+        break;
       }
-    } else if (
-      node.type === 'TSTypeAliasDeclaration' ||
-      node.type === 'TSInterfaceDeclaration'
-    ) {
-      types[node.id.name] = node;
     }
-
     return types;
   }, {});
 }
@@ -42,15 +50,6 @@ export type ASTNode = Object;
 
 const invariant = require('invariant');
 
-type TypeAliasResolutionStatus =
-  | $ReadOnly<{
-      successful: true,
-      aliasName: string,
-    }>
-  | $ReadOnly<{
-      successful: false,
-    }>;
-
 function resolveTypeAnnotation(
   // TODO(T108222691): Use flow-types for @babel/parser
   typeAnnotation: $FlowFixMe,
@@ -75,24 +74,20 @@ function resolveTypeAnnotation(
   };
 
   for (;;) {
-    // Check for optional type in union e.g. T | null | void
-    if (
-      node.type === 'TSUnionType' &&
-      node.types.some(
-        t => t.type === 'TSNullKeyword' || t.type === 'TSVoidKeyword',
-      )
-    ) {
-      node = node.types.filter(
-        t => t.type !== 'TSNullKeyword' && t.type !== 'TSVoidKeyword',
-      )[0];
-      nullable = true;
-    } else if (node.type === 'TSTypeReference') {
+    const topLevelType = parseTopLevelType(node);
+    nullable = nullable || topLevelType.optional;
+    node = topLevelType.type;
+
+    if (node.type === 'TSTypeReference') {
       typeAliasResolutionStatus = {
         successful: true,
         aliasName: node.typeName.name,
       };
       const resolvedTypeAnnotation = types[node.typeName.name];
-      if (resolvedTypeAnnotation == null) {
+      if (
+        resolvedTypeAnnotation == null ||
+        resolvedTypeAnnotation.type === 'TSEnumDeclaration'
+      ) {
         break;
       }
 
@@ -114,114 +109,7 @@ function resolveTypeAnnotation(
   };
 }
 
-function getValueFromTypes(value: ASTNode, types: TypeDeclarationMap): ASTNode {
-  if (value.type === 'TSTypeReference' && types[value.typeName.name]) {
-    return getValueFromTypes(types[value.typeName.name], types);
-  }
-
-  if (value.type === 'TSTypeAliasDeclaration') {
-    return value.typeAnnotation;
-  }
-
-  return value;
-}
-
-export type ParserErrorCapturer = <T>(fn: () => T) => ?T;
-
-function createParserErrorCapturer(): [
-  Array<ParserError>,
-  ParserErrorCapturer,
-] {
-  const errors = [];
-  function guard<T>(fn: () => T): ?T {
-    try {
-      return fn();
-    } catch (error) {
-      if (!(error instanceof ParserError)) {
-        throw error;
-      }
-      errors.push(error);
-
-      return null;
-    }
-  }
-
-  return [errors, guard];
-}
-
-// TODO(T108222691): Use flow-types for @babel/parser
-function visit(
-  astNode: $FlowFixMe,
-  visitor: {
-    [type: string]: (node: $FlowFixMe) => void,
-  },
-) {
-  const queue = [astNode];
-  while (queue.length !== 0) {
-    let item = queue.shift();
-
-    if (!(typeof item === 'object' && item != null)) {
-      continue;
-    }
-
-    if (
-      typeof item.type === 'string' &&
-      typeof visitor[item.type] === 'function'
-    ) {
-      // Don't visit any children
-      visitor[item.type](item);
-    } else if (Array.isArray(item)) {
-      queue.push(...item);
-    } else {
-      queue.push(...Object.values(item));
-    }
-  }
-}
-
-// TODO(T108222691): Use flow-types for @babel/parser
-function isModuleRegistryCall(node: $FlowFixMe): boolean {
-  if (node.type !== 'CallExpression') {
-    return false;
-  }
-
-  const callExpression = node;
-
-  if (callExpression.callee.type !== 'MemberExpression') {
-    return false;
-  }
-
-  const memberExpression = callExpression.callee;
-  if (
-    !(
-      memberExpression.object.type === 'Identifier' &&
-      memberExpression.object.name === 'TurboModuleRegistry'
-    )
-  ) {
-    return false;
-  }
-
-  if (
-    !(
-      memberExpression.property.type === 'Identifier' &&
-      (memberExpression.property.name === 'get' ||
-        memberExpression.property.name === 'getEnforcing')
-    )
-  ) {
-    return false;
-  }
-
-  if (memberExpression.computed) {
-    return false;
-  }
-
-  return true;
-}
-
 module.exports = {
-  getValueFromTypes,
   resolveTypeAnnotation,
-  createParserErrorCapturer,
   getTypes,
-  visit,
-  isModuleRegistryCall,
 };
diff --git a/packages/react-native-codegen/src/parsers/utils.js b/packages/react-native-codegen/src/parsers/utils.js
new file mode 100644
index 000000000000..ede91c81c2d7
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/utils.js
@@ -0,0 +1,266 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {ComponentSchemaBuilderConfig} from './flow/components/schema';
+import type {NativeModuleSchema, SchemaType} from '../CodegenSchema';
+const {ParserError} = require('./errors');
+const {wrapModuleSchema} = require('./parsers-commons');
+
+const fs = require('fs');
+const path = require('path');
+const invariant = require('invariant');
+
+export type TypeDeclarationMap = {[declarationName: string]: $FlowFixMe};
+
+export type TypeAliasResolutionStatus =
+  | $ReadOnly<{
+      successful: true,
+      aliasName: string,
+    }>
+  | $ReadOnly<{
+      successful: false,
+    }>;
+
+function extractNativeModuleName(filename: string): string {
+  // this should drop everything after the file name. For Example it will drop:
+  // .android.js, .android.ts, .android.tsx, .ios.js, .ios.ts, .ios.tsx, .js, .ts, .tsx
+  return path.basename(filename).split('.')[0];
+}
+
+export type ParserErrorCapturer = <T>(fn: () => T) => ?T;
+
+function createParserErrorCapturer(): [
+  Array<ParserError>,
+  ParserErrorCapturer,
+] {
+  const errors = [];
+  function guard<T>(fn: () => T): ?T {
+    try {
+      return fn();
+    } catch (error) {
+      if (!(error instanceof ParserError)) {
+        throw error;
+      }
+      errors.push(error);
+
+      return null;
+    }
+  }
+
+  return [errors, guard];
+}
+
+function verifyPlatforms(
+  hasteModuleName: string,
+  moduleNames: string[],
+): $ReadOnly<{
+  cxxOnly: boolean,
+  excludedPlatforms: Array<'iOS' | 'android'>,
+}> {
+  let cxxOnly = false;
+  const excludedPlatforms = new Set<'iOS' | 'android'>();
+  const namesToValidate = [...moduleNames, hasteModuleName];
+
+  namesToValidate.forEach(name => {
+    if (name.endsWith('Android')) {
+      excludedPlatforms.add('iOS');
+      return;
+    }
+
+    if (name.endsWith('IOS')) {
+      excludedPlatforms.add('android');
+      return;
+    }
+
+    if (name.endsWith('Cxx')) {
+      cxxOnly = true;
+      excludedPlatforms.add('iOS');
+      excludedPlatforms.add('android');
+      return;
+    }
+  });
+
+  return {
+    cxxOnly,
+    excludedPlatforms: Array.from(excludedPlatforms),
+  };
+}
+
+function parseFile(
+  filename: string,
+  callback: (contents: string, filename: string) => SchemaType,
+): SchemaType {
+  const contents = fs.readFileSync(filename, 'utf8');
+
+  return callback(contents, filename);
+}
+
+// TODO(T108222691): Use flow-types for @babel/parser
+function visit(
+  astNode: $FlowFixMe,
+  visitor: {
+    [type: string]: (node: $FlowFixMe) => void,
+  },
+) {
+  const queue = [astNode];
+  while (queue.length !== 0) {
+    let item = queue.shift();
+
+    if (!(typeof item === 'object' && item != null)) {
+      continue;
+    }
+
+    if (
+      typeof item.type === 'string' &&
+      typeof visitor[item.type] === 'function'
+    ) {
+      // Don't visit any children
+      visitor[item.type](item);
+    } else if (Array.isArray(item)) {
+      queue.push(...item);
+    } else {
+      queue.push(...Object.values(item));
+    }
+  }
+}
+
+function buildSchemaFromConfigType(
+  configType: 'module' | 'component' | 'none',
+  filename: ?string,
+  ast: $FlowFixMe,
+  wrapComponentSchema: (config: ComponentSchemaBuilderConfig) => SchemaType,
+  buildComponentSchema: (ast: $FlowFixMe) => ComponentSchemaBuilderConfig,
+  buildModuleSchema: (
+    hasteModuleName: string,
+    ast: $FlowFixMe,
+    tryParse: ParserErrorCapturer,
+  ) => NativeModuleSchema,
+): SchemaType {
+  switch (configType) {
+    case 'component': {
+      return wrapComponentSchema(buildComponentSchema(ast));
+    }
+    case 'module': {
+      if (filename === undefined || filename === null) {
+        throw new Error('Filepath expected while parasing a module');
+      }
+      const nativeModuleName = extractNativeModuleName(filename);
+
+      const [parsingErrors, tryParse] = createParserErrorCapturer();
+
+      const schema = tryParse(() =>
+        buildModuleSchema(nativeModuleName, ast, tryParse),
+      );
+
+      if (parsingErrors.length > 0) {
+        /**
+         * TODO(T77968131): We have two options:
+         *  - Throw the first error, but indicate there are more then one errors.
+         *  - Display all errors, nicely formatted.
+         *
+         * For the time being, we're just throw the first error.
+         **/
+
+        throw parsingErrors[0];
+      }
+
+      invariant(
+        schema != null,
+        'When there are no parsing errors, the schema should not be null',
+      );
+
+      return wrapModuleSchema(schema, nativeModuleName);
+    }
+    default:
+      return {modules: {}};
+  }
+}
+
+function getConfigType(
+  // TODO(T71778680): Flow-type this node.
+  ast: $FlowFixMe,
+  Visitor: ({isComponent: boolean, isModule: boolean}) => {
+    [type: string]: (node: $FlowFixMe) => void,
+  },
+): 'module' | 'component' | 'none' {
+  let infoMap = {
+    isComponent: false,
+    isModule: false,
+  };
+
+  visit(ast, Visitor(infoMap));
+
+  const {isModule, isComponent} = infoMap;
+  if (isModule && isComponent) {
+    throw new Error(
+      'Found type extending "TurboModule" and exported "codegenNativeComponent" declaration in one file. Split them into separated files.',
+    );
+  }
+
+  if (isModule) {
+    return 'module';
+  } else if (isComponent) {
+    return 'component';
+  } else {
+    return 'none';
+  }
+}
+
+// TODO(T71778680): Flow-type ASTNodes.
+function isModuleRegistryCall(node: $FlowFixMe): boolean {
+  if (node.type !== 'CallExpression') {
+    return false;
+  }
+
+  const callExpression = node;
+
+  if (callExpression.callee.type !== 'MemberExpression') {
+    return false;
+  }
+
+  const memberExpression = callExpression.callee;
+  if (
+    !(
+      memberExpression.object.type === 'Identifier' &&
+      memberExpression.object.name === 'TurboModuleRegistry'
+    )
+  ) {
+    return false;
+  }
+
+  if (
+    !(
+      memberExpression.property.type === 'Identifier' &&
+      (memberExpression.property.name === 'get' ||
+        memberExpression.property.name === 'getEnforcing')
+    )
+  ) {
+    return false;
+  }
+
+  if (memberExpression.computed) {
+    return false;
+  }
+
+  return true;
+}
+
+module.exports = {
+  getConfigType,
+  extractNativeModuleName,
+  createParserErrorCapturer,
+  verifyPlatforms,
+  parseFile,
+  visit,
+  buildSchemaFromConfigType,
+  isModuleRegistryCall,
+};
diff --git a/packages/react-native-gradle-plugin/build.gradle.kts b/packages/react-native-gradle-plugin/build.gradle.kts
index 7ba884ae58f5..5ea92ee71b41 100644
--- a/packages/react-native-gradle-plugin/build.gradle.kts
+++ b/packages/react-native-gradle-plugin/build.gradle.kts
@@ -8,6 +8,7 @@
 import org.gradle.api.internal.classpath.ModuleRegistry
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.configurationcache.extensions.serviceOf
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   kotlin("jvm") version "1.6.10"
@@ -32,7 +33,7 @@ group = "com.facebook.react"
 
 dependencies {
   implementation(gradleApi())
-  implementation("com.android.tools.build:gradle:7.2.1")
+  implementation("com.android.tools.build:gradle:7.3.1")
   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")
@@ -49,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> {
diff --git a/packages/react-native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/packages/react-native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
index 92f06b50fd65..8fad3f5a98bf 100644
--- a/packages/react-native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/react-native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/react-native-gradle-plugin/package.json b/packages/react-native-gradle-plugin/package.json
index 5b9389ed3316..31fe16d80091 100644
--- a/packages/react-native-gradle-plugin/package.json
+++ b/packages/react-native-gradle-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-gradle-plugin",
-  "version": "0.70.0",
+  "version": "0.71.12",
   "description": "⚛️ Gradle Plugin for React Native",
   "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/react-native-gradle-plugin",
   "repository": {
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/AndroidConfiguration.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/AndroidConfiguration.kt
deleted file mode 100644
index 48fe2cccea4e..000000000000
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/AndroidConfiguration.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react
-
-import com.android.build.gradle.BaseExtension
-import org.gradle.api.Project
-
-fun Project.configureDevPorts(androidExt: BaseExtension) {
-  val devServerPort =
-      project.properties["reactNativeDevServerPort"]?.toString() ?: DEFAULT_DEV_SERVER_PORT
-  val inspectorProxyPort =
-      project.properties["reactNativeInspectorProxyPort"]?.toString() ?: devServerPort
-
-  androidExt.buildTypes.all {
-    it.resValue("integer", "react_native_dev_server_port", devServerPort)
-    it.resValue("integer", "react_native_inspector_proxy_port", inspectorProxyPort)
-  }
-}
-
-const val DEFAULT_DEV_SERVER_PORT = "8081"
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactExtension.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactExtension.kt
index 44f0e6b9933f..5dfb3737ee9d 100644
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactExtension.kt
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactExtension.kt
@@ -7,27 +7,18 @@
 
 package com.facebook.react
 
-import com.android.build.gradle.api.BaseVariant
 import com.facebook.react.utils.projectPathToLibraryName
-import java.io.File
 import javax.inject.Inject
 import org.gradle.api.Project
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.ListProperty
-import org.gradle.api.provider.MapProperty
 import org.gradle.api.provider.Property
 
 abstract class ReactExtension @Inject constructor(project: Project) {
 
   private val objects = project.objects
 
-  /**
-   * Whether the React App plugin should apply its logic or not. Set it to false if you're still
-   * relying on `react.gradle` to configure your build. Default: false
-   */
-  val applyAppPlugin: Property<Boolean> = objects.property(Boolean::class.java).convention(false)
-
   /**
    * The path to the root of your project. This is the path to where the `package.json` lives. All
    * the CLI commands will be invoked from this folder as working directory.
@@ -37,6 +28,14 @@ abstract class ReactExtension @Inject constructor(project: Project) {
   val root: DirectoryProperty =
       objects.directoryProperty().convention(project.rootProject.layout.projectDirectory.dir("../"))
 
+  /**
+   * The path to the react-native NPM package folder.
+   *
+   * Default: ${rootProject.dir}/../node_modules/react-native-codegen
+   */
+  val reactNativeDir: DirectoryProperty =
+      objects.directoryProperty().convention(root.dir("node_modules/react-native"))
+
   /**
    * The path to the JS entry file. If not specified, the plugin will try to resolve it using a list
    * of known locations (e.g. `index.android.js`, `index.js`, etc.).
@@ -44,10 +43,11 @@ abstract class ReactExtension @Inject constructor(project: Project) {
   val entryFile: RegularFileProperty = objects.fileProperty()
 
   /**
-   * The path to the React Native CLI. If not specified, the plugin will try to resolve it looking
-   * for `react-native` CLI inside `node_modules` in [root].
+   * The reference to the React Native CLI. If not specified, the plugin will try to resolve it
+   * looking for `react-native` CLI inside `node_modules` in [root].
    */
-  val cliPath: Property<String> = objects.property(String::class.java)
+  val cliFile: RegularFileProperty =
+      objects.fileProperty().convention(reactNativeDir.file("cli.js"))
 
   /**
    * The path to the Node executable and extra args. By default it assumes that you have `node`
@@ -60,10 +60,10 @@ abstract class ReactExtension @Inject constructor(project: Project) {
   val bundleCommand: Property<String> = objects.property(String::class.java).convention("bundle")
 
   /**
-   * Custom configuration for the [bundleCommand]. If provided it will be passed over with a
+   * Custom configuration file for the [bundleCommand]. If provided, it will be passed over with a
    * `--config` flag to the bundle command.
    */
-  val bundleConfig: Property<String> = objects.property(String::class.java)
+  val bundleConfig: RegularFileProperty = objects.fileProperty()
 
   /**
    * The Bundle Asset name. This name will be used also for deriving other bundle outputs such as
@@ -75,69 +75,24 @@ abstract class ReactExtension @Inject constructor(project: Project) {
       objects.property(String::class.java).convention("index.android.bundle")
 
   /**
-   * Variant Name to File destination map that allows to specify where is the resource dir for a
-   * specific variant. If a value is supplied, the plugin will copy the bundled resource for that
-   * variant from `generated/res/react/<variant>` into the custom specified location. Default: {}
+   * Toggles the .so Cleanup step. If enabled, we will clean up all the unnecessary files before the
+   * bundle task. If disabled, the developers will have to manually cleanup the files. Default: true
    */
-  val resourcesDir: MapProperty<String, File> =
-      objects.mapProperty(String::class.java, File::class.java).convention(emptyMap())
-
-  /**
-   * Variant Name to File destination map that allows to specify where is the asset dir for a
-   * specific variant. If a value is supplied, the plugin will copy the bundled JS for that variant
-   * from `generated/assets/react/<variant>` into the custom specified location. Default: {}
-   */
-  val jsBundleDir: MapProperty<String, File> =
-      objects.mapProperty(String::class.java, File::class.java).convention(emptyMap())
-
-  /** ANT-style excludes for the bundle command. Default: ["android / **", "ios / **"] */
-  val inputExcludes: ListProperty<String> =
-      objects.listProperty(String::class.java).convention(listOf("android/**", "ios/**"))
-
-  /**
-   * Toggles the VM Cleanup step. If enabled, before the bundle task we will clean up all the
-   * unnecessary files. If disabled, the developers will have to manually cleanup the files.
-   * Default: true
-   */
-  val enableVmCleanup: Property<Boolean> = objects.property(Boolean::class.java).convention(true)
+  val enableSoCleanup: Property<Boolean> = objects.property(Boolean::class.java).convention(true)
 
   /** Extra args that will be passed to the [bundleCommand] Default: [] */
   val extraPackagerArgs: ListProperty<String> =
       objects.listProperty(String::class.java).convention(emptyList())
 
   /**
-   * Allows to disable dev mode for certain variants. That's useful if you have a production variant
-   * (say `canary`) where you don't want dev mode to be enabled. Default: []
-   */
-  val devDisabledInVariants: ListProperty<String> =
-      objects.listProperty(String::class.java).convention(emptyList())
-
-  /**
-   * Functional interface to disable dev mode only on specific [BaseVariant] Default: will check
-   * [devDisabledInVariants] or return True for Release variants and False for Debug variants.
+   * Allows to specify the debuggable variants (by default just 'debug'). Variants in this list
+   * will:
+   * - Not be bundled (the bundle file will not be created and won't be copied over).
+   * - Have the Hermes Debug flags set. That's useful if you have another variant (say `canary`)
+   * where you want dev mode to be enabled. Default: ['debug']
    */
-  var disableDevForVariant: (BaseVariant) -> Boolean = { variant ->
-    variant.name in devDisabledInVariants.get() || variant.isRelease
-  }
-
-  /**
-   * Variant Name to Boolean map that allows to toggle the bundle command for a specific variant.
-   * Default: {}
-   */
-  // todo maybe lambda as for hermes?
-  val bundleIn: MapProperty<String, Boolean> =
-      objects.mapProperty(String::class.java, Boolean::class.java).convention(emptyMap())
-
-  /**
-   * Functional interface to toggle the bundle command only on specific [BaseVariant] Default: will
-   * check [bundleIn] or return True for Release variants and False for Debug variants.
-   */
-  var bundleForVariant: (BaseVariant) -> Boolean = { variant ->
-    if (bundleIn.getting(variant.name).isPresent) bundleIn.getting(variant.name).get()
-    else if (bundleIn.getting(variant.buildType.name).isPresent)
-        bundleIn.getting(variant.buildType.name).get()
-    else variant.isRelease
-  }
+  val debuggableVariants: ListProperty<String> =
+      objects.listProperty(String::class.java).convention(listOf("debug"))
 
   /** Hermes Config */
 
@@ -147,46 +102,20 @@ abstract class ReactExtension @Inject constructor(project: Project) {
    */
   val hermesCommand: Property<String> = objects.property(String::class.java).convention("")
 
-  /** Toggle Hermes for the whole build. Default: false */
-  val enableHermes: Property<Boolean> = objects.property(Boolean::class.java).convention(false)
-
   /**
-   * Functional interface to selectively enabled Hermes only on specific [BaseVariant] Default: will
-   * return [enableHermes] for all the variants.
-   */
-  var enableHermesForVariant: (BaseVariant) -> Boolean = { enableHermes.get() }
-
-  /**
-   * Functional interface specify flags for Hermes on specific [BaseVariant] Default: will return
-   * [hermesFlagsRelease] for Release variants and [hermesFlagsDebug] for Debug variants.
-   */
-  var hermesFlagsForVariant: (BaseVariant) -> List<String> = { variant ->
-    if (variant.isRelease) hermesFlagsRelease.get() else hermesFlagsDebug.get()
-  }
-
-  /**
-   * Functional interface to delete debug files only on specific [BaseVariant] Default: will return
-   * True for Release variants and False for Debug variants.
+   * Whether to enable Hermes only on certain variants. If specified as a non-empty list, hermesc
+   * and the .so cleanup for Hermes will be executed only for variants in this list. An empty list
+   * assumes you're either using Hermes for all variants or not (see [enableHermes]).
+   *
+   * Default: []
    */
-  var deleteDebugFilesForVariant: (BaseVariant) -> Boolean = { variant -> variant.isRelease }
-
-  /** Flags to pass to Hermes for Debug variants. Default: [] */
-  val hermesFlagsDebug: ListProperty<String> =
+  val enableHermesOnlyInVariants: ListProperty<String> =
       objects.listProperty(String::class.java).convention(emptyList())
 
-  /** Flags to pass to Hermes for Release variants. Default: ["-O", "-output-source-map"] */
-  val hermesFlagsRelease: ListProperty<String> =
+  /** Flags to pass to Hermesc. Default: ["-O", "-output-source-map"] */
+  val hermesFlags: ListProperty<String> =
       objects.listProperty(String::class.java).convention(listOf("-O", "-output-source-map"))
 
-  /**
-   * The path to the Compose Source Map script. Default:
-   * "node_modules/react-native/scripts/compose-source-maps.js"
-   */
-  val composeSourceMapsPath: Property<String> =
-      objects
-          .property(String::class.java)
-          .convention("node_modules/react-native/scripts/compose-source-maps.js")
-
   /** Codegen Config */
 
   /**
@@ -197,14 +126,6 @@ abstract class ReactExtension @Inject constructor(project: Project) {
   val codegenDir: DirectoryProperty =
       objects.directoryProperty().convention(root.dir("node_modules/react-native-codegen"))
 
-  /**
-   * The path to the react-native NPM package folder.
-   *
-   * Default: ${rootProject.dir}/../node_modules/react-native-codegen
-   */
-  val reactNativeDir: DirectoryProperty =
-      objects.directoryProperty().convention(root.dir("node_modules/react-native"))
-
   /**
    * The root directory for all JS files for the app.
    *
@@ -227,39 +148,4 @@ abstract class ReactExtension @Inject constructor(project: Project) {
    */
   val codegenJavaPackageName: Property<String> =
       objects.property(String::class.java).convention("com.facebook.fbreact.specs")
-
-  /**
-   * Whether the Java Generator (based on Javapoet) should be used or not. Please note that this is
-   * currently deprecated as the Java generator is not supported anymore. Default: false
-   */
-  @Deprecated(
-      level = DeprecationLevel.ERROR,
-      message =
-          "Please note that this is deprecated as the Java generator is not supported and react-native-codegen should be used instead.")
-  val useJavaGenerator: Property<Boolean> = objects.property(Boolean::class.java).convention(false)
-
-  /**
-   * The `reactRoot` property was confusing and should not be used.
-   *
-   * You should instead use either:
-   * - [root] to point to your root project (where the package.json lives)
-   * - [reactNativeDir] to point to the NPM package of react native.
-   *
-   * A valid configuration would look like:
-   *
-   * ```
-   * react {
-   *    root = rootProject.file("..")
-   *    reactNativeDir = rootProject.file("../node_modules/react-native")
-   * }
-   * ```
-   *
-   * Please also note that those are the default value and you most likely don't need those at all.
-   */
-  @Deprecated(
-      "reactRoot was confusing and has been replace with root " +
-          "to point to your root project and reactNativeDir to point to " +
-          "the folder of the react-native NPM package",
-      replaceWith = ReplaceWith("reactNativeRoot"))
-  val reactRoot: DirectoryProperty = objects.directoryProperty()
 }
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt
index 22628fa94e89..6222bdb86842 100644
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt
@@ -7,14 +7,22 @@
 
 package com.facebook.react
 
+import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.gradle.AppExtension
-import com.android.build.gradle.BaseExtension
-import com.android.build.gradle.LibraryExtension
 import com.android.build.gradle.internal.tasks.factory.dependsOn
 import com.facebook.react.tasks.BuildCodegenCLITask
 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
 import com.facebook.react.utils.JsonUtils
+import com.facebook.react.utils.NdkConfiguratorUtils.configureReactNativeNdk
+import com.facebook.react.utils.ProjectUtils.needsCodegenFromPackageJson
+import com.facebook.react.utils.findPackageJsonFile
 import java.io.File
 import kotlin.system.exitProcess
 import org.gradle.api.Plugin
@@ -26,8 +34,45 @@ class ReactPlugin : Plugin<Project> {
   override fun apply(project: Project) {
     checkJvmVersion(project)
     val extension = project.extensions.create("react", ReactExtension::class.java, project)
-    applyAppPlugin(project, extension)
-    applyCodegenPlugin(project, extension)
+
+    // App Only Configuration
+    project.pluginManager.withPlugin("com.android.application") {
+      project.afterEvaluate {
+        val reactNativeDir = extension.reactNativeDir.get().asFile
+        val propertiesFile = File(reactNativeDir, "ReactAndroid/gradle.properties")
+        val versionString = readVersionString(propertiesFile)
+        configureDependencies(project, versionString)
+        configureRepositories(project, reactNativeDir)
+      }
+
+      configureReactNativeNdk(project, extension)
+      configureBuildConfigFields(project)
+      configureDevPorts(project)
+      configureBackwardCompatibilityReactMap(project)
+
+      project.extensions.getByType(AndroidComponentsExtension::class.java).apply {
+        onVariants(selector().all()) { variant ->
+          project.configureReactTasks(variant = variant, config = extension)
+        }
+      }
+
+      // This is a legacy AGP api. Needed as AGP 7.3 is not consuming generated resources correctly.
+      // Can be removed as we bump to AGP 7.4 stable.
+      // This registers the $buildDir/generated/res/react/<variant> folder as a
+      // res folder to be consumed with the old AGP Apis which are not broken.
+      project.extensions.getByType(AppExtension::class.java).apply {
+        this.applicationVariants.all {
+          it.registerGeneratedResFolders(
+              project.layout.buildDirectory.files("generated/res/react/${it.name}"))
+        }
+      }
+      configureCodegen(project, extension, isLibrary = false)
+    }
+
+    // Library Only Configuration
+    project.pluginManager.withPlugin("com.android.library") {
+      configureCodegen(project, extension, isLibrary = true)
+    }
   }
 
   private fun checkJvmVersion(project: Project) {
@@ -35,34 +80,17 @@ class ReactPlugin : Plugin<Project> {
     if ((jvmVersion?.toIntOrNull() ?: 0) <= 8) {
       project.logger.error(
           """
-      
+
       ********************************************************************************
-      
+
       ERROR: requires JDK11 or higher.
       Incompatible major version detected: '$jvmVersion'
-      
+
       ********************************************************************************
-      
-      """.trimIndent())
-      exitProcess(1)
-    }
-  }
 
-  private fun applyAppPlugin(project: Project, config: ReactExtension) {
-    project.afterEvaluate {
-      if (config.applyAppPlugin.getOrElse(false)) {
-        val androidConfiguration = project.extensions.getByType(BaseExtension::class.java)
-        project.configureDevPorts(androidConfiguration)
-
-        val isAndroidLibrary = project.plugins.hasPlugin("com.android.library")
-        val variants =
-            if (isAndroidLibrary) {
-              project.extensions.getByType(LibraryExtension::class.java).libraryVariants
-            } else {
-              project.extensions.getByType(AppExtension::class.java).applicationVariants
-            }
-        variants.all { project.configureReactTasks(variant = it, config = config) }
-      }
+      """
+              .trimIndent())
+      exitProcess(1)
     }
   }
 
@@ -70,7 +98,8 @@ class ReactPlugin : Plugin<Project> {
    * A plugin to enable react-native-codegen in Gradle environment. See the Gradle API docs for more
    * information: https://docs.gradle.org/current/javadoc/org/gradle/api/Project.html
    */
-  private fun applyCodegenPlugin(project: Project, extension: ReactExtension) {
+  @Suppress("UnstableApiUsage")
+  private fun configureCodegen(project: Project, extension: ReactExtension, isLibrary: Boolean) {
     // First, we set up the output dir for the codegen.
     val generatedSrcDir = File(project.buildDir, "generated/source/codegen")
 
@@ -79,69 +108,68 @@ class ReactPlugin : Plugin<Project> {
           it.codegenDir.set(extension.codegenDir)
           val bashWindowsHome = project.findProperty("REACT_WINDOWS_BASH") as String?
           it.bashWindowsHome.set(bashWindowsHome)
+
+          // 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.
+          val needsCodegenFromPackageJson = project.needsCodegenFromPackageJson(extension)
+          it.onlyIf { isLibrary || needsCodegenFromPackageJson }
         }
 
     // We create the task to produce schema from JS files.
     val generateCodegenSchemaTask =
         project.tasks.register(
             "generateCodegenSchemaFromJavaScript", GenerateCodegenSchemaTask::class.java) { it ->
-          it.dependsOn(buildCodegenTask)
-          it.nodeExecutableAndArgs.set(extension.nodeExecutableAndArgs)
-          it.codegenDir.set(extension.codegenDir)
-          it.generatedSrcDir.set(generatedSrcDir)
-
-          // We're reading the package.json at configuration time to properly feed
-          // the `jsRootDir` @Input property of this task. Therefore, the
-          // parsePackageJson should be invoked here.
-          val parsedPackageJson =
-              extension.root.file("package.json").orNull?.asFile?.let {
-                JsonUtils.fromCodegenJson(it)
-              }
-
-          val parsedJsRootDir =
-              parsedPackageJson?.codegenConfig?.jsSrcsDir?.let { relativePath ->
-                extension.root.dir(relativePath)
+              it.dependsOn(buildCodegenTask)
+              it.nodeExecutableAndArgs.set(extension.nodeExecutableAndArgs)
+              it.codegenDir.set(extension.codegenDir)
+              it.generatedSrcDir.set(generatedSrcDir)
+
+              // We're reading the package.json at configuration time to properly feed
+              // the `jsRootDir` @Input property of this task & the onlyIf. Therefore, the
+              // parsePackageJson should be invoked inside this lambda.
+              val packageJson = findPackageJsonFile(project, extension)
+              val parsedPackageJson = packageJson?.let { JsonUtils.fromCodegenJson(it) }
+
+              val jsSrcsDirInPackageJson = parsedPackageJson?.codegenConfig?.jsSrcsDir
+              if (jsSrcsDirInPackageJson != null) {
+                it.jsRootDir.set(File(packageJson.parentFile, jsSrcsDirInPackageJson))
+              } else {
+                it.jsRootDir.set(extension.jsRootDir)
               }
-                  ?: extension.jsRootDir
-
-          it.jsRootDir.set(parsedJsRootDir)
-        }
+              val needsCodegenFromPackageJson = project.needsCodegenFromPackageJson(extension)
+              it.onlyIf { isLibrary || needsCodegenFromPackageJson }
+            }
 
     // We create the task to generate Java code from schema.
     val generateCodegenArtifactsTask =
         project.tasks.register(
             "generateCodegenArtifactsFromSchema", GenerateCodegenArtifactsTask::class.java) {
-          it.dependsOn(generateCodegenSchemaTask)
-          it.reactNativeDir.set(extension.reactNativeDir)
-          it.deprecatedReactRoot.set(extension.reactRoot)
-          it.nodeExecutableAndArgs.set(extension.nodeExecutableAndArgs)
-          it.codegenDir.set(extension.codegenDir)
-          it.generatedSrcDir.set(generatedSrcDir)
-          it.packageJsonFile.set(extension.root.file("package.json"))
-          it.codegenJavaPackageName.set(extension.codegenJavaPackageName)
-          it.libraryName.set(extension.libraryName)
-        }
+              it.dependsOn(generateCodegenSchemaTask)
+              it.reactNativeDir.set(extension.reactNativeDir)
+              it.nodeExecutableAndArgs.set(extension.nodeExecutableAndArgs)
+              it.generatedSrcDir.set(generatedSrcDir)
+              it.packageJsonFile.set(findPackageJsonFile(project, extension))
+              it.codegenJavaPackageName.set(extension.codegenJavaPackageName)
+              it.libraryName.set(extension.libraryName)
+
+              // 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.
+              val needsCodegenFromPackageJson = project.needsCodegenFromPackageJson(extension)
+              it.onlyIf { isLibrary || needsCodegenFromPackageJson }
+            }
 
-    // We add dependencies & generated sources to the project.
-    // Note: This last step needs to happen after the project has been evaluated.
-    project.afterEvaluate {
-
-      // `preBuild` is one of the base tasks automatically registered by Gradle.
-      // This will invoke the codegen before compiling the entire project.
-      project.tasks.named("preBuild", Task::class.java).dependsOn(generateCodegenArtifactsTask)
-
-      /**
-       * Finally, update the android configuration to include the generated sources. This equivalent
-       * to this DSL:
-       *
-       * android { sourceSets { main { java { srcDirs += "$generatedSrcDir/java" } } } }
-       *
-       * See documentation at
-       * https://google.github.io/android-gradle-dsl/current/com.android.build.gradle.BaseExtension.html.
-       */
-      val android = project.extensions.getByName("android") as BaseExtension
-
-      android.sourceSets.getByName("main").java.srcDir(File(generatedSrcDir, "java"))
+    // We update the android configuration to include the generated sources.
+    // This equivalent to this DSL:
+    //
+    // android { sourceSets { main { java { srcDirs += "$generatedSrcDir/java" } } } }
+    project.extensions.getByType(AndroidComponentsExtension::class.java).finalizeDsl { ext ->
+      ext.sourceSets.getByName("main").java.srcDir(File(generatedSrcDir, "java"))
     }
+
+    // `preBuild` is one of the base tasks automatically registered by AGP.
+    // This will invoke the codegen before compiling the entire project.
+    project.tasks.named("preBuild", Task::class.java).dependsOn(generateCodegenArtifactsTask)
   }
 }
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt
index 60e7e60b0a65..94ccb2bc14bf 100644
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt
@@ -7,246 +7,72 @@
 
 package com.facebook.react
 
-import com.android.build.gradle.api.ApplicationVariant
-import com.android.build.gradle.api.BaseVariant
-import com.android.build.gradle.api.LibraryVariant
-import com.android.build.gradle.internal.tasks.factory.dependsOn
-import com.facebook.react.tasks.BundleJsAndAssetsTask
-import com.facebook.react.tasks.HermesBinaryTask
-import com.facebook.react.utils.detectedCliPath
+import com.android.build.api.variant.Variant
+import com.facebook.react.tasks.BundleHermesCTask
+import com.facebook.react.utils.NdkConfiguratorUtils.configureJsEnginePackagingOptions
+import com.facebook.react.utils.NdkConfiguratorUtils.configureNewArchPackagingOptions
+import com.facebook.react.utils.ProjectUtils.isHermesEnabled
+import com.facebook.react.utils.detectedCliFile
 import com.facebook.react.utils.detectedEntryFile
 import java.io.File
 import org.gradle.api.Project
-import org.gradle.api.Task
-import org.gradle.api.tasks.Copy
-import org.gradle.api.tasks.TaskProvider
 
-private const val REACT_GROUP = "react"
-
-@Suppress("SpreadOperator")
-internal fun Project.configureReactTasks(variant: BaseVariant, config: ReactExtension) {
+@Suppress("SpreadOperator", "UnstableApiUsage")
+internal fun Project.configureReactTasks(variant: Variant, config: ReactExtension) {
   val targetName = variant.name.replaceFirstChar { it.uppercase() }
-  val targetPath = variant.dirName
+  val targetPath = variant.name
 
   // React js bundle directories
-  val jsBundleDir = File(buildDir, "generated/assets/react/$targetPath")
   val resourcesDir = File(buildDir, "generated/res/react/$targetPath")
-
-  val bundleAssetName = config.bundleAssetName.get()
-  val jsBundleFile = File(jsBundleDir, bundleAssetName)
+  // Bundle: generated/assets/react/path/index.android.bundle
+  val jsBundleDir = File(buildDir, "generated/assets/react/$targetPath")
+  // Sourcemap: generated/sourcemaps/react/path/index.android.bundle.map
   val jsSourceMapsDir = File(buildDir, "generated/sourcemaps/react/$targetPath")
+  // Intermediate packager: intermediates/sourcemaps/react/path/index.android.bundle.packager.map
+  // Intermediate compiler: intermediates/sourcemaps/react/path/index.android.bundle.compiler.map
   val jsIntermediateSourceMapsDir = File(buildDir, "intermediates/sourcemaps/react/$targetPath")
-  val jsPackagerSourceMapFile = File(jsIntermediateSourceMapsDir, "${bundleAssetName}.packager.map")
-  val jsCompilerSourceMapFile = File(jsIntermediateSourceMapsDir, "${bundleAssetName}.compiler.map")
-  val jsOutputSourceMapFile = File(jsSourceMapsDir, "${bundleAssetName}.map")
-
-  // Additional node and packager commandline arguments
-  val nodeExecutableAndArgs = config.nodeExecutableAndArgs.get()
-  val cliPath = detectedCliPath(project.projectDir, config)
-
-  val execCommand = nodeExecutableAndArgs + cliPath
-  val enableHermes = config.enableHermesForVariant(variant)
-  val cleanup = config.deleteDebugFilesForVariant(variant)
-  val bundleEnabled = config.bundleForVariant(variant)
-
-  val bundleTask =
-      tasks.register("createBundle${targetName}JsAndAssets", BundleJsAndAssetsTask::class.java) {
-        it.group = REACT_GROUP
-        it.description = "create JS bundle and assets for $targetName."
-
-        it.reactRoot = config.root.get().asFile
-        it.sources =
-            fileTree(config.root) { fileTree -> fileTree.setExcludes(config.inputExcludes.get()) }
-        it.execCommand = execCommand
-        it.bundleCommand = config.bundleCommand.get()
-        it.devEnabled = !config.disableDevForVariant(variant)
-        it.entryFile = detectedEntryFile(config)
-
-        val extraArgs = mutableListOf<String>()
-
-        if (config.bundleConfig.isPresent) {
-          extraArgs.add("--config")
-          extraArgs.add(config.bundleConfig.get())
-        }
-
-        // Hermes doesn't require JS minification.
-        if (enableHermes && !it.devEnabled) {
-          extraArgs.add("--minify")
-          extraArgs.add("false")
-        }
-
-        extraArgs.addAll(config.extraPackagerArgs.get())
-
-        it.extraArgs = extraArgs
-
-        it.jsBundleDir = jsBundleDir
-        it.jsBundleFile = jsBundleFile
-        it.resourcesDir = resourcesDir
-        it.jsIntermediateSourceMapsDir = jsIntermediateSourceMapsDir
-        it.jsSourceMapsDir = jsSourceMapsDir
-        it.jsSourceMapsFile = if (enableHermes) jsPackagerSourceMapFile else jsOutputSourceMapFile
-
-        it.enabled = bundleEnabled
-      }
-
-  val hermesTask =
-      tasks.register("emit${targetName}HermesResources", HermesBinaryTask::class.java) {
-        it.group = REACT_GROUP
-        it.description = "bundle hermes resources for $targetName"
-
-        it.root = config.root.get().asFile
-        it.hermesCommand = config.hermesCommand.get()
-        it.hermesFlags = config.hermesFlagsForVariant(variant)
-        it.jsBundleFile = jsBundleFile
-        it.composeSourceMapsCommand = nodeExecutableAndArgs + config.composeSourceMapsPath.get()
-        it.jsPackagerSourceMapFile = jsPackagerSourceMapFile
-        it.jsCompilerSourceMapFile = jsCompilerSourceMapFile
-        it.jsOutputSourceMapFile = jsOutputSourceMapFile
-
-        it.dependsOn(bundleTask)
-
-        it.enabled = bundleEnabled && enableHermes
-      }
-
-  val aggregatedBundleTask =
-      tasks.register("bundle${targetName}JsAndAssets") {
-        it.group = REACT_GROUP
-        it.description = "bundle JS and resources for $targetName"
-
-        it.dependsOn(bundleTask, hermesTask)
-
-        // this was exposed before, do we still need it?
-        it.extensions.extraProperties["generatedResFolders"] = files(resourcesDir).builtBy(it)
-        it.extensions.extraProperties["generatedAssetsFolders"] = files(jsBundleDir).builtBy(it)
-      }
-
-  val generatedResFolders = files(resourcesDir).builtBy(aggregatedBundleTask)
 
-  // Android configuration
-  variant.registerGeneratedResFolders(generatedResFolders)
+  // The location of the cli.js file for React Native
+  val cliFile = detectedCliFile(config)
 
-  val packageTask: TaskProvider<out Task>? =
-      when (variant) {
-        is ApplicationVariant -> variant.packageApplicationProvider
-        is LibraryVariant -> variant.packageLibraryProvider
-        else -> tasks.named("package$targetName")
+  val isHermesEnabledInProject = project.isHermesEnabled
+  val isHermesEnabledInThisVariant =
+      if (config.enableHermesOnlyInVariants.get().isNotEmpty()) {
+        config.enableHermesOnlyInVariants.get().contains(variant.name) && isHermesEnabledInProject
+      } else {
+        isHermesEnabledInProject
       }
-  val stripDebugSymbolsTask: TaskProvider<Task>? = tasks.named("strip${targetName}DebugSymbols")
-  val mergeNativeLibsTask: TaskProvider<Task>? = tasks.named("merge${targetName}NativeLibs")
-
-  val mergeResourcesTask = variant.mergeResourcesProvider
-  val mergeAssetsTask = variant.mergeAssetsProvider
-  val preBundleTask = tasks.named("build${targetName}PreBundle")
-
-  val resourcesDirConfigValue = config.resourcesDir.getting(variant.name)
-  if (resourcesDirConfigValue.isPresent) {
-    val currentCopyResTask =
-        tasks.register("copy${targetName}BundledResources", Copy::class.java) {
-          it.group = "react"
-          it.description = "copy bundled resources into custom location for $targetName."
-
-          it.from(resourcesDir)
-          it.into(file(resourcesDirConfigValue.get()))
-
-          it.dependsOn(bundleTask)
-
-          it.enabled = bundleEnabled
+  val isDebuggableVariant =
+      config.debuggableVariants.get().any { it.equals(variant.name, ignoreCase = true) }
+
+  configureNewArchPackagingOptions(project, variant)
+  configureJsEnginePackagingOptions(config, variant, isHermesEnabledInThisVariant)
+
+  if (!isDebuggableVariant) {
+    val bundleTask =
+        tasks.register("createBundle${targetName}JsAndAssets", BundleHermesCTask::class.java) {
+          it.root.set(config.root)
+          it.nodeExecutableAndArgs.set(config.nodeExecutableAndArgs)
+          it.cliFile.set(cliFile)
+          it.bundleCommand.set(config.bundleCommand)
+          it.entryFile.set(detectedEntryFile(config))
+          it.extraPackagerArgs.set(config.extraPackagerArgs)
+          it.bundleConfig.set(config.bundleConfig)
+          it.bundleAssetName.set(config.bundleAssetName)
+          it.jsBundleDir.set(jsBundleDir)
+          it.resourcesDir.set(resourcesDir)
+          it.hermesEnabled.set(isHermesEnabledInThisVariant)
+          it.minifyEnabled.set(!isHermesEnabledInThisVariant)
+          it.devEnabled.set(false)
+          it.jsIntermediateSourceMapsDir.set(jsIntermediateSourceMapsDir)
+          it.jsSourceMapsDir.set(jsSourceMapsDir)
+          it.hermesCommand.set(config.hermesCommand)
+          it.hermesFlags.set(config.hermesFlags)
+          it.reactNativeDir.set(config.reactNativeDir)
         }
-
-    packageTask?.dependsOn(currentCopyResTask)
-    preBundleTask.dependsOn(currentCopyResTask)
-  }
-
-  packageTask?.configure {
-    if (config.enableVmCleanup.get()) {
-      val libDir = "$buildDir/intermediates/transforms/"
-      val targetVariant = ".*/transforms/[^/]*/${variant.name}/.*".toRegex()
-      it.doFirst { cleanupVMFiles(libDir, targetVariant, enableHermes, cleanup) }
-    }
-  }
-
-  stripDebugSymbolsTask?.configure {
-    if (config.enableVmCleanup.get()) {
-      val libDir = "$buildDir/intermediates/stripped_native_libs/${variant.name}/out/lib/"
-      val targetVariant = ".*/stripped_native_libs/${variant.name}/out/lib/.*".toRegex()
-      it.doLast { cleanupVMFiles(libDir, targetVariant, enableHermes, cleanup) }
-    }
+    // Currently broken inside AGP 7.3 We need to wait for a release of AGP 7.4 in order to use
+    // the addGeneratedSourceDirectory API.
+    // variant.sources.res?.addGeneratedSourceDirectory(bundleTask, BundleHermesCTask::resourcesDir)
+    variant.sources.assets?.addGeneratedSourceDirectory(bundleTask, BundleHermesCTask::jsBundleDir)
   }
-
-  mergeNativeLibsTask?.configure {
-    if (config.enableVmCleanup.get()) {
-      val libDir = "$buildDir/intermediates/merged_native_libs/${variant.name}/out/lib/"
-      val targetVariant = ".*/merged_native_libs/${variant.name}/out/lib/.*".toRegex()
-      it.doLast { cleanupVMFiles(libDir, targetVariant, enableHermes, cleanup) }
-    }
-  }
-
-  val currentAssetsCopyTask =
-      tasks.register("copy${targetName}BundledJs", Copy::class.java) {
-        it.group = "react"
-        it.description = "copy bundled JS into $targetName."
-
-        it.from(jsBundleDir)
-
-        val jsBundleDirConfigValue = config.jsBundleDir.getting(targetName)
-        if (jsBundleDirConfigValue.isPresent) {
-          it.into(jsBundleDirConfigValue.get())
-        } else {
-          it.into(mergeAssetsTask.map { mergeFoldersTask -> mergeFoldersTask.outputDir.get() })
-          // Workaround for Android Gradle Plugin 7.1 asset directory
-          it.into("$buildDir/intermediates/assets/${variant.name}/merge${targetName}Assets")
-        }
-
-        it.dependsOn(mergeAssetsTask)
-
-        it.enabled = bundleEnabled
-      }
-
-  // mergeResources task runs before the bundle file is copied to the intermediate asset directory
-  // from Android plugin 4.1+.
-  // This ensures to copy the bundle file before mergeResources task starts
-  mergeResourcesTask.dependsOn(currentAssetsCopyTask)
-  packageTask?.dependsOn(currentAssetsCopyTask)
-  preBundleTask.dependsOn(currentAssetsCopyTask)
-}
-
-private fun Project.cleanupVMFiles(
-    libDir: String,
-    targetVariant: Regex,
-    enableHermes: Boolean,
-    cleanup: Boolean
-) {
-  // Delete the VM related libraries that this build doesn't need.
-  // The application can manage this manually by setting 'enableVmCleanup: false'
-  //
-  // This should really be done by packaging all Hermes related libs into
-  // two separate HermesDebug and HermesRelease AARs, but until then we'll
-  // kludge it by deleting the .so files out of the /transforms/ directory.
-  fileTree(libDir) {
-        if (enableHermes) {
-          // For Hermes, delete all the libjsc* files
-          it.include("**/libjsc*.so")
-
-          if (cleanup) {
-            // Reduce size by deleting the debugger/inspector
-            it.include("**/libhermes-executor-debug.so")
-          } else {
-            // Release libs take precedence and must be removed
-            // to allow debugging
-            it.include("**/libhermes-executor-release.so")
-          }
-        } else {
-          // For JSC, delete all the libhermes* files
-          it.include("**/libhermes*.so")
-        }
-      }
-      .visit { visit ->
-        val path = visit.file.absolutePath.replace(File.separatorChar, '/')
-        if (path.matches(targetVariant) && visit.file.isFile) {
-          visit.file.delete()
-        }
-      }
 }
-
-internal val BaseVariant.isRelease: Boolean
-  get() = name.lowercase().contains("release")
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt
new file mode 100644
index 000000000000..2801d3aea634
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt
@@ -0,0 +1,190 @@
+/*
+ * 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.tasks
+
+import com.facebook.react.utils.detectOSAwareHermesCommand
+import com.facebook.react.utils.moveTo
+import com.facebook.react.utils.windowsAwareCommandLine
+import java.io.File
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.ConfigurableFileTree
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.*
+
+abstract class BundleHermesCTask : DefaultTask() {
+
+  init {
+    group = "react"
+  }
+
+  @get:Internal abstract val root: DirectoryProperty
+
+  @get:InputFiles
+  val sources: ConfigurableFileTree =
+      project.fileTree(root) {
+        it.include("**/*.js")
+        it.include("**/*.jsx")
+        it.include("**/*.ts")
+        it.include("**/*.tsx")
+        it.exclude("**/android/**/*")
+        it.exclude("**/ios/**/*")
+        it.exclude("**/build/**/*")
+        it.exclude("**/node_modules/**/*")
+      }
+
+  @get:Input abstract val nodeExecutableAndArgs: ListProperty<String>
+
+  @get:InputFile abstract val cliFile: RegularFileProperty
+
+  @get:Internal abstract val reactNativeDir: DirectoryProperty
+
+  @get:Input abstract val bundleCommand: Property<String>
+
+  @get:InputFile abstract val entryFile: RegularFileProperty
+
+  @get:InputFile @get:Optional abstract val bundleConfig: RegularFileProperty
+
+  @get:Input abstract val bundleAssetName: Property<String>
+
+  @get:Input abstract val minifyEnabled: Property<Boolean>
+
+  @get:Input abstract val hermesEnabled: Property<Boolean>
+
+  @get:Input abstract val devEnabled: Property<Boolean>
+
+  @get:Input abstract val extraPackagerArgs: ListProperty<String>
+
+  @get:Input abstract val hermesCommand: Property<String>
+
+  @get:Input abstract val hermesFlags: ListProperty<String>
+
+  @get:OutputDirectory abstract val jsBundleDir: DirectoryProperty
+
+  @get:OutputDirectory abstract val resourcesDir: DirectoryProperty
+
+  @get:OutputDirectory abstract val jsIntermediateSourceMapsDir: RegularFileProperty
+
+  @get:OutputDirectory abstract val jsSourceMapsDir: DirectoryProperty
+
+  @TaskAction
+  fun run() {
+    jsBundleDir.get().asFile.mkdirs()
+    resourcesDir.get().asFile.mkdirs()
+    jsIntermediateSourceMapsDir.get().asFile.mkdirs()
+    jsSourceMapsDir.get().asFile.mkdirs()
+    val bundleAssetFilename = bundleAssetName.get()
+
+    val bundleFile = File(jsBundleDir.get().asFile, bundleAssetFilename)
+    val packagerSourceMap = resolvePackagerSourceMapFile(bundleAssetFilename)
+
+    val bundleCommand = getBundleCommand(bundleFile, packagerSourceMap)
+    runCommand(bundleCommand)
+
+    if (hermesEnabled.get()) {
+      val detectedHermesCommand = detectOSAwareHermesCommand(root.get().asFile, hermesCommand.get())
+      val bytecodeFile = File("${bundleFile}.hbc")
+      val outputSourceMap = resolveOutputSourceMap(bundleAssetFilename)
+      val compilerSourceMap = resolveCompilerSourceMap(bundleAssetFilename)
+
+      val hermesCommand = getHermescCommand(detectedHermesCommand, bytecodeFile, bundleFile)
+      runCommand(hermesCommand)
+      bytecodeFile.moveTo(bundleFile)
+
+      if (hermesFlags.get().contains("-output-source-map")) {
+        val hermesTempSourceMapFile = File("$bytecodeFile.map")
+        hermesTempSourceMapFile.moveTo(compilerSourceMap)
+
+        val reactNativeDir = reactNativeDir.get().asFile
+        val composeScriptFile = File(reactNativeDir, "scripts/compose-source-maps.js")
+        val composeSourceMapsCommand =
+            getComposeSourceMapsCommand(
+                composeScriptFile, packagerSourceMap, compilerSourceMap, outputSourceMap)
+        runCommand(composeSourceMapsCommand)
+      }
+    }
+  }
+
+  internal fun resolvePackagerSourceMapFile(bundleAssetName: String) =
+      if (hermesEnabled.get()) {
+        File(jsIntermediateSourceMapsDir.get().asFile, "$bundleAssetName.packager.map")
+      } else {
+        resolveOutputSourceMap(bundleAssetName)
+      }
+
+  internal fun resolveOutputSourceMap(bundleAssetName: String) =
+      File(jsSourceMapsDir.get().asFile, "$bundleAssetName.map")
+
+  internal fun resolveCompilerSourceMap(bundleAssetName: String) =
+      File(jsIntermediateSourceMapsDir.get().asFile, "$bundleAssetName.compiler.map")
+
+  private fun runCommand(command: List<Any>) {
+    project.exec {
+      it.workingDir(root.get().asFile)
+      it.commandLine(command)
+    }
+  }
+
+  internal fun getBundleCommand(bundleFile: File, sourceMapFile: File): List<Any> =
+      windowsAwareCommandLine(
+          buildList {
+            addAll(nodeExecutableAndArgs.get())
+            add(cliFile.get().asFile.absolutePath)
+            add(bundleCommand.get())
+            add("--platform")
+            add("android")
+            add("--dev")
+            add(devEnabled.get().toString())
+            add("--reset-cache")
+            add("--entry-file")
+            add(entryFile.get().asFile.toString())
+            add("--bundle-output")
+            add(bundleFile.toString())
+            add("--assets-dest")
+            add(resourcesDir.get().asFile.toString())
+            add("--sourcemap-output")
+            add(sourceMapFile.toString())
+            if (bundleConfig.isPresent) {
+              add("--config")
+              add(bundleConfig.get().asFile.absolutePath)
+            }
+            add("--minify")
+            add(minifyEnabled.get().toString())
+            addAll(extraPackagerArgs.get())
+            add("--verbose")
+          })
+
+  internal fun getHermescCommand(
+      hermesCommand: String,
+      bytecodeFile: File,
+      bundleFile: File
+  ): List<Any> =
+      windowsAwareCommandLine(
+          hermesCommand,
+          "-emit-binary",
+          "-out",
+          bytecodeFile.absolutePath,
+          bundleFile.absolutePath,
+          *hermesFlags.get().toTypedArray())
+
+  internal fun getComposeSourceMapsCommand(
+      composeScript: File,
+      packagerSourceMap: File,
+      compilerSourceMap: File,
+      outputSourceMap: File
+  ): List<Any> =
+      windowsAwareCommandLine(
+          *nodeExecutableAndArgs.get().toTypedArray(),
+          composeScript.absolutePath,
+          packagerSourceMap.toString(),
+          compilerSourceMap.toString(),
+          "-o",
+          outputSourceMap.toString())
+}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleJsAndAssetsTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleJsAndAssetsTask.kt
deleted file mode 100644
index 2e1a0b8be819..000000000000
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleJsAndAssetsTask.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.tasks
-
-import com.facebook.react.utils.recreateDir
-import com.facebook.react.utils.windowsAwareCommandLine
-import java.io.File
-import org.gradle.api.file.FileTree
-import org.gradle.api.tasks.*
-
-abstract class BundleJsAndAssetsTask : Exec() {
-
-  @get:Internal lateinit var reactRoot: File
-
-  @get:InputFiles
-  @Suppress("UNUSED") // used to invalidate caches
-  lateinit var sources: FileTree
-
-  @get:Input lateinit var execCommand: List<String>
-  @get:Input lateinit var bundleCommand: String
-  @get:Input var devEnabled: Boolean = true
-  @get:InputFile lateinit var entryFile: File
-  @get:Input var extraArgs: List<String> = emptyList()
-
-  @get:OutputDirectory lateinit var jsBundleDir: File
-  @get:OutputFile lateinit var jsBundleFile: File
-  @get:OutputDirectory lateinit var resourcesDir: File
-  @get:OutputDirectory lateinit var jsIntermediateSourceMapsDir: File
-  @get:OutputDirectory lateinit var jsSourceMapsDir: File
-  @get:OutputFile lateinit var jsSourceMapsFile: File
-
-  override fun exec() {
-    cleanOutputDirectories()
-    configureBundleCommand()
-    super.exec()
-  }
-
-  private fun cleanOutputDirectories() {
-    jsBundleDir.recreateDir()
-    resourcesDir.recreateDir()
-    jsIntermediateSourceMapsDir.recreateDir()
-    jsSourceMapsDir.recreateDir()
-  }
-
-  private fun configureBundleCommand() {
-    workingDir(reactRoot)
-
-    @Suppress("SpreadOperator")
-    commandLine(
-        windowsAwareCommandLine(
-            *execCommand.toTypedArray(),
-            bundleCommand,
-            "--platform",
-            "android",
-            "--dev",
-            devEnabled,
-            "--reset-cache",
-            "--entry-file",
-            entryFile,
-            "--bundle-output",
-            jsBundleFile,
-            "--assets-dest",
-            resourcesDir,
-            "--sourcemap-output",
-            jsSourceMapsFile,
-            *extraArgs.toTypedArray()))
-  }
-}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTask.kt
index f00bfad9143f..b6003eeb5e14 100644
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTask.kt
+++ b/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,13 +36,6 @@ abstract class GenerateCodegenArtifactsTask : Exec() {
 
   @get:Input abstract val libraryName: Property<String>
 
-  // We're keeping this just to fire a warning at the user should they use the `reactRoot` property.
-  @get:Internal abstract val deprecatedReactRoot: DirectoryProperty
-
-  @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")
 
@@ -53,37 +44,11 @@ abstract class GenerateCodegenArtifactsTask : Exec() {
   @get:OutputDirectory val generatedJniFiles: Provider<Directory> = generatedSrcDir.dir("jni")
 
   override fun exec() {
-    checkForDeprecatedProperty()
-
     val (resolvedLibraryName, resolvedCodegenJavaPackageName) = resolveTaskParameters()
     setupCommandLine(resolvedLibraryName, resolvedCodegenJavaPackageName)
     super.exec()
   }
 
-  private fun checkForDeprecatedProperty() {
-    if (deprecatedReactRoot.isPresent) {
-      project.logger.error(
-          """
-        ********************************************************************************
-        The `reactRoot` property is deprecated and will be removed in 
-        future versions of React Native. The property is currently ignored.
-        
-        You should instead use either:
-        - [root] to point to your root project (where the package.json lives)
-        - [reactNativeDir] to point to the NPM package of react native.
-        
-        You should be fine by just removing the `reactRoot` line entirely from 
-        your build.gradle file. Otherwise a valid configuration would look like:
-        
-        react {
-            root = rootProject.file('..')
-            reactNativeDir = rootProject.file('../node_modules/react-native')
-        }
-        ********************************************************************************
-      """.trimIndent())
-    }
-  }
-
   internal fun resolveTaskParameters(): Pair<String, String> {
     val parsedPackageJson =
         if (packageJsonFile.isPresent && packageJsonFile.get().asFile.exists()) {
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTask.kt
index ba2eeb2ffd16..d72bc0a379f2 100644
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTask.kt
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTask.kt
@@ -33,7 +33,17 @@ abstract class GenerateCodegenSchemaTask : Exec() {
   val jsInputFiles =
       project.fileTree(jsRootDir) {
         it.include("**/*.js")
+        it.include("**/*.ts")
+        // Those are known build paths where the source map or other
+        // .js files could be stored/generated. We want to make sure we don't pick them up
+        // for execution avoidance.
         it.exclude("**/generated/source/codegen/**/*")
+        it.exclude("**/build/ASSETS/**/*")
+        it.exclude("**/build/RES/**/*")
+        it.exclude("**/build/generated/assets/react/**/*")
+        it.exclude("**/build/generated/res/react/**/*")
+        it.exclude("**/build/generated/sourcemaps/react/**/*")
+        it.exclude("**/build/intermediates/sourcemaps/react/**/*")
       }
 
   @get:OutputFile
@@ -61,6 +71,8 @@ abstract class GenerateCodegenSchemaTask : Exec() {
                 .get()
                 .asFile
                 .absolutePath,
+            "--platform",
+            "android",
             generatedSchemaFile.get().asFile.absolutePath,
             jsRootDir.asFile.get().absolutePath,
         ))
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/HermesBinaryTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/HermesBinaryTask.kt
deleted file mode 100644
index 3f9e63597384..000000000000
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/HermesBinaryTask.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.tasks
-
-import com.facebook.react.utils.detectOSAwareHermesCommand
-import com.facebook.react.utils.moveTo
-import com.facebook.react.utils.windowsAwareCommandLine
-import java.io.File
-import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.OutputFile
-import org.gradle.api.tasks.TaskAction
-
-open class HermesBinaryTask : DefaultTask() {
-
-  @get:Internal internal lateinit var root: File
-
-  @get:Input internal lateinit var hermesCommand: String
-  @get:Input internal var hermesFlags: List<String> = emptyList()
-  @get:InputFile internal lateinit var jsBundleFile: File
-
-  @get:Input internal lateinit var composeSourceMapsCommand: List<String>
-  @get:InputFile internal lateinit var jsPackagerSourceMapFile: File
-
-  @get:OutputFile internal lateinit var jsCompilerSourceMapFile: File
-  @get:OutputFile internal lateinit var jsOutputSourceMapFile: File
-
-  @TaskAction
-  fun run() {
-    val detectedHermesCommand = detectOSAwareHermesCommand(root, hermesCommand)
-    val bytecodeTempFile = File("$jsBundleFile.hbc")
-    emitHermesBinary(hermesCommand = detectedHermesCommand, outputFile = bytecodeTempFile)
-    bytecodeTempFile.moveTo(jsBundleFile)
-
-    if (hermesFlags.contains("-output-source-map")) {
-      val hermesTempSourceMapFile = File("$bytecodeTempFile.map")
-      hermesTempSourceMapFile.moveTo(jsCompilerSourceMapFile)
-      composeSourceMaps()
-    }
-  }
-
-  private fun emitHermesBinary(hermesCommand: String, outputFile: File) {
-    project.exec {
-      @Suppress("SpreadOperator")
-      it.commandLine(
-          windowsAwareCommandLine(
-              hermesCommand,
-              "-emit-binary",
-              "-out",
-              outputFile,
-              jsBundleFile,
-              *hermesFlags.toTypedArray()))
-    }
-  }
-
-  private fun composeSourceMaps() {
-    project.exec {
-      it.workingDir(root)
-
-      @Suppress("SpreadOperator")
-      it.commandLine(
-          windowsAwareCommandLine(
-              *composeSourceMapsCommand.toTypedArray(),
-              jsPackagerSourceMapFile,
-              jsCompilerSourceMapFile,
-              "-o",
-              jsOutputSourceMapFile))
-    }
-  }
-}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/ExtractJniAndHeadersTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/ExtractJniAndHeadersTask.kt
deleted file mode 100644
index fd0769b90238..000000000000
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/ExtractJniAndHeadersTask.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.tasks.internal
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.tasks.*
-
-/**
- * A task that takes care of extracting JNIs and Headers from a custom Gradle configuration into an
- * output folder. Users are most likely not going to use this task but it will be used when building
- * the React Native project.
- */
-abstract class ExtractJniAndHeadersTask : DefaultTask() {
-
-  @get:InputFiles abstract val extractHeadersConfiguration: ConfigurableFileCollection
-
-  @get:InputFiles abstract val extractJniConfiguration: ConfigurableFileCollection
-
-  @get:OutputDirectory abstract val baseOutputDir: DirectoryProperty
-
-  @TaskAction
-  fun taskAction() {
-    extractJniConfiguration.files.forEach {
-      val file = it.absoluteFile
-      val packageName = file.name.split("-", ".").first()
-      project.copy { copySpec ->
-        copySpec.from(project.zipTree(file))
-        copySpec.into(baseOutputDir.dir(packageName))
-        copySpec.include("jni/**/*")
-      }
-    }
-    extractHeadersConfiguration.files.forEach {
-      val file = it.absoluteFile
-      val packageName = file.name.split("-", ".").first()
-      project.copy { copySpec ->
-        copySpec.from(project.zipTree(file))
-        copySpec.into(baseOutputDir.get().dir("$packageName/headers"))
-        copySpec.include("**/*.h")
-      }
-    }
-  }
-}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt
index 9fe06794aeab..ee680337af49 100644
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt
@@ -32,7 +32,6 @@ abstract class PrepareBoostTask : DefaultTask() {
       it.from(boostPath)
       it.from(project.file("src/main/jni/third-party/boost"))
       it.include(
-          "Android.mk",
           "CMakeLists.txt",
           "boost_${boostVersion.get()}/boost/**/*.hpp",
           "boost/boost/**/*.hpp",
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareGlogTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareGlogTask.kt
index f23207188724..fcbd204517c8 100644
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareGlogTask.kt
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareGlogTask.kt
@@ -33,7 +33,7 @@ abstract class PrepareGlogTask : DefaultTask() {
     project.copy {
       it.from(glogPath)
       it.from(project.file("src/main/jni/third-party/glog/"))
-      it.include("glog-${glogVersion.get()}/src/**/*", "Android.mk", "CMakeLists.txt", "config.h")
+      it.include("glog-${glogVersion.get()}/src/**/*", "CMakeLists.txt", "config.h")
       it.duplicatesStrategy = DuplicatesStrategy.WARN
       it.includeEmptyDirs = false
       it.filesMatching("**/*.h.in") { matchedFile ->
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareJSCTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareJSCTask.kt
index de742285bb64..9b6913df88fa 100644
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareJSCTask.kt
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareJSCTask.kt
@@ -41,7 +41,6 @@ abstract class PrepareJSCTask : DefaultTask() {
     project.copy { it ->
       it.from(soFiles)
       it.from(headerFiles)
-      it.from(project.file("src/main/jni/third-party/jsc/Android.mk"))
       it.from(project.file("src/main/jni/third-party/jsc/CMakeLists.txt"))
       it.filesMatching("**/*.h") { it.path = "JavaScriptCore/${it.name}" }
       it.includeEmptyDirs = false
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareLibeventTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareLibeventTask.kt
index f5faa9ff75b6..fb00626557f3 100644
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareLibeventTask.kt
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareLibeventTask.kt
@@ -37,8 +37,7 @@ abstract class PrepareLibeventTask : DefaultTask() {
           "libevent-${libeventVersion.get()}-stable/include/**/*",
           "evconfig-private.h",
           "event-config.h",
-          "CMakeLists.txt",
-          "Android.mk")
+          "CMakeLists.txt")
       it.eachFile { it.path = it.path.removePrefix("libevent-${libeventVersion.get()}-stable/") }
       it.includeEmptyDirs = false
       it.into(outputDir)
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt
new file mode 100644
index 000000000000..f3b55e091104
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt
@@ -0,0 +1,62 @@
+/*
+ * 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.tasks.internal
+
+import com.facebook.react.tasks.internal.utils.PrefabPreprocessingEntry
+import java.io.File
+import javax.inject.Inject
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.FileSystemOperations
+import org.gradle.api.file.RegularFile
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.TaskAction
+
+/**
+ * A task that takes care of copying headers and filtering them so that can be consumed by the
+ * Prefab protocol. This task handles also the header prefixes.
+ *
+ * It currently filters out some of the Boost headers as they're not used by React Native and are
+ * resulting in bigger .aar (250Mb+).
+ *
+ * You should provide in input a list fo [PrefabPreprocessingEntry] that will be used by this task
+ * to do the necessary copy operations.
+ */
+abstract class PreparePrefabHeadersTask : DefaultTask() {
+
+  @get:Input abstract val input: ListProperty<PrefabPreprocessingEntry>
+
+  @get:OutputDirectory abstract val outputDir: DirectoryProperty
+
+  @get:Inject abstract val fs: FileSystemOperations
+
+  @TaskAction
+  fun taskAction() {
+    input.get().forEach { (libraryName, pathToPrefixCouples) ->
+      val outputFolder: RegularFile = outputDir.file(libraryName).get()
+      pathToPrefixCouples.forEach { (headerPath, headerPrefix) ->
+        fs.copy {
+          it.from(headerPath)
+          it.include("**/*.h")
+          it.exclude("**/*.cpp")
+          it.exclude("**/*.txt")
+          // We don't want to copy all the boost headers as they are 250Mb+
+          it.include("boost/config.hpp")
+          it.include("boost/config/**/*.hpp")
+          it.include("boost/core/*.hpp")
+          it.include("boost/detail/workaround.hpp")
+          it.include("boost/operators.hpp")
+          it.include("boost/preprocessor/**/*.hpp")
+          it.into(File(outputFolder.asFile, headerPrefix))
+        }
+      }
+    }
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/utils/PrefabPreprocessingEntry.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/utils/PrefabPreprocessingEntry.kt
new file mode 100644
index 000000000000..943bba3eaaca
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/utils/PrefabPreprocessingEntry.kt
@@ -0,0 +1,27 @@
+/*
+ * 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.tasks.internal.utils
+
+import java.io.Serializable
+
+/**
+ * This data class represents an entry that can be consumed by the [PreparePrefabHeadersTask].
+ * @param libraryName The name of the library that you're preparing for Prefab
+ * @param pathToPrefixCouples A list of pairs Path to Header prefix. You can use this list to supply
+ * a list of paths that you want to be considered for prefab. Each path can specify an header prefix
+ * that will be used by prefab to re-created the header layout.
+ */
+data class PrefabPreprocessingEntry(
+    val libraryName: String,
+    val pathToPrefixCouples: List<Pair<String, String>>,
+) : Serializable {
+  constructor(
+      libraryName: String,
+      pathToPrefixCouple: Pair<String, String>
+  ) : this(libraryName, listOf(pathToPrefixCouple))
+}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/AgpConfiguratorUtils.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/AgpConfiguratorUtils.kt
new file mode 100644
index 000000000000..3bf008535f7e
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/AgpConfiguratorUtils.kt
@@ -0,0 +1,54 @@
+/*
+ * 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 com.android.build.api.variant.AndroidComponentsExtension
+import com.facebook.react.utils.ProjectUtils.isHermesEnabled
+import com.facebook.react.utils.ProjectUtils.isNewArchEnabled
+import org.gradle.api.Action
+import org.gradle.api.Project
+import org.gradle.api.plugins.AppliedPlugin
+
+@Suppress("UnstableApiUsage")
+internal object AgpConfiguratorUtils {
+
+  fun configureBuildConfigFields(project: Project) {
+    val action =
+        Action<AppliedPlugin> {
+          project.extensions.getByType(AndroidComponentsExtension::class.java).finalizeDsl { ext ->
+            ext.defaultConfig.buildConfigField(
+                "boolean", "IS_NEW_ARCHITECTURE_ENABLED", project.isNewArchEnabled.toString())
+            ext.defaultConfig.buildConfigField(
+                "boolean", "IS_HERMES_ENABLED", project.isHermesEnabled.toString())
+          }
+        }
+    project.pluginManager.withPlugin("com.android.application", action)
+    project.pluginManager.withPlugin("com.android.library", action)
+  }
+
+  fun configureDevPorts(project: Project) {
+    val devServerPort =
+        project.properties["reactNativeDevServerPort"]?.toString() ?: DEFAULT_DEV_SERVER_PORT
+    val inspectorProxyPort =
+        project.properties["reactNativeInspectorProxyPort"]?.toString() ?: devServerPort
+
+    val action =
+        Action<AppliedPlugin> {
+          project.extensions.getByType(AndroidComponentsExtension::class.java).finalizeDsl { ext ->
+            ext.defaultConfig.resValue("integer", "react_native_dev_server_port", devServerPort)
+            ext.defaultConfig.resValue(
+                "integer", "react_native_inspector_proxy_port", inspectorProxyPort)
+          }
+        }
+
+    project.pluginManager.withPlugin("com.android.application", action)
+    project.pluginManager.withPlugin("com.android.library", action)
+  }
+}
+
+const val DEFAULT_DEV_SERVER_PORT = "8081"
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/BackwardCompatUtils.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/BackwardCompatUtils.kt
new file mode 100644
index 000000000000..5c39266900f6
--- /dev/null
+++ b/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>())
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt
new file mode 100644
index 000000000000..c8760f644d8d
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt
@@ -0,0 +1,89 @@
+/*
+ * 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.io.File
+import java.net.URI
+import java.util.*
+import org.gradle.api.Project
+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) {
+    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")
+      }
+    }
+  }
+
+  /**
+   * 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.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}",
+        )
+      }
+    }
+  }
+
+  fun readVersionString(propertiesFile: File): String {
+    val reactAndroidProperties = Properties()
+    propertiesFile.inputStream().use { reactAndroidProperties.load(it) }
+    val versionString = reactAndroidProperties["VERSION_NAME"] as? String ?: ""
+    // If on a nightly, we need to fetch the -SNAPSHOT artifact from Sonatype.
+    return if (versionString.startsWith("0.0.0")) {
+      "$versionString-SNAPSHOT"
+    } else {
+      versionString
+    }
+  }
+
+  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 }
+}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt
new file mode 100644
index 000000000000..9d0e6b9740c8
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt
@@ -0,0 +1,139 @@
+/*
+ * 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 com.android.build.api.variant.AndroidComponentsExtension
+import com.android.build.api.variant.Variant
+import com.facebook.react.ReactExtension
+import com.facebook.react.utils.ProjectUtils.isNewArchEnabled
+import java.io.File
+import org.gradle.api.Project
+
+internal object NdkConfiguratorUtils {
+  @Suppress("UnstableApiUsage")
+  fun configureReactNativeNdk(project: Project, extension: ReactExtension) {
+    project.pluginManager.withPlugin("com.android.application") {
+      project.extensions.getByType(AndroidComponentsExtension::class.java).finalizeDsl { ext ->
+        if (!project.isNewArchEnabled) {
+          // For Old Arch, we don't need to setup the NDK
+          return@finalizeDsl
+        }
+        // We enable prefab so users can consume .so/headers from ReactAndroid and hermes-engine
+        // .aar
+        ext.buildFeatures.prefab = true
+
+        // If the user has not provided a CmakeLists.txt path, let's provide
+        // the default one from the framework
+        if (ext.externalNativeBuild.cmake.path == null) {
+          ext.externalNativeBuild.cmake.path =
+              File(
+                  extension.reactNativeDir.get().asFile,
+                  "ReactAndroid/cmake-utils/default-app-setup/CMakeLists.txt")
+        }
+
+        // Parameters should be provided in an additive manner (do not override what
+        // the user provided, but allow for sensible defaults).
+        val cmakeArgs = ext.defaultConfig.externalNativeBuild.cmake.arguments
+        if ("-DPROJECT_BUILD_DIR" !in cmakeArgs) {
+          cmakeArgs.add("-DPROJECT_BUILD_DIR=${project.buildDir}")
+        }
+        if ("-DREACT_ANDROID_DIR" !in cmakeArgs) {
+          cmakeArgs.add(
+              "-DREACT_ANDROID_DIR=${extension.reactNativeDir.file("ReactAndroid").get().asFile}")
+        }
+        if ("-DANDROID_STL" !in cmakeArgs) {
+          cmakeArgs.add("-DANDROID_STL=c++_shared")
+        }
+      }
+    }
+  }
+
+  /**
+   * This method is used to configure the .so Packaging Options for the given variant. It will make
+   * sure we specify the correct .pickFirsts for all the .so files we are producing or that we're
+   * aware of as some of our dependencies are pulling them in.
+   */
+  fun configureNewArchPackagingOptions(
+      project: Project,
+      variant: Variant,
+  ) {
+    if (!project.isNewArchEnabled) {
+      // For Old Arch, we set a pickFirst only on libraries that we know are
+      // clashing with our direct dependencies (FBJNI, Flipper and Hermes).
+      variant.packaging.jniLibs.pickFirsts.addAll(
+          listOf(
+              "**/libfbjni.so",
+              "**/libc++_shared.so",
+          ))
+    } else {
+      // We set some packagingOptions { pickFirst ... } for our users for libraries we own.
+      variant.packaging.jniLibs.pickFirsts.addAll(
+          listOf(
+              // This is the .so provided by FBJNI via prefab
+              "**/libfbjni.so",
+              // Those are prefab libraries we distribute via ReactAndroid
+              // Due to a bug in AGP, they fire a warning on console as both the JNI
+              // and the prefab .so files gets considered. See more on:
+              "**/libfabricjni.so",
+              "**/libfolly_runtime.so",
+              "**/libglog.so",
+              "**/libjsi.so",
+              "**/libreact_codegen_rncore.so",
+              "**/libreact_debug.so",
+              "**/libreact_nativemodule_core.so",
+              "**/libreact_newarchdefaults.so",
+              "**/libreact_render_componentregistry.so",
+              "**/libreact_render_core.so",
+              "**/libreact_render_debug.so",
+              "**/libreact_render_graphics.so",
+              "**/libreact_render_imagemanager.so",
+              "**/libreact_render_mapbuffer.so",
+              "**/librrc_image.so",
+              "**/librrc_view.so",
+              "**/libruntimeexecutor.so",
+              "**/libturbomodulejsijni.so",
+              "**/libyoga.so",
+              // AGP will give priority of libc++_shared coming from App modules.
+              "**/libc++_shared.so",
+          ))
+    }
+  }
+
+  /**
+   * This method is used to configure the .so Cleanup for the given variant. It takes care of
+   * cleaning up the .so files that are not needed for Hermes or JSC, given a specific variant.
+   */
+  fun configureJsEnginePackagingOptions(
+      config: ReactExtension,
+      variant: Variant,
+      hermesEnabled: Boolean,
+  ) {
+    if (config.enableSoCleanup.get()) {
+      val (excludes, includes) = getPackagingOptionsForVariant(hermesEnabled)
+      variant.packaging.jniLibs.excludes.addAll(excludes)
+      variant.packaging.jniLibs.pickFirsts.addAll(includes)
+    }
+  }
+
+  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")
+      includes.add("**/libhermes_executor.so")
+    } else {
+      excludes.add("**/libhermes.so")
+      excludes.add("**/libhermes_executor.so")
+      includes.add("**/libjsc.so")
+      includes.add("**/libjscexecutor.so")
+    }
+    return excludes to includes
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt
index 562ac7857c11..a4239dd898e1 100644
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt
@@ -10,7 +10,9 @@
 package com.facebook.react.utils
 
 import com.facebook.react.ReactExtension
+import com.facebook.react.model.ModelPackageJson
 import java.io.File
+import org.gradle.api.Project
 
 /**
  * Computes the entry file for React Native. The Algo follows this order:
@@ -26,20 +28,16 @@ internal fun detectedEntryFile(config: ReactExtension): File =
         entryFile = config.entryFile.orNull?.asFile, reactRoot = config.root.get().asFile)
 
 /**
- * Computes the CLI location for React Native. The Algo follows this order:
- * 1. The path provided by the `cliPath` config in the `reactApp` Gradle extension
- * 2. The output of `node -e "console.log(require('react-native/cli').bin);"` if not failing.
+ * Computes the CLI file for React Native. The Algo follows this order:
+ * 1. The path provided by the `cliFile` config in the `react {}` Gradle extension
+ * 2. The output of `node --print "require.resolve('react-native/cli');"` if not failing.
  * 3. The `node_modules/react-native/cli.js` file if exists
  * 4. Fails otherwise
  */
-internal fun detectedCliPath(
-    projectDir: File,
-    config: ReactExtension,
-): String =
-    detectCliPath(
-        projectDir = projectDir,
-        reactRoot = config.root.get().asFile,
-        preconfiguredCliPath = config.cliPath.orNull)
+internal fun detectedCliFile(config: ReactExtension): File =
+    detectCliFile(
+        reactNativeRoot = config.root.get().asFile,
+        preconfiguredCliFile = config.cliFile.asFile.orNull)
 
 /**
  * Computes the `hermesc` command location. The Algo follows this order:
@@ -62,24 +60,11 @@ private fun detectEntryFile(entryFile: File?, reactRoot: File): File =
       else -> File(reactRoot, "index.js")
     }
 
-private fun detectCliPath(
-    projectDir: File,
-    reactRoot: File,
-    preconfiguredCliPath: String?
-): String {
+private fun detectCliFile(reactNativeRoot: File, preconfiguredCliFile: File?): File {
   // 1. preconfigured path
-  if (preconfiguredCliPath != null) {
-    val preconfiguredCliJsAbsolute = File(preconfiguredCliPath)
-    if (preconfiguredCliJsAbsolute.exists()) {
-      return preconfiguredCliJsAbsolute.absolutePath
-    }
-    val preconfiguredCliJsRelativeToReactRoot = File(reactRoot, preconfiguredCliPath)
-    if (preconfiguredCliJsRelativeToReactRoot.exists()) {
-      return preconfiguredCliJsRelativeToReactRoot.absolutePath
-    }
-    val preconfiguredCliJsRelativeToProject = File(projectDir, preconfiguredCliPath)
-    if (preconfiguredCliJsRelativeToProject.exists()) {
-      return preconfiguredCliJsRelativeToProject.absolutePath
+  if (preconfiguredCliFile != null) {
+    if (preconfiguredCliFile.exists()) {
+      return preconfiguredCliFile
     }
   }
 
@@ -87,29 +72,34 @@ private fun detectCliPath(
   val nodeProcess =
       Runtime.getRuntime()
           .exec(
-              arrayOf("node", "-e", "console.log(require('react-native/cli').bin);"),
+              arrayOf("node", "--print", "require.resolve('react-native/cli');"),
               emptyArray(),
-              projectDir)
+              reactNativeRoot)
 
   val nodeProcessOutput = nodeProcess.inputStream.use { it.bufferedReader().readText().trim() }
 
   if (nodeProcessOutput.isNotEmpty()) {
     val nodeModuleCliJs = File(nodeProcessOutput)
     if (nodeModuleCliJs.exists()) {
-      return nodeModuleCliJs.absolutePath
+      return nodeModuleCliJs
     }
   }
 
   // 3. cli.js in the root folder
-  val rootCliJs = File(reactRoot, "node_modules/react-native/cli.js")
+  val rootCliJs = File(reactNativeRoot, "node_modules/react-native/cli.js")
   if (rootCliJs.exists()) {
-    return rootCliJs.absolutePath
+    return rootCliJs
   }
 
   error(
-      "Couldn't determine CLI location. " +
-          "Please set `project.react.cliPath` to the path of the react-native cli.js file. " +
-          "This file typically resides in `node_modules/react-native/cli.js`")
+      """
+      Couldn't determine CLI location!
+      
+      Please set `react { cliFile = file(...) }` inside your 
+      build.gradle to the path of the react-native cli.js file.
+      This file typically resides in `node_modules/react-native/cli.js`
+    """
+          .trimIndent())
 }
 
 /**
@@ -145,7 +135,8 @@ internal fun detectOSAwareHermesCommand(projectRoot: File, hermesCommand: String
 
   // 3. If the react-native contains a pre-built hermesc, use it.
   val prebuiltHermesPath =
-      HERMESC_IN_REACT_NATIVE_PATH.replace("%OS-BIN%", getHermesOSBin())
+      HERMESC_IN_REACT_NATIVE_DIR.plus(getHermesCBin())
+          .replace("%OS-BIN%", getHermesOSBin())
           // Execution on Windows fails with / as separator
           .replace('/', File.separatorChar)
 
@@ -162,7 +153,7 @@ internal fun detectOSAwareHermesCommand(projectRoot: File, hermesCommand: String
 
 /**
  * Gets the location where Hermesc should be. If nothing is specified, built hermesc is assumed to
- * be inside [HERMESC_BUILT_FROM_SOURCE_PATH]. Otherwise user can specify an override with
+ * be inside [HERMESC_BUILT_FROM_SOURCE_DIR]. Otherwise user can specify an override with
  * [pathOverride], which is assumed to be an absolute path where Hermes source code is
  * provided/built.
  *
@@ -170,11 +161,13 @@ internal fun detectOSAwareHermesCommand(projectRoot: File, hermesCommand: String
  */
 internal fun getBuiltHermescFile(projectRoot: File, pathOverride: String?) =
     if (!pathOverride.isNullOrBlank()) {
-      File(pathOverride, "build/bin/hermesc")
+      File(pathOverride, "build/bin/${getHermesCBin()}")
     } else {
-      File(projectRoot, HERMESC_BUILT_FROM_SOURCE_PATH)
+      File(projectRoot, HERMESC_BUILT_FROM_SOURCE_DIR.plus(getHermesCBin()))
     }
 
+internal fun getHermesCBin() = if (Os.isWindows()) "hermesc.exe" else "hermesc"
+
 internal fun getHermesOSBin(): String {
   if (Os.isWindows()) return "win64-bin"
   if (Os.isMac()) return "osx-bin"
@@ -190,7 +183,38 @@ internal fun projectPathToLibraryName(projectPath: String): String =
         .joinToString("") { token -> token.replaceFirstChar { it.uppercase() } }
         .plus("Spec")
 
-private const val HERMESC_IN_REACT_NATIVE_PATH =
-    "node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
-private const val HERMESC_BUILT_FROM_SOURCE_PATH =
-    "node_modules/react-native/ReactAndroid/hermes-engine/build/hermes/bin/hermesc"
+/**
+ * Function to look for the relevant `package.json`. We first look in the parent folder of this
+ * Gradle module (generally the case for library projects) or we fallback to looking into the `root`
+ * folder of a React Native project (generally the case for app projects).
+ */
+internal fun findPackageJsonFile(project: Project, extension: ReactExtension): File? {
+  val inParent = project.file("../package.json")
+  if (inParent.exists()) {
+    return inParent
+  }
+
+  val fromExtension = extension.root.file("package.json").orNull?.asFile
+  if (fromExtension?.exists() == true) {
+    return fromExtension
+  }
+
+  return null
+}
+
+/**
+ * Function to look for the `package.json` and parse it. It returns a [ModelPackageJson] if found or
+ * null others.
+ *
+ * Please note that this function access the [ReactExtension] field properties and calls .get() on
+ * them, so calling this during apply() of the ReactPlugin is not recommended. It should be invoked
+ * inside lazy lambdas or at execution time.
+ */
+internal fun readPackageJsonFile(project: Project, extension: ReactExtension): ModelPackageJson? {
+  val packageJson = findPackageJsonFile(project, extension)
+  return packageJson?.let { JsonUtils.fromCodegenJson(it) }
+}
+
+private const val HERMESC_IN_REACT_NATIVE_DIR = "node_modules/react-native/sdks/hermesc/%OS-BIN%/"
+private const val HERMESC_BUILT_FROM_SOURCE_DIR =
+    "node_modules/react-native/ReactAndroid/hermes-engine/build/hermes/bin/"
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/ProjectUtils.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/ProjectUtils.kt
new file mode 100644
index 000000000000..c18946a0cd0e
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/ProjectUtils.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.utils
+
+import com.facebook.react.ReactExtension
+import com.facebook.react.model.ModelPackageJson
+import org.gradle.api.Project
+
+internal object ProjectUtils {
+  internal val Project.isNewArchEnabled: Boolean
+    get() =
+        project.hasProperty("newArchEnabled") &&
+            project.property("newArchEnabled").toString().toBoolean()
+
+  const val HERMES_FALLBACK = true
+
+  internal val Project.isHermesEnabled: Boolean
+    get() =
+        if (project.hasProperty("hermesEnabled")) {
+          project.property("hermesEnabled").toString().lowercase().toBooleanStrictOrNull() ?: true
+        } else if (project.extensions.extraProperties.has("react")) {
+          @Suppress("UNCHECKED_CAST")
+          val reactMap = project.extensions.extraProperties.get("react") as? Map<String, Any?>
+          when (val enableHermesKey = reactMap?.get("enableHermes")) {
+            is Boolean -> enableHermesKey
+            is String -> enableHermesKey.lowercase().toBooleanStrictOrNull() ?: true
+            else -> HERMES_FALLBACK
+          }
+        } else {
+          HERMES_FALLBACK
+        }
+
+  internal fun Project.needsCodegenFromPackageJson(extension: ReactExtension): Boolean {
+    val parsedPackageJson = readPackageJsonFile(this, extension)
+    return needsCodegenFromPackageJson(parsedPackageJson)
+  }
+
+  internal fun Project.needsCodegenFromPackageJson(model: ModelPackageJson?): Boolean {
+    return model?.codegenConfig != null
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt
index fd557079f59d..df99d06e47bc 100644
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt
@@ -8,10 +8,13 @@
 package com.facebook.react.utils
 
 internal fun windowsAwareCommandLine(vararg args: Any): List<Any> =
+    windowsAwareCommandLine(args.toList())
+
+internal fun windowsAwareCommandLine(args: List<Any>): List<Any> =
     if (Os.isWindows()) {
       listOf("cmd", "/c") + args
     } else {
-      args.toList()
+      args
     }
 
 internal fun windowsAwareBashCommandLine(
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/AndroidConfigurationTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/AndroidConfigurationTest.kt
deleted file mode 100644
index 3c91f35e5a5a..000000000000
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/AndroidConfigurationTest.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react
-
-import com.android.build.gradle.BaseExtension
-import org.gradle.testfixtures.ProjectBuilder
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-class AndroidConfigurationTest {
-
-  @Test
-  fun configureDevPorts_withNoSpecifiedPort_usesDefault() {
-    val project = ProjectBuilder.builder().build()
-    project.pluginManager.apply("com.android.application")
-    val androidExtension = project.extensions.getByType(BaseExtension::class.java)
-    val debug = androidExtension.buildTypes.findByName("debug")
-    val release = androidExtension.buildTypes.findByName("release")
-
-    project.configureDevPorts(androidExtension)
-
-    assertEquals("8081", debug?.resValues?.get("integer/react_native_dev_server_port")?.value)
-    assertEquals("8081", debug?.resValues?.get("integer/react_native_inspector_proxy_port")?.value)
-    assertEquals("8081", release?.resValues?.get("integer/react_native_dev_server_port")?.value)
-    assertEquals(
-        "8081", release?.resValues?.get("integer/react_native_inspector_proxy_port")?.value)
-  }
-
-  @Test
-  fun configureDevPorts_withSpecifiedReactNativeDevServerPort_usesIt() {
-    val project = ProjectBuilder.builder().build()
-    project.pluginManager.apply("com.android.application")
-    val androidExtension = project.extensions.getByType(BaseExtension::class.java)
-    val debug = androidExtension.buildTypes.findByName("debug")
-    val release = androidExtension.buildTypes.findByName("release")
-
-    project.extensions.extraProperties["reactNativeDevServerPort"] = "42424"
-
-    project.configureDevPorts(androidExtension)
-
-    assertEquals("42424", debug?.resValues?.get("integer/react_native_dev_server_port")?.value)
-    assertEquals("42424", debug?.resValues?.get("integer/react_native_inspector_proxy_port")?.value)
-    assertEquals("42424", release?.resValues?.get("integer/react_native_dev_server_port")?.value)
-    assertEquals(
-        "42424", release?.resValues?.get("integer/react_native_inspector_proxy_port")?.value)
-  }
-
-  @Test
-  fun configureDevPorts_withSpecifiedReactNativeInspectorProxyPort_usesIt() {
-    val project = ProjectBuilder.builder().build()
-    project.pluginManager.apply("com.android.application")
-    val androidExtension = project.extensions.getByType(BaseExtension::class.java)
-    val debug = androidExtension.buildTypes.findByName("debug")
-    val release = androidExtension.buildTypes.findByName("release")
-
-    project.extensions.extraProperties["reactNativeInspectorProxyPort"] = "42424"
-
-    project.configureDevPorts(androidExtension)
-
-    assertEquals("8081", debug?.resValues?.get("integer/react_native_dev_server_port")?.value)
-    assertEquals("42424", debug?.resValues?.get("integer/react_native_inspector_proxy_port")?.value)
-    assertEquals("8081", release?.resValues?.get("integer/react_native_dev_server_port")?.value)
-    assertEquals(
-        "42424", release?.resValues?.get("integer/react_native_inspector_proxy_port")?.value)
-  }
-}
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/ReactPluginTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/ReactPluginTest.kt
deleted file mode 100644
index 39caba83bfaf..000000000000
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/ReactPluginTest.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react
-
-import com.android.build.gradle.AppExtension
-import org.gradle.testfixtures.ProjectBuilder
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-class ReactPluginTest {
-
-  @Test
-  fun reactPlugin_withApplyAppPluginSetToTrue_addsARelevantTask() {
-    val project = ProjectBuilder.builder().build()
-    project.plugins.apply("com.android.application")
-    project.plugins.apply("com.facebook.react")
-
-    project.extensions.getByType(AppExtension::class.java).apply { compileSdkVersion(31) }
-    project.extensions.getByType(ReactExtension::class.java).apply {
-      applyAppPlugin.set(true)
-      cliPath.set(".")
-    }
-
-    // We check if the App Plugin si applied by finding one of the added task.
-    assertTrue(project.getTasksByName("bundleDebugJsAndAssets", false).isNotEmpty())
-  }
-
-  @Test
-  fun reactPlugin_withApplyAppPluginSetToFalse_doesNotApplyTheAppPlugin() {
-    val project = ProjectBuilder.builder().build()
-    project.plugins.apply("com.android.application")
-    project.plugins.apply("com.facebook.react")
-
-    project.extensions.getByType(AppExtension::class.java).apply { compileSdkVersion(31) }
-    project.extensions.getByType(ReactExtension::class.java).apply { applyAppPlugin.set(false) }
-
-    assertTrue(project.getTasksByName("bundleDebugJsAndAssets", false).isEmpty())
-  }
-
-  @Test
-  fun reactPlugin_withApplyAppPluginSetToFalse_codegenPluginIsApplied() {
-    val project = ProjectBuilder.builder().build()
-    project.plugins.apply("com.android.application")
-    project.plugins.apply("com.facebook.react")
-
-    project.extensions.getByType(AppExtension::class.java).apply { compileSdkVersion(31) }
-    project.extensions.getByType(ReactExtension::class.java).apply { applyAppPlugin.set(false) }
-
-    assertTrue(project.getTasksByName("buildCodegenCLI", false).isNotEmpty())
-  }
-}
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/BundleHermesCTaskTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/BundleHermesCTaskTest.kt
new file mode 100644
index 000000000000..fbe7fed63049
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/BundleHermesCTaskTest.kt
@@ -0,0 +1,315 @@
+/*
+ * 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.tasks
+
+import com.facebook.react.tests.OsRule
+import com.facebook.react.tests.createTestTask
+import java.io.File
+import org.junit.Assert.*
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+
+class BundleHermesCTaskTest {
+
+  @get:Rule val tempFolder = TemporaryFolder()
+
+  @get:Rule val osRule = OsRule()
+
+  @Test
+  fun bundleTask_groupIsSetCorrectly() {
+    val task = createTestTask<BundleHermesCTask> {}
+    assertEquals("react", task.group)
+  }
+
+  @Test
+  fun bundleTask_inputFiles_areSetCorrectly() {
+    val rootDir =
+        tempFolder.newFolder("js").apply {
+          File(this, "file.js").createNewFile()
+          File(this, "file.jsx").createNewFile()
+          File(this, "file.ts").createNewFile()
+          File(this, "file.tsx").createNewFile()
+        }
+
+    val task = createTestTask<BundleHermesCTask> { it.root.set(rootDir) }
+
+    assertEquals(4, task.sources.files.size)
+    assertEquals(
+        setOf(
+            File(rootDir, "file.js"),
+            File(rootDir, "file.jsx"),
+            File(rootDir, "file.ts"),
+            File(rootDir, "file.tsx")),
+        task.sources.files)
+  }
+
+  @Test
+  fun bundleTask_inputFilesInExcludedPath_areExcluded() {
+    fun File.createFileAndPath() {
+      parentFile.mkdirs()
+      createNewFile()
+    }
+
+    val rootDir =
+        tempFolder.newFolder("js").apply {
+          File(this, "afolder/includedfile.js").createFileAndPath()
+          // Those files should be excluded due to their filepath
+          File(this, "android/excludedfile.js").createFileAndPath()
+          File(this, "ios/excludedfile.js").createFileAndPath()
+          File(this, "build/excludedfile.js").createFileAndPath()
+          File(this, "node_modules/react-native/excludedfile.js").createFileAndPath()
+        }
+
+    val task = createTestTask<BundleHermesCTask> { it.root.set(rootDir) }
+
+    assertEquals(
+        setOf(
+            "**/android/**/*",
+            "**/ios/**/*",
+            "**/build/**/*",
+            "**/node_modules/**/*",
+        ),
+        task.sources.excludes)
+    assertEquals(1, task.sources.files.size)
+    assertEquals(setOf(File(rootDir, "afolder/includedfile.js")), task.sources.files)
+  }
+
+  @Test
+  fun bundleTask_staticInputs_areSetCorrectly() {
+    val task =
+        createTestTask<BundleHermesCTask> {
+          it.nodeExecutableAndArgs.set(listOf("node", "arg1", "arg2"))
+          it.bundleCommand.set("bundle")
+          it.bundleAssetName.set("myassetname")
+          it.minifyEnabled.set(true)
+          it.hermesEnabled.set(true)
+          it.devEnabled.set(true)
+          it.extraPackagerArgs.set(listOf("extra", "arg"))
+          it.hermesCommand.set("./my-hermesc")
+          it.hermesFlags.set(listOf("flag1", "flag2"))
+        }
+
+    assertEquals(listOf("node", "arg1", "arg2"), task.nodeExecutableAndArgs.get())
+    assertEquals("bundle", task.bundleCommand.get())
+    assertEquals("myassetname", task.bundleAssetName.get())
+    assertTrue(task.minifyEnabled.get())
+    assertTrue(task.hermesEnabled.get())
+    assertTrue(task.devEnabled.get())
+    assertEquals(listOf("extra", "arg"), task.extraPackagerArgs.get())
+    assertEquals("./my-hermesc", task.hermesCommand.get())
+    assertEquals(listOf("flag1", "flag2"), task.hermesFlags.get())
+  }
+
+  @Test
+  fun bundleTask_filesInput_areSetCorrectly() {
+    val entryFile = tempFolder.newFile("entry.js")
+    val cliFile = tempFolder.newFile("cli.js")
+    val jsBundleDir = tempFolder.newFolder("jsbundle")
+    val resourcesDir = tempFolder.newFolder("resources")
+    val jsIntermediateSourceMapsDir = tempFolder.newFolder("jsIntermediateSourceMaps")
+    val jsSourceMapsDir = tempFolder.newFolder("jsSourceMaps")
+    val bundleConfig = tempFolder.newFile("bundle.config")
+    val reactNativeDir = tempFolder.newFolder("node_modules/react-native")
+
+    val task =
+        createTestTask<BundleHermesCTask> {
+          it.entryFile.set(entryFile)
+          it.cliFile.set(cliFile)
+          it.jsBundleDir.set(jsBundleDir)
+          it.resourcesDir.set(resourcesDir)
+          it.jsIntermediateSourceMapsDir.set(jsIntermediateSourceMapsDir)
+          it.jsSourceMapsDir.set(jsSourceMapsDir)
+          it.bundleConfig.set(bundleConfig)
+          it.reactNativeDir.set(reactNativeDir)
+        }
+
+    assertEquals(entryFile, task.entryFile.get().asFile)
+    assertEquals(cliFile, task.cliFile.get().asFile)
+    assertEquals(jsBundleDir, task.jsBundleDir.get().asFile)
+    assertEquals(resourcesDir, task.resourcesDir.get().asFile)
+    assertEquals(jsIntermediateSourceMapsDir, task.jsIntermediateSourceMapsDir.get().asFile)
+    assertEquals(jsSourceMapsDir, task.jsSourceMapsDir.get().asFile)
+    assertEquals(bundleConfig, task.bundleConfig.get().asFile)
+    assertEquals(reactNativeDir, task.reactNativeDir.get().asFile)
+  }
+
+  @Test
+  fun resolvePackagerSourceMapFile_withHermesEnabled_returnsCorrectFile() {
+    val jsIntermediateSourceMapsDir = tempFolder.newFolder("jsIntermediateSourceMaps")
+    val bundleAssetName = "myassetname"
+    val task =
+        createTestTask<BundleHermesCTask> {
+          it.jsIntermediateSourceMapsDir.set(jsIntermediateSourceMapsDir)
+          it.hermesEnabled.set(true)
+          it.bundleAssetName.set(bundleAssetName)
+        }
+
+    assertEquals(
+        File(jsIntermediateSourceMapsDir, "myassetname.packager.map"),
+        task.resolvePackagerSourceMapFile(bundleAssetName))
+  }
+
+  @Test
+  fun resolvePackagerSourceMapFile_withHermesDisabled_returnsCorrectFile() {
+    val jsSourceMapsDir = tempFolder.newFolder("jsSourceMaps")
+    val bundleAssetName = "myassetname"
+    val task =
+        createTestTask<BundleHermesCTask> {
+          it.jsSourceMapsDir.set(jsSourceMapsDir)
+          it.hermesEnabled.set(false)
+        }
+
+    assertEquals(
+        File(jsSourceMapsDir, "myassetname.map"),
+        task.resolvePackagerSourceMapFile(bundleAssetName))
+  }
+
+  @Test
+  fun resolveOutputSourceMap_returnsCorrectFile() {
+    val jsSourceMapsDir = tempFolder.newFolder("jsSourceMaps")
+    val bundleAssetName = "myassetname"
+    val task = createTestTask<BundleHermesCTask> { it.jsSourceMapsDir.set(jsSourceMapsDir) }
+
+    assertEquals(
+        File(jsSourceMapsDir, "myassetname.map"), task.resolveOutputSourceMap(bundleAssetName))
+  }
+
+  @Test
+  fun resolveCompilerSourceMap_returnsCorrectFile() {
+    val jsIntermediateSourceMapsDir = tempFolder.newFolder("jsIntermediateSourceMaps")
+    val bundleAssetName = "myassetname"
+    val task =
+        createTestTask<BundleHermesCTask> {
+          it.jsIntermediateSourceMapsDir.set(jsIntermediateSourceMapsDir)
+        }
+
+    assertEquals(
+        File(jsIntermediateSourceMapsDir, "myassetname.compiler.map"),
+        task.resolveCompilerSourceMap(bundleAssetName))
+  }
+
+  @Test
+  fun getBundleCommand_returnsCorrectCommand() {
+    val entryFile = tempFolder.newFile("index.js")
+    val cliFile = tempFolder.newFile("cli.js")
+    val bundleFile = tempFolder.newFile("bundle.js")
+    val sourceMapFile = tempFolder.newFile("bundle.js.map")
+    val resourcesDir = tempFolder.newFolder("res")
+    val bundleConfig = tempFolder.newFile("bundle.config")
+    val task =
+        createTestTask<BundleHermesCTask> {
+          it.nodeExecutableAndArgs.set(listOf("node", "arg1", "arg2"))
+          it.cliFile.set(cliFile)
+          it.bundleCommand.set("bundle")
+          it.devEnabled.set(true)
+          it.entryFile.set(entryFile)
+          it.resourcesDir.set(resourcesDir)
+          it.bundleConfig.set(bundleConfig)
+          it.minifyEnabled.set(true)
+          it.extraPackagerArgs.set(listOf("--read-global-cache"))
+        }
+
+    val bundleCommand = task.getBundleCommand(bundleFile, sourceMapFile)
+
+    assertEquals("node", bundleCommand[0])
+    assertEquals("arg1", bundleCommand[1])
+    assertEquals("arg2", bundleCommand[2])
+    assertEquals(cliFile.absolutePath, bundleCommand[3])
+    assertEquals("bundle", bundleCommand[4])
+    assertEquals("--platform", bundleCommand[5])
+    assertEquals("android", bundleCommand[6])
+    assertEquals("--dev", bundleCommand[7])
+    assertEquals("true", bundleCommand[8])
+    assertEquals("--reset-cache", bundleCommand[9])
+    assertEquals("--entry-file", bundleCommand[10])
+    assertEquals(entryFile.absolutePath, bundleCommand[11])
+    assertEquals("--bundle-output", bundleCommand[12])
+    assertEquals(bundleFile.absolutePath, bundleCommand[13])
+    assertEquals("--assets-dest", bundleCommand[14])
+    assertEquals(resourcesDir.absolutePath, bundleCommand[15])
+    assertEquals("--sourcemap-output", bundleCommand[16])
+    assertEquals(sourceMapFile.absolutePath, bundleCommand[17])
+    assertEquals("--config", bundleCommand[18])
+    assertEquals(bundleConfig.absolutePath, bundleCommand[19])
+    assertEquals("--minify", bundleCommand[20])
+    assertEquals("true", bundleCommand[21])
+    assertEquals("--read-global-cache", bundleCommand[22])
+    assertEquals("--verbose", bundleCommand[23])
+    assertEquals(24, bundleCommand.size)
+  }
+
+  @Test
+  fun getBundleCommand_withoutConfig_returnsCommandWithoutConfig() {
+    val entryFile = tempFolder.newFile("index.js")
+    val cliFile = tempFolder.newFile("cli.js")
+    val bundleFile = tempFolder.newFile("bundle.js")
+    val sourceMapFile = tempFolder.newFile("bundle.js.map")
+    val resourcesDir = tempFolder.newFolder("res")
+    val task =
+        createTestTask<BundleHermesCTask> {
+          it.nodeExecutableAndArgs.set(listOf("node", "arg1", "arg2"))
+          it.cliFile.set(cliFile)
+          it.bundleCommand.set("bundle")
+          it.devEnabled.set(true)
+          it.entryFile.set(entryFile)
+          it.resourcesDir.set(resourcesDir)
+          it.minifyEnabled.set(true)
+          it.extraPackagerArgs.set(listOf("--read-global-cache"))
+        }
+
+    val bundleCommand = task.getBundleCommand(bundleFile, sourceMapFile)
+
+    assertTrue("--config" !in bundleCommand)
+  }
+
+  @Test
+  fun getHermescCommand_returnsCorrectCommand() {
+    val customHermesc = "hermesc"
+    val bytecodeFile = tempFolder.newFile("bundle.js.hbc")
+    val bundleFile = tempFolder.newFile("bundle.js")
+    val task =
+        createTestTask<BundleHermesCTask> { it.hermesFlags.set(listOf("my-custom-hermes-flag")) }
+
+    val hermesCommand = task.getHermescCommand(customHermesc, bytecodeFile, bundleFile)
+
+    assertEquals(customHermesc, hermesCommand[0])
+    assertEquals("-emit-binary", hermesCommand[1])
+    assertEquals("-out", hermesCommand[2])
+    assertEquals(bytecodeFile.absolutePath, hermesCommand[3])
+    assertEquals(bundleFile.absolutePath, hermesCommand[4])
+    assertEquals("my-custom-hermes-flag", hermesCommand[5])
+    assertEquals(6, hermesCommand.size)
+  }
+
+  @Test
+  fun getComposeSourceMapsCommand_returnsCorrectCommand() {
+    val packagerMap = tempFolder.newFile("bundle.js.packager.map")
+    val compilerMap = tempFolder.newFile("bundle.js.compiler.map")
+    val outputMap = tempFolder.newFile("bundle.js.map")
+    val reactNativeDir = tempFolder.newFolder("node_modules/react-native")
+    val composeSourceMapsFile = File(reactNativeDir, "scripts/compose-source-maps.js")
+    val task =
+        createTestTask<BundleHermesCTask> {
+          it.nodeExecutableAndArgs.set(listOf("node", "arg1", "arg2"))
+        }
+
+    val composeSourcemapCommand =
+        task.getComposeSourceMapsCommand(composeSourceMapsFile, packagerMap, compilerMap, outputMap)
+
+    assertEquals("node", composeSourcemapCommand[0])
+    assertEquals("arg1", composeSourcemapCommand[1])
+    assertEquals("arg2", composeSourcemapCommand[2])
+    assertEquals(composeSourceMapsFile.absolutePath, composeSourcemapCommand[3])
+    assertEquals(packagerMap.absolutePath, composeSourcemapCommand[4])
+    assertEquals(compilerMap.absolutePath, composeSourcemapCommand[5])
+    assertEquals("-o", composeSourcemapCommand[6])
+    assertEquals(outputMap.absolutePath, composeSourcemapCommand[7])
+    assertEquals(8, composeSourcemapCommand.size)
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt
index a559b036422c..e188e47c8495 100644
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt
@@ -29,28 +29,16 @@ class GenerateCodegenArtifactsTaskTest {
     val codegenDir = tempFolder.newFolder("codegen")
     val outputDir = tempFolder.newFolder("output")
 
-    val task =
-        createTestTask<GenerateCodegenArtifactsTask> {
-          it.codegenDir.set(codegenDir)
-          it.generatedSrcDir.set(outputDir)
-        }
+    val task = createTestTask<GenerateCodegenArtifactsTask> { it.generatedSrcDir.set(outputDir) }
 
-    assertEquals(
-        File(codegenDir, "lib/cli/combine/combine-js-to-schema-cli.js"),
-        task.combineJsToSchemaCli.get().asFile)
     assertEquals(File(outputDir, "schema.json"), task.generatedSchemaFile.get().asFile)
   }
 
   @Test
   fun generateCodegenSchema_outputFile_isSetCorrectly() {
-    val codegenDir = tempFolder.newFolder("codegen")
     val outputDir = tempFolder.newFolder("output")
 
-    val task =
-        createTestTask<GenerateCodegenArtifactsTask> {
-          it.codegenDir.set(codegenDir)
-          it.generatedSrcDir.set(outputDir)
-        }
+    val task = createTestTask<GenerateCodegenArtifactsTask> { it.generatedSrcDir.set(outputDir) }
 
     assertEquals(File(outputDir, "java"), task.generatedJavaFiles.get().asFile)
     assertEquals(File(outputDir, "jni"), task.generatedJniFiles.get().asFile)
@@ -77,16 +65,14 @@ class GenerateCodegenArtifactsTaskTest {
   }
 
   @Test
-  @WithOs(OS.UNIX)
+  @WithOs(OS.LINUX)
   fun setupCommandLine_willSetupCorrectly() {
     val reactNativeDir = tempFolder.newFolder("node_modules/react-native/")
-    val codegenDir = tempFolder.newFolder("codegen")
     val outputDir = tempFolder.newFolder("output")
 
     val task =
         createTestTask<GenerateCodegenArtifactsTask> {
           it.reactNativeDir.set(reactNativeDir)
-          it.codegenDir.set(codegenDir)
           it.generatedSrcDir.set(outputDir)
           it.nodeExecutableAndArgs.set(listOf("--verbose"))
         }
@@ -127,7 +113,8 @@ class GenerateCodegenArtifactsTaskTest {
                 }
             }
         }
-        """.trimIndent())
+        """
+                  .trimIndent())
         }
 
     val task =
@@ -155,7 +142,8 @@ class GenerateCodegenArtifactsTaskTest {
             "codegenConfig": {
             }
         }
-        """.trimIndent())
+        """
+                  .trimIndent())
         }
 
     val task =
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTaskTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTaskTest.kt
index 68af7866b047..98e2b39795c1 100644
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTaskTest.kt
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTaskTest.kt
@@ -12,7 +12,6 @@ import com.facebook.react.tests.OsRule
 import com.facebook.react.tests.WithOs
 import com.facebook.react.tests.createTestTask
 import java.io.File
-import org.gradle.api.tasks.*
 import org.junit.Assert.*
 import org.junit.Rule
 import org.junit.Test
@@ -29,15 +28,58 @@ class GenerateCodegenSchemaTaskTest {
     val jsRootDir =
         tempFolder.newFolder("js").apply {
           File(this, "file.js").createNewFile()
+          File(this, "file.ts").createNewFile()
           File(this, "ignore.txt").createNewFile()
         }
 
     val task = createTestTask<GenerateCodegenSchemaTask> { it.jsRootDir.set(jsRootDir) }
 
     assertEquals(jsRootDir, task.jsInputFiles.dir)
-    assertEquals(setOf("**/*.js"), task.jsInputFiles.includes)
+    assertEquals(setOf("**/*.js", "**/*.ts"), task.jsInputFiles.includes)
+    assertEquals(2, task.jsInputFiles.files.size)
+    assertEquals(
+        setOf(File(jsRootDir, "file.js"), File(jsRootDir, "file.ts")), task.jsInputFiles.files)
+  }
+
+  @Test
+  fun generateCodegenSchema_inputFilesInExcludedPath_areExcluded() {
+    fun File.createFileAndPath() {
+      parentFile.mkdirs()
+      createNewFile()
+    }
+
+    val jsRootDir =
+        tempFolder.newFolder("js").apply {
+          File(this, "afolder/includedfile.js").createFileAndPath()
+          // Those files should be excluded due to their filepath
+          File(this, "afolder/generated/source/codegen/anotherfolder/excludedfile.js")
+              .createFileAndPath()
+          File(this, "afolder/build/generated/assets/react/anotherfolder/excludedfile.js")
+              .createFileAndPath()
+          File(this, "afolder/build/generated/res/react/anotherfolder/excludedfile.js")
+              .createFileAndPath()
+          File(this, "afolder/build/generated/sourcemaps/react/anotherfolder/excludedfile.js")
+              .createFileAndPath()
+          File(this, "afolder/build/intermediates/sourcemaps/react/anotherfolder/excludedfile.js")
+              .createFileAndPath()
+        }
+
+    val task = createTestTask<GenerateCodegenSchemaTask> { it.jsRootDir.set(jsRootDir) }
+
+    assertEquals(jsRootDir, task.jsInputFiles.dir)
+    assertEquals(
+        setOf(
+            "**/generated/source/codegen/**/*",
+            "**/build/ASSETS/**/*",
+            "**/build/RES/**/*",
+            "**/build/generated/assets/react/**/*",
+            "**/build/generated/res/react/**/*",
+            "**/build/generated/sourcemaps/react/**/*",
+            "**/build/intermediates/sourcemaps/react/**/*",
+        ),
+        task.jsInputFiles.excludes)
     assertEquals(1, task.jsInputFiles.files.size)
-    assertEquals(setOf(File(jsRootDir, "file.js")), task.jsInputFiles.files)
+    assertEquals(setOf(File(jsRootDir, "afolder/includedfile.js")), task.jsInputFiles.files)
   }
 
   @Test
@@ -87,7 +129,7 @@ class GenerateCodegenSchemaTaskTest {
   }
 
   @Test
-  @WithOs(OS.UNIX)
+  @WithOs(OS.LINUX)
   fun setupCommandLine_willSetupCorrectly() {
     val codegenDir = tempFolder.newFolder("codegen")
     val jsRootDir = tempFolder.newFolder("js")
@@ -107,6 +149,8 @@ class GenerateCodegenSchemaTaskTest {
         listOf(
             "--verbose",
             File(codegenDir, "lib/cli/combine/combine-js-to-schema-cli.js").toString(),
+            "--platform",
+            "android",
             File(outputDir, "schema.json").toString(),
             jsRootDir.toString(),
         ),
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/ExtractJniAndHeadersTaskTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/ExtractJniAndHeadersTaskTest.kt
deleted file mode 100644
index 38394e3bf431..000000000000
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/ExtractJniAndHeadersTaskTest.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.tasks.internal
-
-import com.facebook.react.tests.createProject
-import com.facebook.react.tests.createTestTask
-import com.facebook.react.tests.zipFiles
-import java.io.*
-import java.util.zip.ZipEntry
-import java.util.zip.ZipOutputStream
-import org.junit.Assert.assertTrue
-import org.junit.Rule
-import org.junit.Test
-import org.junit.rules.TemporaryFolder
-
-class ExtractJniAndHeadersTaskTest {
-
-  @get:Rule val tempFolder = TemporaryFolder()
-
-  @Test
-  fun extractJniAndHeadersTask_extractsHeadersCorrectly() {
-    val project = createProject()
-    val aarFile = File(project.projectDir, "libheader.aar")
-    val headerFile = tempFolder.newFile("justaheader.h")
-    val output = tempFolder.newFolder("output")
-    zipFiles(aarFile, listOf(headerFile))
-
-    val task =
-        createTestTask<ExtractJniAndHeadersTask>(project = project) {
-          it.extractHeadersConfiguration.setFrom(aarFile)
-          it.baseOutputDir.set(output)
-        }
-
-    task.taskAction()
-
-    assertTrue(File(output, "libheader/headers/justaheader.h").exists())
-  }
-
-  @Test
-  fun extractJniAndHeadersTask_extractsJniCorrectly() {
-    val project = createProject()
-    val aarFile = File(project.projectDir, "something.aar")
-    File(tempFolder.root, "jni/libsomething.so").apply {
-      parentFile.mkdirs()
-      createNewFile()
-    }
-    val output = tempFolder.newFolder("output")
-    ZipOutputStream(BufferedOutputStream(FileOutputStream(aarFile.absolutePath))).use { out ->
-      FileInputStream(aarFile).use { fi ->
-        BufferedInputStream(fi).use { origin ->
-          out.putNextEntry(ZipEntry("jni/"))
-          out.putNextEntry(ZipEntry("jni/libsomething.so"))
-          origin.copyTo(out, 1024)
-        }
-      }
-    }
-    val task =
-        createTestTask<ExtractJniAndHeadersTask>(project = project) {
-          it.extractJniConfiguration.setFrom(aarFile)
-          it.baseOutputDir.set(output)
-        }
-
-    task.taskAction()
-
-    assertTrue(File(output, "something/jni/libsomething.so").exists())
-  }
-}
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareBoostTaskTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareBoostTaskTest.kt
index d1ebb9c665f7..73cb3fe8122e 100644
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareBoostTaskTest.kt
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareBoostTaskTest.kt
@@ -27,7 +27,7 @@ class PrepareBoostTaskTest {
   }
 
   @Test
-  fun prepareBoostTask_copiesMakefile() {
+  fun prepareBoostTask_copiesCMakefile() {
     val boostpath = tempFolder.newFolder("boostpath")
     val output = tempFolder.newFolder("output")
     val project = createProject()
@@ -37,13 +37,13 @@ class PrepareBoostTaskTest {
           it.boostVersion.set("1.0.0")
           it.outputDir.set(output)
         }
-    File(project.projectDir, "src/main/jni/third-party/boost/Android.mk").apply {
+    File(project.projectDir, "src/main/jni/third-party/boost/CMakeLists.txt").apply {
       parentFile.mkdirs()
       createNewFile()
     }
     task.taskAction()
 
-    assertTrue(output.listFiles()!!.any { it.name == "Android.mk" })
+    assertTrue(output.listFiles()!!.any { it.name == "CMakeLists.txt" })
   }
 
   @Test
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareGlogTaskTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareGlogTaskTest.kt
index ceb0c916e16d..e767577aa4a0 100644
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareGlogTaskTest.kt
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareGlogTaskTest.kt
@@ -27,7 +27,7 @@ class PrepareGlogTaskTest {
   }
 
   @Test
-  fun prepareGlogTask_copiesMakefile() {
+  fun prepareGlogTask_copiesCMakefile() {
     val glogpath = tempFolder.newFolder("glogpath")
     val output = tempFolder.newFolder("output")
     val project = createProject()
@@ -37,13 +37,13 @@ class PrepareGlogTaskTest {
           it.glogVersion.set("1.0.0")
           it.outputDir.set(output)
         }
-    File(project.projectDir, "src/main/jni/third-party/glog/Android.mk").apply {
+    File(project.projectDir, "src/main/jni/third-party/glog/CMakeLists.txt").apply {
       parentFile.mkdirs()
       createNewFile()
     }
     task.taskAction()
 
-    assertTrue(output.listFiles()!!.any { it.name == "Android.mk" })
+    assertTrue(output.listFiles()!!.any { it.name == "CMakeLists.txt" })
   }
 
   @Test
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareJSCTaskTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareJSCTaskTest.kt
index 669664b88142..bcffaa589107 100644
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareJSCTaskTest.kt
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareJSCTaskTest.kt
@@ -97,10 +97,10 @@ class PrepareJSCTaskTest {
   }
 
   @Test
-  fun prepareJSCTask_copiesMakefile() {
+  fun prepareJSCTask_copiesCMakefile() {
     val project = createProject()
     prepareInputFolder()
-    File(project.projectDir, "src/main/jni/third-party/jsc/Android.mk").apply {
+    File(project.projectDir, "src/main/jni/third-party/jsc/CMakeLists.txt").apply {
       parentFile.mkdirs()
       createNewFile()
     }
@@ -114,7 +114,7 @@ class PrepareJSCTaskTest {
 
     task.taskAction()
 
-    assertTrue(File(output, "Android.mk").exists())
+    assertTrue(File(output, "CMakeLists.txt").exists())
   }
 
   private fun prepareInputFolder(aarContent: List<File> = listOf(tempFolder.newFile())) {
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareLibeventTaskTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareLibeventTaskTest.kt
index 1bb571fa769b..f5085df947a4 100644
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareLibeventTaskTest.kt
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareLibeventTaskTest.kt
@@ -27,7 +27,7 @@ class PrepareLibeventTaskTest {
   }
 
   @Test
-  fun prepareBoostTask_copiesMakefile() {
+  fun prepareBoostTask_copiesCMakefile() {
     val libeventPath = tempFolder.newFolder("libeventPath")
     val output = tempFolder.newFolder("output")
     val project = createProject()
@@ -37,13 +37,13 @@ class PrepareLibeventTaskTest {
           it.libeventVersion.set("1.0.0")
           it.outputDir.set(output)
         }
-    File(project.projectDir, "src/main/jni/third-party/libevent/Android.mk").apply {
+    File(project.projectDir, "src/main/jni/third-party/libevent/CMakeLists.txt").apply {
       parentFile.mkdirs()
       createNewFile()
     }
     task.taskAction()
 
-    assertTrue(File(output, "Android.mk").exists())
+    assertTrue(File(output, "CMakeLists.txt").exists())
   }
 
   @Test
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTaskTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTaskTest.kt
new file mode 100644
index 000000000000..adf617cb77ea
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTaskTest.kt
@@ -0,0 +1,201 @@
+/*
+ * 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.tasks.internal
+
+import com.facebook.react.tasks.internal.utils.PrefabPreprocessingEntry
+import com.facebook.react.tests.createProject
+import com.facebook.react.tests.createTestTask
+import java.io.*
+import org.junit.Assert.*
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+
+class PreparePrefabHeadersTaskTest {
+
+  @get:Rule val tempFolder = TemporaryFolder()
+
+  @Test
+  fun preparePrefabHeadersTask_withMissingConfiguration_doesNothing() {
+    val task = createTestTask<PreparePrefabHeadersTask>()
+
+    task.taskAction()
+  }
+
+  @Test
+  fun preparePrefabHeadersTask_withSingleEntry_copiesHeaderFile() {
+    val outputDir = tempFolder.newFolder("output")
+    File(tempFolder.root, "input/hello.h").createNewPathAndFile()
+
+    val project = createProject(projectDir = tempFolder.root)
+    val task =
+        createTestTask<PreparePrefabHeadersTask>(project = project) {
+          it.outputDir.set(outputDir)
+          it.input.set(listOf(PrefabPreprocessingEntry("sample_library", "input/" to "")))
+        }
+
+    task.taskAction()
+
+    assertTrue(File(outputDir, "sample_library/hello.h").exists())
+  }
+
+  @Test
+  fun preparePrefabHeadersTask_withSingleEntry_respectsPrefix() {
+    val expectedPrefix = "react/render/something/"
+    val outputDir = tempFolder.newFolder("output")
+    File(tempFolder.root, "input/hello.h").createNewPathAndFile()
+
+    val project = createProject(projectDir = tempFolder.root)
+    val task =
+        createTestTask<PreparePrefabHeadersTask>(project = project) {
+          it.outputDir.set(outputDir)
+          it.input.set(
+              listOf(PrefabPreprocessingEntry("sample_library", "input/" to expectedPrefix)))
+        }
+
+    task.taskAction()
+
+    assertTrue(File(outputDir, "sample_library/${expectedPrefix}hello.h").exists())
+  }
+
+  @Test
+  fun preparePrefabHeadersTask_ignoresUnnecessaryFiles() {
+    val expectedPrefix = "react/render/something/"
+    val outputDir = tempFolder.newFolder("output")
+    File(tempFolder.root, "input/hello.hpp").createNewPathAndFile()
+    File(tempFolder.root, "input/hello.cpp").createNewPathAndFile()
+    File(tempFolder.root, "input/CMakeLists.txt").createNewPathAndFile()
+
+    val project = createProject(projectDir = tempFolder.root)
+    val task =
+        createTestTask<PreparePrefabHeadersTask>(project = project) {
+          it.outputDir.set(outputDir)
+          it.input.set(
+              listOf(PrefabPreprocessingEntry("sample_library", "input/" to expectedPrefix)))
+        }
+
+    task.taskAction()
+
+    assertFalse(File(outputDir, "sample_library/hello.hpp").exists())
+    assertFalse(File(outputDir, "sample_library/hello.cpp").exists())
+    assertFalse(File(outputDir, "sample_library/CMakeLists.txt").exists())
+  }
+
+  @Test
+  fun preparePrefabHeadersTask_withMultiplePaths_copiesHeaderFiles() {
+    val outputDir = tempFolder.newFolder("output")
+    File(tempFolder.root, "input/component1/hello1.h").createNewPathAndFile()
+    File(tempFolder.root, "input/component2/debug/hello2.h").createNewPathAndFile()
+
+    val project = createProject(projectDir = tempFolder.root)
+    val task =
+        createTestTask<PreparePrefabHeadersTask>(project = project) {
+          it.outputDir.set(outputDir)
+          it.input.set(
+              listOf(
+                  PrefabPreprocessingEntry(
+                      "sample_library",
+                      listOf("input/component1/" to "", "input/component2/" to "")),
+              ))
+        }
+
+    task.taskAction()
+
+    assertTrue(File(outputDir, "sample_library/hello1.h").exists())
+    assertTrue(File(outputDir, "sample_library/debug/hello2.h").exists())
+  }
+
+  @Test
+  fun preparePrefabHeadersTask_withMultipleEntries_copiesHeaderFiles() {
+    val outputDir = tempFolder.newFolder("output")
+    File(tempFolder.root, "input/lib1/hello1.h").createNewPathAndFile()
+    File(tempFolder.root, "input/lib2/hello2.h").createNewPathAndFile()
+
+    val project = createProject(projectDir = tempFolder.root)
+    val task =
+        createTestTask<PreparePrefabHeadersTask>(project = project) {
+          it.outputDir.set(outputDir)
+          it.input.set(
+              listOf(
+                  PrefabPreprocessingEntry("libraryone", "input/lib1/" to ""),
+                  PrefabPreprocessingEntry("librarytwo", "input/lib2/" to "")))
+        }
+
+    task.taskAction()
+
+    assertTrue(File(outputDir, "libraryone/hello1.h").exists())
+    assertTrue(File(outputDir, "librarytwo/hello2.h").exists())
+  }
+
+  @Test
+  fun preparePrefabHeadersTask_withReusedHeaders_copiesHeadersTwice() {
+    val outputDir = tempFolder.newFolder("output")
+    File(tempFolder.root, "input/lib1/hello1.h").createNewPathAndFile()
+    File(tempFolder.root, "input/lib2/hello2.h").createNewPathAndFile()
+    File(tempFolder.root, "input/shared/sharedheader.h").createNewPathAndFile()
+
+    val project = createProject(projectDir = tempFolder.root)
+    val task =
+        createTestTask<PreparePrefabHeadersTask>(project = project) {
+          it.outputDir.set(outputDir)
+          it.input.set(
+              listOf(
+                  PrefabPreprocessingEntry(
+                      "libraryone", listOf("input/lib1/" to "", "input/shared/" to "shared/")),
+                  PrefabPreprocessingEntry(
+                      "librarytwo", listOf("input/lib2/" to "", "input/shared/" to "shared/")),
+              ))
+        }
+
+    task.taskAction()
+
+    assertTrue(File(outputDir, "libraryone/hello1.h").exists())
+    assertTrue(File(outputDir, "libraryone/shared/sharedheader.h").exists())
+    assertTrue(File(outputDir, "librarytwo/hello2.h").exists())
+    assertTrue(File(outputDir, "librarytwo/shared/sharedheader.h").exists())
+  }
+
+  @Test
+  fun preparePrefabHeadersTask_withBoostHeaders_filtersThemCorrectly() {
+    val outputDir = tempFolder.newFolder("output")
+    File(tempFolder.root, "boost/boost/config.hpp").createNewPathAndFile()
+    File(tempFolder.root, "boost/boost/operators.hpp").createNewPathAndFile()
+    File(tempFolder.root, "boost/boost/config/default/default.hpp").createNewPathAndFile()
+    File(tempFolder.root, "boost/boost/core/core.hpp").createNewPathAndFile()
+    File(tempFolder.root, "boost/boost/detail/workaround.hpp").createNewPathAndFile()
+    File(tempFolder.root, "boost/boost/preprocessor/preprocessor.hpp").createNewPathAndFile()
+    File(tempFolder.root, "boost/boost/preprocessor/detail/preprocessor_detail.hpp")
+        .createNewPathAndFile()
+    File(tempFolder.root, "boost/boost/anothermodule/wedontuse.hpp").createNewPathAndFile()
+
+    val project = createProject(projectDir = tempFolder.root)
+    val task =
+        createTestTask<PreparePrefabHeadersTask>(project = project) {
+          it.outputDir.set(outputDir)
+          it.input.set(listOf(PrefabPreprocessingEntry("sample_library", "boost/" to "")))
+        }
+
+    task.taskAction()
+
+    assertTrue(File(outputDir, "sample_library/boost/config.hpp").exists())
+    assertTrue(File(outputDir, "sample_library/boost/operators.hpp").exists())
+    assertTrue(File(outputDir, "sample_library/boost/config/default/default.hpp").exists())
+    assertTrue(File(outputDir, "sample_library/boost/core/core.hpp").exists())
+    assertTrue(File(outputDir, "sample_library/boost/detail/workaround.hpp").exists())
+    assertTrue(File(outputDir, "sample_library/boost/preprocessor/preprocessor.hpp").exists())
+    assertTrue(
+        File(outputDir, "sample_library/boost/preprocessor/detail/preprocessor_detail.hpp")
+            .exists())
+    assertFalse(File(outputDir, "sample_library/boost/anothermodule/wedontuse.hpp").exists())
+  }
+
+  private fun File.createNewPathAndFile() {
+    parentFile.mkdirs()
+    createNewFile()
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/utils/PrefabPreprocessingEntryTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/utils/PrefabPreprocessingEntryTest.kt
new file mode 100644
index 000000000000..a8ab05065b07
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/utils/PrefabPreprocessingEntryTest.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.tasks.internal.utils
+
+import groovy.test.GroovyTestCase.assertEquals
+import org.junit.Test
+
+class PrefabPreprocessingEntryTest {
+
+  @Test
+  fun secondaryConstructor_createsAList() {
+    val sampleEntry =
+        PrefabPreprocessingEntry(
+            libraryName = "justALibrary", pathToPrefixCouple = "aPath" to "andAPrefix")
+
+    assertEquals(1, sampleEntry.pathToPrefixCouples.size)
+    assertEquals("aPath", sampleEntry.pathToPrefixCouples[0].first)
+    assertEquals("andAPrefix", sampleEntry.pathToPrefixCouples[0].second)
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/OsRule.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/OsRule.kt
index 1b3e7cfcc4d8..8d500d0a7192 100644
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/OsRule.kt
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/OsRule.kt
@@ -12,12 +12,13 @@ import org.junit.runner.Description
 import org.junit.runners.model.Statement
 
 /**
- * A JUnit [TestRule] to override values of [System.getProperties] with the support of the
- * [WithSystemProperty] annotation.
+ * A JUnit [TestRule] to override values of [System.getProperties] with the support of the [WithOs]
+ * annotation.
  */
 class OsRule : TestRule {
 
-  private var retain: String? = null
+  private var retainOs: String? = null
+  private var retainArch: String? = null
 
   override fun apply(statement: Statement, description: Description): Statement {
     return object : Statement() {
@@ -25,13 +26,20 @@ class OsRule : TestRule {
         val annotation = description.annotations.filterIsInstance<WithOs>().firstOrNull()
 
         annotation?.os?.propertyName?.let {
-          retain = System.getProperty(OS_NAME_KEY)
+          retainOs = System.getProperty(OS_NAME_KEY)
           System.setProperty(OS_NAME_KEY, it)
         }
+        annotation?.arch?.let {
+          if (it.isNotBlank()) {
+            retainArch = System.getProperty(OS_ARCH_KEY)
+            System.setProperty(OS_ARCH_KEY, it)
+          }
+        }
         try {
           statement.evaluate()
         } finally {
-          retain?.let { System.setProperty(OS_NAME_KEY, it) }
+          retainOs?.let { System.setProperty(OS_NAME_KEY, it) }
+          retainArch?.let { System.setProperty(OS_ARCH_KEY, it) }
         }
       }
     }
@@ -39,5 +47,6 @@ class OsRule : TestRule {
 
   companion object {
     const val OS_NAME_KEY = "os.name"
+    const val OS_ARCH_KEY = "os.arch"
   }
 }
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/TaskTestUtils.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/TaskTestUtils.kt
index 04122985cad3..b677cca66704 100644
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/TaskTestUtils.kt
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/TaskTestUtils.kt
@@ -8,17 +8,28 @@
 package com.facebook.react.tests
 
 import java.io.*
+import java.net.URI
+import java.nio.file.FileSystems
+import java.nio.file.Files
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.testfixtures.ProjectBuilder
 
-internal fun createProject(): Project {
-  with(ProjectBuilder.builder().build()) {
-    plugins.apply("com.facebook.react")
-    return this
-  }
+internal fun createProject(projectDir: File? = null): Project {
+  val project =
+      ProjectBuilder.builder()
+          .apply {
+            if (projectDir != null) {
+              withProjectDir(projectDir)
+            }
+          }
+          .build()
+
+  project.plugins.apply("com.android.library")
+  project.plugins.apply("com.facebook.react")
+  return project
 }
 
 internal inline fun <reified T : Task> createTestTask(
@@ -41,3 +52,18 @@ internal fun zipFiles(destination: File, contents: List<File>) {
     }
   }
 }
+
+/** A util function to create a zip given a list of dummy files path. */
+internal fun createZip(dest: File, paths: List<String>) {
+  val env = mapOf("create" to "true")
+  val uri = URI.create("jar:file:$dest")
+
+  FileSystems.newFileSystem(uri, env).use { zipfs ->
+    paths.forEach {
+      val zipEntryPath = zipfs.getPath(it)
+      val zipEntryFolder = zipEntryPath.subpath(0, zipEntryPath.nameCount - 1)
+      Files.createDirectories(zipEntryFolder)
+      Files.createFile(zipEntryPath)
+    }
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/WithOs.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/WithOs.kt
index beda3142cd30..45d0a0072afd 100644
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/WithOs.kt
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/WithOs.kt
@@ -8,10 +8,10 @@
 package com.facebook.react.tests
 
 /** Annotation to specify an Operating System to override the "os.name" System Property. */
-@Retention(AnnotationRetention.RUNTIME) annotation class WithOs(val os: OS)
+@Retention(AnnotationRetention.RUNTIME) annotation class WithOs(val os: OS, val arch: String = "")
 
 enum class OS(val propertyName: String) {
-  WIN("windows"),
-  MAC("macos"),
-  UNIX("unix")
+  WIN("Windows"),
+  MAC("MacOs"),
+  LINUX("Linux")
 }
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/BackwardCompatUtilsTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/BackwardCompatUtilsTest.kt
new file mode 100644
index 000000000000..da08d88ad06a
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/BackwardCompatUtilsTest.kt
@@ -0,0 +1,43 @@
+/*
+ * 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 com.facebook.react.tests.createProject
+import com.facebook.react.utils.BackwardCompatUtils.configureBackwardCompatibilityReactMap
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+
+class BackwardCompatUtilsTest {
+
+  @get:Rule val tempFolder = TemporaryFolder()
+
+  @Test
+  fun configureBackwardCompatibilityReactMap_addsEmptyReactMap() {
+    val project = createProject()
+
+    configureBackwardCompatibilityReactMap(project)
+
+    assertTrue(project.extensions.extraProperties.has("react"))
+    @Suppress("UNCHECKED_CAST")
+    assertTrue((project.extensions.extraProperties.get("react") as Map<String, Any?>).isEmpty())
+  }
+
+  @Test
+  fun configureBackwardCompatibilityReactMap_withExistingMapSetByUser_wipesTheMap() {
+    val project = createProject()
+    project.extensions.extraProperties.set("react", mapOf("enableHermes" to true))
+
+    configureBackwardCompatibilityReactMap(project)
+
+    assertTrue(project.extensions.extraProperties.has("react"))
+    @Suppress("UNCHECKED_CAST")
+    assertTrue((project.extensions.extraProperties.get("react") as Map<String, Any?>).isEmpty())
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt
new file mode 100644
index 000000000000..1b7c728cc4b4
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt
@@ -0,0 +1,310 @@
+/*
+ * 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 com.facebook.react.tests.createProject
+import com.facebook.react.utils.DependencyUtils.configureDependencies
+import com.facebook.react.utils.DependencyUtils.configureRepositories
+import com.facebook.react.utils.DependencyUtils.mavenRepoFromURI
+import com.facebook.react.utils.DependencyUtils.mavenRepoFromUrl
+import com.facebook.react.utils.DependencyUtils.readVersionString
+import java.net.URI
+import org.gradle.api.artifacts.repositories.MavenArtifactRepository
+import org.gradle.testfixtures.ProjectBuilder
+import org.junit.Assert.*
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+
+class DependencyUtilsTest {
+
+  @get:Rule val tempFolder = TemporaryFolder()
+
+  @Test
+  fun configureRepositories_withProjectPropertySet_configuresMavenLocalCorrectly() {
+    val localMaven = tempFolder.newFolder("m2")
+    val localMavenURI = localMaven.toURI()
+    val project = createProject()
+    project.extensions.extraProperties.set("REACT_NATIVE_MAVEN_LOCAL_REPO", localMaven.absolutePath)
+
+    configureRepositories(project, tempFolder.root)
+
+    assertNotNull(
+        project.repositories.firstOrNull {
+          it is MavenArtifactRepository && it.url == localMavenURI
+        })
+  }
+
+  @Test
+  fun configureRepositories_containsSnapshotRepo() {
+    val repositoryURI = URI.create("https://oss.sonatype.org/content/repositories/snapshots/")
+    val project = createProject()
+
+    configureRepositories(project, tempFolder.root)
+
+    assertNotNull(
+        project.repositories.firstOrNull {
+          it is MavenArtifactRepository && it.url == repositoryURI
+        })
+  }
+
+  @Test
+  fun configureRepositories_containsJscLocalMavenRepo() {
+    val projectFolder = tempFolder.newFolder()
+    val reactNativeDir = tempFolder.newFolder("react-native")
+    val jscAndroidDir = tempFolder.newFolder("jsc-android")
+    val repositoryURI = URI.create("file://${jscAndroidDir}/dist")
+    val project = createProject(projectFolder)
+
+    configureRepositories(project, reactNativeDir)
+
+    assertNotNull(
+        project.repositories.firstOrNull {
+          it is MavenArtifactRepository && it.url == repositoryURI
+        })
+  }
+
+  @Test
+  fun configureRepositories_containsMavenCentral() {
+    val repositoryURI = URI.create("https://repo.maven.apache.org/maven2/")
+    val project = createProject()
+
+    configureRepositories(project, tempFolder.root)
+
+    assertNotNull(
+        project.repositories.firstOrNull {
+          it is MavenArtifactRepository && it.url == repositoryURI
+        })
+  }
+
+  @Test
+  fun configureRepositories_containsGoogleRepo() {
+    val repositoryURI = URI.create("https://dl.google.com/dl/android/maven2/")
+    val project = createProject()
+
+    configureRepositories(project, tempFolder.root)
+
+    assertNotNull(
+        project.repositories.firstOrNull {
+          it is MavenArtifactRepository && it.url == repositoryURI
+        })
+  }
+
+  @Test
+  fun configureRepositories_containsJitPack() {
+    val repositoryURI = URI.create("https://www.jitpack.io")
+    val project = createProject()
+
+    configureRepositories(project, tempFolder.root)
+
+    assertNotNull(
+        project.repositories.firstOrNull {
+          it is MavenArtifactRepository && it.url == repositoryURI
+        })
+  }
+
+  @Test
+  fun configureRepositories_withProjectPropertySet_hasHigherPriorityThanMavenCentral() {
+    val localMaven = tempFolder.newFolder("m2")
+    val localMavenURI = localMaven.toURI()
+    val mavenCentralURI = URI.create("https://repo.maven.apache.org/maven2/")
+    val project = createProject()
+    project.extensions.extraProperties.set("REACT_NATIVE_MAVEN_LOCAL_REPO", localMaven.absolutePath)
+
+    configureRepositories(project, tempFolder.root)
+
+    val indexOfLocalRepo =
+        project.repositories.indexOfFirst {
+          it is MavenArtifactRepository && it.url == localMavenURI
+        }
+    val indexOfMavenCentral =
+        project.repositories.indexOfFirst {
+          it is MavenArtifactRepository && it.url == mavenCentralURI
+        }
+    assertTrue(indexOfLocalRepo < indexOfMavenCentral)
+  }
+
+  @Test
+  fun configureRepositories_snapshotRepoHasHigherPriorityThanMavenCentral() {
+    val repositoryURI = URI.create("https://oss.sonatype.org/content/repositories/snapshots/")
+    val mavenCentralURI = URI.create("https://repo.maven.apache.org/maven2/")
+    val project = createProject()
+
+    configureRepositories(project, tempFolder.root)
+
+    val indexOfSnapshotRepo =
+        project.repositories.indexOfFirst {
+          it is MavenArtifactRepository && it.url == repositoryURI
+        }
+    val indexOfMavenCentral =
+        project.repositories.indexOfFirst {
+          it is MavenArtifactRepository && it.url == mavenCentralURI
+        }
+    assertTrue(indexOfSnapshotRepo < indexOfMavenCentral)
+  }
+
+  @Test
+  fun configureRepositories_appliesToAllProjects() {
+    val repositoryURI = URI.create("https://repo.maven.apache.org/maven2/")
+    val rootProject = ProjectBuilder.builder().build()
+    val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
+    val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
+
+    configureRepositories(appProject, tempFolder.root)
+
+    assertNotNull(
+        appProject.repositories.firstOrNull {
+          it is MavenArtifactRepository && it.url == repositoryURI
+        })
+    assertNotNull(
+        libProject.repositories.firstOrNull {
+          it is MavenArtifactRepository && it.url == repositoryURI
+        })
+  }
+
+  @Test
+  fun configureRepositories_withPreviousExclusionRulesOnMavenCentral_appliesCorrectly() {
+    val repositoryURI = URI.create("https://repo.maven.apache.org/maven2/")
+    val rootProject = ProjectBuilder.builder().build()
+    val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
+    val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
+
+    // Let's emulate a library which set an `excludeGroup` on `com.facebook.react` for Central.
+    libProject.repositories.mavenCentral { repo ->
+      repo.content { content -> content.excludeGroup("com.facebook.react") }
+    }
+
+    configureRepositories(appProject, tempFolder.root)
+
+    // We need to make sure we have Maven Central defined twice, one by the library,
+    // and another is the override by RNGP.
+    assertEquals(
+        2,
+        libProject.repositories.count { it is MavenArtifactRepository && it.url == repositoryURI })
+  }
+
+  @Test
+  fun configureDependencies_withEmptyVersion_doesNothing() {
+    val project = createProject()
+
+    configureDependencies(project, "")
+
+    assertTrue(project.configurations.first().resolutionStrategy.forcedModules.isEmpty())
+  }
+
+  @Test
+  fun configureDependencies_withVersionString_appliesResolutionStrategy() {
+    val project = createProject()
+
+    configureDependencies(project, "1.2.3")
+
+    val forcedModules = project.configurations.first().resolutionStrategy.forcedModules
+    assertTrue(forcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
+    assertTrue(forcedModules.any { it.toString() == "com.facebook.react:hermes-android:1.2.3" })
+  }
+
+  @Test
+  fun configureDependencies_withVersionString_appliesOnAllProjects() {
+    val rootProject = ProjectBuilder.builder().build()
+    val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
+    val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
+    appProject.plugins.apply("com.android.application")
+    libProject.plugins.apply("com.android.library")
+
+    configureDependencies(appProject, "1.2.3")
+
+    val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
+    val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
+    assertTrue(appForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
+    assertTrue(appForcedModules.any { it.toString() == "com.facebook.react:hermes-android:1.2.3" })
+    assertTrue(libForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
+    assertTrue(libForcedModules.any { it.toString() == "com.facebook.react:hermes-android:1.2.3" })
+  }
+
+  @Test
+  fun readVersionString_withCorrectVersionString_returnsIt() {
+    val propertiesFile =
+        tempFolder.newFile("gradle.properties").apply {
+          writeText(
+              """
+        VERSION_NAME=1000.0.0
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent())
+        }
+
+    val versionString = readVersionString(propertiesFile)
+
+    assertEquals("1000.0.0", versionString)
+  }
+
+  @Test
+  fun readVersionString_withNightlyVersionString_returnsSnapshotVersion() {
+    val propertiesFile =
+        tempFolder.newFile("gradle.properties").apply {
+          writeText(
+              """
+        VERSION_NAME=0.0.0-20221101-2019-cfe811ab1
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent())
+        }
+
+    val versionString = readVersionString(propertiesFile)
+
+    assertEquals("0.0.0-20221101-2019-cfe811ab1-SNAPSHOT", versionString)
+  }
+
+  @Test
+  fun readVersionString_withMissingVersionString_returnsEmpty() {
+    val propertiesFile =
+        tempFolder.newFile("gradle.properties").apply {
+          writeText(
+              """
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent())
+        }
+
+    val versionString = readVersionString(propertiesFile)
+    assertEquals("", versionString)
+  }
+
+  @Test
+  fun readVersionString_withEmptyVersionString_returnsEmpty() {
+    val propertiesFile =
+        tempFolder.newFile("gradle.properties").apply {
+          writeText(
+              """
+        VERSION_NAME=
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent())
+        }
+
+    val versionString = readVersionString(propertiesFile)
+    assertEquals("", versionString)
+  }
+
+  @Test
+  fun mavenRepoFromUrl_worksCorrectly() {
+    val process = createProject()
+    val mavenRepo = process.mavenRepoFromUrl("https://hello.world")
+
+    assertEquals(URI.create("https://hello.world"), mavenRepo.url)
+  }
+
+  @Test
+  fun mavenRepoFromURI_worksCorrectly() {
+    val process = createProject()
+    val repoFolder = tempFolder.newFolder("maven-repo")
+    val mavenRepo = process.mavenRepoFromURI(repoFolder.toURI())
+
+    assertEquals(repoFolder.toURI(), mavenRepo.url)
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/JsonUtilsTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/JsonUtilsTest.kt
index d52bd985ac03..6335758685ac 100644
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/JsonUtilsTest.kt
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/JsonUtilsTest.kt
@@ -51,7 +51,8 @@ class JsonUtilsTest {
           ]
         }
       }
-      """.trimIndent())
+      """
+                .trimIndent())
 
     val parsed = JsonUtils.fromCodegenJson(oldJsonConfig)!!
 
@@ -78,7 +79,8 @@ class JsonUtilsTest {
           }
         }
       }
-      """.trimIndent())
+      """
+                .trimIndent())
 
     val parsed = JsonUtils.fromCodegenJson(validJson)!!
 
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/NdkConfiguratorUtilsTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/NdkConfiguratorUtilsTest.kt
new file mode 100644
index 000000000000..bf2f27926ab3
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/NdkConfiguratorUtilsTest.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.utils
+
+import com.facebook.react.utils.NdkConfiguratorUtils.getPackagingOptionsForVariant
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class NdkConfiguratorUtilsTest {
+
+  @Test
+  fun getPackagingOptionsForVariant_withHermesEnabled() {
+    val (excludes, includes) = getPackagingOptionsForVariant(hermesEnabled = true)
+
+    assertTrue("**/libjsc.so" in excludes)
+    assertTrue("**/libjscexecutor.so" in excludes)
+    assertFalse("**/libjsc.so" in includes)
+    assertFalse("**/libjscexecutor.so" in includes)
+
+    assertTrue("**/libhermes.so" in includes)
+    assertTrue("**/libhermes_executor.so" in includes)
+    assertFalse("**/libhermes.so" in excludes)
+    assertFalse("**/libhermes_executor.so" in excludes)
+  }
+
+  @Test
+  fun getPackagingOptionsForVariant_withHermesDisabled() {
+    val (excludes, includes) = getPackagingOptionsForVariant(hermesEnabled = false)
+
+    assertTrue("**/libhermes.so" in excludes)
+    assertTrue("**/libhermes_executor.so" in excludes)
+    assertFalse("**/libhermes.so" in includes)
+    assertFalse("**/libhermes_executor.so" in includes)
+
+    assertTrue("**/libjsc.so" in includes)
+    assertTrue("**/libjscexecutor.so" in includes)
+    assertFalse("**/libjsc.so" in excludes)
+    assertFalse("**/libjscexecutor.so" in excludes)
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/OsTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/OsTest.kt
index 78976ea70ce8..fd37f2474f77 100644
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/OsTest.kt
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/OsTest.kt
@@ -20,11 +20,11 @@ class OsTest {
   @get:Rule val osRule = OsRule()
 
   @Test
-  @WithOs(OS.UNIX)
-  fun onUnix_checksOsCorrectly() {
+  @WithOs(OS.LINUX, "amd64")
+  fun onLinuxAmd64_checksOsCorrectly() {
     assertFalse(Os.isWindows())
     assertFalse(Os.isMac())
-    assertFalse(Os.isLinuxAmd64())
+    assertTrue(Os.isLinuxAmd64())
   }
 
   @Test
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/PathUtilsTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/PathUtilsTest.kt
index 6b45db541d12..7871122498c9 100644
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/PathUtilsTest.kt
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/PathUtilsTest.kt
@@ -7,6 +7,7 @@
 
 package com.facebook.react.utils
 
+import com.facebook.react.ReactExtension
 import com.facebook.react.TestReactExtension
 import com.facebook.react.tests.OS
 import com.facebook.react.tests.OsRule
@@ -57,82 +58,31 @@ class PathUtilsTest {
   }
 
   @Test
-  fun detectedCliPath_withCliPathFromExtensionAbsolute() {
+  fun detectedCliPath_withCliPathFromExtensionAndFileExists_returnsIt() {
     val project = ProjectBuilder.builder().build()
+    val cliFile = tempFolder.newFile("cli.js").apply { createNewFile() }
     val extension = TestReactExtension(project)
-    val expected =
-        File(project.projectDir, "abs/fake-cli.sh").apply {
-          parentFile.mkdirs()
-          writeText("<!-- nothing to see here -->")
-        }
-    extension.cliPath.set(project.projectDir.toString() + "/abs/fake-cli.sh")
-
-    val actual = detectedCliPath(project.projectDir, extension)
-
-    assertEquals(expected.toString(), actual)
-  }
-
-  @Test
-  fun detectedCliPath_withCliPathFromExtensionInReactFolder() {
-    val project = ProjectBuilder.builder().build()
-    val extension = TestReactExtension(project)
-    val expected =
-        File(project.projectDir, "/react-root/fake-cli.sh").apply {
-          parentFile.mkdirs()
-          writeText("<!-- nothing to see here -->")
-        }
-    extension.cliPath.set("fake-cli.sh")
-    extension.root.set(File(project.projectDir.toString(), "react-root"))
-
-    val actual = detectedCliPath(project.projectDir, extension)
-
-    assertEquals(expected.toString(), actual)
-  }
-
-  @Test
-  fun detectedCliPath_withCliPathFromExtensionInProjectFolder() {
-    val project = ProjectBuilder.builder().build()
-    val extension = TestReactExtension(project)
-    val expected =
-        File(project.projectDir, "fake-cli.sh").apply {
-          parentFile.mkdirs()
-          writeText("<!-- nothing to see here -->")
-        }
-    extension.cliPath.set("fake-cli.sh")
-
-    val actual = detectedCliPath(project.projectDir, extension)
-
-    assertEquals(expected.toString(), actual)
-  }
+    extension.cliFile.set(cliFile)
 
-  @Test
-  fun detectedCliPath_withCliPathFromExtensionInParentFolder() {
-    val rootProject = ProjectBuilder.builder().build()
-    val project = ProjectBuilder.builder().withParent(rootProject).build()
-    project.projectDir.mkdirs()
-    val extension = TestReactExtension(project)
-    val expected = File(rootProject.projectDir, "cli-in-root.sh").apply { writeText("#!/bin/bash") }
-    extension.cliPath.set("../cli-in-root.sh")
+    val actual = detectedCliFile(extension)
 
-    val actual = detectedCliPath(project.projectDir, extension)
-
-    assertEquals(expected.canonicalPath, File(actual).canonicalPath)
+    assertEquals(cliFile, actual)
   }
 
   @Test
   fun detectedCliPath_withCliFromNodeModules() {
     val project = ProjectBuilder.builder().build()
     val extension = TestReactExtension(project)
-    extension.root.set(tempFolder.root)
-    val expected =
-        File(tempFolder.root, "node_modules/react-native/cli.js").apply {
-          parentFile.mkdirs()
-          writeText("<!-- nothing to see here -->")
-        }
+    File(tempFolder.root, "node_modules/react-native/cli.js").apply {
+      parentFile.mkdirs()
+      writeText("<!-- nothing to see here -->")
+    }
+    val locationToResolveFrom = File(tempFolder.root, "a-subdirectory").apply { mkdirs() }
+    extension.root.set(locationToResolveFrom)
 
-    val actual = detectedCliPath(project.projectDir, extension)
+    val actual = detectedCliFile(extension)
 
-    assertEquals(expected.toString(), actual)
+    assertEquals("<!-- nothing to see here -->", actual.readText())
   }
 
   @Test(expected = IllegalStateException::class)
@@ -140,7 +90,7 @@ class PathUtilsTest {
     val project = ProjectBuilder.builder().build()
     val extension = TestReactExtension(project)
 
-    detectedCliPath(project.projectDir, extension)
+    detectedCliFile(extension)
   }
 
   @Test
@@ -236,10 +186,121 @@ class PathUtilsTest {
         getBuiltHermescFile(tempFolder.root, ""))
   }
 
+  @Test
+  @WithOs(OS.WIN)
+  fun getBuiltHermescFile_onWindows_withoutOverride() {
+    assertEquals(
+        File(
+            tempFolder.root,
+            "node_modules/react-native/ReactAndroid/hermes-engine/build/hermes/bin/hermesc.exe"),
+        getBuiltHermescFile(tempFolder.root, ""))
+  }
+
   @Test
   fun getBuiltHermescFile_withOverride() {
     assertEquals(
         File("/home/circleci/hermes/build/bin/hermesc"),
         getBuiltHermescFile(tempFolder.root, "/home/circleci/hermes"))
   }
+
+  @Test
+  @WithOs(OS.WIN)
+  fun getHermesCBin_onWindows_returnsHermescExe() {
+    assertEquals("hermesc.exe", getHermesCBin())
+  }
+
+  @Test
+  @WithOs(OS.LINUX)
+  fun getHermesCBin_onLinux_returnsHermesc() {
+    assertEquals("hermesc", getHermesCBin())
+  }
+
+  @Test
+  @WithOs(OS.MAC)
+  fun getHermesCBin_onMac_returnsHermesc() {
+    assertEquals("hermesc", getHermesCBin())
+  }
+
+  @Test
+  fun findPackageJsonFile_withFileInParentFolder_picksItUp() {
+    tempFolder.newFile("package.json")
+    val moduleFolder = tempFolder.newFolder("awesome-module")
+
+    val project = ProjectBuilder.builder().withProjectDir(moduleFolder).build()
+    project.plugins.apply("com.android.library")
+    project.plugins.apply("com.facebook.react")
+    val extension = project.extensions.getByType(ReactExtension::class.java)
+
+    assertEquals(project.file("../package.json"), findPackageJsonFile(project, extension))
+  }
+
+  @Test
+  fun findPackageJsonFile_withFileConfiguredInExtension_picksItUp() {
+    val moduleFolder = tempFolder.newFolder("awesome-module")
+    val localFile = File(moduleFolder, "package.json").apply { writeText("{}") }
+
+    val project = ProjectBuilder.builder().withProjectDir(moduleFolder).build()
+    project.plugins.apply("com.android.library")
+    project.plugins.apply("com.facebook.react")
+    val extension =
+        project.extensions.getByType(ReactExtension::class.java).apply { root.set(moduleFolder) }
+
+    assertEquals(localFile, findPackageJsonFile(project, extension))
+  }
+
+  @Test
+  fun readPackageJsonFile_withMissingFile_returnsNull() {
+    val moduleFolder = tempFolder.newFolder("awesome-module")
+    val project = ProjectBuilder.builder().withProjectDir(moduleFolder).build()
+    project.plugins.apply("com.android.library")
+    project.plugins.apply("com.facebook.react")
+    val extension =
+        project.extensions.getByType(ReactExtension::class.java).apply { root.set(moduleFolder) }
+
+    val actual = readPackageJsonFile(project, extension)
+
+    assertNull(actual)
+  }
+
+  @Test
+  fun readPackageJsonFile_withFileConfiguredInExtension_andMissingCodegenConfig_returnsNullCodegenConfig() {
+    val moduleFolder = tempFolder.newFolder("awesome-module")
+    File(moduleFolder, "package.json").apply { writeText("{}") }
+    val project = ProjectBuilder.builder().withProjectDir(moduleFolder).build()
+    project.plugins.apply("com.android.library")
+    project.plugins.apply("com.facebook.react")
+    val extension =
+        project.extensions.getByType(ReactExtension::class.java).apply { root.set(moduleFolder) }
+
+    val actual = readPackageJsonFile(project, extension)
+
+    assertNotNull(actual)
+    assertNull(actual!!.codegenConfig)
+  }
+
+  @Test
+  fun readPackageJsonFile_withFileConfiguredInExtension_andHavingCodegenConfig_returnsValidCodegenConfig() {
+    val moduleFolder = tempFolder.newFolder("awesome-module")
+    File(moduleFolder, "package.json").apply {
+      writeText(
+          // language=json
+          """
+      {
+        "name": "a-library",
+        "codegenConfig": {}
+      }
+      """
+              .trimIndent())
+    }
+    val project = ProjectBuilder.builder().withProjectDir(moduleFolder).build()
+    project.plugins.apply("com.android.library")
+    project.plugins.apply("com.facebook.react")
+    val extension =
+        project.extensions.getByType(ReactExtension::class.java).apply { root.set(moduleFolder) }
+
+    val actual = readPackageJsonFile(project, extension)
+
+    assertNotNull(actual)
+    assertNotNull(actual!!.codegenConfig)
+  }
 }
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/ProjectUtilsTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/ProjectUtilsTest.kt
new file mode 100644
index 000000000000..4851fb2b0d96
--- /dev/null
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/ProjectUtilsTest.kt
@@ -0,0 +1,172 @@
+/*
+ * 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 com.facebook.react.TestReactExtension
+import com.facebook.react.model.ModelCodegenConfig
+import com.facebook.react.model.ModelPackageJson
+import com.facebook.react.tests.createProject
+import com.facebook.react.utils.ProjectUtils.isHermesEnabled
+import com.facebook.react.utils.ProjectUtils.isNewArchEnabled
+import com.facebook.react.utils.ProjectUtils.needsCodegenFromPackageJson
+import java.io.File
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+
+class ProjectUtilsTest {
+
+  @get:Rule val tempFolder = TemporaryFolder()
+
+  @Test
+  fun isNewArchEnabled_returnsFalseByDefault() {
+    assertFalse(createProject().isNewArchEnabled)
+  }
+
+  @Test
+  fun isNewArchEnabled_withDisabled_returnsFalse() {
+    val project = createProject()
+    project.extensions.extraProperties.set("newArchEnabled", "false")
+    assertFalse(project.isNewArchEnabled)
+  }
+
+  @Test
+  fun isNewArchEnabled_withEnabled_returnsTrue() {
+    val project = createProject()
+    project.extensions.extraProperties.set("newArchEnabled", "true")
+    assertTrue(project.isNewArchEnabled)
+  }
+
+  @Test
+  fun isNewArchEnabled_withInvalid_returnsFalse() {
+    val project = createProject()
+    project.extensions.extraProperties.set("newArchEnabled", "¯\\_(ツ)_/¯")
+    assertFalse(project.isNewArchEnabled)
+  }
+
+  @Test
+  fun isHermesEnabled_returnsTrueByDefault() {
+    assertTrue(createProject().isHermesEnabled)
+  }
+
+  @Test
+  fun isNewArchEnabled_withDisabledViaProperty_returnsFalse() {
+    val project = createProject()
+    project.extensions.extraProperties.set("hermesEnabled", "false")
+    assertFalse(project.isHermesEnabled)
+  }
+
+  @Test
+  fun isHermesEnabled_withEnabledViaProperty_returnsTrue() {
+    val project = createProject()
+    project.extensions.extraProperties.set("hermesEnabled", "true")
+    assertTrue(project.isHermesEnabled)
+  }
+
+  @Test
+  fun isHermesEnabled_withInvalidViaProperty_returnsTrue() {
+    val project = createProject()
+    project.extensions.extraProperties.set("hermesEnabled", "¯\\_(ツ)_/¯")
+    assertTrue(project.isHermesEnabled)
+  }
+
+  @Test
+  fun isHermesEnabled_withDisabledViaExt_returnsFalse() {
+    val project = createProject()
+    val extMap = mapOf("enableHermes" to false)
+    project.extensions.extraProperties.set("react", extMap)
+    assertFalse(project.isHermesEnabled)
+  }
+
+  @Test
+  fun isHermesEnabled_withEnabledViaExt_returnsTrue() {
+    val project = createProject()
+    val extMap = mapOf("enableHermes" to true)
+    project.extensions.extraProperties.set("react", extMap)
+    assertTrue(project.isHermesEnabled)
+  }
+
+  @Test
+  fun isHermesEnabled_withDisabledViaExtAsString_returnsFalse() {
+    val project = createProject()
+    val extMap = mapOf("enableHermes" to "false")
+    project.extensions.extraProperties.set("react", extMap)
+    assertFalse(project.isHermesEnabled)
+  }
+
+  @Test
+  fun isHermesEnabled_withInvalidViaExt_returnsTrue() {
+    val project = createProject()
+    val extMap = mapOf("enableHermes" to "¯\\_(ツ)_/¯")
+    project.extensions.extraProperties.set("react", extMap)
+    assertTrue(project.isHermesEnabled)
+  }
+
+  @Test
+  fun needsCodegenFromPackageJson_withCodegenConfigInPackageJson_returnsTrue() {
+    val project = createProject()
+    val extension = TestReactExtension(project)
+    File(tempFolder.root, "package.json").apply {
+      writeText(
+          // language=json
+          """
+      {
+        "name": "a-library",
+        "codegenConfig": {}
+      }
+      """
+              .trimIndent())
+    }
+    extension.root.set(tempFolder.root)
+    assertTrue(project.needsCodegenFromPackageJson(extension))
+  }
+
+  @Test
+  fun needsCodegenFromPackageJson_withMissingCodegenConfigInPackageJson_returnsFalse() {
+    val project = createProject()
+    val extension = TestReactExtension(project)
+    File(tempFolder.root, "package.json").apply {
+      writeText(
+          // language=json
+          """
+      {
+        "name": "a-library"
+      }
+      """
+              .trimIndent())
+    }
+    extension.root.set(tempFolder.root)
+    assertFalse(project.needsCodegenFromPackageJson(extension))
+  }
+
+  @Test
+  fun needsCodegenFromPackageJson_withCodegenConfigInModel_returnsTrue() {
+    val project = createProject()
+    val model = ModelPackageJson(ModelCodegenConfig(null, null, null, null))
+
+    assertTrue(project.needsCodegenFromPackageJson(model))
+  }
+
+  @Test
+  fun needsCodegenFromPackageJson_withMissingCodegenConfigInModel_returnsFalse() {
+    val project = createProject()
+    val model = ModelPackageJson(null)
+
+    assertFalse(project.needsCodegenFromPackageJson(model))
+  }
+
+  @Test
+  fun needsCodegenFromPackageJson_withMissingPackageJson_returnsFalse() {
+    val project = createProject()
+    val extension = TestReactExtension(project)
+
+    assertFalse(project.needsCodegenFromPackageJson(extension))
+  }
+}
diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/TaskUtilsTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/TaskUtilsTest.kt
index 8156ef029e71..cafbba6f7afd 100644
--- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/TaskUtilsTest.kt
+++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/TaskUtilsTest.kt
@@ -24,6 +24,12 @@ class TaskUtilsTest {
     assertTrue(windowsAwareCommandLine().isEmpty())
   }
 
+  @Test
+  fun windowsAwareCommandLine_withList_isEqualAsVararg() {
+    assertEquals(
+        windowsAwareCommandLine(listOf("a", "b", "c")), windowsAwareCommandLine("a", "b", "c"))
+  }
+
   @Test
   @WithOs(OS.MAC)
   fun windowsAwareCommandLine_onMac_returnsTheList() {
@@ -31,7 +37,7 @@ class TaskUtilsTest {
   }
 
   @Test
-  @WithOs(OS.UNIX)
+  @WithOs(OS.LINUX)
   fun windowsAwareCommandLine_onLinux_returnsTheList() {
     assertEquals(listOf("a", "b", "c"), windowsAwareCommandLine("a", "b", "c"))
   }
@@ -50,7 +56,7 @@ class TaskUtilsTest {
   }
 
   @Test
-  @WithOs(OS.UNIX)
+  @WithOs(OS.LINUX)
   fun windowsAwareBashCommandLine_onLinux_returnsTheList() {
     assertEquals(listOf("a", "b", "c"), windowsAwareBashCommandLine("a", "b", "c"))
   }
diff --git a/packages/rn-tester/BUCK b/packages/rn-tester/BUCK
index 04c75fe503b5..dae1544ba4ed 100644
--- a/packages/rn-tester/BUCK
+++ b/packages/rn-tester/BUCK
@@ -1,3 +1,4 @@
+load("@fbsource//tools/build_defs:glob_defs.bzl", "subdir_glob")
 load("@fbsource//xplat/hermes/defs:hermes.bzl", "HERMES_BYTECODE_VERSION")
 load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
 load("//tools/build_defs:fb_xplat_platform_specific_rule.bzl", "fb_xplat_platform_specific_rule")
@@ -10,6 +11,7 @@ load("//tools/build_defs/apple:flag_defs.bzl", "get_objc_arc_preprocessor_flags"
 load("//tools/build_defs/oss:metro_defs.bzl", "rn_library")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
     "APPLE",
     "YOGA_APPLE_TARGET",
     "js_library_glob",
@@ -49,6 +51,7 @@ rn_library(
     srcs = js_library_glob(
         [
             "js",
+            "NativeCxxModuleExample",
             "NativeModuleExample",
             "NativeComponentExample",
             "RCTTest",
@@ -61,11 +64,13 @@ rn_library(
         ],
     ),
     codegen_components = True,
+    codegen_modules = True,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.playground",
     ],
     native_component_spec_name = "AppSpecs",
+    native_module_android_package_name = "com.facebook.fbreact.specs",
+    native_module_spec_name = "AppSpecs",
     skip_processors = True,
     visibility = ["PUBLIC"],
     deps = [
@@ -308,7 +313,6 @@ rn_xplat_cxx_library2(
     contacts = ["oncall+react_native@xmail.facebook.com"],
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
     plugins = [
         react_fabric_component_plugin_provider("RNTMyNativeView", "RNTMyNativeViewCls"),
@@ -321,3 +325,24 @@ rn_xplat_cxx_library2(
         "//xplat/js/react-native-github:RCTFabricComponentViewsBase",
     ],
 )
+
+rn_xplat_cxx_library2(
+    name = "NativeCxxModuleExample",
+    srcs = glob(["NativeCxxModuleExample/*.cpp"]),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("NativeCxxModuleExample", "*.h"),
+        ],
+        prefix = "NativeCxxModuleExample",
+    ),
+    fbandroid_compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+    ],
+    platforms = (ANDROID, APPLE),
+    visibility = ["PUBLIC"],
+    deps = [
+        ":AppSpecsJSI",
+    ],
+)
diff --git a/packages/rn-tester/NativeComponentExample/MyNativeView.podspec b/packages/rn-tester/NativeComponentExample/MyNativeView.podspec
index 45aee537e34e..3368c3e47c0c 100644
--- a/packages/rn-tester/NativeComponentExample/MyNativeView.podspec
+++ b/packages/rn-tester/NativeComponentExample/MyNativeView.podspec
@@ -7,8 +7,6 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "../" "package.json")))
 
-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_version = '1.76.0'
 boost_compiler_flags = '-Wno-documentation'
 
@@ -19,24 +17,19 @@ Pod::Spec.new do |s|
   s.description     = "my-native-view"
   s.homepage        = "https://github.com/sota000/my-native-view.git"
   s.license         = "MIT"
-  s.platforms       = { :ios => "12.4", :tvos => "12.4" }
-  s.compiler_flags  = folly_compiler_flags + ' ' + boost_compiler_flags + ' -Wno-nullability-completeness'
+  s.platforms       = { :ios => "12.4" }
+  s.compiler_flags  = boost_compiler_flags + ' -Wno-nullability-completeness'
   s.author          = "Facebook, Inc. and its affiliates"
   s.source          = { :git => "https://github.com/facebook/my-native-view.git", :tag => "#{s.version}" }
   s.pod_target_xcconfig    = {
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/boost\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"",
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/boost\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"",
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
   }
 
   s.source_files    = "ios/**/*.{h,m,mm,cpp}"
   s.requires_arc    = true
 
-  s.dependency "React"
-  s.dependency "React-RCTFabric"
-  s.dependency "React-Codegen"
-  s.dependency "RCTRequired"
-  s.dependency "RCTTypeSafety"
-  s.dependency "ReactCommon/turbomodule/core"
+  install_modules_dependencies(s)
 
   # Enable codegen for this library
   use_react_native_codegen!(s, {
diff --git a/packages/rn-tester/NativeCxxModuleExample/CMakeLists.txt b/packages/rn-tester/NativeCxxModuleExample/CMakeLists.txt
new file mode 100644
index 000000000000..ce1fa2d89801
--- /dev/null
+++ b/packages/rn-tester/NativeCxxModuleExample/CMakeLists.txt
@@ -0,0 +1,29 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -DFOLLY_NO_CONFIG=1
+        -DLOG_TAG=\"ReactNative\")
+
+file(GLOB nativecxxmoduleexample_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(nativecxxmoduleexample STATIC ${nativecxxmoduleexample_SRC})
+
+target_include_directories(nativecxxmoduleexample PUBLIC .)
+target_include_directories(react_codegen_AppSpecs PUBLIC .)
+
+target_link_libraries(nativecxxmoduleexample
+        fbjni
+        jsi
+        react_nativemodule_core
+        react_codegen_AppSpecs)
diff --git a/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.cpp b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.cpp
new file mode 100644
index 000000000000..78c9c1e3a27c
--- /dev/null
+++ b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.cpp
@@ -0,0 +1,110 @@
+/*
+ * 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 "NativeCxxModuleExample.h"
+
+namespace facebook::react {
+
+NativeCxxModuleExample::NativeCxxModuleExample(
+    std::shared_ptr<CallInvoker> jsInvoker)
+    : NativeCxxModuleExampleCxxSpec(std::move(jsInvoker)) {}
+
+void NativeCxxModuleExample::getValueWithCallback(
+    jsi::Runtime &rt,
+    AsyncCallback<std::string> callback) {
+  callback({"value from callback!"});
+}
+
+std::vector<std::optional<ObjectStruct>> NativeCxxModuleExample::getArray(
+    jsi::Runtime &rt,
+    std::vector<std::optional<ObjectStruct>> arg) {
+  return arg;
+}
+
+bool NativeCxxModuleExample::getBool(jsi::Runtime &rt, bool arg) {
+  return arg;
+}
+
+ConstantsStruct NativeCxxModuleExample::getConstants(jsi::Runtime &rt) {
+  return ConstantsStruct{true, 69, "react-native"};
+}
+
+int32_t NativeCxxModuleExample::getEnum(jsi::Runtime &rt, int32_t arg) {
+  return arg;
+}
+
+std::map<std::string, std::optional<int32_t>> NativeCxxModuleExample::getMap(
+    jsi::Runtime &rt,
+    std::map<std::string, std::optional<int32_t>> arg) {
+  return arg;
+}
+
+double NativeCxxModuleExample::getNumber(jsi::Runtime &rt, double arg) {
+  return arg;
+}
+
+ObjectStruct NativeCxxModuleExample::getObject(
+    jsi::Runtime &rt,
+    ObjectStruct arg) {
+  return arg;
+}
+
+std::set<float> NativeCxxModuleExample::getSet(
+    jsi::Runtime &rt,
+    std::set<float> arg) {
+  return arg;
+}
+
+std::string NativeCxxModuleExample::getString(
+    jsi::Runtime &rt,
+    std::string arg) {
+  return arg;
+}
+
+std::string NativeCxxModuleExample::getUnion(
+    jsi::Runtime &rt,
+    float x,
+    std::string y,
+    jsi::Object z) {
+  std::string result = "x: " + std::to_string(x) + ", y: " + y + ", z: { ";
+  if (z.hasProperty(rt, "value")) {
+    result += "value: ";
+    result += std::to_string(z.getProperty(rt, "value").getNumber());
+  } else if (z.hasProperty(rt, "low")) {
+    result += "low: ";
+    result += z.getProperty(rt, "low").getString(rt).utf8(rt);
+  }
+  result += " }";
+  return result;
+}
+
+ValueStruct NativeCxxModuleExample::getValue(
+    jsi::Runtime &rt,
+    double x,
+    std::string y,
+    ObjectStruct z) {
+  ValueStruct result{x, y, z};
+  return result;
+}
+
+AsyncPromise<std::string> NativeCxxModuleExample::getValueWithPromise(
+    jsi::Runtime &rt,
+    bool error) {
+  auto promise = AsyncPromise<std::string>(rt, jsInvoker_);
+  if (error) {
+    promise.reject("intentional promise rejection");
+  } else {
+    promise.resolve("result!");
+  }
+  return promise;
+}
+
+void NativeCxxModuleExample::voidFunc(jsi::Runtime &rt) {
+  // Nothing to do
+}
+
+} // namespace facebook::react
diff --git a/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h
new file mode 100644
index 000000000000..e968db5848ee
--- /dev/null
+++ b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h
@@ -0,0 +1,98 @@
+/*
+ * 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
+
+#if __has_include(<React-Codegen/AppSpecsJSI.h>) // CocoaPod headers on Apple
+#include <React-Codegen/AppSpecsJSI.h>
+#elif __has_include("AppSpecsJSI.h") // Cmake headers on Android
+#include "AppSpecsJSI.h"
+#else // BUCK headers
+#include <AppSpecs/AppSpecsJSI.h>
+#endif
+#include <memory>
+#include <set>
+#include <string>
+#include <vector>
+
+namespace facebook::react {
+
+#pragma mark - Structs
+using ConstantsStruct =
+    NativeCxxModuleExampleCxxBaseConstantsStruct<bool, int32_t, std::string>;
+
+template <>
+struct Bridging<ConstantsStruct>
+    : NativeCxxModuleExampleCxxBaseConstantsStructBridging<
+          bool,
+          int32_t,
+          std::string> {};
+
+using ObjectStruct = NativeCxxModuleExampleCxxBaseObjectStruct<
+    int32_t,
+    std::string,
+    std::optional<std::string>>;
+
+template <>
+struct Bridging<ObjectStruct>
+    : NativeCxxModuleExampleCxxBaseObjectStructBridging<
+          int32_t,
+          std::string,
+          std::optional<std::string>> {};
+
+using ValueStruct =
+    NativeCxxModuleExampleCxxBaseValueStruct<double, std::string, ObjectStruct>;
+
+template <>
+struct Bridging<ValueStruct> : NativeCxxModuleExampleCxxBaseValueStructBridging<
+                                   double,
+                                   std::string,
+                                   ObjectStruct> {};
+
+#pragma mark - implementation
+class NativeCxxModuleExample
+    : public NativeCxxModuleExampleCxxSpec<NativeCxxModuleExample> {
+ public:
+  NativeCxxModuleExample(std::shared_ptr<CallInvoker> jsInvoker);
+
+  void getValueWithCallback(
+      jsi::Runtime &rt,
+      AsyncCallback<std::string> callback);
+
+  std::vector<std::optional<ObjectStruct>> getArray(
+      jsi::Runtime &rt,
+      std::vector<std::optional<ObjectStruct>> arg);
+
+  bool getBool(jsi::Runtime &rt, bool arg);
+
+  ConstantsStruct getConstants(jsi::Runtime &rt);
+
+  int32_t getEnum(jsi::Runtime &rt, int32_t arg);
+
+  std::map<std::string, std::optional<int32_t>> getMap(
+      jsi::Runtime &rt,
+      std::map<std::string, std::optional<int32_t>> arg);
+
+  double getNumber(jsi::Runtime &rt, double arg);
+
+  ObjectStruct getObject(jsi::Runtime &rt, ObjectStruct arg);
+
+  std::set<float> getSet(jsi::Runtime &rt, std::set<float> arg);
+
+  std::string getString(jsi::Runtime &rt, std::string arg);
+
+  std::string getUnion(jsi::Runtime &rt, float x, std::string y, jsi::Object z);
+
+  ValueStruct
+  getValue(jsi::Runtime &rt, double x, std::string y, ObjectStruct z);
+
+  AsyncPromise<std::string> getValueWithPromise(jsi::Runtime &rt, bool error);
+
+  void voidFunc(jsi::Runtime &rt);
+};
+
+} // namespace facebook::react
diff --git a/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.js b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.js
new file mode 100644
index 000000000000..d48614a2ca91
--- /dev/null
+++ b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.js
@@ -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.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
+
+import {TurboModuleRegistry} from 'react-native';
+
+/** FIXME: Enable flow-enum support
+export enum EnumInt {
+  A = 23,
+  B = 42,
+}
+*/
+
+export type UnionFloat = 1.44 | 2.88 | 5.76;
+export type UnionString = 'One' | 'Two' | 'Three';
+export type UnionObject = {value: number} | {low: string};
+
+export type ConstantsStruct = {|
+  const1: boolean,
+  const2: number,
+  const3: string,
+|};
+
+export type ObjectStruct = {|
+  a: number,
+  b: string,
+  c?: ?string,
+|};
+
+export type ValueStruct = {|
+  x: number,
+  y: string,
+  z: ObjectStruct,
+|};
+
+export interface Spec extends TurboModule {
+  +getArray: (arg: Array<ObjectStruct | null>) => Array<ObjectStruct | null>;
+  +getBool: (arg: boolean) => boolean;
+  +getConstants: () => ConstantsStruct;
+  // FIXME: Enable flow-enum support
+  +getEnum: (arg: number /*EnumInt*/) => number /*EnumInt*/;
+  +getMap: (arg: {[key: string]: ?number}) => {[key: string]: ?number};
+  +getNumber: (arg: number) => number;
+  +getObject: (arg: ObjectStruct) => ObjectStruct;
+  +getSet: (arg: Array<number>) => Array<number>;
+  +getString: (arg: string) => string;
+  +getUnion: (x: UnionFloat, y: UnionString, z: UnionObject) => string;
+  +getValue: (x: number, y: string, z: ObjectStruct) => ValueStruct;
+  +getValueWithCallback: (callback: (value: string) => void) => void;
+  +getValueWithPromise: (error: boolean) => Promise<string>;
+  +voidFunc: () => void;
+}
+
+export default (TurboModuleRegistry.get<Spec>(
+  'NativeCxxModuleExampleCxx',
+): ?Spec);
diff --git a/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.podspec b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.podspec
new file mode 100644
index 000000000000..4eaef3a39788
--- /dev/null
+++ b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.podspec
@@ -0,0 +1,31 @@
+# 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")))
+
+Pod::Spec.new do |s|
+  s.name            = "NativeCxxModuleExample"
+  s.version         = package["version"]
+  s.summary         = package["description"]
+  s.description     = "NativeCxxModuleExample"
+  s.homepage        = "https://github.com/facebook/react-native.git"
+  s.license         = "MIT"
+  s.platforms       = { :ios => "12.4" }
+  s.compiler_flags  = '-Wno-nullability-completeness'
+  s.author          = "Meta Platforms, Inc. and its affiliates"
+  s.source          = { :git => "https://github.com/facebook/react-native.git", :tag => "#{s.version}" }
+  s.source_files    = "**/*.{h,cpp}"
+  s.requires_arc    = true
+  s.pod_target_xcconfig = {
+    "USE_HEADERMAP" => "YES",
+    "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+  }
+
+  install_modules_dependencies(s)
+
+  s.dependency "ReactCommon/turbomodule/core"
+end
diff --git a/packages/rn-tester/NativeModuleExample/ScreenshotManager.podspec b/packages/rn-tester/NativeModuleExample/ScreenshotManager.podspec
index 00cde709b2ff..339f68e1d412 100644
--- a/packages/rn-tester/NativeModuleExample/ScreenshotManager.podspec
+++ b/packages/rn-tester/NativeModuleExample/ScreenshotManager.podspec
@@ -7,9 +7,6 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "../package.json")))
 
-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'
-
 Pod::Spec.new do |s|
   s.name            = "ScreenshotManager"
   s.version         = package["version"]
@@ -17,16 +14,15 @@ Pod::Spec.new do |s|
   s.description     = "ScreenshotManager"
   s.homepage        = "https://github.com/facebook/react-native.git"
   s.license         = "MIT"
-  s.platforms       = { :ios => "12.4", :tvos => "12.4" }
-  s.compiler_flags  = folly_compiler_flags + ' -Wno-nullability-completeness'
+  s.platforms       = { :ios => "12.4" }
+  s.compiler_flags  = '-Wno-nullability-completeness'
   s.author          = "Facebook, Inc. and its affiliates"
   s.source          = { :git => "https://github.com/facebook/react-native.git", :tag => "#{s.version}" }
 
   s.source_files    = "**/*.{h,m,mm,swift}"
   s.requires_arc    = true
 
-  s.dependency "React-Core"
-  s.dependency "RCT-Folly", folly_version
+  install_modules_dependencies(s)
 
   # s.dependency "..."
 
diff --git a/packages/rn-tester/Podfile b/packages/rn-tester/Podfile
index d50d388be192..36b03d00d2cb 100644
--- a/packages/rn-tester/Podfile
+++ b/packages/rn-tester/Podfile
@@ -1,11 +1,9 @@
 require_relative '../../scripts/react_native_pods'
 
 source 'https://cdn.cocoapods.org/'
-platform :ios, '12.4'
+platform :ios, min_ios_version_supported
 
-# Temporary solution to suppress duplicated GUID error.
-# Can be removed once we move to generate files outside pod install.
-install! 'cocoapods', :deterministic_uuids => false
+prepare_react_native_project!
 
 USE_FRAMEWORKS = ENV['USE_FRAMEWORKS'] == '1'
 IN_CI = ENV['CI'] == 'true'
@@ -17,7 +15,7 @@ if USE_FRAMEWORKS
   use_frameworks!
 end
 
-def pods(options = {}, use_flipper: false)
+def pods(target_name, options = {}, use_flipper: !IN_CI && !USE_FRAMEWORKS)
   project 'RNTesterPods.xcodeproj'
 
   fabric_enabled = true
@@ -25,7 +23,7 @@ def pods(options = {}, use_flipper: false)
   # Hermes is now enabled by default.
   # The following line will only disable Hermes if the USE_HERMES envvar is SET to a value other than 1 (e.g. USE_HERMES=0).
   hermes_enabled = !ENV.has_key?('USE_HERMES') || ENV['USE_HERMES'] == '1'
-  puts "Building RNTester with Fabric #{fabric_enabled ? "enabled" : "disabled"}.#{hermes_enabled ? " Using Hermes engine." : ""}"
+  puts "Configuring #{target_name} with Fabric #{fabric_enabled ? "enabled" : "disabled"}.#{hermes_enabled ? " Using Hermes engine." : ""}"
 
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1'
     # Custom fabric component is only supported when using codegen discovery.
@@ -39,7 +37,8 @@ def pods(options = {}, use_flipper: false)
     flipper_configuration: use_flipper ? FlipperConfiguration.enabled : FlipperConfiguration.disabled,
     app_path: "#{Dir.pwd}",
     config_file_dir: "#{Dir.pwd}/node_modules",
-    production: !ENV['PRODUCTION'].nil?
+    production: !ENV['PRODUCTION'].nil?,
+    ios_folder: '.',
   )
   pod 'ReactCommon/turbomodule/samples', :path => "#{@prefix_path}/ReactCommon"
 
@@ -50,19 +49,22 @@ def pods(options = {}, use_flipper: false)
 
   # RNTester native modules and components
   pod 'ScreenshotManager', :path => "NativeModuleExample"
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+    pod 'NativeCxxModuleExample', :path => "NativeCxxModuleExample"
+  end
 end
 
 target 'RNTester' do
-  pods({}, :use_flipper => !IN_CI && !USE_FRAMEWORKS)
+  pods('RNTester')
 end
 
 target 'RNTesterUnitTests' do
-  pods()
+  pods('RNTesterUnitTests')
   pod 'React-RCTTest', :path => "./RCTTest"
 end
 
 target 'RNTesterIntegrationTests' do
-  pods()
+  pods('RNTesterIntegrationTests')
   pod 'React-RCTTest', :path => "./RCTTest"
 end
 
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
index 824da7bca361..e617263a5d05 100644
--- a/packages/rn-tester/Podfile.lock
+++ b/packages/rn-tester/Podfile.lock
@@ -1,80 +1,24 @@
 PODS:
   - boost (1.76.0)
-  - CocoaAsyncSocket (7.6.5)
   - DoubleConversion (1.1.6)
-  - FBLazyVector (1000.0.0)
-  - FBReactNativeSpec (1000.0.0):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-Core (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - Flipper (0.125.0):
-    - Flipper-Folly (~> 2.6)
-    - Flipper-RSocket (~> 1.4)
-  - Flipper-Boost-iOSX (1.76.0.1.11)
-  - Flipper-DoubleConversion (3.2.0.1)
-  - Flipper-Fmt (7.1.7)
-  - Flipper-Folly (2.6.10):
-    - Flipper-Boost-iOSX
-    - Flipper-DoubleConversion
-    - Flipper-Fmt (= 7.1.7)
-    - Flipper-Glog
-    - libevent (~> 2.1.12)
-    - OpenSSL-Universal (= 1.1.1100)
-  - Flipper-Glog (0.5.0.5)
-  - Flipper-PeerTalk (0.0.4)
-  - Flipper-RSocket (1.4.3):
-    - Flipper-Folly (~> 2.6)
-  - FlipperKit (0.125.0):
-    - FlipperKit/Core (= 0.125.0)
-  - FlipperKit/Core (0.125.0):
-    - Flipper (~> 0.125.0)
-    - FlipperKit/CppBridge
-    - FlipperKit/FBCxxFollyDynamicConvert
-    - FlipperKit/FBDefines
-    - FlipperKit/FKPortForwarding
-    - SocketRocket (~> 0.6.0)
-  - FlipperKit/CppBridge (0.125.0):
-    - Flipper (~> 0.125.0)
-  - FlipperKit/FBCxxFollyDynamicConvert (0.125.0):
-    - Flipper-Folly (~> 2.6)
-  - FlipperKit/FBDefines (0.125.0)
-  - FlipperKit/FKPortForwarding (0.125.0):
-    - CocoaAsyncSocket (~> 7.6)
-    - Flipper-PeerTalk (~> 0.0.4)
-  - FlipperKit/FlipperKitHighlightOverlay (0.125.0)
-  - FlipperKit/FlipperKitLayoutHelpers (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitHighlightOverlay
-    - FlipperKit/FlipperKitLayoutTextSearchable
-  - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitHighlightOverlay
-    - FlipperKit/FlipperKitLayoutHelpers
-    - YogaKit (~> 1.18)
-  - FlipperKit/FlipperKitLayoutPlugin (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitHighlightOverlay
-    - FlipperKit/FlipperKitLayoutHelpers
-    - FlipperKit/FlipperKitLayoutIOSDescriptors
-    - FlipperKit/FlipperKitLayoutTextSearchable
-    - YogaKit (~> 1.18)
-  - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0)
-  - FlipperKit/FlipperKitNetworkPlugin (0.125.0):
-    - FlipperKit/Core
-  - FlipperKit/FlipperKitReactPlugin (0.125.0):
-    - FlipperKit/Core
-  - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0):
-    - FlipperKit/Core
-  - FlipperKit/SKIOSNetworkPlugin (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitNetworkPlugin
+  - FBLazyVector (0.71.0-rc.4)
+  - FBReactNativeSpec (0.71.0-rc.4):
+    - RCT-Folly (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-Core (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
   - fmt (6.2.1)
   - glog (0.3.5)
+  - hermes-engine (0.71.0-rc.4):
+    - hermes-engine/Hermes (= 0.71.0-rc.4)
+    - hermes-engine/JSI (= 0.71.0-rc.4)
+    - hermes-engine/Public (= 0.71.0-rc.4)
+  - hermes-engine/Hermes (0.71.0-rc.4)
+  - hermes-engine/JSI (0.71.0-rc.4)
+  - hermes-engine/Public (0.71.0-rc.4)
   - libevent (2.1.12)
-  - OpenSSL-Universal (1.1.1100)
   - RCT-Folly (2021.07.22.00):
     - boost
     - DoubleConversion
@@ -91,686 +35,690 @@ PODS:
     - DoubleConversion
     - fmt (~> 6.2.1)
     - glog
-  - RCTRequired (1000.0.0)
-  - RCTTypeSafety (1000.0.0):
-    - FBLazyVector (= 1000.0.0)
-    - RCTRequired (= 1000.0.0)
-    - React-Core (= 1000.0.0)
-  - React (1000.0.0):
-    - React-Core (= 1000.0.0)
-    - React-Core/DevSupport (= 1000.0.0)
-    - React-Core/RCTWebSocket (= 1000.0.0)
-    - React-RCTActionSheet (= 1000.0.0)
-    - React-RCTAnimation (= 1000.0.0)
-    - React-RCTBlob (= 1000.0.0)
-    - React-RCTImage (= 1000.0.0)
-    - React-RCTLinking (= 1000.0.0)
-    - React-RCTNetwork (= 1000.0.0)
-    - React-RCTSettings (= 1000.0.0)
-    - React-RCTText (= 1000.0.0)
-    - React-RCTVibration (= 1000.0.0)
-  - React-bridging (1000.0.0):
-    - RCT-Folly (= 2021.07.22.00)
-    - React-jsi (= 1000.0.0)
-  - React-callinvoker (1000.0.0)
-  - React-Codegen (1000.0.0):
-    - FBReactNativeSpec (= 1000.0.0)
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-Core (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-rncore (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Core (1000.0.0):
+  - RCT-Folly/Futures (2021.07.22.00):
+    - boost
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - libevent
+  - RCTRequired (0.71.0-rc.4)
+  - RCTTypeSafety (0.71.0-rc.4):
+    - FBLazyVector (= 0.71.0-rc.4)
+    - RCTRequired (= 0.71.0-rc.4)
+    - React-Core (= 0.71.0-rc.4)
+  - React (0.71.0-rc.4):
+    - React-Core (= 0.71.0-rc.4)
+    - React-Core/DevSupport (= 0.71.0-rc.4)
+    - React-Core/RCTWebSocket (= 0.71.0-rc.4)
+    - React-RCTActionSheet (= 0.71.0-rc.4)
+    - React-RCTAnimation (= 0.71.0-rc.4)
+    - React-RCTBlob (= 0.71.0-rc.4)
+    - React-RCTImage (= 0.71.0-rc.4)
+    - React-RCTLinking (= 0.71.0-rc.4)
+    - React-RCTNetwork (= 0.71.0-rc.4)
+    - React-RCTSettings (= 0.71.0-rc.4)
+    - React-RCTText (= 0.71.0-rc.4)
+    - React-RCTVibration (= 0.71.0-rc.4)
+  - React-callinvoker (0.71.0-rc.4)
+  - React-Codegen (0.71.0-rc.4):
+    - FBReactNativeSpec
+    - hermes-engine
+    - RCT-Folly
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-rncore
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+  - React-Core (0.71.0-rc.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 1000.0.0)
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
+    - React-Core/Default (= 0.71.0-rc.4)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
     - Yoga
-  - React-Core/CoreModulesHeaders (1000.0.0):
+  - React-Core/CoreModulesHeaders (0.71.0-rc.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
     - Yoga
-  - React-Core/Default (1000.0.0):
+  - React-Core/Default (0.71.0-rc.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
     - Yoga
-  - React-Core/DevSupport (1000.0.0):
+  - React-Core/DevSupport (0.71.0-rc.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 1000.0.0)
-    - React-Core/RCTWebSocket (= 1000.0.0)
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-jsinspector (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
+    - React-Core/Default (= 0.71.0-rc.4)
+    - React-Core/RCTWebSocket (= 0.71.0-rc.4)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-jsinspector (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
     - Yoga
-  - React-Core/RCTActionSheetHeaders (1000.0.0):
+  - React-Core/RCTActionSheetHeaders (0.71.0-rc.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
     - Yoga
-  - React-Core/RCTAnimationHeaders (1000.0.0):
+  - React-Core/RCTAnimationHeaders (0.71.0-rc.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
     - Yoga
-  - React-Core/RCTBlobHeaders (1000.0.0):
+  - React-Core/RCTBlobHeaders (0.71.0-rc.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
     - Yoga
-  - React-Core/RCTImageHeaders (1000.0.0):
+  - React-Core/RCTImageHeaders (0.71.0-rc.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
     - Yoga
-  - React-Core/RCTLinkingHeaders (1000.0.0):
+  - React-Core/RCTLinkingHeaders (0.71.0-rc.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
     - Yoga
-  - React-Core/RCTNetworkHeaders (1000.0.0):
+  - React-Core/RCTNetworkHeaders (0.71.0-rc.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
     - Yoga
-  - React-Core/RCTPushNotificationHeaders (1000.0.0):
+  - React-Core/RCTPushNotificationHeaders (0.71.0-rc.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
     - Yoga
-  - React-Core/RCTSettingsHeaders (1000.0.0):
+  - React-Core/RCTSettingsHeaders (0.71.0-rc.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
     - Yoga
-  - React-Core/RCTTextHeaders (1000.0.0):
+  - React-Core/RCTTextHeaders (0.71.0-rc.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
     - Yoga
-  - React-Core/RCTVibrationHeaders (1000.0.0):
+  - React-Core/RCTVibrationHeaders (0.71.0-rc.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-Core/Default
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
     - Yoga
-  - React-Core/RCTWebSocket (1000.0.0):
+  - React-Core/RCTWebSocket (0.71.0-rc.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 1000.0.0)
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
+    - React-Core/Default (= 0.71.0-rc.4)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
     - Yoga
-  - React-CoreModules (1000.0.0):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-Codegen (= 1000.0.0)
-    - React-Core/CoreModulesHeaders (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-RCTImage (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-cxxreact (1000.0.0):
+  - React-CoreModules (0.71.0-rc.4):
+    - RCT-Folly (= 2021.07.22.00)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-Codegen (= 0.71.0-rc.4)
+    - React-Core/CoreModulesHeaders (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-RCTImage (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-cxxreact (0.71.0-rc.4):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsinspector (= 1000.0.0)
-    - React-logger (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
-    - React-runtimeexecutor (= 1000.0.0)
-  - React-Fabric (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-Fabric/animations (= 1000.0.0)
-    - React-Fabric/attributedstring (= 1000.0.0)
-    - React-Fabric/butter (= 1000.0.0)
-    - React-Fabric/componentregistry (= 1000.0.0)
-    - React-Fabric/componentregistrynative (= 1000.0.0)
-    - React-Fabric/components (= 1000.0.0)
-    - React-Fabric/config (= 1000.0.0)
-    - React-Fabric/core (= 1000.0.0)
-    - React-Fabric/debug_core (= 1000.0.0)
-    - React-Fabric/debug_renderer (= 1000.0.0)
-    - React-Fabric/imagemanager (= 1000.0.0)
-    - React-Fabric/leakchecker (= 1000.0.0)
-    - React-Fabric/mounting (= 1000.0.0)
-    - React-Fabric/runtimescheduler (= 1000.0.0)
-    - React-Fabric/scheduler (= 1000.0.0)
-    - React-Fabric/telemetry (= 1000.0.0)
-    - React-Fabric/templateprocessor (= 1000.0.0)
-    - React-Fabric/textlayoutmanager (= 1000.0.0)
-    - React-Fabric/uimanager (= 1000.0.0)
-    - React-Fabric/utils (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/animations (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/attributedstring (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/butter (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/componentregistry (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/componentregistrynative (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/components (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-Fabric/components/activityindicator (= 1000.0.0)
-    - React-Fabric/components/image (= 1000.0.0)
-    - React-Fabric/components/inputaccessory (= 1000.0.0)
-    - React-Fabric/components/legacyviewmanagerinterop (= 1000.0.0)
-    - React-Fabric/components/modal (= 1000.0.0)
-    - React-Fabric/components/root (= 1000.0.0)
-    - React-Fabric/components/safeareaview (= 1000.0.0)
-    - React-Fabric/components/scrollview (= 1000.0.0)
-    - React-Fabric/components/slider (= 1000.0.0)
-    - React-Fabric/components/text (= 1000.0.0)
-    - React-Fabric/components/textinput (= 1000.0.0)
-    - React-Fabric/components/unimplementedview (= 1000.0.0)
-    - React-Fabric/components/view (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/components/activityindicator (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/components/image (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/components/inputaccessory (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/components/legacyviewmanagerinterop (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/components/modal (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/components/root (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/components/safeareaview (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/components/scrollview (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/components/slider (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/components/text (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/components/textinput (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/components/unimplementedview (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/components/view (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
+    - React-callinvoker (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsinspector (= 0.71.0-rc.4)
+    - React-logger (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
+    - React-runtimeexecutor (= 0.71.0-rc.4)
+  - React-Fabric (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-Fabric/animations (= 0.71.0-rc.4)
+    - React-Fabric/attributedstring (= 0.71.0-rc.4)
+    - React-Fabric/butter (= 0.71.0-rc.4)
+    - React-Fabric/componentregistry (= 0.71.0-rc.4)
+    - React-Fabric/componentregistrynative (= 0.71.0-rc.4)
+    - React-Fabric/components (= 0.71.0-rc.4)
+    - React-Fabric/config (= 0.71.0-rc.4)
+    - React-Fabric/core (= 0.71.0-rc.4)
+    - React-Fabric/debug_core (= 0.71.0-rc.4)
+    - React-Fabric/debug_renderer (= 0.71.0-rc.4)
+    - React-Fabric/imagemanager (= 0.71.0-rc.4)
+    - React-Fabric/leakchecker (= 0.71.0-rc.4)
+    - React-Fabric/mapbuffer (= 0.71.0-rc.4)
+    - React-Fabric/mounting (= 0.71.0-rc.4)
+    - React-Fabric/runtimescheduler (= 0.71.0-rc.4)
+    - React-Fabric/scheduler (= 0.71.0-rc.4)
+    - React-Fabric/telemetry (= 0.71.0-rc.4)
+    - React-Fabric/templateprocessor (= 0.71.0-rc.4)
+    - React-Fabric/textlayoutmanager (= 0.71.0-rc.4)
+    - React-Fabric/uimanager (= 0.71.0-rc.4)
+    - React-Fabric/utils (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/animations (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/attributedstring (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/butter (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/componentregistry (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/componentregistrynative (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/components (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-Fabric/components/activityindicator (= 0.71.0-rc.4)
+    - React-Fabric/components/image (= 0.71.0-rc.4)
+    - React-Fabric/components/inputaccessory (= 0.71.0-rc.4)
+    - React-Fabric/components/legacyviewmanagerinterop (= 0.71.0-rc.4)
+    - React-Fabric/components/modal (= 0.71.0-rc.4)
+    - React-Fabric/components/root (= 0.71.0-rc.4)
+    - React-Fabric/components/safeareaview (= 0.71.0-rc.4)
+    - React-Fabric/components/scrollview (= 0.71.0-rc.4)
+    - React-Fabric/components/slider (= 0.71.0-rc.4)
+    - React-Fabric/components/text (= 0.71.0-rc.4)
+    - React-Fabric/components/textinput (= 0.71.0-rc.4)
+    - React-Fabric/components/unimplementedview (= 0.71.0-rc.4)
+    - React-Fabric/components/view (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/components/activityindicator (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/components/image (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/components/inputaccessory (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/components/legacyviewmanagerinterop (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/components/modal (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/components/root (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/components/safeareaview (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/components/scrollview (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/components/slider (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/components/text (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/components/textinput (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/components/unimplementedview (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/components/view (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
     - Yoga
-  - React-Fabric/config (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/core (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/debug_core (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/debug_renderer (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/imagemanager (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - React-RCTImage (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/leakchecker (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/mounting (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/runtimescheduler (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/scheduler (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/telemetry (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/templateprocessor (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/textlayoutmanager (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
+  - React-Fabric/config (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/core (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/debug_core (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/debug_renderer (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/imagemanager (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-RCTImage (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/leakchecker (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/mapbuffer (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/mounting (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/runtimescheduler (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/scheduler (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/telemetry (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/templateprocessor (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/textlayoutmanager (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
     - React-Fabric/uimanager
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/uimanager (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-Fabric/utils (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - RCTRequired (= 1000.0.0)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-graphics (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-jsiexecutor (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-graphics (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - React-Core/Default (= 1000.0.0)
-  - React-jsi (1000.0.0):
-    - boost (= 1.76.0)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/uimanager (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-Fabric/utils (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - RCTRequired (= 0.71.0-rc.4)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-graphics (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-graphics (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - React-Core/Default (= 0.71.0-rc.4)
+  - React-hermes (0.71.0-rc.4):
     - DoubleConversion
     - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-jsi/Default (= 1000.0.0)
-  - React-jsi/Default (1000.0.0):
+    - hermes-engine
+    - RCT-Folly (= 2021.07.22.00)
+    - RCT-Folly/Futures (= 2021.07.22.00)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsiexecutor (= 0.71.0-rc.4)
+    - React-jsinspector (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
+  - React-jsi (0.71.0-rc.4):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
+    - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-  - React-jsi/Fabric (1000.0.0):
-    - boost (= 1.76.0)
+  - React-jsiexecutor (0.71.0-rc.4):
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.07.22.00)
-  - React-jsiexecutor (1000.0.0):
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
+  - React-jsinspector (0.71.0-rc.4)
+  - React-logger (0.71.0-rc.4):
+    - glog
+  - React-perflogger (0.71.0-rc.4)
+  - React-RCTActionSheet (0.71.0-rc.4):
+    - React-Core/RCTActionSheetHeaders (= 0.71.0-rc.4)
+  - React-RCTAnimation (0.71.0-rc.4):
+    - RCT-Folly (= 2021.07.22.00)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-Codegen (= 0.71.0-rc.4)
+    - React-Core/RCTAnimationHeaders (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-RCTAppDelegate (0.71.0-rc.4):
+    - RCT-Folly
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - ReactCommon/turbomodule/core
+  - React-RCTBlob (0.71.0-rc.4):
+    - RCT-Folly (= 2021.07.22.00)
+    - React-Codegen (= 0.71.0-rc.4)
+    - React-Core/RCTBlobHeaders (= 0.71.0-rc.4)
+    - React-Core/RCTWebSocket (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-RCTNetwork (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-RCTFabric (0.71.0-rc.4):
+    - RCT-Folly/Fabric (= 2021.07.22.00)
+    - React-Core (= 0.71.0-rc.4)
+    - React-Fabric (= 0.71.0-rc.4)
+    - React-RCTImage (= 0.71.0-rc.4)
+  - React-RCTImage (0.71.0-rc.4):
+    - RCT-Folly (= 2021.07.22.00)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-Codegen (= 0.71.0-rc.4)
+    - React-Core/RCTImageHeaders (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-RCTNetwork (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-RCTLinking (0.71.0-rc.4):
+    - React-Codegen (= 0.71.0-rc.4)
+    - React-Core/RCTLinkingHeaders (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-RCTNetwork (0.71.0-rc.4):
+    - RCT-Folly (= 2021.07.22.00)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-Codegen (= 0.71.0-rc.4)
+    - React-Core/RCTNetworkHeaders (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-RCTPushNotification (0.71.0-rc.4):
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-Codegen (= 0.71.0-rc.4)
+    - React-Core/RCTPushNotificationHeaders (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-RCTSettings (0.71.0-rc.4):
+    - RCT-Folly (= 2021.07.22.00)
+    - RCTTypeSafety (= 0.71.0-rc.4)
+    - React-Codegen (= 0.71.0-rc.4)
+    - React-Core/RCTSettingsHeaders (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-RCTTest (0.71.0-rc.4):
+    - RCT-Folly (= 2021.07.22.00)
+    - React-Core (= 0.71.0-rc.4)
+    - React-CoreModules (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-RCTText (0.71.0-rc.4):
+    - React-Core/RCTTextHeaders (= 0.71.0-rc.4)
+  - React-RCTVibration (0.71.0-rc.4):
+    - RCT-Folly (= 2021.07.22.00)
+    - React-Codegen (= 0.71.0-rc.4)
+    - React-Core/RCTVibrationHeaders (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
+  - React-rncore (0.71.0-rc.4)
+  - React-runtimeexecutor (0.71.0-rc.4):
+    - React-jsi (= 0.71.0-rc.4)
+  - ReactCommon/turbomodule/bridging (0.71.0-rc.4):
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.07.22.00)
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
-  - React-jsinspector (1000.0.0)
-  - React-logger (1000.0.0):
-    - glog
-  - React-perflogger (1000.0.0)
-  - React-RCTActionSheet (1000.0.0):
-    - React-Core/RCTActionSheetHeaders (= 1000.0.0)
-  - React-RCTAnimation (1000.0.0):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-Codegen (= 1000.0.0)
-    - React-Core/RCTAnimationHeaders (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-RCTBlob (1000.0.0):
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 1000.0.0)
-    - React-Core/RCTBlobHeaders (= 1000.0.0)
-    - React-Core/RCTWebSocket (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-RCTNetwork (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-RCTFabric (1000.0.0):
-    - RCT-Folly/Fabric (= 2021.07.22.00)
-    - React-Core (= 1000.0.0)
-    - React-Fabric (= 1000.0.0)
-    - React-RCTImage (= 1000.0.0)
-  - React-RCTImage (1000.0.0):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-Codegen (= 1000.0.0)
-    - React-Core/RCTImageHeaders (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-RCTNetwork (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-RCTLinking (1000.0.0):
-    - React-Codegen (= 1000.0.0)
-    - React-Core/RCTLinkingHeaders (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-RCTNetwork (1000.0.0):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-Codegen (= 1000.0.0)
-    - React-Core/RCTNetworkHeaders (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-RCTPushNotification (1000.0.0):
-    - RCTTypeSafety (= 1000.0.0)
-    - React-Codegen (= 1000.0.0)
-    - React-Core/RCTPushNotificationHeaders (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-RCTSettings (1000.0.0):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 1000.0.0)
-    - React-Codegen (= 1000.0.0)
-    - React-Core/RCTSettingsHeaders (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-RCTTest (1000.0.0):
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core (= 1000.0.0)
-    - React-CoreModules (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-RCTText (1000.0.0):
-    - React-Core/RCTTextHeaders (= 1000.0.0)
-  - React-RCTVibration (1000.0.0):
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 1000.0.0)
-    - React-Core/RCTVibrationHeaders (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
-  - React-rncore (1000.0.0)
-  - React-runtimeexecutor (1000.0.0):
-    - React-jsi (= 1000.0.0)
-  - ReactCommon/turbomodule/core (1000.0.0):
+    - React-callinvoker (= 0.71.0-rc.4)
+    - React-Core (= 0.71.0-rc.4)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-logger (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
+  - ReactCommon/turbomodule/core (0.71.0-rc.4):
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.07.22.00)
-    - React-bridging (= 1000.0.0)
-    - React-callinvoker (= 1000.0.0)
-    - React-Core (= 1000.0.0)
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-logger (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
-  - ReactCommon/turbomodule/samples (1000.0.0):
+    - React-callinvoker (= 0.71.0-rc.4)
+    - React-Core (= 0.71.0-rc.4)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-logger (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
+  - ReactCommon/turbomodule/samples (0.71.0-rc.4):
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.07.22.00)
-    - React-bridging (= 1000.0.0)
-    - React-callinvoker (= 1000.0.0)
-    - React-Core (= 1000.0.0)
-    - React-cxxreact (= 1000.0.0)
-    - React-jsi (= 1000.0.0)
-    - React-logger (= 1000.0.0)
-    - React-perflogger (= 1000.0.0)
-    - ReactCommon/turbomodule/core (= 1000.0.0)
+    - React-callinvoker (= 0.71.0-rc.4)
+    - React-Core (= 0.71.0-rc.4)
+    - React-cxxreact (= 0.71.0-rc.4)
+    - React-jsi (= 0.71.0-rc.4)
+    - React-logger (= 0.71.0-rc.4)
+    - React-perflogger (= 0.71.0-rc.4)
+    - ReactCommon/turbomodule/core (= 0.71.0-rc.4)
   - ScreenshotManager (0.0.1):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
-  - SocketRocket (0.6.0)
   - Yoga (1.14.0)
-  - YogaKit (1.18.1):
-    - Yoga (~> 1.14)
 
 DEPENDENCIES:
   - boost (from `../../third-party-podspecs/boost.podspec`)
   - DoubleConversion (from `../../third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../../Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../../React/FBReactNativeSpec`)
-  - Flipper (= 0.125.0)
-  - Flipper-Boost-iOSX (= 1.76.0.1.11)
-  - Flipper-DoubleConversion (= 3.2.0.1)
-  - Flipper-Fmt (= 7.1.7)
-  - Flipper-Folly (= 2.6.10)
-  - Flipper-Glog (= 0.5.0.5)
-  - Flipper-PeerTalk (= 0.0.4)
-  - Flipper-RSocket (= 1.4.3)
-  - FlipperKit (= 0.125.0)
-  - FlipperKit/Core (= 0.125.0)
-  - FlipperKit/CppBridge (= 0.125.0)
-  - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0)
-  - FlipperKit/FBDefines (= 0.125.0)
-  - FlipperKit/FKPortForwarding (= 0.125.0)
-  - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0)
-  - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0)
-  - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0)
-  - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0)
-  - FlipperKit/FlipperKitReactPlugin (= 0.125.0)
-  - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0)
-  - FlipperKit/SKIOSNetworkPlugin (= 0.125.0)
   - glog (from `../../third-party-podspecs/glog.podspec`)
-  - OpenSSL-Universal (= 1.1.1100)
+  - hermes-engine (from `../../sdks/hermes-engine/hermes-engine.podspec`)
+  - libevent (~> 2.1.12)
   - RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`)
   - RCT-Folly/Fabric (from `../../third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../../Libraries/RCTRequired`)
   - RCTTypeSafety (from `../../Libraries/TypeSafety`)
   - React (from `../../`)
-  - React-bridging (from `../../ReactCommon/react/bridging`)
   - React-callinvoker (from `../../ReactCommon/callinvoker`)
   - React-Codegen (from `build/generated/ios`)
   - React-Core (from `../../`)
-  - React-Core/DevSupport (from `../../`)
   - React-Core/RCTWebSocket (from `../../`)
   - React-CoreModules (from `../../React/CoreModules`)
   - React-cxxreact (from `../../ReactCommon/cxxreact`)
   - React-Fabric (from `../../ReactCommon`)
   - React-graphics (from `../../ReactCommon/react/renderer/graphics`)
+  - React-hermes (from `../../ReactCommon/hermes`)
   - React-jsi (from `../../ReactCommon/jsi`)
-  - React-jsi/Fabric (from `../../ReactCommon/jsi`)
   - React-jsiexecutor (from `../../ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../../ReactCommon/jsinspector`)
   - React-logger (from `../../ReactCommon/logger`)
   - React-perflogger (from `../../ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../../Libraries/ActionSheetIOS`)
   - React-RCTAnimation (from `../../Libraries/NativeAnimation`)
+  - React-RCTAppDelegate (from `../../Libraries/AppDelegate`)
   - React-RCTBlob (from `../../Libraries/Blob`)
   - React-RCTFabric (from `../../React`)
   - React-RCTImage (from `../../Libraries/Image`)
@@ -790,21 +738,8 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
-    - CocoaAsyncSocket
-    - Flipper
-    - Flipper-Boost-iOSX
-    - Flipper-DoubleConversion
-    - Flipper-Fmt
-    - Flipper-Folly
-    - Flipper-Glog
-    - Flipper-PeerTalk
-    - Flipper-RSocket
-    - FlipperKit
     - fmt
     - libevent
-    - OpenSSL-Universal
-    - SocketRocket
-    - YogaKit
 
 EXTERNAL SOURCES:
   boost:
@@ -817,6 +752,8 @@ EXTERNAL SOURCES:
     :path: "../../React/FBReactNativeSpec"
   glog:
     :podspec: "../../third-party-podspecs/glog.podspec"
+  hermes-engine:
+    :podspec: "../../sdks/hermes-engine/hermes-engine.podspec"
   RCT-Folly:
     :podspec: "../../third-party-podspecs/RCT-Folly.podspec"
   RCTRequired:
@@ -825,8 +762,6 @@ EXTERNAL SOURCES:
     :path: "../../Libraries/TypeSafety"
   React:
     :path: "../../"
-  React-bridging:
-    :path: "../../ReactCommon/react/bridging"
   React-callinvoker:
     :path: "../../ReactCommon/callinvoker"
   React-Codegen:
@@ -841,6 +776,8 @@ EXTERNAL SOURCES:
     :path: "../../ReactCommon"
   React-graphics:
     :path: "../../ReactCommon/react/renderer/graphics"
+  React-hermes:
+    :path: "../../ReactCommon/hermes"
   React-jsi:
     :path: "../../ReactCommon/jsi"
   React-jsiexecutor:
@@ -855,6 +792,8 @@ EXTERNAL SOURCES:
     :path: "../../Libraries/ActionSheetIOS"
   React-RCTAnimation:
     :path: "../../Libraries/NativeAnimation"
+  React-RCTAppDelegate:
+    :path: "../../Libraries/AppDelegate"
   React-RCTBlob:
     :path: "../../Libraries/Blob"
   React-RCTFabric:
@@ -887,61 +826,50 @@ EXTERNAL SOURCES:
     :path: "../../ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  boost: a7c83b31436843459a1961bfd74b96033dc77234
-  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
+  boost: 57d2868c099736d80fcd648bf211b4431e51a558
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
-  FBLazyVector: 19e408e76fa9258dd32191a50d60c41444f52d29
-  FBReactNativeSpec: a9bf67b4be55c0819bc88e1721820286c1340710
-  Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
-  Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
-  Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
-  Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
-  Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
-  Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446
-  Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
-  Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
-  FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
+  FBLazyVector: 4ad110cfb69a03015d09af4e0a307f04e16ec1b8
+  FBReactNativeSpec: a0d4f8e113a31605a863eb25cc447d3c232f1ff4
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
+  hermes-engine: 0341e7fcc04f9df282b945229160230c85604ca9
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
-  RCT-Folly: 9638863070ed4e7b2be5e91385745a0ad741e9c1
-  RCTRequired: 1c8808cf84569265784a6c33984bbb506ada8c6e
-  RCTTypeSafety: b6dcb5036a808864ee8cad66ca15f263c24661cc
-  React: 8d809d414723bb5763093ddec7658066a21ccabc
-  React-bridging: 3ba3efbd3a2d7d99aad5658b8e48b1c134c16ecf
-  React-callinvoker: 5f16202ad4e45f0607b1fae0f6955a8f7c87eef1
-  React-Codegen: 5adf19af97eb37a7d441c040521191e446255086
-  React-Core: 0cfb25c65d4dcb856b1807fe44a1ebe5e7ec9749
-  React-CoreModules: 675170bccf156da3a3348e04e2036ce401b2010d
-  React-cxxreact: 7276467c246302fedf598cc40d7003896ddb20ba
-  React-Fabric: abfd61dc5498ce165634af85d65fcc42b82b5bf4
-  React-graphics: 5ccc9cc0d91794fd42bc1c693e9aea207554bbef
-  React-jsi: a042596cb558abea721ab5e23cb175647610a73d
-  React-jsiexecutor: f7fbac5dff7e7ff110a66edf2626b4f4f4600ef5
-  React-jsinspector: 7733dd522d044aef87caa39f3eda77593358a7eb
-  React-logger: c7960346b021767ed90971aff592a44e3d69f8bb
-  React-perflogger: c4fdd48988c2d3047186fc1bc1772d634cfca2ea
-  React-RCTActionSheet: 166fd1df85ac10219466b45d12a5884d3eaceac1
-  React-RCTAnimation: d6127046c6bb44bd3e67b7503c4ad7f91131b58e
-  React-RCTBlob: 68675c89ebe6edf310dddd0774ba07b685f090a9
-  React-RCTFabric: a98a6effece6719669b8c6b4d2c33fb0edddc613
-  React-RCTImage: 6de9f0f4402af859849e97cc73a56a52f400f4c9
-  React-RCTLinking: 21bb4675c3ec8fe704672ea511e817aeb3bf8370
-  React-RCTNetwork: a865deadacbf6b3d863f0496e7d2c2e81c269317
-  React-RCTPushNotification: 7f678a88147254ede5d21a1e1e71e8a964dd0051
-  React-RCTSettings: 23ce1aa52ddf5db44c973bb5cc93713e871e09b6
-  React-RCTTest: 06c388632dc7b30df17af01c8f9e89e641b4d31c
-  React-RCTText: a861fbf2835299d3cc4189697cddd8bd8602afb9
-  React-RCTVibration: 0386f50996a153b3f39cecbe7d139763ac9a9fdf
-  React-rncore: 6daa27c74047a9e13ce3412b99660274a5780603
-  React-runtimeexecutor: 97dca9247f4d3cfe0733384b189c6930fbd402b7
-  ReactCommon: a34f02c7251e6725e744167b9381d5dd9d016591
-  ScreenshotManager: 71d047abd38a77310985b87f8136b620c5c61e88
-  SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
-  Yoga: 1b1a12ff3d86a10565ea7cbe057d42f5e5fb2a07
-  YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
+  RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
+  RCTRequired: c38764a18620814708b72742ae7f656b32931286
+  RCTTypeSafety: 458ad2c233c604c8f98437b0b28e7c90ad6e3f34
+  React: f2beb6ddeb5a2b4838f9a00f73b4d139ac3fc860
+  React-callinvoker: 5f1983a15a7cec0a4f3dd5d168a0bceaa16a40bb
+  React-Codegen: ba313a645a8ce1d9475461d75ccfb0cc6f48b8a0
+  React-Core: 85b0203d410ab5bcdf40513c2321f8f564ea4584
+  React-CoreModules: 1a30da9c332738471ceb85fb94dcb420da84d816
+  React-cxxreact: ef25dd0426b44890d80dae9f762b04daaa144de0
+  React-Fabric: b3d258332ce61e67c50bb059672613c61dd8c6e8
+  React-graphics: 9a12a36de90b505944c654fe4211166aeb3eabcf
+  React-hermes: 55b9e791b0435a3ba6acf1e10d6bd79e8dcfe178
+  React-jsi: 88da7e3be9bee8cb3bbae75bb1ed8c7f5ec7ff18
+  React-jsiexecutor: ac2d82b86fc05e2dd4989c04cc17271fc97f1e64
+  React-jsinspector: e7f24be02178a7a2b29a5706ccf9e478f6a708eb
+  React-logger: bfba604c0fe56388474e0b2bdcb817ef54174f32
+  React-perflogger: af2376aeb1bae3fa971d0a5511555137d74f7339
+  React-RCTActionSheet: b6d47e3f432d59fb20ea1f73d2d0e50dc16aa7c1
+  React-RCTAnimation: bc4d4cd8ead3cc5403958fe4dbe886e9de536fd5
+  React-RCTAppDelegate: a2e473044cfe0ee5b5a66aa43b69c94d00a50997
+  React-RCTBlob: 7abd200cca373c4653782e957f1825dc462d041d
+  React-RCTFabric: 7da13740513268fc46dd938346979454f4b3ef9d
+  React-RCTImage: 281b43b6b90f2238f88f9250eb712bc71f1fc5c1
+  React-RCTLinking: 2e747486fcc26460c374d454c12303f3f933d30d
+  React-RCTNetwork: 23e7b97a5161dee42c46e90f2230efd04cc704ea
+  React-RCTPushNotification: 305cf1c3b0377433a63a3fb8b7c8ef7353e605f3
+  React-RCTSettings: 8975a86058a95bb3a5bb50d325093582032825b7
+  React-RCTTest: 7e12ed2df1aa364af92a34598548a898fb756daa
+  React-RCTText: 574c6cf99f6e8c54776015a8513a3d650f1f3e6e
+  React-RCTVibration: 87e3d3de92a744ce548d6e038be917d55cd09174
+  React-rncore: 13ee3c0da9107a422f92ce03b1803bf728bddea8
+  React-runtimeexecutor: 187bc845984212fbbfc12fe217d1b878c96c4354
+  ReactCommon: a89974d06091aa102b1d1a91b15b56ea56eaf320
+  ScreenshotManager: cf552c19152e3357f08875fc2f85adb2dee6a66b
+  Yoga: d6849be370b322656141089f8d4ed9659be5aa4c
 
-PODFILE CHECKSUM: e067e04e7697dc3cd3d3fbd7556f77c6eccf8075
+PODFILE CHECKSUM: 5d1fc1e8809808c4384337ae55c5be2de48ffe4c
 
 COCOAPODS: 1.11.3
diff --git a/packages/rn-tester/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m b/packages/rn-tester/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m
index 3aefe13faf7f..48d51fa52990 100644
--- a/packages/rn-tester/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m
+++ b/packages/rn-tester/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m
@@ -241,9 +241,6 @@ - (NSString *)_fileNameForSelector:(SEL)selector
   if ([[UIScreen mainScreen] scale] > 1.0) {
     fileName = [fileName stringByAppendingFormat:@"@%.fx", [[UIScreen mainScreen] scale]];
   }
-#if TARGET_OS_TV
-  fileName = [fileName stringByAppendingString:@"_tvOS"];
-#endif
   fileName = [fileName stringByAppendingPathExtension:@"png"];
   return fileName;
 }
diff --git a/packages/rn-tester/RCTTest/RCTTestRunner.m b/packages/rn-tester/RCTTest/RCTTestRunner.m
index 7f95689af57f..d373afe19764 100644
--- a/packages/rn-tester/RCTTest/RCTTestRunner.m
+++ b/packages/rn-tester/RCTTest/RCTTestRunner.m
@@ -196,11 +196,7 @@ - (void)runTest:(SEL)test
       RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
                                                        moduleName:moduleName
                                                 initialProperties:initialProps];
-#if TARGET_OS_TV
-      rootView.frame = CGRectMake(0, 0, 1920, 1080); // Standard screen size for tvOS
-#else
       rootView.frame = CGRectMake(0, 0, 320, 2000); // Constant size for testing on multiple devices
-#endif
 
       rootTag = rootView.reactTag;
       testModule.view = rootView;
diff --git a/packages/rn-tester/RCTTest/React-RCTTest.podspec b/packages/rn-tester/RCTTest/React-RCTTest.podspec
index f6836ca2fa1e..5f6d58f908ec 100644
--- a/packages/rn-tester/RCTTest/React-RCTTest.podspec
+++ b/packages/rn-tester/RCTTest/React-RCTTest.podspec
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "12.4", :tvos => "12.4" }
+  s.platforms              = { :ios => "12.4" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "**/*.{h,m,mm}"
diff --git a/packages/rn-tester/RNTester/AppDelegate.mm b/packages/rn-tester/RNTester/AppDelegate.mm
index 2d1b676a5ec8..8fafba034302 100644
--- a/packages/rn-tester/RNTester/AppDelegate.mm
+++ b/packages/rn-tester/RNTester/AppDelegate.mm
@@ -63,7 +63,6 @@
 #endif
 
 #import <ReactCommon/RCTTurboModuleManager.h>
-
 #import "RNTesterTurboModuleProvider.h"
 
 @interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate> {
diff --git a/packages/rn-tester/RNTester/RNTesterTurboModuleProvider.mm b/packages/rn-tester/RNTester/RNTesterTurboModuleProvider.mm
index b8532eab9db2..32e5c3418013 100644
--- a/packages/rn-tester/RNTester/RNTesterTurboModuleProvider.mm
+++ b/packages/rn-tester/RNTester/RNTesterTurboModuleProvider.mm
@@ -7,6 +7,9 @@
 
 #import "RNTesterTurboModuleProvider.h"
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <NativeCxxModuleExample/NativeCxxModuleExample.h>
+#endif
 #import <React/CoreModulesPlugins.h>
 #import <ReactCommon/RCTSampleTurboModule.h>
 #import <ReactCommon/SampleTurboCxxModule.h>
@@ -28,7 +31,11 @@ Class RNTesterTurboModuleClassProvider(const char *name)
   if (name == "SampleTurboCxxModule") {
     return std::make_shared<SampleTurboCxxModule>(jsInvoker);
   }
-
+#ifdef RCT_NEW_ARCH_ENABLED
+  if (name == "NativeCxxModuleExampleCxx") {
+    return std::make_shared<NativeCxxModuleExample>(jsInvoker);
+  }
+#endif
   return nullptr;
 }
 
diff --git a/packages/rn-tester/RNTesterIntegrationTests/RCTLoggingTests.m b/packages/rn-tester/RNTesterIntegrationTests/RCTLoggingTests.m
index 03a1d4defda3..5aa954c70e70 100644
--- a/packages/rn-tester/RNTesterIntegrationTests/RCTLoggingTests.m
+++ b/packages/rn-tester/RNTesterIntegrationTests/RCTLoggingTests.m
@@ -11,6 +11,9 @@
 #import <React/RCTBridge.h>
 #import <React/RCTLog.h>
 
+// Time to wait for an expected log statement to show before failing the test
+const int64_t LOGGER_TIMEOUT = 10 * NSEC_PER_SEC;
+
 @interface RCTLoggingTests : XCTestCase
 
 @end
@@ -44,24 +47,8 @@ - (void)setUp
   XCTAssertFalse(_bridge.loading);
 
   _logSem = dispatch_semaphore_create(0);
-}
-
-- (void)tearDown
-{
-  [_bridge invalidate];
-  _bridge = nil;
 
-  RCTSetLogFunction(RCTDefaultLogFunction);
-}
-
-- (void)testLogging
-{
-  // First console log call will fire after 2.0 sec, to allow for any initial log messages
-  // that might come in (seeing this in tvOS)
-  [_bridge enqueueJSCall:@"LoggingTestModule.logToConsoleAfterWait" args:@[ @"Invoking console.log", @2000 ]];
-  // Spin native layer for 1.9 sec
-  [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1.9]];
-  // Now set the log function to signal the semaphore
+  // Set the log function to signal the semaphore
   RCTSetLogFunction(
       ^(RCTLogLevel level,
         RCTLogSource source,
@@ -75,33 +62,62 @@ - (void)testLogging
           dispatch_semaphore_signal(self->_logSem);
         }
       });
-  // Wait for console log to signal the semaphore
-  dispatch_semaphore_wait(_logSem, DISPATCH_TIME_FOREVER);
+}
+
+- (void)tearDown
+{
+  [_bridge invalidate];
+  _bridge = nil;
+
+  RCTSetLogFunction(RCTDefaultLogFunction);
+}
+
+- (void)testLogging
+{
+  intptr_t waitRet = 0;
+
+  // First queue the marker and spin until it happens to be logged.
+  // This is to ensure we skip all of the other messages, that were logged earlier.
+  NSString *const LogMarker = @"===LOG_MARKER===";
+  [_bridge enqueueJSCall:@"LoggingTestModule.logToConsole" args:@[ LogMarker ]];
+
+  do {
+    waitRet = dispatch_semaphore_wait(_logSem, dispatch_time(DISPATCH_TIME_NOW, LOGGER_TIMEOUT));
+    XCTAssertEqual(waitRet, 0, @"Timed out waiting for log marker");
+  } while (waitRet == 0 && ![_lastLogMessage isEqualToString:LogMarker]);
+
+  [_bridge enqueueJSCall:@"LoggingTestModule.logToConsole" args:@[ @"Invoking console.log" ]];
+  waitRet = dispatch_semaphore_wait(_logSem, dispatch_time(DISPATCH_TIME_NOW, LOGGER_TIMEOUT));
+  XCTAssertEqual(waitRet, 0, @"Timed out waiting for logToConsole");
 
   XCTAssertEqual(_lastLogLevel, RCTLogLevelInfo);
   XCTAssertEqual(_lastLogSource, RCTLogSourceJavaScript);
   XCTAssertEqualObjects(_lastLogMessage, @"Invoking console.log");
 
   [_bridge enqueueJSCall:@"LoggingTestModule.warning" args:@[ @"Generating warning" ]];
-  dispatch_semaphore_wait(_logSem, DISPATCH_TIME_FOREVER);
+  waitRet = dispatch_semaphore_wait(_logSem, dispatch_time(DISPATCH_TIME_NOW, LOGGER_TIMEOUT));
+  XCTAssertEqual(waitRet, 0, @"Timed out waiting for warning");
 
   XCTAssertEqual(_lastLogLevel, RCTLogLevelWarning);
   XCTAssertEqual(_lastLogSource, RCTLogSourceJavaScript);
   XCTAssertEqualObjects(_lastLogMessage, @"Generating warning");
 
   [_bridge enqueueJSCall:@"LoggingTestModule.invariant" args:@[ @"Invariant failed" ]];
-  dispatch_semaphore_wait(_logSem, DISPATCH_TIME_FOREVER);
+  waitRet = dispatch_semaphore_wait(_logSem, dispatch_time(DISPATCH_TIME_NOW, LOGGER_TIMEOUT));
+  XCTAssertEqual(waitRet, 0, @"Timed out waiting for invariant");
 
   XCTAssertEqual(_lastLogLevel, RCTLogLevelError);
   XCTAssertEqual(_lastLogSource, RCTLogSourceJavaScript);
   XCTAssertTrue([_lastLogMessage containsString:@"Invariant Violation: Invariant failed"]);
 
   [_bridge enqueueJSCall:@"LoggingTestModule.logErrorToConsole" args:@[ @"Invoking console.error" ]];
-  dispatch_semaphore_wait(_logSem, DISPATCH_TIME_FOREVER);
+  waitRet = dispatch_semaphore_wait(_logSem, dispatch_time(DISPATCH_TIME_NOW, LOGGER_TIMEOUT));
+  XCTAssertEqual(waitRet, 0, @"Timed out waiting for logErrorToConsole");
 
-  // For local bundles, we'll first get a warning about symbolication
-  if ([_bridge.bundleURL isFileURL]) {
-    dispatch_semaphore_wait(_logSem, DISPATCH_TIME_FOREVER);
+  // For local bundles, we may first get a warning about symbolication
+  if (![_lastLogMessage isEqualToString:@"Invoking console.error"]) {
+    waitRet = dispatch_semaphore_wait(_logSem, dispatch_time(DISPATCH_TIME_NOW, LOGGER_TIMEOUT));
+    XCTAssertEqual(waitRet, 0, @"Timed out waiting for logErrorToConsole #2");
   }
 
   XCTAssertEqual(_lastLogLevel, RCTLogLevelError);
@@ -109,11 +125,13 @@ - (void)testLogging
   XCTAssertEqualObjects(_lastLogMessage, @"Invoking console.error");
 
   [_bridge enqueueJSCall:@"LoggingTestModule.throwError" args:@[ @"Throwing an error" ]];
-  dispatch_semaphore_wait(_logSem, DISPATCH_TIME_FOREVER);
+  waitRet = dispatch_semaphore_wait(_logSem, dispatch_time(DISPATCH_TIME_NOW, LOGGER_TIMEOUT));
+  XCTAssertEqual(waitRet, 0, @"Timed out waiting for throwError");
 
-  // For local bundles, we'll first get a warning about symbolication
-  if ([_bridge.bundleURL isFileURL]) {
-    dispatch_semaphore_wait(_logSem, DISPATCH_TIME_FOREVER);
+  // For local bundles, we may first get a warning about symbolication
+  if (![_lastLogMessage containsString:@"Error: Throwing an error"]) {
+    waitRet = dispatch_semaphore_wait(_logSem, dispatch_time(DISPATCH_TIME_NOW, LOGGER_TIMEOUT));
+    XCTAssertEqual(waitRet, 0, @"Timed out waiting for throwError #2");
   }
 
   XCTAssertEqual(_lastLogLevel, RCTLogLevelError);
diff --git a/packages/rn-tester/RNTesterIntegrationTests/RNTesterIntegrationTests.m b/packages/rn-tester/RNTesterIntegrationTests/RNTesterIntegrationTests.m
index 89f55306497f..f2ae63646751 100644
--- a/packages/rn-tester/RNTesterIntegrationTests/RNTesterIntegrationTests.m
+++ b/packages/rn-tester/RNTesterIntegrationTests/RNTesterIntegrationTests.m
@@ -63,7 +63,6 @@ - (void)testTheTester_waitOneFrame
 // This list should be kept in sync with IntegrationTestsApp.js
 RCT_TEST(IntegrationTestHarnessTest)
 // RCT_TEST(TimersTest) // Disabled due to issue introduced in 61346d3
-// TODO(TD15973709) RCT_TEST(AsyncStorageTest)
 RCT_TEST(AppEventsTest)
 // RCT_TEST(ImageCachePolicyTest) // This test never passed.
 RCT_TEST(ImageSnapshotTest)
diff --git a/packages/rn-tester/RNTesterIntegrationTests/RNTesterSnapshotTests.m b/packages/rn-tester/RNTesterIntegrationTests/RNTesterSnapshotTests.m
index 177eb153414e..cf97294c73fa 100644
--- a/packages/rn-tester/RNTesterIntegrationTests/RNTesterSnapshotTests.m
+++ b/packages/rn-tester/RNTesterIntegrationTests/RNTesterSnapshotTests.m
@@ -24,6 +24,9 @@ - (void)setUp
   if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 10) {
     _runner.testSuffix = [NSString stringWithFormat:@"-iOS%d", UIDevice.currentDevice.systemVersion.intValue];
   }
+
+  // To update snapshots, set recordMode to YES and re-run RNTesterSnapshotTests.
+  // Do not forget to set back to NO before committing your changes.
   _runner.recordMode = NO;
 }
 
diff --git a/packages/rn-tester/RNTesterIntegrationTests/ReferenceImages/packages-rn-tester-js-RNTesterApp.ios/testLayoutExample_1-iOS16@3x.png b/packages/rn-tester/RNTesterIntegrationTests/ReferenceImages/packages-rn-tester-js-RNTesterApp.ios/testLayoutExample_1-iOS16@3x.png
new file mode 100644
index 000000000000..825607ad47d3
Binary files /dev/null and b/packages/rn-tester/RNTesterIntegrationTests/ReferenceImages/packages-rn-tester-js-RNTesterApp.ios/testLayoutExample_1-iOS16@3x.png differ
diff --git a/packages/rn-tester/RNTesterIntegrationTests/ReferenceImages/packages-rn-tester-js-RNTesterApp.ios/testSwitchExample_1-iOS16@3x.png b/packages/rn-tester/RNTesterIntegrationTests/ReferenceImages/packages-rn-tester-js-RNTesterApp.ios/testSwitchExample_1-iOS16@3x.png
new file mode 100644
index 000000000000..91dffdf81bd0
Binary files /dev/null and b/packages/rn-tester/RNTesterIntegrationTests/ReferenceImages/packages-rn-tester-js-RNTesterApp.ios/testSwitchExample_1-iOS16@3x.png differ
diff --git a/packages/rn-tester/RNTesterIntegrationTests/ReferenceImages/packages-rn-tester-js-RNTesterApp.ios/testTextExample_1-iOS16@3x.png b/packages/rn-tester/RNTesterIntegrationTests/ReferenceImages/packages-rn-tester-js-RNTesterApp.ios/testTextExample_1-iOS16@3x.png
new file mode 100644
index 000000000000..bc22a90cca8a
Binary files /dev/null and b/packages/rn-tester/RNTesterIntegrationTests/ReferenceImages/packages-rn-tester-js-RNTesterApp.ios/testTextExample_1-iOS16@3x.png differ
diff --git a/packages/rn-tester/RNTesterIntegrationTests/ReferenceImages/packages-rn-tester-js-RNTesterApp.ios/testViewExample_1-iOS16@3x.png b/packages/rn-tester/RNTesterIntegrationTests/ReferenceImages/packages-rn-tester-js-RNTesterApp.ios/testViewExample_1-iOS16@3x.png
new file mode 100644
index 000000000000..59178f1b7576
Binary files /dev/null and b/packages/rn-tester/RNTesterIntegrationTests/ReferenceImages/packages-rn-tester-js-RNTesterApp.ios/testViewExample_1-iOS16@3x.png differ
diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
index 0f987f23e68b..b241a4f2db43 100644
--- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
+++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
@@ -410,8 +410,8 @@
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				68CD48B71D2BCB2C007E06A9 /* Build JS Bundle */,
 				5CF0FD27207FC6EC00C13D65 /* Start Metro */,
-				2FCDFB64B37634EC8EC3139B /* [CP] Embed Pods Frameworks */,
 				A8DE6393E2BB72D8FBBF6C27 /* [CP] Copy Pods Resources */,
+				992FB5A50F2847F7EB2C285C /* [RN] Copy Hermes Framework */,
 			);
 			buildRules = (
 			);
@@ -551,23 +551,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		2FCDFB64B37634EC8EC3139B /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		4930FC87997EBCAD361CEF12 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -660,6 +643,24 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		992FB5A50F2847F7EB2C285C /* [RN] Copy Hermes Framework */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "[RN] Copy Hermes Framework";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = ". ../../sdks/hermes-engine/utils/copy-hermes-xcode.sh";
+		};
 		9A596313B3964A4DEB794409 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -800,7 +801,7 @@
 					"-framework",
 					"\"JavaScriptCore\"",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.react.uiapp;
+				PRODUCT_BUNDLE_IDENTIFIER = com.meta.RNTester.localDevelopment;
 				PRODUCT_NAME = RNTester;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -832,7 +833,7 @@
 					"-framework",
 					"\"JavaScriptCore\"",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.react.uiapp;
+				PRODUCT_BUNDLE_IDENTIFIER = com.meta.RNTester.localDevelopment;
 				PRODUCT_NAME = RNTester;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -875,7 +876,7 @@
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -960,7 +961,7 @@
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
@@ -1032,7 +1033,7 @@
 					"-DFB_SONARKIT_ENABLED=1",
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -DFB_SONARKIT_ENABLED";
-				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.RNTesterUnitTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.meta.RNTesterUnitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -1069,7 +1070,7 @@
 					"-DFB_SONARKIT_ENABLED=1",
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -DFB_SONARKIT_ENABLED";
-				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.RNTesterUnitTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.meta.RNTesterUnitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -1106,7 +1107,7 @@
 					"-DFB_SONARKIT_ENABLED=1",
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -DFB_SONARKIT_ENABLED";
-				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.RNTesterIntegrationTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.meta.RNTesterIntegrationTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RNTester.app/RNTester";
@@ -1140,7 +1141,7 @@
 					"-DFB_SONARKIT_ENABLED=1",
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -DFB_SONARKIT_ENABLED";
-				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.RNTesterIntegrationTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.meta.RNTesterIntegrationTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RNTester.app/RNTester";
diff --git a/packages/rn-tester/RNTesterUnitTests/RCTConvert_NSURLTests.m b/packages/rn-tester/RNTesterUnitTests/RCTConvert_NSURLTests.m
index 2eb72a7a1700..7d3dadde38fb 100644
--- a/packages/rn-tester/RNTesterUnitTests/RCTConvert_NSURLTests.m
+++ b/packages/rn-tester/RNTesterUnitTests/RCTConvert_NSURLTests.m
@@ -45,6 +45,9 @@ -(void)test_##name                                   \
 TEST_BUNDLE_PATH(imageAt2XPath, @"images/foo@2x.jpg", @"images/foo@2x.jpg")
 TEST_BUNDLE_PATH(imageFile, @"foo.jpg", @"foo.jpg")
 
+TEST_BUNDLE_PATH(imageFileWithSemicolon, @"folder/foo:bar-baz.jpg", @"folder/foo:bar-baz.jpg")
+TEST_URL(filePathWithSemicolon, @"/folder/foo:bar-baz.jpg", @"file:///folder/foo:bar-baz.jpg")
+
 // User documents
 TEST_PATH(
     documentsFolder,
diff --git a/packages/rn-tester/android/app/_BUCK b/packages/rn-tester/android/app/_BUCK
index 36279061dd87..fa2ba5a645a4 100644
--- a/packages/rn-tester/android/app/_BUCK
+++ b/packages/rn-tester/android/app/_BUCK
@@ -12,7 +12,6 @@ rn_android_binary(
 rn_android_library(
     name = "rntester-lib",
     srcs = glob(["src/main/java/**/*.java"]),
-    is_androidx = True,
     deps = [
         ":res",
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle
index ef1c2b59b363..bbe757547912 100644
--- a/packages/rn-tester/android/app/build.gradle
+++ b/packages/rn-tester/android/app/build.gradle
@@ -11,101 +11,57 @@ plugins {
 }
 
 /**
- * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
- * and bundleReleaseJsAndAssets).
- * These basically call `react-native bundle` with the correct arguments during the Android build
- * cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
- * bundle directly from the development server. Below you can see all the possible configurations
- * and their defaults. If you decide to add a configuration block, make sure to add it before the
- * `apply from: "react.gradle"` line.
- *
- * project.ext.react = [
- *   // the name of the generated asset file containing your JS bundle
- *   bundleAssetName: "index.android.bundle",
- *
- *   // the entry file for bundle generation
- *   entryFile: "index.android.js",
- *
- *   // whether to bundle JS and assets in debug mode
- *   bundleInDebug: false,
- *
- *   // whether to bundle JS and assets in release mode
- *   bundleInRelease: true,
- *
- *   // whether to bundle JS and assets in another build variant (if configured).
- *   // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
- *   // The configuration property is in the format 'bundleIn${productFlavor}${buildType}'
- *   // bundleInFreeDebug: true,
- *   // bundleInPaidRelease: true,
- *   // bundleInBeta: true,
- *
- *   // the root of your project, i.e. where "package.json" lives
- *   root: "../../",
- *
- *   // where to put the JS bundle asset in debug mode
- *   jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
- *
- *   // where to put the JS bundle asset in release mode
- *   jsBundleDirRelease: "$buildDir/intermediates/assets/release",
- *
- *   // where to put drawable resources / React Native assets, e.g. the ones you use via
- *   // require('./image.png')), in debug mode
- *   resourcesDirDebug: "$buildDir/intermediates/res/merged/debug",
- *
- *   // where to put drawable resources / React Native assets, e.g. the ones you use via
- *   // require('./image.png')), in release mode
- *   resourcesDirRelease: "$buildDir/intermediates/res/merged/release",
- *
- *   // by default the gradle tasks are skipped if none of the JS files or assets change; this means
- *   // that we don't look at files in android/ or ios/ to determine whether the tasks are up to
- *   // date; if you have any other folders that you want to ignore for performance reasons (gradle
- *   // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
- *   // for example, you might want to remove it from here.
- *   inputExcludes: ["android/**", "ios/**"],
- *
- *   // Root dir for all JS files for the app. Defaults to `root` above.
- *   jsRootDir: "../..",
- *
- *   // Enable Fabric at runtime.
- *   enableFabric: true,
- *
- *   // Java package name to use for any codegen artifacts produced during build time.
- *   // Defaults to "com.facebook.fbreact.specs".
- *   codegenJavaPackageName: "com.facebook.fbreact.specs",
- * ]
+ * This is the configuration block to customize your React Native Android app.
+ * By default you don't need to apply any configuration, just uncomment the lines you need.
  */
-
 react {
-    applyAppPlugin = true
-    cliPath = "../../../../cli.js"
+    /* Folders */
+    //   The root of your project, i.e. where "package.json" lives. Default is '..'
+    root = file("../../")
+    //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
+    reactNativeDir = rootDir
+    //   The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen
+    codegenDir = file("$rootDir/node_modules/react-native-codegen")
+    //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
+    cliFile = file("$rootDir/cli.js")
+
+    /* Variants */
+    //   The list of variants to that are debuggable. For those we're going to
+    //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
+    //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
+    debuggableVariants = ["hermesDebug", "jscDebug"]
+
+    /* Bundling */
+    //   A list containing the node command and its flags. Default is just 'node'.
+    // nodeExecutableAndArgs = ["node"]
+    //
+    //   The command to run when bundling. By default is 'bundle'
+    // bundleCommand = "ram-bundle"
+    //
+    //   The path to the CLI configuration file. Default is empty.
+    // bundleConfig = file(../rn-cli.config.js)
+    //
+    //   The name of the generated asset file containing your JS bundle
     bundleAssetName = "RNTesterApp.android.bundle"
+    //
+    //   The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
     entryFile = file("../../js/RNTesterApp.android.js")
-    root = file("../../")
-    inputExcludes = ["android/**", "./**", ".gradle/**"]
-    composeSourceMapsPath = "$rootDir/scripts/compose-source-maps.js"
-    hermesCommand = "$rootDir/ReactAndroid/hermes-engine/build/hermes/bin/hermesc"
-    enableHermesForVariant { def v -> v.name.contains("hermes") }
+    //
+    //   A list of extra flags to pass to the 'bundle' commands.
+    //   See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
+    // extraPackagerArgs = []
 
-    // Codegen Configs
-    reactNativeDir = rootDir
-    codegenDir = new File(rootDir, "node_modules/react-native-codegen")
+    /* Hermes Commands */
+    //   The hermes compiler command to run. By default it is 'hermesc'
+    hermesCommand = "$rootDir/ReactAndroid/hermes-engine/build/hermes/bin/hermesc"
+    enableHermesOnlyInVariants = ["hermesDebug", "hermesRelease"]
 }
 
-project.ext.react = [
-    enableCodegen: true, // Keep this here until it's sync'ed to Android template.
-    enableFabric: (System.getenv('USE_FABRIC') ?: 'true').toBoolean()
-]
-
-//apply from: "../../../../react.gradle"
-
 /**
- * Set this to true to create three separate APKs instead of one:
- *   - A universal APK that works on all devices
- *   - An APK that only works on ARM devices
- *   - An APK that only works on x86 devices
- * The advantage is the size of the APK is reduced by about 4MB.
- * Upload all the APKs to the Play Store and people will download
- * the correct one based on the CPU architecture of their device.
+ * Set this to true to create four separate APKs instead of one,
+ * one for each native architecture. This is useful if you don't
+ * use App Bundles (https://developer.android.com/guide/app-bundle/)
+ * and want to have separate APKs to upload to the Play Store.
  */
 def enableSeparateBuildPerCPUArchitecture = true
 
@@ -115,22 +71,11 @@ def enableSeparateBuildPerCPUArchitecture = true
 def enableProguardInReleaseBuilds = true
 
 /**
- * Build and enable codegen-related output in RN Tester app.
- */
-def enableCodegen = project.ext.react.enableCodegen
-
-/**
- * Enable Fabric in RN Tester app.
- */
-def enableFabric = project.ext.react.enableFabric
-
-/**
- * Use the international variant of JavaScriptCore
- * This variant includes the ICU i18n library to make APIs like `Date.toLocaleString`
- * and `String.localeCompare` work when using with locales other than en-US.
- * Note that this variant is about 6MiB larger per architecture than the default.
+ * The preferred build flavor of JavaScriptCore (JSC)
+ * For example, to use the international variant, you can use:
+ * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
  */
-def useIntlJsc = false
+def jscFlavor = 'org.webkit:android-jsc:+'
 
 /**
  * Architectures to build native code for.
@@ -141,8 +86,9 @@ def reactNativeArchitectures() {
 }
 
 android {
-    buildToolsVersion = "31.0.0"
-    compileSdkVersion 31
+    buildToolsVersion = "33.0.0"
+    compileSdkVersion 33
+    namespace "com.facebook.react.uiapp"
 
     // 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)
@@ -157,22 +103,22 @@ android {
     productFlavors {
         hermes {
             dimension "vm"
+            buildConfigField("boolean", "IS_HERMES_ENABLED_IN_FLAVOR", "true")
         }
         jsc {
             dimension "vm"
+            buildConfigField("boolean", "IS_HERMES_ENABLED_IN_FLAVOR", "false")
         }
     }
 
     defaultConfig {
         applicationId "com.facebook.react.uiapp"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         testBuildType System.getProperty('testBuildType', 'debug')  // This will later be used to control the test apk build type
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-        buildConfigField("boolean", "ENABLE_FABRIC", "$enableFabric")
-        buildConfigField("boolean", "ENABLE_TURBOMODULE", "$enableCodegen") // If using codegen, assume using TurboModule
     }
     signingConfigs {
         release {
@@ -210,108 +156,38 @@ android {
             ]
         }
     }
-    packagingOptions {
-        pickFirst '**/libhermes.so'
-        pickFirst '**/libjsc.so'
-    }
-}
-
-configurations {
-  hermesDebugImplementation {}
-  hermesReleaseImplementation {}
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
     // Build React Native from source
     implementation project(':ReactAndroid')
 
     // Consume Hermes as built from source only for the Hermes variant.
-    hermesImplementation(project(":ReactAndroid:hermes-engine")) {
-        exclude group:'com.facebook.fbjni'
-    }
+    hermesImplementation(project(":ReactAndroid:hermes-engine"))
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
 
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.fbjni'
-    }
-
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
-    }
+    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
+    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}")
+    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
 
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
-    }
-
-    if (useIntlJsc) {
-        jscImplementation 'org.webkit:android-jsc-intl:+'
-    } else {
-        jscImplementation 'org.webkit:android-jsc:+'
-    }
+    jscImplementation jscFlavor
 
     androidTestImplementation 'junit:junit:4.12'
 }
 
-if (enableCodegen) {
-    // TODO: Move all this logic to CodegenPlugin.java.
-    def reactAndroidProjectDir = project(':ReactAndroid').projectDir;
-    def reactAndroidBuildDir = project(':ReactAndroid').buildDir;
-
-    android {
-        defaultConfig {
-            externalNativeBuild {
-                cmake {
-                    arguments "-DGENERATED_SRC_DIR=$buildDir/generated/source",
-                        "-DPROJECT_BUILD_DIR=$buildDir",
-                        "-DREACT_ANDROID_DIR=$reactAndroidProjectDir",
-                        "-DREACT_ANDROID_BUILD_DIR=$reactAndroidBuildDir",
-                        "-DANDROID_STL=c++_shared"
-
-                    targets "rntester_appmodules"
-                }
-            }
-        }
-        externalNativeBuild {
-            cmake {
-                path "src/main/jni/CMakeLists.txt"
-            }
+android {
+    externalNativeBuild {
+        cmake {
+            // RN Tester is doing custom linking of C++ libraries therefore needs
+            // a dedicated CMakeLists.txt file.
+            path "src/main/jni/CMakeLists.txt"
         }
     }
+}
 
-    def packageReactDebugNdkLibs = tasks.register("packageReactDebugNdkLibs", Copy) {
-        // TODO: handle extracting .so from prebuilt :ReactAndroid.
-        dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
-        dependsOn("generateCodegenArtifactsFromSchema")
-        from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-        into("$buildDir/react-ndk/exported")
-    }
-    def packageReactReleaseNdkLibs = tasks.register("packageReactReleaseNdkLibs", Copy) {
-        // TODO: handle extracting .so from prebuilt :ReactAndroid.
-        dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
-        dependsOn("generateCodegenArtifactsFromSchema")
-        from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-        into("$buildDir/react-ndk/exported")
-    }
-
-    afterEvaluate {
-        reactNativeArchitectures().each { architecture ->
-            tasks.findByName("configureCMakeDebug[${architecture}]")?.configure {
-                dependsOn("preHermesDebugBuild")
-                dependsOn("preJscDebugBuild")
-            }
-            tasks.findByName("configureCMakeRelWithDebInfo[${architecture}]")?.configure {
-                dependsOn("preHermesReleaseBuild")
-                dependsOn("preJscReleaseBuild")
-            }
-        }
-        configureCMakeRelWithDebInfo.dependsOn(packageReactReleaseNdkLibs)
-        preHermesReleaseBuild.dependsOn(packageReactReleaseNdkLibs)
-        preJscReleaseBuild.dependsOn(packageReactReleaseNdkLibs)
-        configureCMakeDebug.dependsOn(packageReactDebugNdkLibs)
-        preHermesDebugBuild.dependsOn(packageReactDebugNdkLibs)
-        preJscDebugBuild.dependsOn(packageReactDebugNdkLibs)
-    }
+afterEvaluate {
+    // As we're consuming Hermes from source, we want to make sure
+    // `hermesc` is built before we actually invoke the `emit*HermesResource` task
+    createBundleHermesReleaseJsAndAssets.dependsOn(":ReactAndroid:hermes-engine:buildHermes")
 }
diff --git a/packages/rn-tester/android/app/gradle.properties b/packages/rn-tester/android/app/gradle.properties
index c780b9d10b81..18b9871789b1 100644
--- a/packages/rn-tester/android/app/gradle.properties
+++ b/packages/rn-tester/android/app/gradle.properties
@@ -11,3 +11,8 @@ android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
 FLIPPER_VERSION=0.125.0
+
+# RN-Tester is building with NewArch always enabled
+newArchEnabled=true
+# RN-Tester is running with Hermes enabled and filtering variants with enableHermesOnlyInVariants
+hermesEnabled=true
diff --git a/packages/rn-tester/android/app/src/main/AndroidManifest.xml b/packages/rn-tester/android/app/src/main/AndroidManifest.xml
index 5bdcb1a686b3..640e56c12a6f 100644
--- a/packages/rn-tester/android/app/src/main/AndroidManifest.xml
+++ b/packages/rn-tester/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.facebook.react.uiapp">
+  xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-feature
     android:name="android.software.leanback"
diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
index 75b0dadaa034..da9cba600d30 100644
--- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
+++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
@@ -11,26 +11,25 @@
 import androidx.annotation.Nullable;
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.ReactRootView;
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
+import com.facebook.react.defaults.DefaultReactActivityDelegate;
 
 public class RNTesterActivity extends ReactActivity {
-  public static class RNTesterActivityDelegate extends ReactActivityDelegate {
+  public static class RNTesterActivityDelegate extends DefaultReactActivityDelegate {
     private static final String PARAM_ROUTE = "route";
     private Bundle mInitialProps = null;
     private final @Nullable ReactActivity mActivity;
 
     public RNTesterActivityDelegate(ReactActivity activity, String mainComponentName) {
-      super(activity, mainComponentName);
+      super(
+          activity,
+          mainComponentName,
+          DefaultNewArchitectureEntryPoint.getFabricEnabled(), // fabricEnabled
+          DefaultNewArchitectureEntryPoint.getConcurrentReactEnabled() // concurrentRootEnabled
+          );
       this.mActivity = activity;
     }
 
-    @Override
-    protected ReactRootView createRootView() {
-      ReactRootView reactRootView = new ReactRootView(getContext());
-      reactRootView.setIsFabric(BuildConfig.ENABLE_FABRIC);
-      return reactRootView;
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
       // Get remote param before calling super which uses it
@@ -51,11 +50,6 @@ protected void onCreate(Bundle savedInstanceState) {
     protected Bundle getLaunchOptions() {
       return mInitialProps;
     }
-
-    @Override
-    protected boolean isConcurrentRootEnabled() {
-      return true;
-    }
   }
 
   @Override
diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
index 12d2825968a1..98de09e81c0d 100644
--- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
+++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
@@ -8,39 +8,24 @@
 package com.facebook.react.uiapp;
 
 import android.app.Application;
-import android.content.Context;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import com.facebook.fbreact.specs.SampleTurboModule;
 import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
 import com.facebook.react.TurboReactPackage;
-import com.facebook.react.bridge.JSIModulePackage;
-import com.facebook.react.bridge.JSIModuleProvider;
-import com.facebook.react.bridge.JSIModuleSpec;
-import com.facebook.react.bridge.JSIModuleType;
-import com.facebook.react.bridge.JavaScriptContextHolder;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.UIManager;
 import com.facebook.react.config.ReactFeatureFlags;
-import com.facebook.react.fabric.ComponentFactory;
-import com.facebook.react.fabric.CoreComponentsRegistry;
-import com.facebook.react.fabric.FabricJSIModuleProvider;
-import com.facebook.react.fabric.ReactNativeConfig;
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
+import com.facebook.react.defaults.DefaultReactNativeHost;
 import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.react.uiapp.component.MyNativeViewManager;
 import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.react.views.text.ReactFontManager;
 import com.facebook.soloader.SoLoader;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -50,7 +35,7 @@
 public class RNTesterApplication extends Application implements ReactApplication {
 
   private final ReactNativeHost mReactNativeHost =
-      new ReactNativeHost(this) {
+      new DefaultReactNativeHost(this) {
         @Override
         public String getJSMainModuleName() {
           return "packages/rn-tester/js/RNTesterApp.android";
@@ -126,105 +111,28 @@ public List<ViewManager> createViewManagers(
               });
         }
 
-        @Nullable
         @Override
-        protected ReactPackageTurboModuleManagerDelegate.Builder
-            getReactPackageTurboModuleManagerDelegateBuilder() {
-          return new RNTesterTurboModuleManagerDelegate.Builder();
+        protected boolean isNewArchEnabled() {
+          return true;
         }
 
-        @Nullable
         @Override
-        protected JSIModulePackage getJSIModulePackage() {
-          if (!BuildConfig.ENABLE_FABRIC && !ReactFeatureFlags.useTurboModules) {
-            return null;
-          }
-
-          return new JSIModulePackage() {
-            @Override
-            public List<JSIModuleSpec> getJSIModules(
-                final ReactApplicationContext reactApplicationContext,
-                final JavaScriptContextHolder jsContext) {
-              final List<JSIModuleSpec> specs = new ArrayList<>();
-
-              // Install the new renderer.
-              if (BuildConfig.ENABLE_FABRIC) {
-                specs.add(
-                    new JSIModuleSpec() {
-                      @Override
-                      public JSIModuleType getJSIModuleType() {
-                        return JSIModuleType.UIManager;
-                      }
-
-                      @Override
-                      public JSIModuleProvider<UIManager> getJSIModuleProvider() {
-                        final ComponentFactory componentFactory = new ComponentFactory();
-                        CoreComponentsRegistry.register(componentFactory);
-                        RNTesterComponentsRegistry.register(componentFactory);
-                        final ReactInstanceManager reactInstanceManager = getReactInstanceManager();
-
-                        ViewManagerRegistry viewManagerRegistry =
-                            new ViewManagerRegistry(
-                                reactInstanceManager.getOrCreateViewManagers(
-                                    reactApplicationContext));
-
-                        return new FabricJSIModuleProvider(
-                            reactApplicationContext,
-                            componentFactory,
-                            ReactNativeConfig.DEFAULT_CONFIG,
-                            viewManagerRegistry);
-                      }
-                    });
-              }
-
-              return specs;
-            }
-          };
+        protected Boolean isHermesEnabled() {
+          return BuildConfig.IS_HERMES_ENABLED_IN_FLAVOR;
         }
       };
 
   @Override
   public void onCreate() {
-    ReactFeatureFlags.useTurboModules = BuildConfig.ENABLE_TURBOMODULE;
     ReactFontManager.getInstance().addCustomFont(this, "Rubik", R.font.rubik);
     super.onCreate();
     SoLoader.init(this, /* native exopackage */ false);
-    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+    DefaultNewArchitectureEntryPoint.load();
+    ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
   }
 
   @Override
   public ReactNativeHost getReactNativeHost() {
     return mReactNativeHost;
   }
-
-  /**
-   * Loads Flipper in React Native templates. Call this in the onCreate method with something like
-   * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
-   *
-   * @param context
-   * @param reactInstanceManager
-   */
-  private static void initializeFlipper(
-      final Context context, final ReactInstanceManager reactInstanceManager) {
-    if (BuildConfig.DEBUG) {
-      try {
-        /*
-         We use reflection here to pick up the class that initializes Flipper,
-        since Flipper library is not available in release mode
-        */
-        final Class<?> aClass = Class.forName("com.facebook.react.uiapp.ReactNativeFlipper");
-        aClass
-            .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
-            .invoke(null, context, reactInstanceManager);
-      } catch (final ClassNotFoundException e) {
-        e.printStackTrace();
-      } catch (final NoSuchMethodException e) {
-        e.printStackTrace();
-      } catch (final IllegalAccessException e) {
-        e.printStackTrace();
-      } catch (final InvocationTargetException e) {
-        e.printStackTrace();
-      }
-    }
-  }
 };
diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterComponentsRegistry.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterComponentsRegistry.java
deleted file mode 100644
index 4c0582ba6f5c..000000000000
--- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterComponentsRegistry.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.uiapp;
-
-import com.facebook.jni.HybridData;
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.fabric.ComponentFactory;
-import com.facebook.soloader.SoLoader;
-
-@DoNotStrip
-public class RNTesterComponentsRegistry {
-  static {
-    SoLoader.loadLibrary("fabricjni");
-  }
-
-  @DoNotStrip private final HybridData mHybridData;
-
-  @DoNotStrip
-  private native HybridData initHybrid(ComponentFactory componentFactory);
-
-  @DoNotStrip
-  private RNTesterComponentsRegistry(ComponentFactory componentFactory) {
-    mHybridData = initHybrid(componentFactory);
-  }
-
-  @DoNotStrip
-  public static RNTesterComponentsRegistry register(ComponentFactory componentFactory) {
-    return new RNTesterComponentsRegistry(componentFactory);
-  }
-}
diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterTurboModuleManagerDelegate.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterTurboModuleManagerDelegate.java
deleted file mode 100644
index bb046c4b37b1..000000000000
--- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterTurboModuleManagerDelegate.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.uiapp;
-
-import androidx.annotation.VisibleForTesting;
-import com.facebook.jni.HybridData;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.soloader.SoLoader;
-import java.util.List;
-
-/** This class is responsible for creating all the TurboModules for the RNTester app. */
-public class RNTesterTurboModuleManagerDelegate extends ReactPackageTurboModuleManagerDelegate {
-  private static volatile boolean sIsSoLibraryLoaded;
-
-  protected native HybridData initHybrid();
-
-  @VisibleForTesting
-  native boolean canCreateTurboModule(String moduleName);
-
-  private RNTesterTurboModuleManagerDelegate(
-      ReactApplicationContext context, List<ReactPackage> packages) {
-    super(context, packages);
-  }
-
-  public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder {
-    protected RNTesterTurboModuleManagerDelegate build(
-        ReactApplicationContext context, List<ReactPackage> packages) {
-      return new RNTesterTurboModuleManagerDelegate(context, packages);
-    }
-  }
-
-  @Override
-  protected synchronized void maybeLoadOtherSoLibraries() {
-    // Prevents issues with initializer interruptions.
-    if (!sIsSoLibraryLoaded) {
-      SoLoader.loadLibrary("rntester_appmodules");
-      sIsSoLibraryLoaded = true;
-    }
-  }
-}
diff --git a/packages/rn-tester/android/app/src/main/jni/CMakeLists.txt b/packages/rn-tester/android/app/src/main/jni/CMakeLists.txt
index 8458616c6a1c..e5bd4dde4bd3 100644
--- a/packages/rn-tester/android/app/src/main/jni/CMakeLists.txt
+++ b/packages/rn-tester/android/app/src/main/jni/CMakeLists.txt
@@ -5,15 +5,17 @@
 
 cmake_minimum_required(VERSION 3.13)
 
-# Define the library name here.
-project(rntester_appmodules)
+# Define the application dynamic library name here.
+project(appmodules)
 
 include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake)
 
-add_subdirectory(${PROJECT_BUILD_DIR}/generated/source/codegen/jni/ codegen_build)
 add_subdirectory(${REACT_COMMON_DIR}/react/nativemodule/samples/platform/android/ sampleturbomodule_build)
+add_subdirectory(${REACT_COMMON_DIR}/../packages/rn-tester/NativeCxxModuleExample/ nativecxxmoduleexample_build)
 
-# RN Tester needs to link against the local codegen-ned library and a sample turbomobule
+# RN Tester needs to link against the sample turbomobule
 target_link_libraries(${CMAKE_PROJECT_NAME}
-        react_codegen_AppSpecs
         sampleturbomodule)
+# RN Tester needs to link against the NativeCxxModuleExample
+target_link_libraries(${CMAKE_PROJECT_NAME}
+        nativecxxmoduleexample)
diff --git a/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp b/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp
index 8e5b8a6fba08..be31e906ef02 100644
--- a/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp
+++ b/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp
@@ -5,16 +5,59 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <AppSpecs.h>
+#include <DefaultComponentsRegistry.h>
+#include <DefaultTurboModuleManagerDelegate.h>
+#include <NativeCxxModuleExample.h>
+#include <ReactCommon/SampleTurboModuleSpec.h>
 #include <fbjni/fbjni.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <react/renderer/components/AppSpecs/ComponentDescriptors.h>
+#include <rncore.h>
 
-#include "RNTesterComponentsRegistry.h"
-#include "RNTesterTurboModuleManagerDelegate.h"
+namespace facebook {
+namespace react {
+
+void registerComponents(
+    std::shared_ptr<ComponentDescriptorProviderRegistry const> registry) {
+  registry->add(concreteComponentDescriptorProvider<
+                RNTMyNativeViewComponentDescriptor>());
+}
+
+std::shared_ptr<TurboModule> cxxModuleProvider(
+    const std::string &name,
+    const std::shared_ptr<CallInvoker> &jsInvoker) {
+  if (name == "NativeCxxModuleExampleCxx") {
+    return std::make_shared<NativeCxxModuleExample>(jsInvoker);
+  }
+  return nullptr;
+}
+
+std::shared_ptr<TurboModule> javaModuleProvider(
+    const std::string &name,
+    const JavaTurboModule::InitParams &params) {
+  auto module = AppSpecs_ModuleProvider(name, params);
+  if (module != nullptr) {
+    return module;
+  }
+  module = SampleTurboModuleSpec_ModuleProvider(name, params);
+  if (module != nullptr) {
+    return module;
+  };
+  return rncore_ModuleProvider(name, params);
+}
+
+} // namespace react
+} // namespace facebook
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(vm, [] {
-    // TODO: dvacca ramanpreet unify this with the way
-    // "ComponentDescriptorFactory" is defined in Fabric
-    facebook::react::RNTesterTurboModuleManagerDelegate::registerNatives();
-    facebook::react::RNTesterComponentsRegistry::registerNatives();
+    facebook::react::DefaultTurboModuleManagerDelegate::cxxModuleProvider =
+        &facebook::react::cxxModuleProvider;
+    facebook::react::DefaultTurboModuleManagerDelegate::javaModuleProvider =
+        &facebook::react::javaModuleProvider;
+    facebook::react::DefaultComponentsRegistry::
+        registerComponentDescriptorsFromEntryPoint =
+            &facebook::react::registerComponents;
   });
 }
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
deleted file mode 100644
index 5b55ce4a9de9..000000000000
--- a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
+++ /dev/null
@@ -1,34 +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.
- */
-
-#include "RNTesterAppModuleProvider.h"
-
-#include <AppSpecs.h>
-#include <ReactCommon/SampleTurboModuleSpec.h>
-#include <rncore.h>
-
-namespace facebook {
-namespace react {
-
-std::shared_ptr<TurboModule> RNTesterAppModuleProvider(
-    const std::string &moduleName,
-    const JavaTurboModule::InitParams &params) {
-  auto module = AppSpecs_ModuleProvider(moduleName, params);
-  if (module != nullptr) {
-    return module;
-  }
-
-  module = SampleTurboModuleSpec_ModuleProvider(moduleName, params);
-  if (module != nullptr) {
-    return module;
-  }
-
-  return rncore_ModuleProvider(moduleName, params);
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleManagerDelegate.cpp b/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleManagerDelegate.cpp
deleted file mode 100644
index 6bf5c8e8afae..000000000000
--- a/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleManagerDelegate.cpp
+++ /dev/null
@@ -1,50 +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.
- */
-
-#include "RNTesterTurboModuleManagerDelegate.h"
-
-#include "RNTesterAppModuleProvider.h"
-
-namespace facebook {
-namespace react {
-
-jni::local_ref<RNTesterTurboModuleManagerDelegate::jhybriddata>
-RNTesterTurboModuleManagerDelegate::initHybrid(jni::alias_ref<jhybridobject>) {
-  return makeCxxInstance();
-}
-
-void RNTesterTurboModuleManagerDelegate::registerNatives() {
-  registerHybrid({
-      makeNativeMethod(
-          "initHybrid", RNTesterTurboModuleManagerDelegate::initHybrid),
-      makeNativeMethod(
-          "canCreateTurboModule",
-          RNTesterTurboModuleManagerDelegate::canCreateTurboModule),
-  });
-}
-
-std::shared_ptr<TurboModule> RNTesterTurboModuleManagerDelegate::getTurboModule(
-    const std::string &name,
-    const std::shared_ptr<CallInvoker> &jsInvoker) {
-  // Not implemented yet: provide pure-C++ NativeModules here.
-  return nullptr;
-}
-
-std::shared_ptr<TurboModule> RNTesterTurboModuleManagerDelegate::getTurboModule(
-    const std::string &name,
-    const JavaTurboModule::InitParams &params) {
-  return RNTesterAppModuleProvider(name, params);
-}
-
-bool RNTesterTurboModuleManagerDelegate::canCreateTurboModule(
-    const std::string &name) {
-  return getTurboModule(name, nullptr) != nullptr ||
-      getTurboModule(name, {.moduleName = name}) != nullptr;
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/packages/rn-tester/android/app/src/release/java/com/facebook/react/uiapp/ReactNativeFlipper.java b/packages/rn-tester/android/app/src/release/java/com/facebook/react/uiapp/ReactNativeFlipper.java
new file mode 100644
index 000000000000..26cc2168b998
--- /dev/null
+++ b/packages/rn-tester/android/app/src/release/java/com/facebook/react/uiapp/ReactNativeFlipper.java
@@ -0,0 +1,21 @@
+/*
+ * 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.uiapp;
+
+import android.content.Context;
+import com.facebook.react.ReactInstanceManager;
+
+/**
+ * Class responsible of loading Flipper inside your React Native application. This is the release
+ * flavor of it so it's empty as we don't want to load Flipper.
+ */
+public class ReactNativeFlipper {
+  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
+    // Do nothing as we don't want to initialize Flipper on Release.
+  }
+}
diff --git a/packages/rn-tester/js/RNTesterApp.ios.js b/packages/rn-tester/js/RNTesterApp.ios.js
index b2170dcef6fc..d997862b6442 100644
--- a/packages/rn-tester/js/RNTesterApp.ios.js
+++ b/packages/rn-tester/js/RNTesterApp.ios.js
@@ -8,6 +8,8 @@
  * @flow
  */
 
+import type {Node} from 'react';
+
 import {AppRegistry} from 'react-native';
 import React from 'react';
 
@@ -31,7 +33,7 @@ RNTesterList.Components.concat(RNTesterList.APIs).forEach(
     const ExampleModule = Example.module;
     if (ExampleModule.displayName) {
       class Snapshotter extends React.Component<{...}> {
-        render() {
+        render(): Node {
           return (
             <SnapshotViewIOS>
               <RNTesterModuleContainer
diff --git a/packages/rn-tester/js/RNTesterAppShared.js b/packages/rn-tester/js/RNTesterAppShared.js
index fc35f5c89f5c..cec3abe635c9 100644
--- a/packages/rn-tester/js/RNTesterAppShared.js
+++ b/packages/rn-tester/js/RNTesterAppShared.js
@@ -8,13 +8,7 @@
  * @flow
  */
 
-import {
-  BackHandler,
-  StyleSheet,
-  useColorScheme,
-  View,
-  LogBox,
-} from 'react-native';
+import {BackHandler, StyleSheet, useColorScheme, View} from 'react-native';
 import * as React from 'react';
 
 import RNTesterModuleContainer from './components/RNTesterModuleContainer';
@@ -23,28 +17,23 @@ import RNTesterNavBar, {navBarHeight} from './components/RNTesterNavbar';
 import RNTesterList from './utils/RNTesterList';
 import {
   Screens,
-  initialState,
+  initialNavigationState,
   getExamplesListWithBookmarksAndRecentlyUsed,
-  getInitialStateFromAsyncStorage,
 } from './utils/testerStateUtils';
-import {useAsyncStorageReducer} from './utils/useAsyncStorageReducer';
-import {RNTesterReducer, RNTesterActionsType} from './utils/RNTesterReducer';
+import {
+  RNTesterNavigationReducer,
+  RNTesterNavigationActionsType,
+} from './utils/RNTesterNavigationReducer';
 import {RNTesterThemeContext, themes} from './components/RNTesterTheme';
 import RNTTitleBar from './components/RNTTitleBar';
 import {RNTesterEmptyBookmarksState} from './components/RNTesterEmptyBookmarksState';
 
-const APP_STATE_KEY = 'RNTesterAppState.v3';
-
-// RNTester App currently uses AsyncStorage from react-native for storing navigation state
-// and bookmark items.
-// TODO: Vendor AsyncStorage or create our own.
-LogBox.ignoreLogs([/AsyncStorage has been extracted from react-native/]);
+// RNTester App currently uses in memory storage for storing navigation state
 
 const RNTesterApp = (): React.Node => {
-  const [state, dispatch] = useAsyncStorageReducer(
-    RNTesterReducer,
-    initialState,
-    APP_STATE_KEY,
+  const [state, dispatch] = React.useReducer(
+    RNTesterNavigationReducer,
+    initialNavigationState,
   );
   const colorScheme = useColorScheme();
 
@@ -57,17 +46,6 @@ const RNTesterApp = (): React.Node => {
     recentlyUsed,
   } = state;
 
-  React.useEffect(() => {
-    getInitialStateFromAsyncStorage(APP_STATE_KEY).then(
-      initialStateFromStorage => {
-        dispatch({
-          type: RNTesterActionsType.INIT_FROM_STORAGE,
-          data: initialStateFromStorage,
-        });
-      },
-    );
-  }, [dispatch]);
-
   const examplesList = React.useMemo(
     () =>
       getExamplesListWithBookmarksAndRecentlyUsed({bookmarks, recentlyUsed}),
@@ -76,7 +54,7 @@ const RNTesterApp = (): React.Node => {
 
   const handleBackPress = React.useCallback(() => {
     if (activeModuleKey != null) {
-      dispatch({type: RNTesterActionsType.BACK_BUTTON_PRESS});
+      dispatch({type: RNTesterNavigationActionsType.BACK_BUTTON_PRESS});
     }
   }, [dispatch, activeModuleKey]);
 
@@ -103,7 +81,7 @@ const RNTesterApp = (): React.Node => {
   const handleModuleCardPress = React.useCallback(
     ({exampleType, key, title}) => {
       dispatch({
-        type: RNTesterActionsType.MODULE_CARD_PRESS,
+        type: RNTesterNavigationActionsType.MODULE_CARD_PRESS,
         data: {exampleType, key, title},
       });
     },
@@ -111,9 +89,9 @@ const RNTesterApp = (): React.Node => {
   );
 
   const handleModuleExampleCardPress = React.useCallback(
-    exampleName => {
+    (exampleName: string) => {
       dispatch({
-        type: RNTesterActionsType.EXAMPLE_CARD_PRESS,
+        type: RNTesterNavigationActionsType.EXAMPLE_CARD_PRESS,
         data: {key: exampleName},
       });
     },
@@ -123,7 +101,7 @@ const RNTesterApp = (): React.Node => {
   const toggleBookmark = React.useCallback(
     ({exampleType, key}) => {
       dispatch({
-        type: RNTesterActionsType.BOOKMARK_PRESS,
+        type: RNTesterNavigationActionsType.BOOKMARK_PRESS,
         data: {exampleType, key},
       });
     },
@@ -131,9 +109,9 @@ const RNTesterApp = (): React.Node => {
   );
 
   const handleNavBarPress = React.useCallback(
-    args => {
+    (args: {screen: string}) => {
       dispatch({
-        type: RNTesterActionsType.NAVBAR_PRESS,
+        type: RNTesterNavigationActionsType.NAVBAR_PRESS,
         data: {screen: args.screen},
       });
     },
diff --git a/packages/rn-tester/js/components/RNTesterSettingSwitchRow.js b/packages/rn-tester/js/components/RNTesterSettingSwitchRow.js
index 22341cfbf28f..3aa87f5c3dea 100644
--- a/packages/rn-tester/js/components/RNTesterSettingSwitchRow.js
+++ b/packages/rn-tester/js/components/RNTesterSettingSwitchRow.js
@@ -8,38 +8,16 @@
  * @flow strict-local
  */
 
-'use strict';
+import * as React from 'react';
+import {StyleSheet, Switch, Text, View} from 'react-native';
 
-const RNTesterStatePersister = require('../utils/RNTesterStatePersister');
-const React = require('react');
+type Props = {
+  label: string,
+  onEnable: () => void,
+  onDisable: () => void,
+  active: boolean,
+};
 
-const {StyleSheet, Switch, Text, View} = require('react-native');
-
-class RNTesterSettingSwitchRow extends React.Component<
-  $FlowFixMeProps,
-  $FlowFixMeState,
-> {
-  UNSAFE_componentWillReceiveProps(newProps: $FlowFixMeProps) {
-    const {onEnable, onDisable, persister} = this.props;
-    if (newProps.persister.state !== persister.state) {
-      newProps.persister.state ? onEnable() : onDisable();
-    }
-  }
-  render(): React.Node {
-    const {label, persister} = this.props;
-    return (
-      <View style={styles.row}>
-        <Text>{label}</Text>
-        <Switch
-          value={persister.state}
-          onValueChange={value => {
-            persister.setState(() => value);
-          }}
-        />
-      </View>
-    );
-  }
-}
 const styles = StyleSheet.create({
   row: {
     padding: 10,
@@ -48,9 +26,18 @@ const styles = StyleSheet.create({
   },
 });
 
-const RNTesterSettingSwitchRowContainer: React.ComponentType<$FlowFixMeProps> =
-  RNTesterStatePersister.createContainer(RNTesterSettingSwitchRow, {
-    cacheKeySuffix: ({label}) => 'Switch:' + label,
-    getInitialState: ({initialValue}) => initialValue,
-  });
-module.exports = RNTesterSettingSwitchRowContainer;
+const RNTesterSettingSwitchRow = ({
+  label,
+  onEnable,
+  onDisable,
+  active,
+}: Props): React.Node => {
+  return (
+    <View style={styles.row}>
+      <Text>{label}</Text>
+      <Switch value={active} onValueChange={active ? onDisable : onEnable} />
+    </View>
+  );
+};
+
+export default RNTesterSettingSwitchRow;
diff --git a/packages/rn-tester/js/components/createExamplePage.js b/packages/rn-tester/js/components/createExamplePage.js
index 9c24f24bbce4..62decfc0bbe8 100644
--- a/packages/rn-tester/js/components/createExamplePage.js
+++ b/packages/rn-tester/js/components/createExamplePage.js
@@ -20,7 +20,7 @@ const createExamplePage = function (
   exampleModule: RNTesterModule,
 ): React.ComponentType<any> {
   class ExamplePage extends React.Component<{...}> {
-    render() {
+    render(): React.Node {
       return <RNTesterModuleContainer module={exampleModule} />;
     }
   }
diff --git a/packages/rn-tester/js/examples/Accessibility/AccessibilityAndroidExample.android.js b/packages/rn-tester/js/examples/Accessibility/AccessibilityAndroidExample.android.js
index 35e1be366ca0..2daf0ba27c67 100644
--- a/packages/rn-tester/js/examples/Accessibility/AccessibilityAndroidExample.android.js
+++ b/packages/rn-tester/js/examples/Accessibility/AccessibilityAndroidExample.android.js
@@ -153,7 +153,7 @@ class AccessibilityAndroidExample extends React.Component<
           <Text style={styles.paragraph}>
             In the following example, the words "test", "inline links", "another
             link", and "link that spans multiple lines because the text is so
-            long", should each be independantly focusable elements, announced as
+            long", should each be independently focusable elements, announced as
             their content followed by ", Link".
           </Text>
           <Text style={styles.paragraph}>
@@ -162,7 +162,7 @@ class AccessibilityAndroidExample extends React.Component<
           </Text>
           <Text style={styles.paragraph}>
             Focusing on the paragraph itself should also announce that there are
-            "links avaialable", and opening Talkback's links menu should show
+            "links available", and opening Talkback's links menu should show
             these same links.
           </Text>
           <Text style={styles.paragraph}>
diff --git a/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js b/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js
index fb917d19dc32..c552f7569965 100644
--- a/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js
+++ b/packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js
@@ -14,6 +14,7 @@ import type {PressEvent} from 'react-native/Libraries/Types/CoreEventTypes';
 
 const React = require('react');
 const {
+  ImageBackground,
   AccessibilityInfo,
   TextInput,
   Button,
@@ -26,6 +27,7 @@ const {
   StyleSheet,
   Slider,
   Platform,
+  Switch,
 } = require('react-native');
 import type {EventSubscription} from 'react-native/Libraries/vendor/emitter/EventEmitter';
 
@@ -67,6 +69,21 @@ const styles = StyleSheet.create({
     flexDirection: 'column',
     justifyContent: 'space-between',
   },
+  container: {
+    flex: 1,
+  },
+  ImageBackground: {
+    flex: 1,
+    justifyContent: 'center',
+  },
+  text: {
+    color: 'white',
+    fontSize: 20,
+    lineHeight: 84,
+    fontWeight: 'bold',
+    textAlign: 'center',
+    backgroundColor: '#000000c0',
+  },
 });
 
 class AccessibilityExample extends React.Component<{}> {
@@ -93,7 +110,7 @@ class AccessibilityExample extends React.Component<{}> {
           </View>
         </RNTesterBlock>
 
-        <RNTesterBlock title="Accessible view with TextViews wihout label">
+        <RNTesterBlock title="Accessible view with TextViews without label">
           <View accessible={true}>
             <Text style={{color: 'green'}}>This is text one.</Text>
             <Text style={{color: 'blue'}}>This is text two.</Text>
@@ -109,6 +126,14 @@ class AccessibilityExample extends React.Component<{}> {
           </View>
         </RNTesterBlock>
 
+        <RNTesterBlock title="View with hidden children from accessibility tree.">
+          <View aria-hidden>
+            <Text>
+              This view's children are hidden from the accessibility tree
+            </Text>
+          </View>
+        </RNTesterBlock>
+
         {/* Android screen readers will say the accessibility hint instead of the text
            since the view doesn't have a label. */}
         <RNTesterBlock title="Accessible view with TextViews with hint">
@@ -132,6 +157,10 @@ class AccessibilityExample extends React.Component<{}> {
           <Text accessibilityRole="header">This is a title.</Text>
         </RNTesterBlock>
 
+        <RNTesterBlock title="Text with role = heading">
+          <Text role="heading">This is a title.</Text>
+        </RNTesterBlock>
+
         <RNTesterBlock title="Touchable with accessibilityRole = link">
           <TouchableOpacity
             onPress={() => Alert.alert('Link has been clicked!')}
@@ -195,6 +224,17 @@ class AccessibilityExample extends React.Component<{}> {
           </View>
         </RNTesterBlock>
 
+        <RNTesterBlock title="View with label, hint, role, and state">
+          <View
+            accessible={true}
+            accessibilityLabel="Accessibility label."
+            accessibilityRole="button"
+            aria-selected={true}
+            accessibilityHint="Accessibility hint.">
+            <Text>Accessible view with label, hint, role, and state</Text>
+          </View>
+        </RNTesterBlock>
+
         <RNTesterBlock title="TextInput with accessibilityLabelledBy attribute">
           <View>
             <Text nativeID="formLabel1">Mail Address</Text>
@@ -212,6 +252,16 @@ class AccessibilityExample extends React.Component<{}> {
             />
           </View>
         </RNTesterBlock>
+        <RNTesterBlock title="Switch with accessibilityLabelledBy attribute">
+          <View>
+            <Text nativeID="formLabel4">Enable Notifications</Text>
+            <Switch
+              value={true}
+              accessibilityLabel="switch test1"
+              accessibilityLabelledBy="formLabel4"
+            />
+          </View>
+        </RNTesterBlock>
       </View>
     );
   }
@@ -223,7 +273,7 @@ class CheckboxExample extends React.Component<
     checkboxState: boolean | 'mixed',
   },
 > {
-  state = {
+  state: {checkboxState: boolean | 'mixed'} = {
     checkboxState: true,
   };
 
@@ -242,7 +292,7 @@ class CheckboxExample extends React.Component<
     });
   };
 
-  render() {
+  render(): React.Node {
     return (
       <TouchableOpacity
         onPress={this._onCheckboxPress}
@@ -262,7 +312,7 @@ class SwitchExample extends React.Component<
     switchState: boolean,
   },
 > {
-  state = {
+  state: {switchState: boolean} = {
     switchState: true,
   };
 
@@ -274,7 +324,7 @@ class SwitchExample extends React.Component<
     });
   };
 
-  render() {
+  render(): React.Node {
     return (
       <TouchableOpacity
         onPress={this._onSwitchToggle}
@@ -303,7 +353,7 @@ class SelectionExample extends React.Component<
     current: React.ElementRef<typeof TouchableOpacity> | null,
   };
 
-  state = {
+  state: {isEnabled: boolean, isSelected: boolean} = {
     isSelected: true,
     isEnabled: false,
   };
@@ -375,7 +425,7 @@ class ExpandableElementExample extends React.Component<
     expandState: boolean,
   },
 > {
-  state = {
+  state: {expandState: boolean} = {
     expandState: false,
   };
 
@@ -387,7 +437,7 @@ class ExpandableElementExample extends React.Component<
     });
   };
 
-  render() {
+  render(): React.Node {
     return (
       <TouchableOpacity
         onPress={this._onElementPress}
@@ -408,7 +458,11 @@ class NestedCheckBox extends React.Component<
     checkbox3: boolean | 'mixed',
   },
 > {
-  state = {
+  state: {
+    checkbox1: boolean | 'mixed',
+    checkbox2: boolean | 'mixed',
+    checkbox3: boolean | 'mixed',
+  } = {
     checkbox1: false,
     checkbox2: false,
     checkbox3: false,
@@ -460,7 +514,7 @@ class NestedCheckBox extends React.Component<
     });
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <TouchableOpacity
@@ -723,7 +777,7 @@ class AccessibilityActionsExample extends React.Component<{}> {
             onAccessibilityAction={event => {
               switch (event.nativeEvent.actionName) {
                 case 'activate':
-                  Alert.alert('Alert', 'Activate accessiblity action');
+                  Alert.alert('Alert', 'Activate accessibility action');
                   break;
                 case 'copy':
                   Alert.alert('Alert', 'copy action success');
@@ -731,7 +785,7 @@ class AccessibilityActionsExample extends React.Component<{}> {
               }
             }}
             onPress={() => Alert.alert('Button has been pressed!')}
-            title="Button with accessiblity action"
+            title="Button with accessibility action"
           />
         </RNTesterBlock>
 
@@ -745,7 +799,7 @@ class AccessibilityActionsExample extends React.Component<{}> {
             onAccessibilityAction={event => {
               switch (event.nativeEvent.actionName) {
                 case 'activate':
-                  Alert.alert('Alert', 'Activate accessiblity action');
+                  Alert.alert('Alert', 'Activate accessibility action');
                   break;
                 case 'copy':
                   Alert.alert('Alert', 'copy action success');
@@ -769,7 +823,7 @@ function SliderAccessibilityExample(): React.Node {
         <Slider value={25} maximumValue={100} minimumValue={0} disabled />
       </RNTesterBlock>
       <RNTesterBlock
-        title="Disabled Slider via accessibiltyState"
+        title="Disabled Slider via accessibilityState"
         description="Verify with TalkBack/VoiceOver announces Slider as disabled">
         <Slider
           value={75}
@@ -880,14 +934,100 @@ class FakeSliderExample extends React.Component<{}, FakeSliderExampleState> {
   }
 }
 
+class FakeSliderExampleForAccessibilityValue extends React.Component<
+  {},
+  FakeSliderExampleState,
+> {
+  state: FakeSliderExampleState = {
+    current: 50,
+    textualValue: 'center',
+  };
+
+  increment: () => void = () => {
+    let newValue = this.state.current + 2;
+    if (newValue > 100) {
+      newValue = 100;
+    }
+    this.setState({
+      current: newValue,
+    });
+  };
+
+  decrement: () => void = () => {
+    let newValue = this.state.current - 2;
+    if (newValue < 0) {
+      newValue = 0;
+    }
+    this.setState({
+      current: newValue,
+    });
+  };
+
+  render(): React.Node {
+    return (
+      <View>
+        <View
+          accessible={true}
+          accessibilityLabel="Fake Slider"
+          accessibilityRole="adjustable"
+          accessibilityActions={[{name: 'increment'}, {name: 'decrement'}]}
+          onAccessibilityAction={event => {
+            switch (event.nativeEvent.actionName) {
+              case 'increment':
+                this.increment();
+                break;
+              case 'decrement':
+                this.decrement();
+                break;
+            }
+          }}
+          aria-valuemax={100}
+          aria-valuemin={0}
+          aria-valuetext={'slider aria value text'}
+          aria-valuenow={this.state.current}>
+          <Text>Fake Slider</Text>
+        </View>
+        <TouchableWithoutFeedback
+          accessible={true}
+          accessibilityLabel="Equalizer"
+          accessibilityRole="adjustable"
+          accessibilityActions={[{name: 'increment'}, {name: 'decrement'}]}
+          onAccessibilityAction={event => {
+            switch (event.nativeEvent.actionName) {
+              case 'increment':
+                if (this.state.textualValue === 'center') {
+                  this.setState({textualValue: 'right'});
+                } else if (this.state.textualValue === 'left') {
+                  this.setState({textualValue: 'center'});
+                }
+                break;
+              case 'decrement':
+                if (this.state.textualValue === 'center') {
+                  this.setState({textualValue: 'left'});
+                } else if (this.state.textualValue === 'right') {
+                  this.setState({textualValue: 'center'});
+                }
+                break;
+            }
+          }}
+          accessibilityValue={{text: this.state.textualValue}}>
+          <View>
+            <Text>Equalizer</Text>
+          </View>
+        </TouchableWithoutFeedback>
+      </View>
+    );
+  }
+}
+
 class AnnounceForAccessibility extends React.Component<{}> {
-  _handleOnPress = () =>
+  _handleOnPress = (): TimeoutID =>
     setTimeout(
       () => AccessibilityInfo.announceForAccessibility('Announcement Test'),
       1000,
     );
 
-  _handleOnPressQueued = () =>
+  _handleOnPressQueued = (): TimeoutID =>
     setTimeout(
       () =>
         AccessibilityInfo.announceForAccessibilityWithOptions(
@@ -956,7 +1096,7 @@ function SetAccessibilityFocusExample(props: {}): React.Node {
 
   const onPress = () => {
     if (myRef && myRef.current) {
-      AccessibilityInfo.sendAccessibilityEvent_unstable(myRef.current, 'focus');
+      AccessibilityInfo.sendAccessibilityEvent(myRef.current, 'focus');
     }
   };
 
@@ -1035,6 +1175,44 @@ class EnabledExamples extends React.Component<{}> {
   }
 }
 
+class ImportantForAccessibilityExamples extends React.Component<{}> {
+  render(): React.Node {
+    return (
+      <View>
+        <RNTesterBlock title="ImageBackground with importantForAccessibility=no-hide-descendants">
+          <View style={styles.container}>
+            <ImageBackground
+              importantForAccessibility="no-hide-descendants"
+              source={require('../../assets/trees.jpg')}
+              resizeMode="cover"
+              style={styles.ImageBackground}>
+              <Text style={styles.text}>not accessible</Text>
+            </ImageBackground>
+          </View>
+        </RNTesterBlock>
+        <RNTesterBlock title="ImageBackground with importantForAccessibility=no">
+          <View style={styles.container}>
+            <ImageBackground
+              importantForAccessibility="no"
+              source={require('../../assets/trees.jpg')}
+              resizeMode="cover"
+              style={styles.ImageBackground}>
+              <Text style={styles.text}>accessible</Text>
+            </ImageBackground>
+          </View>
+        </RNTesterBlock>
+        <RNTesterBlock title="Button with importantForAccessibility=no">
+          <Button
+            title="this is text"
+            importantForAccessibility="no"
+            onPress={() => console.log('pressed')}
+          />
+        </RNTesterBlock>
+      </View>
+    );
+  }
+}
+
 class EnabledExample extends React.Component<
   {
     eventListener:
@@ -1052,11 +1230,11 @@ class EnabledExample extends React.Component<
     isEnabled: boolean,
   },
 > {
-  state = {
+  state: {isEnabled: boolean} = {
     isEnabled: false,
   };
   _subscription: EventSubscription;
-  componentDidMount() {
+  componentDidMount(): null | Promise<mixed> {
     this._subscription = AccessibilityInfo.addEventListener(
       this.props.eventListener,
       this._handleToggled,
@@ -1114,6 +1292,11 @@ class DisplayOptionsStatusExample extends React.Component<{}> {
           optionChecker={AccessibilityInfo.isReduceMotionEnabled}
           notification={'reduceMotionChanged'}
         />
+        <DisplayOptionStatusExample
+          optionName={'Prefer Cross-Fade Transitions'}
+          optionChecker={AccessibilityInfo.prefersCrossFadeTransitions}
+          notification={'prefersCrossFadeTransitionsChanged'}
+        />
         <DisplayOptionStatusExample
           optionName={'Screen Reader'}
           optionChecker={AccessibilityInfo.isScreenReaderEnabled}
@@ -1216,6 +1399,12 @@ exports.examples = [
       return <FakeSliderExample />;
     },
   },
+  {
+    title: 'Fake SliderExample For AccessibilityValue',
+    render(): React.Element<typeof FakeSliderExampleForAccessibilityValue> {
+      return <FakeSliderExampleForAccessibilityValue />;
+    },
+  },
   {
     title: 'Check if the display options are enabled',
     render(): React.Element<typeof DisplayOptionsStatusExample> {
@@ -1240,6 +1429,12 @@ exports.examples = [
       return <EnabledExamples />;
     },
   },
+  {
+    title: 'Testing importantForAccessibility',
+    render(): React.Element<typeof ImportantForAccessibilityExamples> {
+      return <ImportantForAccessibilityExamples />;
+    },
+  },
   {
     title:
       'Check if accessibilityState disabled is announced when the screenreader focus moves on the image',
@@ -1255,4 +1450,18 @@ exports.examples = [
       );
     },
   },
+  {
+    title: 'TextInput with aria-labelledby attribute"',
+    render(): React.Element<typeof View> {
+      return (
+        <View>
+          <Text nativeID="testAriaLabelledBy">Phone Number</Text>
+          <TextInput
+            aria-labelledby={'testAriaLabelledBy'}
+            style={styles.default}
+          />
+        </View>
+      );
+    },
+  },
 ];
diff --git a/packages/rn-tester/js/examples/Accessibility/AccessibilityIOSExample.js b/packages/rn-tester/js/examples/Accessibility/AccessibilityIOSExample.js
index b8572b3fb98d..a401d6dae739 100644
--- a/packages/rn-tester/js/examples/Accessibility/AccessibilityIOSExample.js
+++ b/packages/rn-tester/js/examples/Accessibility/AccessibilityIOSExample.js
@@ -17,7 +17,7 @@ const RNTesterBlock = require('../../components/RNTesterBlock');
 
 type Props = $ReadOnly<{||}>;
 class AccessibilityIOSExample extends React.Component<Props> {
-  render() {
+  render(): React.Node {
     return (
       <RNTesterBlock title="Accessibility iOS APIs">
         <View
diff --git a/packages/rn-tester/js/examples/ActionSheetIOS/ActionSheetIOSExample.js b/packages/rn-tester/js/examples/ActionSheetIOS/ActionSheetIOSExample.js
index 4b7ada70a3c2..8f0ebaf041f5 100644
--- a/packages/rn-tester/js/examples/ActionSheetIOS/ActionSheetIOSExample.js
+++ b/packages/rn-tester/js/examples/ActionSheetIOS/ActionSheetIOSExample.js
@@ -10,6 +10,8 @@
 
 'use strict';
 
+import type {NativeMethods} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes';
+
 const React = require('react');
 const {
   ActionSheetIOS,
@@ -29,11 +31,11 @@ const DISABLED_BUTTON_INDICES = [1, 2];
 type Props = $ReadOnly<{||}>;
 type State = {|clicked: string|};
 class ActionSheetExample extends React.Component<Props, State> {
-  state = {
+  state: State = {
     clicked: 'none',
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Text onPress={this.showActionSheet} style={style.button}>
@@ -62,11 +64,11 @@ class ActionSheetTintExample extends React.Component<
   $FlowFixMeProps,
   $FlowFixMeState,
 > {
-  state = {
+  state: any | {clicked: string} = {
     clicked: 'none',
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Text onPress={this.showActionSheet} style={style.button}>
@@ -96,11 +98,11 @@ class ActionSheetCancelButtonTintExample extends React.Component<
   $FlowFixMeProps,
   $FlowFixMeState,
 > {
-  state = {
+  state: any | {clicked: string} = {
     clicked: 'none',
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Text onPress={this.showActionSheet} style={style.button}>
@@ -131,13 +133,13 @@ class ActionSheetAnchorExample extends React.Component<
   $FlowFixMeProps,
   $FlowFixMeState,
 > {
-  state = {
+  state: any | {clicked: string} = {
     clicked: 'none',
   };
 
-  anchorRef = React.createRef();
+  anchorRef: {current: null | $Exact<NativeMethods>} = React.createRef();
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <View style={style.anchorRow}>
@@ -174,11 +176,11 @@ class ActionSheetAnchorExample extends React.Component<
 }
 
 class ActionSheetDisabledExample extends React.Component<Props, State> {
-  state = {
+  state: State = {
     clicked: 'none',
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Text onPress={this.showActionSheet} style={style.button}>
@@ -205,7 +207,7 @@ class ActionSheetDisabledExample extends React.Component<Props, State> {
 }
 
 class ActionSheetDismissExample extends React.Component<{...}> {
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Text onPress={this.showAndDismissActionSheet} style={style.button}>
@@ -236,11 +238,11 @@ class ShareActionSheetExample extends React.Component<
   $FlowFixMeProps,
   $FlowFixMeState,
 > {
-  state = {
+  state: any | {text: string} = {
     text: '',
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Text onPress={this.showShareActionSheet} style={style.button}>
@@ -277,11 +279,11 @@ class ShareScreenshotExample extends React.Component<
   $FlowFixMeProps,
   $FlowFixMeState,
 > {
-  state = {
+  state: any | {text: string} = {
     text: '',
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Text onPress={this.showShareActionSheet} style={style.button}>
@@ -322,13 +324,13 @@ class ShareScreenshotAnchorExample extends React.Component<
   $FlowFixMeProps,
   $FlowFixMeState,
 > {
-  state = {
+  state: any | {text: string} = {
     text: '',
   };
 
-  anchorRef = React.createRef();
+  anchorRef: {current: null | $Exact<NativeMethods>} = React.createRef();
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <View style={style.anchorRow}>
diff --git a/packages/rn-tester/js/examples/ActivityIndicator/ActivityIndicatorExample.js b/packages/rn-tester/js/examples/ActivityIndicator/ActivityIndicatorExample.js
index 188302df2f78..2713fce143fa 100644
--- a/packages/rn-tester/js/examples/ActivityIndicator/ActivityIndicatorExample.js
+++ b/packages/rn-tester/js/examples/ActivityIndicator/ActivityIndicatorExample.js
@@ -10,46 +10,35 @@
 
 import type {Node} from 'React';
 import {ActivityIndicator, StyleSheet, View} from 'react-native';
-import React, {Component} from 'react';
+import React, {useState, useCallback, useRef, useEffect} from 'react';
 
-type State = {|animating: boolean|};
-type Props = $ReadOnly<{||}>;
-type Timer = TimeoutID;
+function ToggleAnimatingActivityIndicator() {
+  const timer = useRef();
 
-class ToggleAnimatingActivityIndicator extends Component<Props, State> {
-  _timer: Timer;
+  const [animating, setAnimating] = useState(true);
 
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      animating: true,
-    };
-  }
-
-  componentDidMount() {
-    this.setToggleTimeout();
-  }
+  const setToggleTimeout: () => void = useCallback(() => {
+    timer.current = setTimeout(() => {
+      setAnimating(currentState => !currentState);
+      setToggleTimeout();
+    }, 2000);
+  }, []);
 
-  componentWillUnmount() {
-    clearTimeout(this._timer);
-  }
+  useEffect(() => {
+    setToggleTimeout();
 
-  setToggleTimeout() {
-    this._timer = setTimeout(() => {
-      this.setState({animating: !this.state.animating});
-      this.setToggleTimeout();
-    }, 2000);
-  }
+    return () => {
+      clearTimeout(timer.current);
+    };
+  }, [timer, setToggleTimeout]);
 
-  render(): Node {
-    return (
-      <ActivityIndicator
-        animating={this.state.animating}
-        style={[styles.centering, {height: 80}]}
-        size="large"
-      />
-    );
-  }
+  return (
+    <ActivityIndicator
+      animating={animating}
+      style={[styles.centering, {height: 80}]}
+      size="large"
+    />
+  );
 }
 
 const styles = StyleSheet.create({
diff --git a/packages/rn-tester/js/examples/Alert/AlertExample.js b/packages/rn-tester/js/examples/Alert/AlertExample.js
index 4e22ba4b6c62..fc354a16af17 100644
--- a/packages/rn-tester/js/examples/Alert/AlertExample.js
+++ b/packages/rn-tester/js/examples/Alert/AlertExample.js
@@ -5,13 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
+ * @flow
  */
 
-import React, {useState} from 'react';
+import * as React from 'react';
+import type {RNTesterModule} from '../../types/RNTesterTypes';
 import {Alert, StyleSheet, Text, TouchableHighlight, View} from 'react-native';
 
 // Shows log on the screen
-const Log = ({message}) =>
+const Log = ({message}: {message: string}) =>
   message ? (
     <View style={styles.logContainer}>
       <Text>
@@ -42,7 +44,7 @@ const AlertWithDefaultButton = () => {
 };
 
 const AlertWithTwoButtons = () => {
-  const [message, setMessage] = useState('');
+  const [message, setMessage] = React.useState('');
 
   const alertMessage = 'Your subscription has expired!';
 
@@ -66,7 +68,7 @@ const AlertWithTwoButtons = () => {
 };
 
 const AlertWithThreeButtons = () => {
-  const [message, setMessage] = useState('');
+  const [message, setMessage] = React.useState('');
 
   const alertMessage = 'Do you want to save your changes?';
 
@@ -92,7 +94,7 @@ const AlertWithThreeButtons = () => {
 };
 
 const AlertWithManyButtons = () => {
-  const [message, setMessage] = useState('');
+  const [message, setMessage] = React.useState('');
 
   const alertMessage =
     'Credibly reintermediate next-generation potentialities after goal-oriented ' +
@@ -122,7 +124,7 @@ const AlertWithManyButtons = () => {
 };
 
 const AlertWithCancelableTrue = () => {
-  const [message, setMessage] = useState('');
+  const [message, setMessage] = React.useState('');
 
   const alertMessage = 'Tapping outside this dialog will dismiss this alert.';
 
@@ -154,7 +156,7 @@ const AlertWithCancelableTrue = () => {
 };
 
 const AlertWithStyles = () => {
-  const [message, setMessage] = useState('');
+  const [message, setMessage] = React.useState('');
 
   const alertMessage = 'Look at the button styles!';
 
@@ -190,6 +192,39 @@ const AlertWithStyles = () => {
   );
 };
 
+const AlertWithStylesPreferred = () => {
+  const [message, setMessage] = React.useState('');
+
+  const alertMessage =
+    "The Preferred button is styled with 'preferred', so it is emphasized over the cancel button.";
+
+  return (
+    <View>
+      <TouchableHighlight
+        style={styles.wrapper}
+        onPress={() =>
+          Alert.alert('Foo Title', alertMessage, [
+            {
+              text: 'Preferred',
+              isPreferred: true,
+              onPress: () => setMessage('Preferred Pressed!'),
+            },
+            {
+              text: 'Cancel',
+              style: 'cancel',
+              onPress: () => setMessage('Cancel Pressed!'),
+            },
+          ])
+        }>
+        <View style={styles.button}>
+          <Text>Tap to view alert</Text>
+        </View>
+      </TouchableHighlight>
+      <Log message={message} />
+    </View>
+  );
+};
+
 const styles = StyleSheet.create({
   wrapper: {
     borderRadius: 5,
@@ -208,12 +243,7 @@ const styles = StyleSheet.create({
   },
 });
 
-exports.title = 'Alerts';
-exports.description =
-  'Alerts display a concise and informative message ' +
-  'and prompt the user to make a decision.';
-exports.documentationURL = 'https://reactnative.dev/docs/alert';
-exports.examples = [
+export const examples = [
   {
     title: 'Alert with default Button',
     description:
@@ -262,4 +292,24 @@ exports.examples = [
       return <AlertWithStyles />;
     },
   },
+  {
+    title: 'Alert with styles + preferred',
+    platform: 'ios',
+    description:
+      "Alert buttons with 'isPreferred' will be emphasized, even over cancel buttons",
+    render(): React.Node {
+      return <AlertWithStylesPreferred />;
+    },
+  },
 ];
+
+export default ({
+  framework: 'React',
+  title: 'Alerts',
+  category: 'UI',
+  documentationURL: 'https://reactnative.dev/docs/alert',
+  description:
+    'Alerts display a concise and informative message and prompt the user to make a decision.',
+  showIndividualExamples: true,
+  examples,
+}: RNTesterModule);
diff --git a/packages/rn-tester/js/examples/Alert/AlertIOSExample.js b/packages/rn-tester/js/examples/Alert/AlertIOSExample.js
index 984ff8b6324c..7f0e19724fdf 100644
--- a/packages/rn-tester/js/examples/Alert/AlertIOSExample.js
+++ b/packages/rn-tester/js/examples/Alert/AlertIOSExample.js
@@ -19,7 +19,7 @@ const {
   Alert,
 } = require('react-native');
 
-const {examples: SharedAlertExamples} = require('./AlertExample');
+import {examples as SharedAlertExamples} from './AlertExample';
 
 import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
 
@@ -53,7 +53,7 @@ class PromptOptions extends React.Component<Props, State> {
     };
   }
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Text style={styles.promptValue}>
diff --git a/packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExTilt.js b/packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExTilt.js
index 3f9552ca88d9..3e9b54a338d7 100644
--- a/packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExTilt.js
+++ b/packages/rn-tester/js/examples/AnimatedGratuitousApp/AnExTilt.js
@@ -60,7 +60,7 @@ class AnExTilt extends React.Component<Object, any> {
           useNativeDriver: false,
         }).start();
         this.state.panX.removeAllListeners();
-        const id = this.state.panX.addListener(({value}) => {
+        const id: any = this.state.panX.addListener(({value}) => {
           // listen until offscreen
           if (Math.abs(value) > 400) {
             this.state.panX.removeListener(id); // offscreen, so stop listening
diff --git a/packages/rn-tester/js/examples/AppState/AppStateExample.js b/packages/rn-tester/js/examples/AppState/AppStateExample.js
index bca42f662725..5357f57c1c95 100644
--- a/packages/rn-tester/js/examples/AppState/AppStateExample.js
+++ b/packages/rn-tester/js/examples/AppState/AppStateExample.js
@@ -21,7 +21,12 @@ class AppStateSubscription extends React.Component<
   $FlowFixMeProps,
   $FlowFixMeState,
 > {
-  state = {
+  state: {
+    appState: ?string,
+    eventsDetected: Array<string>,
+    memoryWarnings: number,
+    previousAppStates: Array<?(any | string)>,
+  } = {
     appState: AppState.currentState,
     previousAppStates: [],
     memoryWarnings: 0,
@@ -76,7 +81,7 @@ class AppStateSubscription extends React.Component<
     });
   };
 
-  render() {
+  render(): React.Node {
     if (this.props.showMemoryWarnings) {
       return (
         <View>
diff --git a/packages/rn-tester/js/examples/Appearance/AppearanceExample.js b/packages/rn-tester/js/examples/Appearance/AppearanceExample.js
index 601bcdf7fbf1..9272c6ab6c0a 100644
--- a/packages/rn-tester/js/examples/Appearance/AppearanceExample.js
+++ b/packages/rn-tester/js/examples/Appearance/AppearanceExample.js
@@ -20,7 +20,7 @@ class ColorSchemeSubscription extends React.Component<
 > {
   _subscription: ?EventSubscription;
 
-  state = {
+  state: {colorScheme: ?string, ...} = {
     colorScheme: Appearance.getColorScheme(),
   };
 
@@ -37,7 +37,7 @@ class ColorSchemeSubscription extends React.Component<
     this._subscription?.remove();
   }
 
-  render() {
+  render(): React.Node {
     return (
       <RNTesterThemeContext.Consumer>
         {theme => {
diff --git a/packages/rn-tester/js/examples/Button/ButtonExample.js b/packages/rn-tester/js/examples/Button/ButtonExample.js
index cc04f1e0bea7..3f49b6119662 100644
--- a/packages/rn-tester/js/examples/Button/ButtonExample.js
+++ b/packages/rn-tester/js/examples/Button/ButtonExample.js
@@ -176,6 +176,28 @@ exports.examples = [
       );
     },
   },
+  {
+    title: 'Button with aria-label="label"',
+    description: ('Note: This prop changes the text that a screen ' +
+      'reader announces (there are no visual differences).': string),
+    render: function (): React.Node {
+      return (
+        <RNTesterThemeContext.Consumer>
+          {theme => {
+            return (
+              <Button
+                onPress={() => onButtonPress('submitted')}
+                testID="aria_label_button"
+                color={theme.LinkColor}
+                title="Submit Application"
+                aria-label="Press to submit your application!"
+              />
+            );
+          }}
+        </RNTesterThemeContext.Consumer>
+      );
+    },
+  },
   {
     title: 'Button with accessibilityState={{disabled: true}}',
     description:
diff --git a/packages/rn-tester/js/examples/Dimensions/DimensionsExample.js b/packages/rn-tester/js/examples/Dimensions/DimensionsExample.js
index e8b8554b2aa1..8e8d1a28da41 100644
--- a/packages/rn-tester/js/examples/Dimensions/DimensionsExample.js
+++ b/packages/rn-tester/js/examples/Dimensions/DimensionsExample.js
@@ -8,38 +8,24 @@
  * @flow
  */
 
-import type {EventSubscription} from 'react-native/Libraries/vendor/emitter/EventEmitter';
 import {Dimensions, Text, useWindowDimensions} from 'react-native';
 import * as React from 'react';
+import {useState, useEffect} from 'react';
 
-class DimensionsSubscription extends React.Component<
-  {dim: string, ...},
-  {dims: Object, ...},
-> {
-  state = {
-    dims: Dimensions.get(this.props.dim),
-  };
+type Props = {dim: string};
 
-  _dimensionsSubscription: ?EventSubscription;
+function DimensionsSubscription(props: Props) {
+  const [dims, setDims] = useState(() => Dimensions.get(props.dim));
 
-  componentDidMount() {
-    this._dimensionsSubscription = Dimensions.addEventListener(
-      'change',
-      dimensions => {
-        this.setState({
-          dims: dimensions[this.props.dim],
-        });
-      },
-    );
-  }
+  useEffect(() => {
+    const subscription = Dimensions.addEventListener('change', dimensions => {
+      setDims(dimensions[props.dim]);
+    });
 
-  componentWillUnmount() {
-    this._dimensionsSubscription?.remove();
-  }
+    return () => subscription.remove();
+  }, [props.dim]);
 
-  render() {
-    return <Text>{JSON.stringify(this.state.dims, null, 2)}</Text>;
-  }
+  return <Text>{JSON.stringify(dims, null, 2)}</Text>;
 }
 
 const DimensionsViaHook = () => {
diff --git a/packages/rn-tester/js/examples/Experimental/Compatibility/CompatibilityNativeGestureHandling.js b/packages/rn-tester/js/examples/Experimental/Compatibility/CompatibilityNativeGestureHandling.js
new file mode 100644
index 000000000000..4494a382640f
--- /dev/null
+++ b/packages/rn-tester/js/examples/Experimental/Compatibility/CompatibilityNativeGestureHandling.js
@@ -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.
+ *
+ * @format
+ * @flow
+ */
+
+import * as React from 'react';
+import {ScrollView, View, StyleSheet} from 'react-native';
+import EventfulView from '../W3CPointerEventsEventfulView';
+import type {RNTesterModuleExample} from '../../../types/RNTesterTypes';
+
+const styles = StyleSheet.create({
+  container: {
+    borderWidth: 1,
+  },
+  eventfulView: {
+    borderWidth: 1,
+    height: 100,
+    width: '100%',
+  },
+  lighblue: {
+    backgroundColor: 'lightblue',
+  },
+  item: {
+    height: 40,
+  },
+});
+
+function CompatibilityNativeGestureHandling(): React.Node {
+  return (
+    <View style={styles.container}>
+      <ScrollView>
+        {Array(100)
+          .fill()
+          .map((_, index) => {
+            return (
+              <EventfulView
+                log={console.log}
+                onDown
+                onCancel
+                key={index}
+                name={`${index}`}
+                style={[styles.item, index % 2 === 0 ? styles.lighblue : null]}
+              />
+            );
+          })}
+      </ScrollView>
+    </View>
+  );
+}
+
+export default ({
+  name: 'compatibility_native_gesture',
+  title: 'Native Gesture Handling Example',
+  description:
+    'Scroll to trigger a native gesture. Verify no native events are being fired once a native gesture starts until it ends. A pointer cancel will be triggered when a native gesture starts.',
+  render(): React.Node {
+    return <CompatibilityNativeGestureHandling />;
+  },
+}: RNTesterModuleExample);
diff --git a/packages/rn-tester/js/examples/Experimental/Compatibility/ManyPointersPropertiesExample.js b/packages/rn-tester/js/examples/Experimental/Compatibility/ManyPointersPropertiesExample.js
new file mode 100644
index 000000000000..f07df3a3a878
--- /dev/null
+++ b/packages/rn-tester/js/examples/Experimental/Compatibility/ManyPointersPropertiesExample.js
@@ -0,0 +1,63 @@
+/**
+ * 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
+ */
+
+import * as React from 'react';
+import {View, Text, StyleSheet} from 'react-native';
+import type {RNTesterModuleExample} from '../../../types/RNTesterTypes';
+import type {PointerEvent} from 'react-native/Libraries/Types/CoreEventTypes';
+
+const styles = StyleSheet.create({
+  container: {height: '30%', width: '100%', backgroundColor: 'black'},
+  properties: {},
+  property: {borderWidth: 1, margin: 10},
+});
+
+function ManyPointersPropertiesExample(): React.Node {
+  const [data, setData] = React.useState<{}>({});
+  const onPointerMove = (event: PointerEvent) => {
+    const pointerId = event.nativeEvent.pointerId;
+    setData({...data, [pointerId]: event.nativeEvent});
+  };
+
+  return (
+    <>
+      <View style={styles.container} onPointerMove={onPointerMove} />
+      <View style={styles.properties}>
+        {Object.entries(data).map(
+          //$FlowFixMe can't supply generic for Object.entries
+          ([key, evt]: [string, PointerEvent['nativeEvent']]) => (
+            <View style={styles.property} key={key}>
+              <Text>PointerID: {evt.pointerId}</Text>
+              <Text>
+                Offset: [{evt.offsetX.toPrecision(3)},{' '}
+                {evt.offsetY.toPrecision(3)}]
+              </Text>
+              <Text>
+                Coordinates: [{evt.clientX.toPrecision(3)},{' '}
+                {evt.clientY.toPrecision(3)}]
+              </Text>
+              <Text>Button: {evt.button}</Text>
+              <Text>Pressure: {evt.pressure}</Text>
+            </View>
+          ),
+        )}
+      </View>
+    </>
+  );
+}
+
+export default ({
+  name: 'many_pointers_properties_example',
+  description: 'Display of properties for multiple pointers',
+  title: 'Display Properties of many pointers',
+  render(): React.Node {
+    return <ManyPointersPropertiesExample />;
+  },
+}: RNTesterModuleExample);
diff --git a/packages/rn-tester/js/examples/Experimental/PlatformTest/README.md b/packages/rn-tester/js/examples/Experimental/PlatformTest/README.md
index 7814ecb2405d..02365c92f4a4 100644
--- a/packages/rn-tester/js/examples/Experimental/PlatformTest/README.md
+++ b/packages/rn-tester/js/examples/Experimental/PlatformTest/README.md
@@ -22,11 +22,11 @@ function ExampleTestCase ({ harness }) { /* ... */ }
 ```
 
 
-As of writting this README there are 2 different types of tests that the `harness` prop provides:
+As of writing this README there are 2 different types of tests that the `harness` prop provides:
 
-### `test(testcase: (TestContext) => void, testName: string)`
+### `test(testcase: (TestContext) => void, testName: string, options?: TestOptions)`
 
-This is a method to create "regular" test reminicent of other frameworks such as Jest. These are meant to be run imperatively, and while that means that they technically could work in a `useEffect` hook as a way to run the test "on mount" — it is instead recommended to try and keep these tests in callbacks instead. A good alternative to running the test on mount would be to instead put the test in a callback and render a "Start Test" button which executes the callback.
+This is a method to create "regular" test reminiscent of other frameworks such as Jest. These are meant to be run imperatively, and while that means that they technically could work in a `useEffect` hook as a way to run the test "on mount" — it is instead recommended to try and keep these tests in callbacks instead. A good alternative to running the test on mount would be to instead put the test in a callback and render a "Start Test" button which executes the callback.
 
 The first argument is the closure in which you will run your test and make assertions. The assertions are contained in the `TestContext` object which is provided in the test closure's first argument and contains the following assertions:
 
@@ -35,6 +35,10 @@ The first argument is the closure in which you will run your test and make asser
 * `assert_greater_than_equal(a: number, b: number, description: string): void`
 * `assert_less_than_equal(a: number, b: number, description: string): void`
 
+An optional third argument can be used for specifying additional options to the test — that object currently has the following properties (all of which are optional themselves):
+
+* `skip: boolean`: In cases where we want the test to be registered but we don't want it to contribute to the pass/fail count.
+
 Here's what a basic/contrived example which verifies the layout of a basic view:
 
 ```js
@@ -84,7 +88,7 @@ Here's what a basic example would look like for verifying that `pointermove` eve
 
 ```js
 function BasicPointerMoveTestCase({harness}) {
-  const testPointerMove = harness.useAsyncTest('pointermove event recieved');
+  const testPointerMove = harness.useAsyncTest('pointermove event received');
 
   return (
     <View
diff --git a/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTest.js b/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTest.js
index 92389f36b812..8c2f40a2208e 100644
--- a/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTest.js
+++ b/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTest.js
@@ -39,9 +39,11 @@ export default function RNTesterPlatformTest(props: Props): React.MixedElement {
     <View style={styles.root}>
       <View style={styles.testcaseContainer}>
         <Text style={[styles.textBlock, styles.title]}>{title}</Text>
-        <Text style={[styles.textBlock, styles.description]}>
-          {description}
-        </Text>
+        {description !== '' ? (
+          <Text style={[styles.textBlock, styles.description]}>
+            {description}
+          </Text>
+        ) : null}
         <RNTesterPlatformTestInstructions
           instructions={instructions}
           style={[styles.instructions, styles.block]}
diff --git a/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestEventRecorder.js b/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestEventRecorder.js
new file mode 100644
index 000000000000..72adba1e9627
--- /dev/null
+++ b/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestEventRecorder.js
@@ -0,0 +1,177 @@
+/**
+ * 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
+ */
+
+import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
+
+import {useMemo} from 'react';
+
+type EventRecorderOptions = $ReadOnly<{
+  mergeEventTypes: Array<string>,
+  relevantEvents: Array<string>,
+}>;
+
+type EventRecord = {
+  chronologicalOrder: number,
+  sequentialOccurrences: number,
+  nestedEvents: ?Array<EventRecord>,
+  target: string,
+  type: string,
+  event: Object,
+};
+
+class RNTesterPlatformTestEventRecorder {
+  allRecords: Array<EventRecord> = [];
+  relevantEvents: Array<string> = [];
+  rawOrder: number = 1;
+  eventsInScope: Array<EventRecord> = []; // Tracks synchronous event dispatches
+  recording: boolean = true;
+
+  mergeTypesTruthMap: {[string]: boolean} = {};
+
+  constructor(options: EventRecorderOptions) {
+    if (options.mergeEventTypes && Array.isArray(options.mergeEventTypes)) {
+      options.mergeEventTypes.forEach(eventType => {
+        this.mergeTypesTruthMap[eventType] = true;
+      });
+    }
+    if (options.relevantEvents && Array.isArray(options.relevantEvents)) {
+      this.relevantEvents = options.relevantEvents;
+    }
+  }
+
+  _createEventRecord(
+    rawEvent: Object,
+    target: string,
+    type: string,
+  ): EventRecord {
+    return {
+      chronologicalOrder: this.rawOrder++,
+      sequentialOccurrences: 1,
+      nestedEvents: undefined,
+      target,
+      type,
+      event: rawEvent,
+    };
+  }
+
+  _recordEvent(e: Object, targetName: string, eventType: string): ?EventRecord {
+    const record = this._createEventRecord(e, targetName, eventType);
+    let recordList = this.allRecords;
+    // Adjust which sequential list to use depending on scope
+    if (this.eventsInScope.length > 0) {
+      let newRecordList =
+        this.eventsInScope[this.eventsInScope.length - 1].nestedEvents;
+      if (newRecordList == null) {
+        newRecordList = this.eventsInScope[
+          this.eventsInScope.length - 1
+        ].nestedEvents = [];
+      }
+      recordList = newRecordList;
+    }
+    if (this.mergeTypesTruthMap[eventType] && recordList.length > 0) {
+      const tail = recordList[recordList.length - 1];
+      // Same type and target?
+      if (tail.type === eventType && tail.target === targetName) {
+        tail.sequentialOccurrences++;
+        return;
+      }
+    }
+    recordList.push(record);
+    return record;
+  }
+
+  _generateRecordedEventHandlerWithCallback(
+    targetName: string,
+    callback?: (event: Object, eventType: string) => void,
+  ): (Object, string) => void {
+    return (e: Object, eventType: string) => {
+      if (this.recording) {
+        this._recordEvent(e, targetName, eventType);
+        if (callback) {
+          callback(e, eventType);
+        }
+      }
+    };
+  }
+
+  useRecorderTestEventHandlers(
+    targetNames: $ReadOnlyArray<string>,
+    callback?: (event: Object, eventType: string, targetName: string) => void,
+  ): $ReadOnly<{[targetName: string]: ViewProps}> {
+    // Yes this method exists as a class's prototype method but it will still only be used
+    // in functional components
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    return useMemo(() => {
+      const result: {[targetName: string]: ViewProps} = {};
+      for (const targetName of targetNames) {
+        const recordedEventHandler =
+          this._generateRecordedEventHandlerWithCallback(
+            targetName,
+            (event, eventType) =>
+              callback && callback(event, eventType, targetName),
+          );
+        const eventListenerProps = this.relevantEvents.reduce(
+          (acc, eventName) => {
+            const eventPropName =
+              'on' + eventName[0].toUpperCase() + eventName.slice(1);
+            return {
+              ...acc,
+              [eventPropName]: e => {
+                recordedEventHandler(e, eventName);
+              },
+            };
+          },
+          {},
+        );
+        result[targetName] = eventListenerProps;
+      }
+      return result;
+    }, [callback, targetNames]);
+  }
+
+  getRecords(): Array<EventRecord> {
+    return this.allRecords;
+  }
+
+  checkRecords(
+    expected: Array<{
+      type: string,
+      target: string,
+      optional?: boolean,
+    }>,
+  ): boolean {
+    if (expected.length < this.allRecords.length) {
+      return false;
+    }
+    let j = 0;
+    for (let i = 0; i < expected.length; ++i) {
+      if (j >= this.allRecords.length) {
+        if (expected[i].optional === true) {
+          continue;
+        }
+        return false;
+      }
+      if (
+        expected[i].type === this.allRecords[j].type &&
+        expected[i].target === this.allRecords[j].target
+      ) {
+        j++;
+        continue;
+      }
+      if (expected[i].optional === true) {
+        continue;
+      }
+      return false;
+    }
+    return true;
+  }
+}
+
+export default RNTesterPlatformTestEventRecorder;
diff --git a/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestMinimizedResultView.js b/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestMinimizedResultView.js
index 275ede2a7105..ed9a2b2080a1 100644
--- a/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestMinimizedResultView.js
+++ b/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestMinimizedResultView.js
@@ -10,6 +10,8 @@
 
 import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
 
+import RNTesterPlatformTestResultsText from './RNTesterPlatformTestResultsText';
+
 import * as React from 'react';
 import {View, Text, StyleSheet, TouchableHighlight} from 'react-native';
 
@@ -18,6 +20,7 @@ type Props = $ReadOnly<{|
   numError: number,
   numPass: number,
   numPending: number,
+  numSkipped: number,
   onPress?: () => void,
   style?: ?ViewStyleProp,
 |}>;
@@ -26,26 +29,22 @@ export default function RNTesterPlatformTestMinimizedResultView({
   numError,
   numPass,
   numPending,
+  numSkipped,
   onPress,
   style,
 }: Props): React.MixedElement {
   return (
     <TouchableHighlight onPress={onPress} style={[styles.root, style]}>
       <View style={styles.innerContainer}>
-        <View style={styles.statsContainer}>
-          <Text style={styles.summaryText}>
-            {numPass} <Text style={styles.passText}>Pass</Text>
-          </Text>
-          <Text style={styles.summaryText}>
-            {numFail} <Text style={styles.failText}>Fail</Text>
-          </Text>
-          <Text style={styles.summaryText}>
-            {numError} <Text style={styles.errorText}>Error</Text>
-          </Text>
-          <Text style={styles.summaryText}>
-            {numPending} <Text style={styles.pendingText}>Pending</Text>
-          </Text>
-        </View>
+        <Text style={styles.statsContainer}>
+          <RNTesterPlatformTestResultsText
+            numError={numError}
+            numFail={numFail}
+            numPass={numPass}
+            numPending={numPending}
+            numSkipped={numSkipped}
+          />
+        </Text>
         <Text style={styles.caret}>⌃</Text>
       </View>
     </TouchableHighlight>
@@ -59,12 +58,6 @@ const styles = StyleSheet.create({
     marginEnd: 8,
     opacity: 0.5,
   },
-  errorText: {
-    color: 'orange',
-  },
-  failText: {
-    color: 'red',
-  },
   innerContainer: {
     width: '100%',
     height: '100%',
@@ -74,12 +67,6 @@ const styles = StyleSheet.create({
     paddingHorizontal: 8,
     backgroundColor: 'white',
   },
-  passText: {
-    color: 'green',
-  },
-  pendingText: {
-    color: 'gray',
-  },
   root: {
     borderTopColor: 'rgb(171, 171, 171)',
     borderTopWidth: StyleSheet.hairlineWidth,
@@ -89,8 +76,6 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     alignItems: 'center',
     justifyContent: 'flex-start',
-  },
-  summaryText: {
     marginStart: 8,
   },
 });
diff --git a/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestResultView.js b/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestResultView.js
index fbe4696c7bb0..f46aac110903 100644
--- a/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestResultView.js
+++ b/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestResultView.js
@@ -19,11 +19,13 @@ import type {
 } from './RNTesterPlatformTestTypes';
 
 import RNTesterPlatformTestMinimizedResultView from './RNTesterPlatformTestMinimizedResultView';
+import RNTesterPlatformTestResultsText from './RNTesterPlatformTestResultsText';
 
 import * as React from 'react';
 import {useMemo, useState, useCallback} from 'react';
 import {
   Button,
+  Switch,
   View,
   Text,
   StyleSheet,
@@ -40,14 +42,17 @@ const DISPLAY_STATUS_MAPPING: {[PlatformTestResultStatus]: string} = {
   PASS: 'Pass',
   FAIL: 'Fail',
   ERROR: 'Error',
+  SKIPPED: 'Skipped',
 };
 
 type FilterModalProps = $ReadOnly<{
   filterText: string,
   setFilterText: (newFilterText: string) => void,
+  filterFail: boolean,
+  setFilterFail: (newFilterFail: boolean) => void,
 }>;
 function FilterModalButton(props: FilterModalProps) {
-  const {filterText, setFilterText} = props;
+  const {filterText, setFilterText, filterFail, setFilterFail} = props;
 
   const [modalVisible, setModalVisible] = useState(false);
   const [pendingFilterText, setPendingFilterText] = useState(filterText);
@@ -66,7 +71,14 @@ function FilterModalButton(props: FilterModalProps) {
     setModalVisible(false);
   }, []);
 
-  const onPendingTextChange = useCallback(newText => {
+  const onFilterFailStatus = useCallback(
+    (value: boolean) => {
+      setFilterFail(value);
+    },
+    [setFilterFail],
+  );
+
+  const onPendingTextChange = useCallback((newText: string) => {
     setPendingFilterText(newText);
   }, []);
 
@@ -80,7 +92,7 @@ function FilterModalButton(props: FilterModalProps) {
         transparent={true}>
         <SafeAreaView style={styles.filterModalRoot}>
           <KeyboardAvoidingView
-            style={styles.filterModalKeboardAvoidingRoot}
+            style={styles.filterModalKeyboardAvoidingRoot}
             behavior={Platform.OS === 'ios' ? 'padding' : 'height'}>
             <View style={styles.filterModalContainer}>
               <View style={styles.filterModalContentContainer}>
@@ -98,6 +110,15 @@ function FilterModalButton(props: FilterModalProps) {
                   onChangeText={onPendingTextChange}
                   onSubmitEditing={onFilterSubmit}
                 />
+                <View style={styles.filterFail}>
+                  <Text>
+                    {filterFail ? 'Filter All Status' : 'Filter Only Failed'}
+                  </Text>
+                  <Switch
+                    value={filterFail}
+                    onValueChange={onFilterFailStatus}
+                  />
+                </View>
               </View>
               <View style={styles.filterModalActionsContainer}>
                 <Button title="Cancel" onPress={onFilterCancel} />
@@ -173,17 +194,22 @@ export default function RNTesterPlatformTestResultView(
   const {numPending, reset, results, style} = props;
 
   const [filterText, setFilterText] = useState('');
+  const [filterFailStatus, setFilterFailStatus] = useState(false);
 
   const filteredResults = useMemo(() => {
+    const statusFiltered = filterFailStatus
+      ? results.filter(result => result.status === 'FAIL')
+      : results;
+
     if (filterText === '') {
-      return results;
+      return statusFiltered;
     }
-    return results.filter(result =>
+    return statusFiltered.filter(result =>
       result.name.toLowerCase().includes(filterText.toLowerCase()),
     );
-  }, [filterText, results]);
+  }, [filterFailStatus, filterText, results]);
 
-  const {numPass, numFail, numError} = useMemo(
+  const {numPass, numFail, numError, numSkipped} = useMemo(
     () =>
       filteredResults.reduce(
         (acc, result) => {
@@ -194,12 +220,15 @@ export default function RNTesterPlatformTestResultView(
               return {...acc, numFail: acc.numFail + 1};
             case 'ERROR':
               return {...acc, numError: acc.numError + 1};
+            case 'SKIPPED':
+              return {...acc, numSkipped: acc.numSkipped + 1};
           }
         },
         {
           numPass: 0,
           numFail: 0,
           numError: 0,
+          numSkipped: 0,
         },
       ),
     [filteredResults],
@@ -208,6 +237,7 @@ export default function RNTesterPlatformTestResultView(
   const [resultsExpanded, setResultsExpanded] = useState(false);
 
   const handleReset = useCallback(() => {
+    setFilterFailStatus(false);
     setFilterText('');
     reset();
     setResultsExpanded(false);
@@ -221,6 +251,11 @@ export default function RNTesterPlatformTestResultView(
     setResultsExpanded(false);
   }, []);
 
+  const filteredNotice = `Filtered${filterFailStatus ? ' (Failed)' : ''}${
+    filterText !== '' ? `: ${filterText}` : ''
+  }
+  `;
+
   return (
     <>
       <RNTesterPlatformTestMinimizedResultView
@@ -228,6 +263,7 @@ export default function RNTesterPlatformTestResultView(
         numError={numError}
         numPass={numPass}
         numPending={numPending}
+        numSkipped={numSkipped}
         onPress={handleMinimizedPress}
         style={style}
       />
@@ -244,38 +280,23 @@ export default function RNTesterPlatformTestResultView(
           <View style={styles.resultsHeader}>
             <View style={styles.titleContainer}>
               <Text style={styles.title}>Results</Text>
-              {filterText !== '' ? (
-                <Text style={styles.filteredText}>
-                  (Filtered: '{filterText}')
-                </Text>
-              ) : null}
+              <Text style={styles.filteredText}>{filteredNotice}</Text>
               <Text style={styles.summaryContainer}>
-                <Text>
-                  {numPass} <Text style={styles.passText}>Pass</Text>
-                </Text>
-                {'  '}
-                <Text>
-                  {numFail} <Text style={styles.failText}>Fail</Text>
-                </Text>
-                {'  '}
-                <Text>
-                  {numError} <Text style={styles.errorText}>Error</Text>
-                </Text>
-                {numPending > 0 ? (
-                  <>
-                    {' '}
-                    <Text>
-                      {numPending}{' '}
-                      <Text style={styles.pendingText}>Pending</Text>
-                    </Text>
-                  </>
-                ) : null}
+                <RNTesterPlatformTestResultsText
+                  numError={numError}
+                  numFail={numFail}
+                  numPass={numPass}
+                  numPending={numPending}
+                  numSkipped={numSkipped}
+                />
               </Text>
             </View>
             <View style={styles.actionsContainer}>
               <FilterModalButton
                 filterText={filterText}
                 setFilterText={setFilterText}
+                filterFail={filterFailStatus}
+                setFilterFail={setFilterFailStatus}
               />
               <View style={styles.buttonSpacer} />
               <Button title="Reset" onPress={handleReset} />
@@ -380,11 +401,17 @@ const styles = StyleSheet.create({
     borderColor: 'rgb(171, 171, 171)',
     borderRadius: 8,
   },
-  filterModalKeboardAvoidingRoot: {
+  filterModalKeyboardAvoidingRoot: {
     flex: 1,
     alignItems: 'center',
     justifyContent: 'center',
   },
+  filterFail: {
+    alignItems: 'center',
+    padding: 10,
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+  },
   passText: {
     color: 'green',
   },
@@ -399,6 +426,9 @@ const styles = StyleSheet.create({
     paddingTop: 8,
     flex: 0,
   },
+  skippedText: {
+    color: 'blue',
+  },
   table: {
     flex: 1,
   },
@@ -446,4 +476,5 @@ const STATUS_TEXT_STYLE_MAPPING: {[PlatformTestResultStatus]: TextStyle} = {
   PASS: styles.passText,
   FAIL: styles.failText,
   ERROR: styles.errorText,
+  SKIPPED: styles.skippedText,
 };
diff --git a/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestResultsText.js b/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestResultsText.js
new file mode 100644
index 000000000000..ee35d22d976c
--- /dev/null
+++ b/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestResultsText.js
@@ -0,0 +1,78 @@
+/**
+ * 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
+ */
+
+import {Text, StyleSheet} from 'react-native';
+import * as React from 'react';
+
+type Props = $ReadOnly<{
+  numPass: number,
+  numFail: number,
+  numError: number,
+  numPending: number,
+  numSkipped: number,
+}>;
+export default function RNTesterPlatformTestResultsText(
+  props: Props,
+): React.MixedElement {
+  const {numPass, numFail, numError, numPending, numSkipped} = props;
+  return (
+    <>
+      <Text>
+        {numPass} <Text style={styles.passText}>Pass</Text>
+      </Text>
+      {'  '}
+      <Text>
+        {numFail} <Text style={styles.failText}>Fail</Text>
+      </Text>
+      {numSkipped > 0 ? (
+        <>
+          {'  '}
+          <Text>
+            {numSkipped} <Text style={styles.skippedText}>Skipped</Text>
+          </Text>
+        </>
+      ) : null}
+      {numError > 0 ? (
+        <>
+          {'  '}
+          <Text>
+            {numError} <Text style={styles.errorText}>Error</Text>
+          </Text>
+        </>
+      ) : null}
+      {numPending > 0 ? (
+        <>
+          {' '}
+          <Text>
+            {numPending} <Text style={styles.pendingText}>Pending</Text>
+          </Text>
+        </>
+      ) : null}
+    </>
+  );
+}
+
+const styles = StyleSheet.create({
+  errorText: {
+    color: 'orange',
+  },
+  failText: {
+    color: 'red',
+  },
+  passText: {
+    color: 'green',
+  },
+  pendingText: {
+    color: 'gray',
+  },
+  skippedText: {
+    color: 'blue',
+  },
+});
diff --git a/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestTypes.js b/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestTypes.js
index 2097d43dd8d6..89678a796db7 100644
--- a/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestTypes.js
+++ b/packages/rn-tester/js/examples/Experimental/PlatformTest/RNTesterPlatformTestTypes.js
@@ -28,18 +28,19 @@ export type PlatformTestAssertionResult =
   | PassingPlatformTestAssertionResult
   | FailingPlatformTestAssertionResult;
 
-export type PlatformTestResultStatus = 'PASS' | 'FAIL' | 'ERROR';
+export type PlatformTestResultStatus = 'PASS' | 'FAIL' | 'ERROR' | 'SKIPPED';
 
 export type PlatformTestResult = $ReadOnly<{|
   name: string,
   status: PlatformTestResultStatus,
   assertions: $ReadOnlyArray<PlatformTestAssertionResult>,
-  error: mixed | null, // null is technically unecessary but is kept to ensure the error is described as nullable
+  error: mixed | null, // null is technically unnecessary but is kept to ensure the error is described as nullable
 |}>;
 
 export type PlatformTestContext = $ReadOnly<{
   assert_true(a: boolean, description: string): void,
   assert_equals(a: any, b: any, description: string): void,
+  assert_not_equals(a: any, b: any, description: string): void,
   assert_greater_than_equal(a: number, b: number, description: string): void,
   assert_less_than_equal(a: number, b: number, description: string): void,
 }>;
@@ -48,10 +49,19 @@ export type PlatformTestCase = (context: PlatformTestContext) => void;
 
 export type AsyncPlatformTest = $ReadOnly<{|
   done(): void,
+  step(testcase: PlatformTestCase): void,
+|}>;
+
+export type SyncTestOptions = $ReadOnly<{|
+  skip?: boolean,
 |}>;
 
 export type PlatformTestHarness = $ReadOnly<{|
-  test(testcase: PlatformTestCase, name: string): void,
+  test(
+    testcase: PlatformTestCase,
+    name: string,
+    options?: SyncTestOptions,
+  ): void,
   useAsyncTest(description: string, timeout?: number): AsyncPlatformTest,
 |}>;
 
diff --git a/packages/rn-tester/js/examples/Experimental/PlatformTest/usePlatformTestHarness.js b/packages/rn-tester/js/examples/Experimental/PlatformTest/usePlatformTestHarness.js
index 4216839d019d..b0cd68e06f17 100644
--- a/packages/rn-tester/js/examples/Experimental/PlatformTest/usePlatformTestHarness.js
+++ b/packages/rn-tester/js/examples/Experimental/PlatformTest/usePlatformTestHarness.js
@@ -16,6 +16,7 @@ import type {
   PlatformTestCase,
   PlatformTestAssertionResult,
   PlatformTestContext,
+  SyncTestOptions,
 } from './RNTesterPlatformTestTypes';
 
 type AsyncTestStatus = 'NOT_RAN' | 'COMPLETED' | 'TIMED_OUT';
@@ -34,8 +35,13 @@ function constructAsyncTestHook(
       $ReadOnly<{[string]: AsyncTestStatus}>,
     ) => $ReadOnly<{[string]: AsyncTestStatus}>,
   ) => void,
+  runTestCase: (
+    testCase: PlatformTestCase,
+  ) => Array<PlatformTestAssertionResult>,
 ) {
   return (description: string, timeoutMs?: number = 10000) => {
+    const assertionsRef = useRef<Array<PlatformTestAssertionResult>>([]);
+
     const timeoutIDRef = useRef<TimeoutID | null>(null);
 
     const timeoutHandler = useCallback(() => {
@@ -43,6 +49,7 @@ function constructAsyncTestHook(
       addTestResult({
         name: description,
         assertions: [
+          ...assertionsRef.current,
           {
             passing: false,
             name: 'async_timeout',
@@ -81,13 +88,16 @@ function constructAsyncTestHook(
           addTestResult({
             name: description,
             assertions: [
+              ...assertionsRef.current,
               {
                 passing: true,
                 name: 'async_test',
                 description: 'async test should be completed',
               },
             ],
-            status: 'PASS',
+            status: didAllAssertionsPass(assertionsRef.current)
+              ? 'PASS'
+              : 'FAIL',
             error: null,
           });
           return {...prev, [description]: 'COMPLETED'};
@@ -96,6 +106,11 @@ function constructAsyncTestHook(
       });
     }, [description]);
 
+    const stepHandler = useCallback((testCase: PlatformTestCase) => {
+      const stepAssertions = runTestCase(testCase);
+      assertionsRef.current.push(...stepAssertions);
+    }, []);
+
     // test registration
     useEffect(() => {
       updateAsyncTestStatuses(prev => {
@@ -109,8 +124,9 @@ function constructAsyncTestHook(
     return useMemo(
       () => ({
         done: completionHandler,
+        step: stepHandler,
       }),
-      [completionHandler],
+      [completionHandler, stepHandler],
     );
   };
 }
@@ -128,11 +144,11 @@ export default function usePlatformTestHarness(): PlatformTestHarnessHookResult
     $ReadOnlyArray<PlatformTestResult>,
   >([]);
 
-  // Since updaing the test results array can get expensive at larger sizes
+  // Since updating the test results array can get expensive at larger sizes
   // we use a basic debouncing logic to minimize the number of re-renders
   // caused by adding test results
   const resultQueueRef = useRef<Array<PlatformTestResult>>([]);
-  const schedulerTimeoutIdRef = useRef(null);
+  const schedulerTimeoutIdRef = useRef<null | TimeoutID>(null);
 
   const commitResults = useCallback(() => {
     const queuedResults = resultQueueRef.current;
@@ -158,7 +174,7 @@ export default function usePlatformTestHarness(): PlatformTestHarnessHookResult
     [scheduleResultsCommit],
   );
 
-  // When reseting the test results we should also re-mount the
+  // When resetting the test results we should also re-mount the
   // so we apply a key to that component which we can increment
   // to ensure it re-mounts
   const [testElementKey, setTestElementKey] = useState<number>(0);
@@ -173,65 +189,94 @@ export default function usePlatformTestHarness(): PlatformTestHarnessHookResult
     setTestElementKey(k => k + 1);
   }, []);
 
+  const runTestCase = useCallback((testCase: PlatformTestCase) => {
+    const assertionResults: Array<PlatformTestAssertionResult> = [];
+
+    const baseAssert = (
+      assertionName: string,
+      testConditionResult: boolean,
+      description: string,
+      failureMessage: string,
+    ) => {
+      if (testConditionResult) {
+        assertionResults.push({
+          passing: true,
+          name: assertionName,
+          description,
+        });
+      } else {
+        assertionResults.push({
+          passing: false,
+          name: assertionName,
+          description,
+          failureMessage,
+        });
+      }
+    };
+
+    const context: PlatformTestContext = {
+      assert_true: (cond: boolean, desc: string) =>
+        baseAssert(
+          'assert_true',
+          cond,
+          desc,
+          "expected 'true' but received 'false'",
+        ),
+      assert_equals: (a: any, b: any, desc: string) =>
+        baseAssert(
+          'assert_equal',
+          a === b,
+          desc,
+          `expected ${a} to equal ${b}`,
+        ),
+      assert_not_equals: (a: any, b: any, desc: string) =>
+        baseAssert(
+          'assert_not_equals',
+          a !== b,
+          desc,
+          `expected ${a} not to equal ${b}`,
+        ),
+      assert_greater_than_equal: (a: number, b: number, desc: string) =>
+        baseAssert(
+          'assert_greater_than_equal',
+          a >= b,
+          desc,
+          `expected ${a} to be greater than or equal to ${b}`,
+        ),
+      assert_less_than_equal: (a: number, b: number, desc: string) =>
+        baseAssert(
+          'assert_less_than_equal',
+          a <= b,
+          desc,
+          `expected ${a} to be less than or equal to ${b}`,
+        ),
+    };
+
+    testCase(context);
+
+    return assertionResults;
+  }, []);
+
   const testFunction: PlatformTestHarness['test'] = useCallback(
-    (testCase: PlatformTestCase, name: string): void => {
-      const assertionResults: Array<PlatformTestAssertionResult> = [];
-
-      const baseAssert = (
-        assertionName: string,
-        testConditionResult: boolean,
-        description: string,
-        failureMessage: string,
-      ) => {
-        if (testConditionResult) {
-          assertionResults.push({
-            passing: true,
-            name: assertionName,
-            description,
-          });
-        } else {
-          assertionResults.push({
-            passing: false,
-            name: assertionName,
-            description,
-            failureMessage,
-          });
-        }
-      };
+    (
+      testCase: PlatformTestCase,
+      name: string,
+      options?: SyncTestOptions,
+    ): void => {
+      const {skip = false} = options ?? {};
 
-      const context: PlatformTestContext = {
-        assert_true: (cond: boolean, desc: string) =>
-          baseAssert(
-            'assert_true',
-            cond,
-            desc,
-            "expected 'true' but recieved 'false'",
-          ),
-        assert_equals: (a: any, b: any, desc: string) =>
-          baseAssert(
-            'assert_equal',
-            a === b,
-            desc,
-            `expected ${a} to equal ${b}`,
-          ),
-        assert_greater_than_equal: (a: number, b: number, desc: string) =>
-          baseAssert(
-            'assert_greater_than_equal',
-            a >= b,
-            desc,
-            `expected ${a} to be greater than or equal to ${b}`,
-          ),
-        assert_less_than_equal: (a: number, b: number, desc: string) =>
-          baseAssert(
-            'assert_less_than_equal',
-            a <= b,
-            desc,
-            `expected ${a} to be less than or equal to ${b}`,
-          ),
-      };
+      if (skip) {
+        addTestResult({
+          name,
+          status: 'SKIPPED',
+          assertions: [],
+          error: null,
+        });
+        return;
+      }
 
       try {
-        testCase(context);
+        const assertionResults = runTestCase(testCase);
         addTestResult({
           name,
           status: didAllAssertionsPass(assertionResults) ? 'PASS' : 'FAIL',
@@ -242,17 +287,22 @@ export default function usePlatformTestHarness(): PlatformTestHarnessHookResult
         addTestResult({
           name,
           status: 'ERROR',
-          assertions: assertionResults,
+          assertions: [],
           error,
         });
       }
     },
-    [addTestResult],
+    [addTestResult, runTestCase],
   );
 
   const asyncTestHook: PlatformTestHarness['useAsyncTest'] = useMemo(
-    () => constructAsyncTestHook(addTestResult, updateAsyncTestStatuses),
-    [addTestResult],
+    () =>
+      constructAsyncTestHook(
+        addTestResult,
+        updateAsyncTestStatuses,
+        runTestCase,
+      ),
+    [addTestResult, runTestCase],
   );
 
   const numPendingAsyncTests = useMemo(() => {
diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesHoverablePointers.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesHoverablePointers.js
index 0e69dd2b3762..6582d9f3483a 100644
--- a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesHoverablePointers.js
+++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesHoverablePointers.js
@@ -36,8 +36,8 @@ function PointerEventAttributesHoverablePointersTestCase(
 ) {
   const {harness} = props;
 
-  const detected_pointertypesRef = useRef({});
-  const detected_eventTypesRef = useRef({});
+  const detected_pointertypesRef = useRef(({}: {[string]: boolean}));
+  const detected_eventTypesRef = useRef(({}: {[string]: boolean}));
   const expectedPointerIdRef = useRef(NaN);
 
   const [square1Visible, setSquare1Visible] = useState(true);
@@ -139,7 +139,6 @@ function PointerEventAttributesHoverablePointersTestCase(
         }, pointerTestName + "'s ClientX and ClientY attributes are correct.");
       }
 
-      // TODO: check_PointerEvent
       check_PointerEvent(harness, event, eventType, {
         testNamePrefix,
       });
@@ -190,7 +189,7 @@ function PointerEventAttributesHoverablePointersTestCase(
           eventList.length
         ) {
           setSquare1Visible(false);
-          detected_eventTypesRef.current = {};
+          detected_eventTypesRef.current = ({}: {[string]: boolean});
           setSquare2Visible(true);
           expectedPointerIdRef.current = NaN;
         }
diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesNoHoverPointers.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesNoHoverPointers.js
new file mode 100644
index 000000000000..5369a55aba0f
--- /dev/null
+++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventAttributesNoHoverPointers.js
@@ -0,0 +1,246 @@
+/**
+ * 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
+ */
+
+import type {
+  Layout,
+  PointerEvent,
+} from 'react-native/Libraries/Types/CoreEventTypes';
+import type {PlatformTestComponentBaseProps} from '../PlatformTest/RNTesterPlatformTestTypes';
+
+import * as React from 'react';
+import {useCallback, useRef, useState} from 'react';
+import {View, StyleSheet} from 'react-native';
+
+import RNTesterPlatformTest from '../PlatformTest/RNTesterPlatformTest';
+import {check_PointerEvent, useTestEventHandler} from './PointerEventSupport';
+
+const eventList = [
+  'pointerOver',
+  'pointerEnter',
+  'pointerDown',
+  'pointerUp',
+  'pointerOut',
+  'pointerLeave',
+];
+
+function PointerEventAttributesNoHoverPointersTestCase(
+  props: PlatformTestComponentBaseProps,
+) {
+  const {harness} = props;
+
+  const detected_pointertypesRef = useRef(({}: {[string]: boolean}));
+  const detected_eventTypesRef = useRef(({}: {[string]: boolean}));
+  const expectedPointerIdRef = useRef(NaN);
+
+  const [square1Visible, setSquare1Visible] = useState(true);
+  const [square2Visible, setSquare2Visible] = useState(false);
+
+  // Adapted from https://github.com/web-platform-tests/wpt/blob/8222ceeeebd4beab32f101ebf651a5dd7c5e8365/pointerevents/pointerevent_attributes_nohover_pointers.html#L25
+  const checkPointerEventAttributes = useCallback(
+    (
+      event: PointerEvent,
+      eventType: string,
+      targetLayout: Layout,
+      testNamePrefix: string,
+      expectedPointerType: string,
+    ) => {
+      const detected_pointertypes = detected_pointertypesRef.current;
+      const detected_eventTypes = detected_eventTypesRef.current;
+      const expectedPointerId = expectedPointerIdRef.current;
+
+      if (detected_eventTypes[eventType]) {
+        return;
+      }
+      const expectedEventType =
+        eventList[Object.keys(detected_eventTypes).length].toLowerCase();
+      detected_eventTypes[eventType] = true;
+      const pointerTestName =
+        testNamePrefix + ' ' + expectedPointerType + ' ' + expectedEventType;
+
+      detected_pointertypes[event.nativeEvent.pointerType] = true;
+      harness.test(({assert_equals}) => {
+        assert_equals(
+          eventType,
+          expectedEventType,
+          'Event.type should be ' + expectedEventType,
+        );
+      }, pointerTestName + "'s type should be " + expectedEventType);
+
+      // Test button and buttons
+      harness.test(({assert_equals}) => {
+        assert_equals(event.nativeEvent.button, 0, 'Button attribute is 0');
+      }, pointerTestName + "'s button attribute is 0 when left mouse button is pressed.");
+      if (
+        eventType === 'pointerdown' ||
+        eventType === 'pointerover' ||
+        eventType === 'pointerenter'
+      ) {
+        harness.test(({assert_equals}) => {
+          assert_equals(event.nativeEvent.buttons, 1, 'Buttons attribute is 1');
+        }, pointerTestName + "'s buttons attribute is 1 when left mouse button is pressed.");
+      } else {
+        harness.test(({assert_equals}) => {
+          assert_equals(event.nativeEvent.buttons, 0, 'Buttons attribute is 0');
+        }, pointerTestName + "'s buttons is 0 when mouse buttons are in released state.");
+      }
+
+      const left = targetLayout.x;
+      const top = targetLayout.y;
+      const right = targetLayout.x + targetLayout.width;
+      const bottom = targetLayout.y + targetLayout.height;
+
+      // Test clientX and clientY
+      harness.test(({assert_true}) => {
+        assert_true(
+          event.nativeEvent.clientX >= left &&
+            event.nativeEvent.clientX < right &&
+            event.nativeEvent.clientY >= top &&
+            event.nativeEvent.clientY < bottom,
+          'ClientX/Y should be in the boundaries of the box',
+        );
+      }, pointerTestName + "'s ClientX and ClientY attributes are correct.");
+
+      check_PointerEvent(harness, event, eventType, {
+        testNamePrefix,
+      });
+
+      // Test isPrimary value
+      harness.test(({assert_equals}) => {
+        assert_equals(
+          event.nativeEvent.isPrimary,
+          true,
+          'isPrimary should be true',
+        );
+      }, pointerTestName + '.isPrimary attribute is correct.');
+
+      // Test pointerId value
+      if (isNaN(expectedPointerId)) {
+        expectedPointerIdRef.current = event.nativeEvent.pointerId;
+      } else {
+        harness.test(({assert_equals}) => {
+          assert_equals(
+            event.nativeEvent.pointerId,
+            expectedPointerId,
+            'pointerId should remain the same for the same active pointer',
+          );
+        }, pointerTestName + '.pointerId should be the same as previous pointer events for this active pointer.');
+      }
+    },
+    [harness],
+  );
+
+  const square1Ref = useRef();
+  const square1Handlers = useTestEventHandler(eventList, (event, eventType) => {
+    if (!square1Visible) {
+      return;
+    }
+
+    const square1Elem = square1Ref.current;
+    if (square1Elem != null) {
+      square1Elem.measure((x, y, width, height, pageX, pageY) => {
+        checkPointerEventAttributes(
+          event,
+          eventType,
+          {x: pageX, y: pageY, width, height},
+          '',
+          'touch',
+        );
+        if (
+          Object.keys(detected_eventTypesRef.current).length ===
+          eventList.length
+        ) {
+          setSquare1Visible(false);
+          detected_eventTypesRef.current = ({}: {[string]: boolean});
+          setSquare2Visible(true);
+          expectedPointerIdRef.current = NaN;
+        }
+      });
+    }
+  });
+
+  const square2Ref = useRef();
+  const square2Handlers = useTestEventHandler(eventList, (event, eventType) => {
+    const square2Elem = square2Ref.current;
+    if (square2Elem != null) {
+      square2Elem.measure((x, y, width, height, pageX, pageY) => {
+        checkPointerEventAttributes(
+          event,
+          eventType,
+          {x: pageX, y: pageY, width, height},
+          'Inner frame ',
+          'touch',
+        );
+        if (
+          Object.keys(detected_eventTypesRef.current).length ===
+          eventList.length
+        ) {
+          setSquare2Visible(false);
+          // TODO: Mark test as done
+        }
+      });
+    }
+  });
+
+  return (
+    <View style={styles.root}>
+      <View style={styles.squareContainer}>
+        {square1Visible && (
+          <View ref={square1Ref} style={styles.square1} {...square1Handlers} />
+        )}
+      </View>
+      <View style={styles.squareContainer}>
+        {square2Visible && (
+          <View ref={square2Ref} style={styles.square2} {...square2Handlers} />
+        )}
+      </View>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  root: {
+    height: 150,
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  square1: {
+    width: 40,
+    height: 40,
+    backgroundColor: 'black',
+  },
+  square2: {
+    width: 40,
+    height: 40,
+    backgroundColor: 'red',
+  },
+  squareContainer: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+});
+
+type Props = $ReadOnly<{}>;
+export default function PointerEventAttributesNoHoverPointers(
+  props: Props,
+): React.MixedElement {
+  return (
+    <RNTesterPlatformTest
+      component={PointerEventAttributesNoHoverPointersTestCase}
+      description="This test checks the properties of pointer events that do not support hover."
+      instructions={[
+        'Tap the black square.',
+        'Then move it off the black square so that it disappears.',
+        'When the red square appears tap on that as well.',
+      ]}
+      title="Pointer Events no-hover pointer attributes test"
+    />
+  );
+}
diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventLayoutChangeShouldFirePointerOver.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventLayoutChangeShouldFirePointerOver.js
new file mode 100644
index 000000000000..79caf0afcd27
--- /dev/null
+++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventLayoutChangeShouldFirePointerOver.js
@@ -0,0 +1,123 @@
+/**
+ * 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
+ */
+
+import type {PlatformTestComponentBaseProps} from '../PlatformTest/RNTesterPlatformTestTypes';
+import type {PointerEvent} from 'react-native/Libraries/Types/CoreEventTypes';
+
+import RNTesterPlatformTest from '../PlatformTest/RNTesterPlatformTest';
+import * as React from 'react';
+import {useRef, useCallback, useState, useMemo} from 'react';
+import {StyleSheet, View} from 'react-native';
+
+const styles = StyleSheet.create({
+  spacer: {
+    width: 100,
+    height: 100,
+  },
+  red: {
+    backgroundColor: 'red',
+    position: 'absolute',
+    left: 0,
+    top: 0,
+    width: 100,
+    height: 100,
+    zIndex: 0,
+  },
+  blue: {
+    backgroundColor: 'blue',
+    position: 'absolute',
+    left: 0,
+    top: 0,
+    width: 100,
+    height: 100,
+    zIndex: 1,
+  },
+});
+
+// adapted from https://github.com/web-platform-tests/wpt/blob/master/uievents/mouse/layout_change_should_fire_mouseover.html
+function PointerEventLayoutShouldFirePointerOverTestCase(
+  props: PlatformTestComponentBaseProps,
+) {
+  const {harness} = props;
+
+  const testMouseOver = harness.useAsyncTest(
+    'Tests that the pointerover event is fired and the element has a hover effect when the element underneath the mouse cursor is changed.',
+  );
+
+  const [showBlue, setShowBlue] = useState(false);
+
+  const eventListRef = useRef<Array<string>>([]);
+
+  const checkEventSequence = useCallback(() => {
+    testMouseOver.step(({assert_equals}) => {
+      const result = eventListRef.current.join(',');
+      assert_equals(
+        result,
+        'pointerover,pointerenter',
+        'The only events recorded should be pointerover and pointerenter (in that order)',
+      );
+    });
+    testMouseOver.done();
+  }, [testMouseOver]);
+
+  const redClickHandler = useCallback(() => {
+    setShowBlue(true);
+    setTimeout(() => {
+      checkEventSequence();
+    }, 2500);
+  }, [checkEventSequence]);
+
+  const createBlueHoverEventHandler = useCallback(
+    (eventType: string) => (event: PointerEvent) => {
+      eventListRef.current.push(eventType);
+      testMouseOver.step(({assert_equals}) => {
+        if (eventType === 'pointerenter') {
+          checkEventSequence();
+        }
+      });
+    },
+    [checkEventSequence, testMouseOver],
+  );
+
+  const blueEventHandlers = useMemo(
+    () => ({
+      onPointerOver: createBlueHoverEventHandler('pointerover'),
+      onPointerMove: createBlueHoverEventHandler('pointermove'),
+      onPointerEnter: createBlueHoverEventHandler('pointerenter'),
+      onPointerLeave: createBlueHoverEventHandler('pointerleave'),
+    }),
+    [createBlueHoverEventHandler],
+  );
+
+  return (
+    <>
+      <View style={styles.spacer} />
+      <View onPointerUp={redClickHandler} style={styles.red} />
+      {showBlue && <View {...blueEventHandlers} style={styles.blue} />}
+    </>
+  );
+}
+
+type Props = $ReadOnly<{}>;
+export default function PointerEventLayoutShouldFirePointerOver(
+  props: Props,
+): React.MixedElement {
+  return (
+    <RNTesterPlatformTest
+      component={PointerEventLayoutShouldFirePointerOverTestCase}
+      description="Tests that the pointerover event is fired and the element has a hover effect when the element underneath the mouse cursor is changed."
+      instructions={[
+        'Put your mouse over the red rectangle',
+        'Click the primary mouse button',
+      ]}
+      title="Pointerover/enter is sent on layout change"
+    />
+  );
+}
diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMove.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMove.js
index 976b20aaf9d4..09000898edf2 100644
--- a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMove.js
+++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMove.js
@@ -8,7 +8,7 @@
  * @flow
  */
 
-// adapated from https://github.com/web-platform-tests/wpt/blob/master/pointerevents/pointerevent_pointermove.html
+// adapted from https://github.com/web-platform-tests/wpt/blob/master/pointerevents/pointerevent_pointermove.html
 
 import type {PlatformTestComponentBaseProps} from '../PlatformTest/RNTesterPlatformTestTypes';
 import type {PointerEvent} from 'react-native/Libraries/Types/CoreEventTypes';
@@ -24,8 +24,8 @@ function PointerEventPointerMoveTestCase(
 ) {
   const {harness} = props;
 
-  const detectedPointerTypesRef = useRef({});
-  const testPointerMove = harness.useAsyncTest('pointermove event recieved');
+  const detectedPointerTypesRef = useRef(({}: {[string]: boolean}));
+  const testPointerMove = harness.useAsyncTest('pointermove event received');
 
   const handlers = useTestEventHandler(
     ['pointerMove'],
diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMoveAcross.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMoveAcross.js
new file mode 100644
index 000000000000..f01651e170f8
--- /dev/null
+++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMoveAcross.js
@@ -0,0 +1,166 @@
+/**
+ * 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
+ */
+
+import type {PlatformTestComponentBaseProps} from '../PlatformTest/RNTesterPlatformTestTypes';
+
+import RNTesterPlatformTest from '../PlatformTest/RNTesterPlatformTest';
+import RNTesterPlatformTestEventRecorder from '../PlatformTest/RNTesterPlatformTestEventRecorder';
+import * as React from 'react';
+import {useCallback, useState} from 'react';
+import {View, StyleSheet} from 'react-native';
+
+const styles = StyleSheet.create({
+  a: {
+    backgroundColor: 'red',
+    height: 120,
+    width: 200,
+  },
+  b: {
+    marginLeft: 50,
+    height: 120,
+    width: 200,
+    backgroundColor: 'green',
+  },
+  c: {
+    height: 120,
+    width: 200,
+    backgroundColor: 'yellow',
+    marginVertical: 10,
+    marginLeft: 50,
+  },
+  a1: {
+    backgroundColor: 'blue',
+    height: 120,
+    width: 200,
+  },
+  b1: {
+    padding: 1,
+    marginLeft: 50,
+    height: 120,
+    width: 200,
+    backgroundColor: 'green',
+  },
+  c1: {
+    height: 120,
+    width: 200,
+    backgroundColor: 'black',
+    marginLeft: 50,
+  },
+});
+
+const relevantEvents = [
+  'pointerMove',
+  'pointerOver',
+  'pointerEnter',
+  'pointerOut',
+  'pointerLeave',
+];
+
+const expected = [
+  {type: 'pointerOver', target: 'a'},
+  {type: 'pointerEnter', target: 'c'},
+  {type: 'pointerEnter', target: 'b'},
+  {type: 'pointerEnter', target: 'a'},
+  {type: 'pointerMove', target: 'a', optional: true},
+  {type: 'pointerOut', target: 'a'},
+  {type: 'pointerLeave', target: 'a'},
+  {type: 'pointerLeave', target: 'b'},
+  {type: 'pointerOver', target: 'c'},
+  {type: 'pointerMove', target: 'c', optional: true},
+  {type: 'pointerOut', target: 'c'},
+  {type: 'pointerLeave', target: 'c'},
+  {type: 'pointerOver', target: 'a1'},
+  {type: 'pointerEnter', target: 'c1'},
+  {type: 'pointerEnter', target: 'b1'},
+  {type: 'pointerEnter', target: 'a1'},
+  {type: 'pointerMove', target: 'a1', optional: true},
+  {type: 'pointerOut', target: 'a1'},
+  {type: 'pointerLeave', target: 'a1'},
+  {type: 'pointerLeave', target: 'b1'},
+  {type: 'pointerOver', target: 'c1'},
+  {type: 'pointerMove', target: 'c1', optional: true},
+  {type: 'pointerOut', target: 'c1'},
+  {type: 'pointerLeave', target: 'c1'},
+];
+
+const targetNames = ['a', 'b', 'c', 'a1', 'b1', 'c1'];
+
+// adapted from https://github.com/web-platform-tests/wpt/blob/master/uievents/order-of-events/mouse-events/mousemove-across.html
+function PointerEventPointerMoveAcrossTestCase(
+  props: PlatformTestComponentBaseProps,
+) {
+  const {harness} = props;
+
+  const pointermove_across = harness.useAsyncTest(
+    'Pointermove events across elements should fire in the correct order.',
+  );
+
+  const [eventRecorder] = useState(
+    () =>
+      new RNTesterPlatformTestEventRecorder({
+        mergeEventTypes: ['pointerMove'],
+        relevantEvents,
+      }),
+  );
+
+  const eventHandler = useCallback(
+    (event: PointerEvent, eventType: string, eventTarget: string) => {
+      event.stopPropagation();
+      if (eventTarget === 'c1' && eventType === 'pointerLeave') {
+        pointermove_across.step(({assert_true}) => {
+          assert_true(
+            eventRecorder.checkRecords(expected),
+            'Expected events to occur in the correct order',
+          );
+        });
+        pointermove_across.done();
+      }
+    },
+    [eventRecorder, pointermove_across],
+  );
+
+  const eventProps = eventRecorder.useRecorderTestEventHandlers(
+    targetNames,
+    eventHandler,
+  );
+
+  return (
+    <>
+      <View {...eventProps.c} style={styles.c}>
+        <View {...eventProps.b} style={styles.b}>
+          <View {...eventProps.a} style={styles.a} />
+        </View>
+      </View>
+      <View {...eventProps.c1} style={styles.c1}>
+        <View {...eventProps.b1} style={styles.b1}>
+          <View {...eventProps.a1} style={styles.a1} />
+        </View>
+      </View>
+    </>
+  );
+}
+
+type Props = $ReadOnly<{}>;
+export default function PointerEventPointerMoveAcross(
+  props: Props,
+): React.MixedElement {
+  return (
+    <RNTesterPlatformTest
+      component={PointerEventPointerMoveAcrossTestCase}
+      description=""
+      instructions={[
+        'Move your mouse across the yellow/red <div> element quickly from right to left',
+        'Move your mouse across the black/blue <div> element quickly from right to left',
+        'If the test fails, redo it again and move faster on the black/blue <div> element next time.',
+      ]}
+      title="Pointermove handling across elements"
+    />
+  );
+}
diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMoveBetween.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMoveBetween.js
new file mode 100644
index 000000000000..854494e71842
--- /dev/null
+++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMoveBetween.js
@@ -0,0 +1,135 @@
+/**
+ * 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
+ */
+
+import type {PlatformTestComponentBaseProps} from '../PlatformTest/RNTesterPlatformTestTypes';
+
+import RNTesterPlatformTest from '../PlatformTest/RNTesterPlatformTest';
+import RNTesterPlatformTestEventRecorder from '../PlatformTest/RNTesterPlatformTestEventRecorder';
+import * as React from 'react';
+import {useCallback, useState} from 'react';
+import {View, StyleSheet} from 'react-native';
+
+const styles = StyleSheet.create({
+  a: {
+    width: 200,
+    height: 120,
+    backgroundColor: 'blue',
+    flexDirection: 'row',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  b: {
+    height: 60,
+    width: 100,
+    backgroundColor: 'green',
+  },
+  c: {
+    height: 120,
+    width: 200,
+    backgroundColor: 'yellow',
+  },
+});
+
+const relevantEvents = [
+  'pointerMove',
+  'pointerOver',
+  'pointerEnter',
+  'pointerOut',
+  'pointerLeave',
+];
+
+const expected = [
+  {type: 'pointerOver', target: 'a'},
+  {type: 'pointerEnter', target: 'a'},
+  {type: 'pointerMove', target: 'a', optional: true},
+  {type: 'pointerOut', target: 'a'},
+  {type: 'pointerOver', target: 'b'},
+  {type: 'pointerEnter', target: 'b'},
+  {type: 'pointerMove', target: 'b', optional: true},
+  {type: 'pointerOut', target: 'b'},
+  {type: 'pointerLeave', target: 'b'},
+  {type: 'pointerOver', target: 'a'},
+  {type: 'pointerMove', target: 'a', optional: true},
+  {type: 'pointerOut', target: 'a'},
+  {type: 'pointerLeave', target: 'a'},
+  {type: 'pointerOver', target: 'c'},
+  {type: 'pointerEnter', target: 'c'},
+  {type: 'pointerMove', target: 'c', optional: true},
+  {type: 'pointerOut', target: 'c'},
+  {type: 'pointerLeave', target: 'c'},
+];
+
+const targetNames = ['a', 'b', 'c'];
+
+// adapted from https://github.com/web-platform-tests/wpt/blob/master/uievents/order-of-events/mouse-events/mousemove-between.html
+function PointerEventPointerMoveBetweenTestCase(
+  props: PlatformTestComponentBaseProps,
+) {
+  const {harness} = props;
+
+  const pointermove_between = harness.useAsyncTest(
+    'Pointermove events between elements should fire in the correct order.',
+  );
+
+  const [eventRecorder] = useState(
+    () =>
+      new RNTesterPlatformTestEventRecorder({
+        mergeEventTypes: ['pointerMove'],
+        relevantEvents,
+      }),
+  );
+
+  const eventHandler = useCallback(
+    (event: PointerEvent, eventType: string, eventTarget: string) => {
+      event.stopPropagation();
+      if (eventTarget === 'c' && eventType === 'pointerLeave') {
+        pointermove_between.step(({assert_true}) => {
+          assert_true(
+            eventRecorder.checkRecords(expected),
+            'Expected events to occur in the correct order',
+          );
+        });
+        pointermove_between.done();
+      }
+    },
+    [eventRecorder, pointermove_between],
+  );
+
+  const eventProps = eventRecorder.useRecorderTestEventHandlers(
+    targetNames,
+    eventHandler,
+  );
+
+  return (
+    <>
+      <View {...eventProps.a} style={styles.a}>
+        <View {...eventProps.b} style={styles.b} />
+      </View>
+      <View {...eventProps.c} style={styles.c} />
+    </>
+  );
+}
+
+type Props = $ReadOnly<{}>;
+export default function PointerEventPointerMoveBetween(
+  props: Props,
+): React.MixedElement {
+  return (
+    <RNTesterPlatformTest
+      component={PointerEventPointerMoveBetweenTestCase}
+      description=""
+      instructions={[
+        'Move your cursor over the blue element, later over the green one, later back to the blue one.',
+        'Move the mosue from the blue element to the yellow one, later to the white background.',
+      ]}
+      title="Pointermove handling between elements"
+    />
+  );
+}
diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMoveEventOrder.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMoveEventOrder.js
new file mode 100644
index 000000000000..108ee5b15b7c
--- /dev/null
+++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMoveEventOrder.js
@@ -0,0 +1,147 @@
+/**
+ * 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
+ */
+
+import type {PlatformTestComponentBaseProps} from '../PlatformTest/RNTesterPlatformTestTypes';
+import type {PointerEvent} from 'react-native/Libraries/Types/CoreEventTypes';
+
+import * as React from 'react';
+import {useCallback, useState} from 'react';
+import RNTesterPlatformTest from '../PlatformTest/RNTesterPlatformTest';
+import {StyleSheet, View} from 'react-native';
+import RNTesterPlatformTestEventRecorder from '../PlatformTest/RNTesterPlatformTestEventRecorder';
+
+const styles = StyleSheet.create({
+  end: {
+    backgroundColor: 'red',
+    position: 'absolute',
+    right: '15%',
+    bottom: '15%',
+    width: '50%',
+    height: '50%',
+    borderWidth: 1,
+    borderColor: 'grey',
+  },
+  green: {
+    backgroundColor: 'green',
+  },
+  start: {
+    backgroundColor: 'red',
+    position: 'absolute',
+    left: '15%',
+    top: '15%',
+    width: '50%',
+    height: '50%',
+    borderWidth: 1,
+    borderColor: 'grey',
+  },
+  testarea: {
+    width: '80%',
+    height: 250,
+    borderWidth: 1,
+    borderColor: 'grey',
+  },
+});
+
+// adapted from https://github.com/web-platform-tests/wpt/blob/master/uievents/order-of-events/mouse-events/mouseevents-mousemove.htm
+function PointerEventPointerMoveEventOrderTestCase(
+  props: PlatformTestComponentBaseProps,
+) {
+  const {harness} = props;
+  const pointer_test = harness.useAsyncTest('Pointermove events');
+
+  const [eventRecorder] = useState(
+    () =>
+      new RNTesterPlatformTestEventRecorder({
+        mergeEventTypes: ['pointerMove'],
+        relevantEvents: ['pointerMove'],
+      }),
+  );
+
+  const [startMoved, setStartMoved] = useState(false);
+  const [endMoved, setEndMoved] = useState(false);
+
+  const eventHandler = useCallback(
+    (event: PointerEvent, eventType: string, eventTarget: string) => {
+      event.stopPropagation();
+      if (
+        !startMoved &&
+        eventType === 'pointerMove' &&
+        eventTarget === 'start'
+      ) {
+        setStartMoved(true);
+      }
+      if (!endMoved && eventType === 'pointerMove' && eventTarget === 'end') {
+        setEndMoved(true);
+        const results = eventRecorder.getRecords();
+        pointer_test.step(({assert_equals}) => {
+          assert_equals(results.length, 2, 'Two pointermove events');
+          if (results.length === 2) {
+            assert_equals(
+              results[0].type,
+              'pointerMove',
+              'First event is a pointermove event',
+            );
+            assert_equals(
+              results[1].type,
+              'pointerMove',
+              'Second event is a pointermove event',
+            );
+            assert_equals(
+              results[0].target,
+              'start',
+              'First event targeted #start',
+            );
+            assert_equals(
+              results[1].target,
+              'end',
+              'Second event targeted #end',
+            );
+          }
+        });
+        pointer_test.done();
+      }
+    },
+    [endMoved, eventRecorder, pointer_test, startMoved],
+  );
+
+  const eventProps = eventRecorder.useRecorderTestEventHandlers(
+    ['start', 'end'],
+    eventHandler,
+  );
+
+  return (
+    <View style={styles.testarea}>
+      <View
+        {...eventProps.start}
+        style={[styles.start, startMoved && styles.green]}
+      />
+      <View
+        {...eventProps.end}
+        style={[styles.end, endMoved && styles.green]}
+      />
+    </View>
+  );
+}
+
+type Props = $ReadOnly<{}>;
+export default function PointerEventPointerMoveEventOrder(
+  props: Props,
+): React.MixedElement {
+  return (
+    <RNTesterPlatformTest
+      component={PointerEventPointerMoveEventOrderTestCase}
+      instructions={[
+        'Move the pointer to the upper-left red box and then move it directly toward and into the lower-right red box.',
+      ]}
+      description="Verifies that pointermove events track the pointer position and transition from top-most visible element to top-most visible element, changing targets along the way."
+      title="PointerEvent - pointermove event order"
+    />
+  );
+}
diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMoveOnChordedMouseButton.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMoveOnChordedMouseButton.js
new file mode 100644
index 000000000000..35bd727a5b23
--- /dev/null
+++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerMoveOnChordedMouseButton.js
@@ -0,0 +1,138 @@
+/**
+ * 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
+ */
+
+import type {PlatformTestComponentBaseProps} from '../PlatformTest/RNTesterPlatformTestTypes';
+import type {PointerEvent} from 'react-native/Libraries/Types/CoreEventTypes';
+
+import RNTesterPlatformTest from '../PlatformTest/RNTesterPlatformTest';
+import * as React from 'react';
+import {useCallback, useRef} from 'react';
+import {View, StyleSheet} from 'react-native';
+
+const styles = StyleSheet.create({
+  target: {
+    backgroundColor: 'black',
+    padding: 32,
+  },
+});
+
+// adapted from https://github.com/web-platform-tests/wpt/blob/master/pointerevents/pointerevent_pointermove_on_chorded_mouse_button.html
+function PointerEventPointerMoveOnChordedMouseButtonTestCase(
+  props: PlatformTestComponentBaseProps,
+) {
+  const {harness} = props;
+
+  const test_pointermove = harness.useAsyncTest(
+    'pointermove events received for button state changes',
+  );
+
+  const stepRef = useRef(0);
+  const firstButtonRef = useRef(0);
+
+  // When a pointer changes button state and the circumstances produce no other pointer event, the pointermove event must be dispatched.
+  // 5.2.6
+
+  const handlePointerDown = useCallback(
+    (event: PointerEvent) => {
+      test_pointermove.step(({assert_equals}) => {
+        assert_equals(
+          stepRef.current,
+          0,
+          'There must not be more than one pointer down event.',
+        );
+      });
+      if (stepRef.current === 0) {
+        stepRef.current = 1;
+        firstButtonRef.current = event.nativeEvent.buttons;
+      }
+    },
+    [test_pointermove],
+  );
+
+  const handlePointerMove = useCallback(
+    (event: PointerEvent) => {
+      if (stepRef.current === 1 && event.nativeEvent.button !== -1) {
+        // second button pressed
+        test_pointermove.step(({assert_not_equals, assert_true}) => {
+          assert_not_equals(
+            event.nativeEvent.buttons,
+            firstButtonRef.current,
+            'The pointermove event must be triggered by pressing a second button.',
+          );
+          assert_true(
+            // eslint-disable-next-line no-bitwise
+            (event.nativeEvent.buttons & firstButtonRef.current) !== 0,
+            'The first button must still be reported pressed.',
+          );
+        });
+        stepRef.current = 2;
+      } else if (stepRef.current === 2 && event.nativeEvent.button !== -1) {
+        // second button released
+        test_pointermove.step(({assert_equals}) => {
+          assert_equals(
+            event.nativeEvent.buttons,
+            firstButtonRef.current,
+            'The pointermove event must be triggered by releasing the second button.',
+          );
+        });
+        stepRef.current = 3;
+      }
+    },
+    [test_pointermove],
+  );
+
+  const handlePointerUp = useCallback(
+    (event: PointerEvent) => {
+      test_pointermove.step(({assert_equals}) => {
+        assert_equals(
+          stepRef.current,
+          3,
+          'The pointerup event must be triggered after pressing and releasing the second button.',
+        );
+        assert_equals(
+          event.nativeEvent.buttons,
+          0,
+          'The pointerup event must be triggered by releasing the last pressed button.',
+        );
+      });
+      test_pointermove.done();
+    },
+    [test_pointermove],
+  );
+
+  return (
+    <View
+      onPointerDown={handlePointerDown}
+      onPointerMove={handlePointerMove}
+      onPointerUp={handlePointerUp}
+      style={styles.target}
+    />
+  );
+}
+
+type Props = $ReadOnly<{}>;
+export default function PointerEventPointerMoveOnChordedMouseButton(
+  props: Props,
+): React.MixedElement {
+  return (
+    <RNTesterPlatformTest
+      component={PointerEventPointerMoveOnChordedMouseButtonTestCase}
+      description="This test checks if pointermove event are triggered by button state changes"
+      instructions={[
+        'Put your mouse over the black rectangle',
+        'Press the left mouse button and hold it',
+        'Press the middle mouse button',
+        'Release the middle mouse button',
+        'Release the left mouse button to complete the test',
+      ]}
+      title="PointerEvents pointermove on button state changes"
+    />
+  );
+}
diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerOverOut.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerOverOut.js
new file mode 100644
index 000000000000..8b1046a760bd
--- /dev/null
+++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPointerOverOut.js
@@ -0,0 +1,228 @@
+/**
+ * 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
+ */
+
+import type {PlatformTestComponentBaseProps} from '../PlatformTest/RNTesterPlatformTestTypes';
+import type {PointerEvent} from 'react-native/Libraries/Types/CoreEventTypes';
+import type {HostComponent} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes';
+
+import RNTesterPlatformTest from '../PlatformTest/RNTesterPlatformTest';
+import * as React from 'react';
+import {useRef, useCallback} from 'react';
+import {StyleSheet, View} from 'react-native';
+
+function getNativeTagFromHostElement(
+  elem: ?React.ElementRef<HostComponent<mixed>> | number,
+): ?number {
+  if (typeof elem === 'number') {
+    return elem;
+  }
+  if (elem != null) {
+    // $FlowExpectedError - accessing non-public property
+    return elem._nativeTag;
+  }
+  return undefined;
+}
+
+const styles = StyleSheet.create({
+  outer: {
+    padding: 40,
+    height: 60,
+    backgroundColor: 'blue',
+  },
+  inner: {
+    padding: 40,
+    height: 60,
+    backgroundColor: 'green',
+  },
+  released: {
+    padding: 40,
+    height: 60,
+    backgroundColor: 'yellow',
+  },
+});
+
+// adapted from https://github.com/web-platform-tests/wpt/blob/master/uievents/order-of-events/mouse-events/mouseover-out.html
+function PointerEventPointerOverOutTestCase(
+  props: PlatformTestComponentBaseProps,
+) {
+  const {harness} = props;
+
+  const t = harness.useAsyncTest('PointerOver/Out events');
+
+  const innerNativeTagRef = useRef(-1);
+  const outerNativeTagRef = useRef(-1);
+
+  const handleInnerRefCallback = useCallback(elem => {
+    const nativeTag = getNativeTagFromHostElement(elem);
+    innerNativeTagRef.current = nativeTag != null ? nativeTag : -1;
+  }, []);
+  const handleOuterRefCallback = useCallback(elem => {
+    const nativeTag = getNativeTagFromHostElement(elem);
+    outerNativeTagRef.current = nativeTag != null ? nativeTag : -1;
+  }, []);
+
+  const innerOverRef = useRef(0);
+  const innerOutRef = useRef(0);
+
+  const outerOwnOverRef = useRef(0);
+  const outerOwnOutRef = useRef(0);
+  const outerOverRef = useRef(0);
+  const outerOutRef = useRef(0);
+
+  const innerPointerOverHandler = useCallback(
+    (e: PointerEvent) => {
+      t.step(({assert_equals, assert_true}) => {
+        assert_equals(
+          innerOverRef.current,
+          innerOutRef.current,
+          'pointerover is recieved before pointerout',
+        );
+        switch (innerOverRef.current) {
+          case 0: {
+            assert_equals(
+              outerOwnOverRef.current,
+              1,
+              'should have triggered a pointerover in the outer before',
+            );
+            break;
+          }
+          case 1: {
+            assert_equals(
+              outerOwnOverRef.current,
+              1,
+              'should have not triggered a pointerover in the outer before',
+            );
+            break;
+          }
+          default: {
+            assert_true(false, 'should not get more than two mouseovers');
+          }
+        }
+      });
+      innerOverRef.current++;
+    },
+    [t],
+  );
+  const innerPointerOutHandler = useCallback(
+    (e: PointerEvent) => {
+      t.step(({assert_equals, assert_true}) => {
+        assert_equals(
+          innerOverRef.current,
+          innerOutRef.current + 1,
+          'pointerout is received after pointerover',
+        );
+        switch (innerOutRef.current) {
+          case 0: {
+            assert_equals(
+              outerOwnOutRef.current,
+              1,
+              'pointerout should have been received in the parent when hovering over this element',
+            );
+            break;
+          }
+          case 1: {
+            break;
+          }
+          default: {
+            assert_true(false, 'should not get more than two pointerouts');
+          }
+        }
+      });
+      innerOutRef.current++;
+    },
+    [t],
+  );
+
+  const outerPointerOverHandler = useCallback(
+    (e: PointerEvent) => {
+      const eventElemTag = getNativeTagFromHostElement(e.target);
+      t.step(({assert_equals}) => {
+        if (eventElemTag === outerNativeTagRef.current) {
+          assert_equals(
+            outerOwnOverRef.current,
+            outerOwnOutRef.current,
+            'outer: pointerover is recieved before pointerout',
+          );
+          outerOwnOverRef.current++;
+        } else {
+          assert_equals(
+            outerOverRef.current - outerOwnOverRef.current,
+            innerOverRef.current - 1,
+            'pointerover: should only receive this via bubbling',
+          );
+        }
+      });
+      outerOverRef.current++;
+    },
+    [t],
+  );
+  const outerPointerOutHandler = useCallback(
+    (e: PointerEvent) => {
+      const eventElemTag = getNativeTagFromHostElement(e.target);
+      t.step(({assert_equals}) => {
+        if (eventElemTag === outerNativeTagRef.current) {
+          assert_equals(
+            outerOwnOverRef.current,
+            outerOwnOutRef.current + 1,
+            'outer: pointerout is recieved after pointerover',
+          );
+          if (outerOwnOutRef.current === 1) {
+            assert_equals(innerOutRef.current, 2, 'inner should be done now');
+            t.done();
+          }
+          outerOwnOutRef.current++;
+        } else {
+          assert_equals(
+            outerOutRef.current - outerOwnOutRef.current,
+            innerOutRef.current - 1,
+            'pointerout: should only recieve this via bubbling',
+          );
+        }
+      });
+      outerOutRef.current++;
+    },
+    [t],
+  );
+
+  return (
+    <>
+      <View
+        ref={handleOuterRefCallback}
+        onPointerOver={outerPointerOverHandler}
+        onPointerOut={outerPointerOutHandler}
+        style={styles.outer}>
+        <View
+          ref={handleInnerRefCallback}
+          onPointerOver={innerPointerOverHandler}
+          onPointerOut={innerPointerOutHandler}
+          style={styles.inner}
+        />
+      </View>
+      <View style={styles.released} />
+    </>
+  );
+}
+
+type Props = $ReadOnly<{}>;
+export default function PointerEventPointerOverOut(
+  props: Props,
+): React.MixedElement {
+  return (
+    <RNTesterPlatformTest
+      component={PointerEventPointerOverOutTestCase}
+      description=""
+      instructions={[
+        'Move your mouse over the blue view, later over the green one, later over the yellow one.',
+        'Move the mouse from the yellow view to the green one, later to the blue one, and later over this paragraph.',
+      ]}
+      title="PointerOver/PointerOut handling"
+    />
+  );
+}
diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPrimaryTouchPointer.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPrimaryTouchPointer.js
new file mode 100644
index 000000000000..140f1da72861
--- /dev/null
+++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventPrimaryTouchPointer.js
@@ -0,0 +1,144 @@
+/**
+ * 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
+ */
+
+import type {PlatformTestComponentBaseProps} from '../PlatformTest/RNTesterPlatformTestTypes';
+import type {PointerEvent} from 'react-native/Libraries/Types/CoreEventTypes';
+
+import {useTestEventHandler} from './PointerEventSupport';
+import RNTesterPlatformTest from '../PlatformTest/RNTesterPlatformTest';
+import * as React from 'react';
+import {useRef, useCallback, useMemo} from 'react';
+import {StyleSheet, View} from 'react-native';
+
+const styles = StyleSheet.create({
+  root: {
+    flexDirection: 'row',
+    justifyContent: 'space-around',
+    paddingTop: 20,
+  },
+  box: {
+    width: 80,
+    height: 80,
+  },
+});
+
+const listenedEvents = ['pointerDown', 'pointerUp'];
+
+const expectedOrder = [
+  ['red', 'pointerDown', true],
+  ['green', 'pointerDown', false],
+  ['red', 'pointerUp', true],
+  ['blue', 'pointerDown', true],
+  ['green', 'pointerUp', false],
+  ['blue', 'pointerUp', true],
+];
+
+function PointerEventPrimaryTouchPointerTestCase(
+  props: PlatformTestComponentBaseProps,
+) {
+  const {harness} = props;
+
+  const detected_eventsRef = useRef(({}: {[string]: boolean}));
+
+  const handleIncomingPointerEvent = useCallback(
+    (boxLabel: string, eventType: string, isPrimary: boolean) => {
+      const detected_events = detected_eventsRef.current;
+
+      const pointerEventIdentifier = `${boxLabel}-${eventType}-${String(
+        isPrimary,
+      )}`;
+      if (detected_events[pointerEventIdentifier]) {
+        return;
+      }
+
+      const [expectedBoxLabel, expectedEventType, expectedIsPrimary] =
+        expectedOrder[Object.keys(detected_events).length];
+      detected_events[pointerEventIdentifier] = true;
+
+      harness.test(({assert_equals}) => {
+        assert_equals(
+          boxLabel,
+          expectedBoxLabel,
+          'event should be coming from the correct box',
+        );
+        assert_equals(
+          eventType,
+          expectedEventType.toLowerCase(),
+          'event should have the right type',
+        );
+        assert_equals(
+          isPrimary,
+          expectedIsPrimary,
+          'event should be correctly primary',
+        );
+      }, `${expectedBoxLabel} box's ${expectedEventType} should${!expectedIsPrimary ? ' not' : ''} be marked as the primary pointer`);
+    },
+    [harness],
+  );
+
+  const createBoxHandler = useCallback(
+    (boxLabel: string) => (event: PointerEvent, eventName: string) => {
+      if (
+        Object.keys(detected_eventsRef.current).length < expectedOrder.length
+      ) {
+        handleIncomingPointerEvent(
+          boxLabel,
+          eventName,
+          event.nativeEvent.isPrimary,
+        );
+      }
+    },
+    [handleIncomingPointerEvent],
+  );
+
+  const {handleBoxAEvent, handleBoxBEvent, handleBoxCEvent} = useMemo(
+    () => ({
+      handleBoxAEvent: createBoxHandler('red'),
+      handleBoxBEvent: createBoxHandler('green'),
+      handleBoxCEvent: createBoxHandler('blue'),
+    }),
+    [createBoxHandler],
+  );
+
+  const boxAHandlers = useTestEventHandler(listenedEvents, handleBoxAEvent);
+  const boxBHandlers = useTestEventHandler(listenedEvents, handleBoxBEvent);
+  const boxCHandlers = useTestEventHandler(listenedEvents, handleBoxCEvent);
+
+  return (
+    <View style={styles.root}>
+      <View {...boxAHandlers} style={[styles.box, {backgroundColor: 'red'}]} />
+      <View
+        {...boxBHandlers}
+        style={[styles.box, {backgroundColor: 'green'}]}
+      />
+      <View {...boxCHandlers} style={[styles.box, {backgroundColor: 'blue'}]} />
+    </View>
+  );
+}
+
+type Props = $ReadOnly<{}>;
+export default function PointerEventPrimaryTouchPointer(
+  props: Props,
+): React.MixedElement {
+  return (
+    <RNTesterPlatformTest
+      component={PointerEventPrimaryTouchPointerTestCase}
+      description="This test checks for the correct differentiation of a primary pointer in a multitouch scenario"
+      instructions={[
+        'Touch and hold your finger on the red box',
+        'Take different finger and touch and hold the green box',
+        'Lift your finger from the red box and place it on the blue box',
+        'Lift your finger from the green box',
+        'Lift your finger from the blue box',
+      ]}
+      title="Pointer Event primary touch pointer test"
+    />
+  );
+}
diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventSupport.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventSupport.js
index 0fa7ceb46b5b..20c4a19369a6 100644
--- a/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventSupport.js
+++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventPlatformTests/PointerEventSupport.js
@@ -14,6 +14,10 @@ import type {PointerEvent} from 'react-native/Libraries/Types/CoreEventTypes';
 
 import {useMemo} from 'react';
 
+// These props are not in the specification but are present in the WPT so we keep them
+// but marked as skipped so we don't prioritize them
+const SKIPPED_PROPS = ['fromElement', 'toElement'];
+
 // Check for conformance to PointerEvent interface
 // TA: 1.1, 1.2, 1.6, 1.7, 1.8, 1.9, 1.10, 1.11, 1.12, 1.13
 // Adapted from https://github.com/web-platform-tests/wpt/blob/6c26371ea1c144dd612864a278e88b6ba2f3d883/pointerevents/pointerevent_support.js#L15
@@ -95,33 +99,54 @@ export function check_PointerEvent(
     const name = attr[2];
     const value = attr[3];
 
+    const skip = SKIPPED_PROPS.includes(name);
+
     // existence check
-    harness.test(({assert_true}) => {
-      assert_true(
-        name in nativeEvent,
-        name + ' attribute in ' + eventType + ' event',
-      );
-    }, pointerTestName + '.' + name + ' attribute exists');
+    harness.test(
+      ({assert_true}) => {
+        assert_true(
+          name in nativeEvent,
+          name + ' attribute in ' + eventType + ' event',
+        );
+      },
+      pointerTestName + '.' + name + ' attribute exists',
+      {skip},
+    );
 
     // readonly check
     // TODO
 
     // type check
-    harness.test(({assert_true}) => {
-      assert_true(
+    harness.test(
+      ({assert_true}) => {
+        assert_true(
+          // $FlowFixMe
+          idl_type_check[type](nativeEvent[name]),
+          name + ' attribute of type ' + type,
+        );
+      },
+      pointerTestName +
+        '.' +
+        name +
+        ' IDL type ' +
+        type +
+        ' (JS type was ' +
         // $FlowFixMe
-        idl_type_check[type](nativeEvent[name]),
-        name + ' attribute of type ' + type,
-      );
-      // $FlowFixMe
-    }, pointerTestName + '.' + name + ' IDL type ' + type + ' (JS type was ' + typeof nativeEvent[name] + ')');
+        typeof nativeEvent[name] +
+        ')',
+      {skip},
+    );
 
     // value check if defined
     if (value !== undefined) {
-      harness.test(({assert_equals}) => {
-        // $FlowFixMe
-        assert_equals(nativeEvent[name], value, name + ' attribute value');
-      }, pointerTestName + '.' + name + ' value is ' + String(value) + '.');
+      harness.test(
+        ({assert_equals}) => {
+          // $FlowFixMe
+          assert_equals(nativeEvent[name], value, name + ' attribute value');
+        },
+        pointerTestName + '.' + name + ' value is ' + String(value) + '.',
+        {skip},
+      );
     }
   });
 
@@ -191,7 +216,7 @@ export function useTestEventHandler(
   const eventProps: any = useMemo(() => {
     const handlerFactory = (eventName: string) => (event: any) =>
       handler(event, eventName);
-    const props = {};
+    const props: {[string]: (event: any) => void} = {};
     for (const eventName of eventNames) {
       const eventPropName =
         'on' + eventName[0].toUpperCase() + eventName.slice(1);
diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventsEventfulView.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventsEventfulView.js
new file mode 100644
index 000000000000..157f59285873
--- /dev/null
+++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventsEventfulView.js
@@ -0,0 +1,118 @@
+/**
+ * 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
+ */
+
+import type {PointerEvent} from 'react-native/Libraries/Types/CoreEventTypes';
+import {StyleSheet, View, Text} from 'react-native';
+import * as React from 'react';
+import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
+
+export default function EventfulView(props: {|
+  name: string,
+  emitByDefault?: boolean,
+  onLeave?: boolean,
+  onLeaveCapture?: boolean,
+  onEnter?: boolean,
+  onEnterCapture?: boolean,
+  onDown?: boolean,
+  onDownCapture?: boolean,
+  onUp?: boolean,
+  onOver?: boolean,
+  onOverCapture?: boolean,
+  onOut?: boolean,
+  onOutCapture?: boolean,
+  onUpCapture?: boolean,
+  onMove?: boolean,
+  onMoveCapture?: boolean,
+  onCancel?: boolean,
+  onCancelCapture?: boolean,
+  log: string => void,
+  ...ViewProps,
+|}): React.Node {
+  const ref = React.useRef<?React.ElementRef<typeof View>>();
+  React.useEffect(() => {
+    // $FlowFixMe[prop-missing] Using private property
+    setTag(ref.current?._nativeTag);
+  }, [ref]);
+
+  const {
+    log,
+    name,
+    children,
+    emitByDefault,
+    onLeave,
+    onLeaveCapture,
+    onEnter,
+    onEnterCapture,
+    onDown,
+    onDownCapture,
+    onUp,
+    onUpCapture,
+    onMove,
+    onMoveCapture,
+    onOut,
+    onOutCapture,
+    onOver,
+    onOverCapture,
+    onCancel,
+    onCancelCapture,
+    ...restProps
+  } = props;
+  const [tag, setTag] = React.useState('');
+
+  const eventLog =
+    (eventName: string, handler: ?(e: PointerEvent) => void) =>
+    (event: PointerEvent) => {
+      // $FlowFixMe Using private property
+      log(`${name} - ${eventName} - target: ${event.target._nativeTag}`);
+      handler?.(event);
+    };
+
+  const listeners = {
+    onPointerUp: onUp ? eventLog('up') : null,
+    onPointerUpCapture: onUpCapture ? eventLog('up capture') : null,
+    onPointerDown: onDown ? eventLog('down') : null,
+    onPointerDownCapture: onDownCapture ? eventLog('down capture') : null,
+    onPointerLeave: onLeave ? eventLog('leave') : null,
+    onPointerLeaveCapture: onLeaveCapture ? eventLog('leave capture') : null,
+    onPointerEnter: onEnter ? eventLog('enter') : null,
+    onPointerEnterCapture: onEnterCapture ? eventLog('enter capture') : null,
+    onPointerMove: onMove ? eventLog('move') : null,
+    onPointerMoveCapture: onMoveCapture ? eventLog('move capture') : null,
+    onPointerOut: onOut ? eventLog('out') : null,
+    onPointerOutCapture: onOutCapture ? eventLog('out capture') : null,
+    onPointerOver: onOver ? eventLog('over') : null,
+    onPointerOverCapture: onOverCapture ? eventLog('over capture') : null,
+    onPointerCancel: onCancel ? eventLog('cancel') : null,
+    onPointerCancelCapture: onCancelCapture ? eventLog('cancel capture') : null,
+  };
+
+  const listeningTo = Object.keys(listeners)
+    .filter(listenerName => listeners[listenerName] != null)
+    .join(', ');
+
+  return (
+    <View ref={ref} {...listeners} {...restProps}>
+      <View style={styles.row}>
+        <Text>
+          {props.name}, {tag}, {listeningTo}
+        </Text>
+      </View>
+      {props.children}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  row: {
+    flexDirection: 'row',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+});
diff --git a/packages/rn-tester/js/examples/Experimental/W3CPointerEventsExample.js b/packages/rn-tester/js/examples/Experimental/W3CPointerEventsExample.js
index 0e1745d25045..7d326130c322 100644
--- a/packages/rn-tester/js/examples/Experimental/W3CPointerEventsExample.js
+++ b/packages/rn-tester/js/examples/Experimental/W3CPointerEventsExample.js
@@ -8,92 +8,23 @@
  * @flow
  */
 
-import type {PointerEvent} from 'react-native/Libraries/Types/CoreEventTypes';
 import {Button, StyleSheet, ScrollView, View, Text} from 'react-native';
 import * as React from 'react';
-import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
 
 import PointerEventAttributesHoverablePointers from './W3CPointerEventPlatformTests/PointerEventAttributesHoverablePointers';
 import PointerEventPointerMove from './W3CPointerEventPlatformTests/PointerEventPointerMove';
 import CompatibilityAnimatedPointerMove from './Compatibility/CompatibilityAnimatedPointerMove';
-
-function EventfulView(props: {|
-  name: string,
-  emitByDefault?: boolean,
-  onLeave?: boolean,
-  onLeaveCapture?: boolean,
-  onEnter?: boolean,
-  onEnterCapture?: boolean,
-  onDown?: boolean,
-  onDownCapture?: boolean,
-  onUp?: boolean,
-  onUpCapture?: boolean,
-  onMove?: boolean,
-  onMoveCapture?: boolean,
-  log: string => void,
-  ...ViewProps,
-|}) {
-  const ref = React.useRef<?React.ElementRef<typeof View>>();
-  React.useEffect(() => {
-    // $FlowFixMe[prop-missing] Using private property
-    setTag(ref.current?._nativeTag);
-  }, [ref]);
-
-  const {
-    log,
-    name,
-    children,
-    emitByDefault,
-    onLeave,
-    onLeaveCapture,
-    onEnter,
-    onEnterCapture,
-    onDown,
-    onDownCapture,
-    onUp,
-    onUpCapture,
-    onMove,
-    onMoveCapture,
-    ...restProps
-  } = props;
-  const [tag, setTag] = React.useState('');
-
-  const eventLog =
-    (eventName: string, handler: ?(e: PointerEvent) => void) =>
-    (event: PointerEvent) => {
-      // $FlowFixMe Using private property
-      log(`${name} - ${eventName} - target: ${event.target._nativeTag}`);
-      handler?.(event);
-    };
-
-  const listeners = {
-    onPointerUp: onUp ? eventLog('up') : null,
-    onPointerUpCapture: onUpCapture ? eventLog('up capture') : null,
-    onPointerDown: onDown ? eventLog('down') : null,
-    onPointerDownCapture: onDownCapture ? eventLog('down capture') : null,
-    onPointerLeave: onLeave ? eventLog('leave') : null,
-    onPointerLeaveCapture: onLeaveCapture ? eventLog('leave capture') : null,
-    onPointerEnter: onEnter ? eventLog('enter') : null,
-    onPointerEnterCapture: onEnterCapture ? eventLog('enter capture') : null,
-    onPointerMove: onMove ? eventLog('move') : null,
-    onPointerMoveCapture: onMoveCapture ? eventLog('move capture') : null,
-  };
-
-  const listeningTo = Object.keys(listeners)
-    .filter(listenerName => listeners[listenerName] != null)
-    .join(', ');
-
-  return (
-    <View ref={ref} {...listeners} {...restProps}>
-      <View style={styles.row}>
-        <Text>
-          {props.name}, {tag}, {listeningTo}
-        </Text>
-      </View>
-      {props.children}
-    </View>
-  );
-}
+import CompatibilityNativeGestureHandling from './Compatibility/CompatibilityNativeGestureHandling';
+import PointerEventPrimaryTouchPointer from './W3CPointerEventPlatformTests/PointerEventPrimaryTouchPointer';
+import PointerEventAttributesNoHoverPointers from './W3CPointerEventPlatformTests/PointerEventAttributesNoHoverPointers';
+import PointerEventPointerMoveOnChordedMouseButton from './W3CPointerEventPlatformTests/PointerEventPointerMoveOnChordedMouseButton';
+import PointerEventPointerMoveAcross from './W3CPointerEventPlatformTests/PointerEventPointerMoveAcross';
+import PointerEventPointerMoveEventOrder from './W3CPointerEventPlatformTests/PointerEventPointerMoveEventOrder';
+import PointerEventPointerMoveBetween from './W3CPointerEventPlatformTests/PointerEventPointerMoveBetween';
+import PointerEventPointerOverOut from './W3CPointerEventPlatformTests/PointerEventPointerOverOut';
+import PointerEventLayoutChangeShouldFirePointerOver from './W3CPointerEventPlatformTests/PointerEventLayoutChangeShouldFirePointerOver';
+import EventfulView from './W3CPointerEventsEventfulView';
+import ManyPointersPropertiesExample from './Compatibility/ManyPointersPropertiesExample';
 
 function AbsoluteChildExample({log}: {log: string => void}) {
   return (
@@ -128,6 +59,8 @@ function RelativeChildExample({log}: {log: string => void}) {
         log={log}
         style={StyleSheet.compose(styles.eventfulView, styles.parent)}
         onUp
+        onOver
+        onOut
         onDown
         onEnter
         onLeave
@@ -135,6 +68,8 @@ function RelativeChildExample({log}: {log: string => void}) {
         <EventfulView
           log={log}
           onUp
+          onOver
+          onOut
           onDown
           onEnter
           onLeave
@@ -143,6 +78,8 @@ function RelativeChildExample({log}: {log: string => void}) {
           <EventfulView
             log={log}
             onUp
+            onOver
+            onOut
             onDown
             onEnter
             onLeave
@@ -216,37 +153,103 @@ export default {
   showIndividualExamples: true,
   examples: [
     {
-      name: 'relative',
-      description: 'Children laid out using relative positioning',
-      title: 'Relative Child',
+      name: 'pointerevent_attributes_hoverable_pointers',
+      description: '',
+      title: 'WPT: Pointer Events hoverable pointer attributes test',
       render(): React.Node {
-        return <PointerEventScaffolding Example={RelativeChildExample} />;
+        return <PointerEventAttributesHoverablePointers />;
       },
     },
     {
-      name: 'absolute',
-      description: 'Children laid out using absolute positioning',
-      title: 'Absolute Child',
+      name: 'pointerevent_attributes_nohover_pointers',
+      description: '',
+      title: 'WPT: Pointer Events no-hover pointer attributes test',
       render(): React.Node {
-        return <PointerEventScaffolding Example={AbsoluteChildExample} />;
+        return <PointerEventAttributesNoHoverPointers />;
       },
     },
     {
-      name: 'pointerevent_attributes_hoverable_pointers',
+      name: 'pointerevent_pointermove',
       description: '',
-      title: 'Pointer Events hoverable pointer attributes test',
+      title: 'WPT: PointerMove test',
       render(): React.Node {
-        return <PointerEventAttributesHoverablePointers />;
+        return <PointerEventPointerMove />;
       },
     },
     {
-      name: 'pointerevent_pointermove',
+      name: 'pointerevent_primary_touch_pointer',
       description: '',
-      title: 'PointerMove test',
+      title: 'WPT: Pointer Event primary touch pointer test',
       render(): React.Node {
-        return <PointerEventPointerMove />;
+        return <PointerEventPrimaryTouchPointer />;
+      },
+    },
+    {
+      name: 'pointerevent_pointermove_on_chorded_mouse_button',
+      description: '',
+      title: 'WPT: PointerEvents pointermove on button state changes',
+      render(): React.Node {
+        return <PointerEventPointerMoveOnChordedMouseButton />;
+      },
+    },
+    {
+      name: 'pointerevent_pointermove_across',
+      description: '',
+      title: 'WPT: Pointermove handling across elements',
+      render(): React.Node {
+        return <PointerEventPointerMoveAcross />;
+      },
+    },
+    {
+      name: 'pointerevent_pointermove_event_order',
+      description: '',
+      title: 'WPT: PointerEvent - pointermove event order',
+      render(): React.Node {
+        return <PointerEventPointerMoveEventOrder />;
+      },
+    },
+    {
+      name: 'pointerevent_pointermove_between',
+      description: '',
+      title: 'WPT: Pointermove handling between elements',
+      render(): React.Node {
+        return <PointerEventPointerMoveBetween />;
+      },
+    },
+    {
+      name: 'pointerevent_pointerover_out',
+      description: '',
+      title: 'WPT: PointerOver/PointerOut handling',
+      render(): React.Node {
+        return <PointerEventPointerOverOut />;
+      },
+    },
+    {
+      name: 'pointerevent_layout_change_should_fire_pointerover',
+      description: '',
+      title: 'WPT: Layout change should fire pointerover',
+      render(): React.Node {
+        return <PointerEventLayoutChangeShouldFirePointerOver />;
+      },
+    },
+    {
+      name: 'relative',
+      description: 'Children laid out using relative positioning',
+      title: 'Relative Child',
+      render(): React.Node {
+        return <PointerEventScaffolding Example={RelativeChildExample} />;
+      },
+    },
+    {
+      name: 'absolute',
+      description: 'Children laid out using absolute positioning',
+      title: 'Absolute Child',
+      render(): React.Node {
+        return <PointerEventScaffolding Example={AbsoluteChildExample} />;
       },
     },
     CompatibilityAnimatedPointerMove,
+    CompatibilityNativeGestureHandling,
+    ManyPointersPropertiesExample,
   ],
 };
diff --git a/packages/rn-tester/js/examples/FlatList/BaseFlatListExample.js b/packages/rn-tester/js/examples/FlatList/BaseFlatListExample.js
index 211706ced3c8..0f07b9847bac 100644
--- a/packages/rn-tester/js/examples/FlatList/BaseFlatListExample.js
+++ b/packages/rn-tester/js/examples/FlatList/BaseFlatListExample.js
@@ -144,7 +144,7 @@ const styles = StyleSheet.create({
   separator: {
     height: 12,
   },
-  separtorText: {
+  separatorText: {
     fontSize: 10,
   },
   list: {
diff --git a/packages/rn-tester/js/examples/FlatList/FlatList-basic.js b/packages/rn-tester/js/examples/FlatList/FlatList-basic.js
index 9d3796062a7d..64f2800a3554 100644
--- a/packages/rn-tester/js/examples/FlatList/FlatList-basic.js
+++ b/packages/rn-tester/js/examples/FlatList/FlatList-basic.js
@@ -12,6 +12,7 @@
 
 import type {AnimatedComponentType} from 'react-native/Libraries/Animated/createAnimatedComponent';
 import typeof FlatListType from 'react-native/Libraries/Lists/FlatList';
+import type {RenderItemProps} from 'react-native/Libraries/Lists/VirtualizedListProps';
 
 import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
 import * as React from 'react';
@@ -94,21 +95,24 @@ class FlatListExample extends React.PureComponent<Props, State> {
   };
 
   _onChangeScrollToIndex = (text: mixed) => {
-    this._listRef.scrollToIndex({viewPosition: 0.5, index: Number(text)});
+    this._listRef?.scrollToIndex({viewPosition: 0.5, index: Number(text)});
   };
 
+  // $FlowFixMe[missing-local-annot]
   _scrollPos = new Animated.Value(0);
+  // $FlowFixMe[missing-local-annot]
   _scrollSinkX = Animated.event(
     [{nativeEvent: {contentOffset: {x: this._scrollPos}}}],
     {useNativeDriver: true},
   );
+  // $FlowFixMe[missing-local-annot]
   _scrollSinkY = Animated.event(
     [{nativeEvent: {contentOffset: {y: this._scrollPos}}}],
     {useNativeDriver: true},
   );
 
   componentDidUpdate() {
-    this._listRef.recordInteraction(); // e.g. flipping logViewable switch
+    this._listRef?.recordInteraction(); // e.g. flipping logViewable switch
   }
 
   _setBooleanValue: string => boolean => void = key => value =>
@@ -267,10 +271,11 @@ class FlatListExample extends React.PureComponent<Props, State> {
         React.ElementConfig<FlatListType>,
         React.ElementRef<FlatListType>,
       >,
-    >,
+    > | null,
   ) => {
     this._listRef = ref;
   };
+  // $FlowFixMe[missing-local-annot]
   _getItemLayout = (data: any, index: number) => {
     return getItemLayout(data, index, this.state.horizontal);
   };
@@ -282,39 +287,36 @@ class FlatListExample extends React.PureComponent<Props, State> {
       data: state.data.concat(genItemData(100, state.data.length)),
     }));
   };
+  // $FlowFixMe[missing-local-annot]
   _onPressCallback = () => {
     const {onPressDisabled} = this.state;
     const warning = () => console.log('onPress disabled');
     const onPressAction = onPressDisabled ? warning : this._pressItem;
     return onPressAction;
   };
+  // $FlowFixMe[missing-local-annot]
   _onRefresh = () => Alert.alert('onRefresh: nothing to refresh :P');
+  // $FlowFixMe[missing-local-annot]
   _renderItemComponent = () => {
-    const flatListPropKey = this.state.useFlatListItemComponent
-      ? 'ListItemComponent'
-      : 'renderItem';
-
-    return {
-      renderItem: undefined,
-      /* $FlowFixMe[invalid-computed-prop] (>=0.111.0 site=react_native_fb)
-       * This comment suppresses an error found when Flow v0.111 was deployed.
-       * To see the error, delete this comment and run Flow. */
-      /* $FlowFixMe[missing-local-annot] The type annotation(s) required by
-       * Flow's LTI update could not be added via codemod */
-      [flatListPropKey]: ({item, separators}) => {
-        return (
-          <ItemComponent
-            item={item}
-            horizontal={this.state.horizontal}
-            fixedHeight={this.state.fixedHeight}
-            onPress={this._onPressCallback()}
-            onShowUnderlay={separators.highlight}
-            onHideUnderlay={separators.unhighlight}
-            textSelectable={this.state.textSelectable}
-          />
-        );
-      },
+    const renderProp = ({item, separators}: RenderItemProps<Item>) => {
+      return (
+        <ItemComponent
+          item={item}
+          horizontal={this.state.horizontal}
+          fixedHeight={this.state.fixedHeight}
+          onPress={this._onPressCallback()}
+          onShowUnderlay={separators.highlight}
+          onHideUnderlay={separators.unhighlight}
+          textSelectable={this.state.textSelectable}
+        />
+      );
     };
+    return this.state.useFlatListItemComponent
+      ? {
+          renderItem: undefined,
+          ListItemComponent: renderProp,
+        }
+      : {renderItem: renderProp};
   };
   // This is called when items change viewability by scrolling into or out of
   // the viewable area.
@@ -339,7 +341,7 @@ class FlatListExample extends React.PureComponent<Props, State> {
   };
 
   _pressItem = (key: string) => {
-    this._listRef && this._listRef.recordInteraction();
+    this._listRef?.recordInteraction();
     const index = Number(key);
     const itemState = pressItem(this.state.data[index]);
     this.setState(state => ({
@@ -352,7 +354,7 @@ class FlatListExample extends React.PureComponent<Props, State> {
     }));
   };
 
-  _listRef: React.ElementRef<typeof Animated.FlatList>;
+  _listRef: React.ElementRef<typeof Animated.FlatList> | null;
 }
 
 const styles = StyleSheet.create({
diff --git a/packages/rn-tester/js/examples/FlatList/FlatList-multiColumn.js b/packages/rn-tester/js/examples/FlatList/FlatList-multiColumn.js
index 66f0fc441532..c92c688840fc 100644
--- a/packages/rn-tester/js/examples/FlatList/FlatList-multiColumn.js
+++ b/packages/rn-tester/js/examples/FlatList/FlatList-multiColumn.js
@@ -142,7 +142,7 @@ class MultiColumnExample extends React.PureComponent<
       getItemLayout(data, index).length + 2 * (CARD_MARGIN + BORDER_WIDTH);
     return {length, offset: length * index, index};
   }
-  _renderItemComponent = ({item}: RenderItemProps<any | Item>) => {
+  _renderItemComponent = ({item}: RenderItemProps<any | Item>): $FlowFixMe => {
     return (
       <View style={styles.card}>
         <ItemComponent
diff --git a/packages/rn-tester/js/examples/FlatList/FlatList-nested.js b/packages/rn-tester/js/examples/FlatList/FlatList-nested.js
new file mode 100644
index 000000000000..f2d1282a5a72
--- /dev/null
+++ b/packages/rn-tester/js/examples/FlatList/FlatList-nested.js
@@ -0,0 +1,340 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+import * as React from 'react';
+import {useCallback, useEffect, useReducer} from 'react';
+import {FlatList, StyleSheet, Text, View} from 'react-native';
+
+import RNTesterPage from '../../components/RNTesterPage';
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+import type {ViewToken} from '../../../../../Libraries/Lists/ViewabilityHelper';
+
+type OuterItem = 'head' | 'vertical' | 'horizontal' | 'filler';
+
+const outerItems: OuterItem[] = [
+  'head',
+  'vertical',
+  'filler',
+  'horizontal',
+  'filler',
+  'vertical',
+];
+
+const items = [1, 2, 3, 4, 5];
+
+type ItemsState = {
+  renderedItems: number[],
+  viewableItems: number[],
+};
+
+const initialItemsState: ItemsState = {
+  renderedItems: [],
+  viewableItems: [],
+};
+
+type ItemsAction = {
+  type: 'add-rendered' | 'add-viewable' | 'remove-rendered' | 'remove-viewable',
+  item: number,
+};
+
+function reducer(state: ItemsState, action: ItemsAction): ItemsState {
+  if (action.type === 'add-rendered') {
+    if (state.renderedItems.includes(action.item)) {
+      return state;
+    } else {
+      return {...state, renderedItems: [...state.renderedItems, action.item]};
+    }
+  } else if (action.type === 'add-viewable') {
+    if (state.viewableItems.includes(action.item)) {
+      return state;
+    } else {
+      return {...state, viewableItems: [...state.viewableItems, action.item]};
+    }
+  } else if (action.type === 'remove-rendered') {
+    return {
+      ...state,
+      renderedItems: state.renderedItems.filter(i => i !== action.item),
+    };
+  } else if (action.type === 'remove-viewable') {
+    return {
+      ...state,
+      viewableItems: state.viewableItems.filter(i => i !== action.item),
+    };
+  }
+
+  return state;
+}
+
+function NestedListExample(): React.Node {
+  const [outer, dispatchOuter] = useReducer(reducer, initialItemsState);
+  const [inner, dispatchInner] = useReducer(reducer, initialItemsState);
+
+  const onViewableItemsChanged = useCallback(
+    ({
+      changed,
+    }: {
+      changed: Array<ViewToken>,
+      viewableItems: Array<ViewToken>,
+      ...
+    }) => {
+      for (const token of changed) {
+        dispatchOuter({
+          type: token.isViewable ? 'add-viewable' : 'remove-viewable',
+          item: token.index ?? -1,
+        });
+      }
+    },
+    [dispatchOuter],
+  );
+
+  return (
+    <RNTesterPage noSpacer={true} noScroll={true}>
+      <Text style={styles.debugText}>
+        <Text style={styles.debugTextHeader}>Outer Viewable:{'\n'}</Text>
+        {outerItems
+          .map((item, i) => ({item, i}))
+          .filter(o => outer.viewableItems.includes(o.i))
+          .map(({item, i}) => `${i} (${item})`)
+          .join(', ')}
+      </Text>
+      <Text style={styles.debugText}>
+        <Text style={styles.debugTextHeader}>Outer Rendered:{'\n'}</Text>
+        {outerItems
+          .map((item, i) => ({item, i}))
+          .filter(o => outer.renderedItems.includes(o.i))
+          .map(({item, i}) => `${i} (${item})`)
+          .join(', ')}
+      </Text>
+      <Text style={styles.debugText}>
+        <Text style={styles.debugTextHeader}>Inner Viewable:{'\n'}</Text>
+        {inner.viewableItems.sort((a, b) => a - b).join(', ')}
+      </Text>
+      <Text style={styles.debugText}>
+        <Text style={styles.debugTextHeader}>Inner Rendered:{'\n'}</Text>
+        {inner.renderedItems.sort((a, b) => a - b).join(', ')}
+      </Text>
+
+      <FlatList
+        data={outerItems}
+        renderItem={({index, item}) => (
+          <OuterItemRenderer
+            index={index}
+            item={item}
+            dispatchOuter={dispatchOuter}
+            dispatchInner={dispatchInner}
+          />
+        )}
+        style={styles.list}
+        windowSize={3}
+        initialNumToRender={1}
+        onViewableItemsChanged={onViewableItemsChanged}
+      />
+    </RNTesterPage>
+  );
+}
+
+function OuterItemRenderer({
+  index,
+  item,
+  dispatchOuter,
+  dispatchInner,
+}: {
+  index: number,
+  item: OuterItem,
+  dispatchOuter: ItemsAction => void,
+  dispatchInner: ItemsAction => void,
+  ...
+}) {
+  useEffect(() => {
+    dispatchOuter({
+      type: 'add-rendered',
+      item: index,
+    });
+
+    return () => {
+      dispatchOuter({
+        type: 'remove-rendered',
+        item: index,
+      });
+    };
+  }, [dispatchOuter, index]);
+
+  const onViewableItemsChanged = useCallback(
+    ({
+      changed,
+    }: {
+      changed: Array<ViewToken>,
+      viewableItems: Array<ViewToken>,
+      ...
+    }) => {
+      for (const token of changed) {
+        dispatchInner({
+          type: token.isViewable ? 'add-viewable' : 'remove-viewable',
+          item: token.item,
+        });
+      }
+    },
+    [dispatchInner],
+  );
+
+  switch (item) {
+    case 'head':
+      return (
+        <View style={styles.header}>
+          <Text>Header</Text>
+        </View>
+      );
+
+    case 'vertical':
+      return (
+        <View style={styles.body}>
+          <View style={styles.col}>
+            <FlatList
+              data={items.map(i => index * items.length * 3 + i)}
+              renderItem={p => (
+                <InnerItemRenderer
+                  item={p.item}
+                  dispatchInner={dispatchInner}
+                />
+              )}
+              style={styles.childList}
+              onViewableItemsChanged={onViewableItemsChanged}
+              windowSize={1}
+              initialNumToRender={1}
+            />
+          </View>
+          <View style={styles.col}>
+            <FlatList
+              data={items.map(i => index * items.length * 3 + i + items.length)}
+              renderItem={p => (
+                <InnerItemRenderer
+                  item={p.item}
+                  dispatchInner={dispatchInner}
+                />
+              )}
+              style={styles.childList}
+              onViewableItemsChanged={onViewableItemsChanged}
+              windowSize={1}
+              initialNumToRender={1}
+            />
+          </View>
+        </View>
+      );
+
+    case 'horizontal':
+      return (
+        <View style={styles.row}>
+          <FlatList
+            horizontal={true}
+            data={items.map(
+              i => index * items.length * 3 + i + 2 * items.length,
+            )}
+            renderItem={p => (
+              <InnerItemRenderer item={p.item} dispatchInner={dispatchInner} />
+            )}
+            style={styles.childList}
+            onViewableItemsChanged={onViewableItemsChanged}
+          />
+        </View>
+      );
+
+    case 'filler':
+      return <View style={styles.filler} />;
+  }
+}
+
+function InnerItemRenderer({
+  item,
+  dispatchInner,
+}: {
+  item: number,
+  dispatchInner: ItemsAction => void,
+  ...
+}) {
+  useEffect(() => {
+    dispatchInner({
+      type: 'add-rendered',
+      item: item,
+    });
+
+    return () => {
+      dispatchInner({
+        type: 'remove-rendered',
+        item: item,
+      });
+    };
+  }, [dispatchInner, item]);
+
+  return (
+    <View style={styles.cell}>
+      <View style={styles.item}>
+        <Text>{item}</Text>
+      </View>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  debugText: {
+    fontSize: 10,
+  },
+  debugTextHeader: {
+    fontWeight: 'bold',
+  },
+  list: {
+    borderWidth: 1,
+    borderColor: 'black',
+  },
+  body: {
+    flexDirection: 'row',
+    justifyContent: 'space-around',
+  },
+  col: {
+    flex: 1,
+    padding: 10,
+  },
+  row: {
+    flex: 1,
+  },
+  filler: {
+    height: 72,
+    backgroundColor: 'lightblue',
+  },
+  childList: {
+    backgroundColor: 'lightgreen',
+  },
+  header: {
+    height: 40,
+    backgroundColor: 'lightcoral',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  cell: {
+    padding: 10,
+  },
+  item: {
+    alignItems: 'center',
+    justifyContent: 'center',
+    borderWidth: 1,
+    borderColor: 'black',
+    backgroundColor: 'oldlace',
+    height: 72,
+    minWidth: 144,
+  },
+});
+
+export default ({
+  title: 'Nested',
+  description: 'Nested FlatLists of same and opposite orientation',
+  name: 'nested',
+  render: NestedListExample,
+}: RNTesterModuleExample);
diff --git a/packages/rn-tester/js/examples/FlatList/FlatList-onViewableItemsChanged.js b/packages/rn-tester/js/examples/FlatList/FlatList-onViewableItemsChanged.js
index 8f35338ccb11..981d226dc1e3 100644
--- a/packages/rn-tester/js/examples/FlatList/FlatList-onViewableItemsChanged.js
+++ b/packages/rn-tester/js/examples/FlatList/FlatList-onViewableItemsChanged.js
@@ -9,7 +9,9 @@
  */
 
 'use strict';
+
 import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+import type {ViewToken} from '../../../../../Libraries/Lists/ViewabilityHelper';
 import BaseFlatListExample from './BaseFlatListExample';
 import {StyleSheet, View, FlatList} from 'react-native';
 import * as React from 'react';
@@ -32,7 +34,7 @@ export function FlatList_onViewableItemsChanged(props: {
   const {viewabilityConfig, offScreen, horizontal, useScrollRefScroll} = props;
   const [output, setOutput] = React.useState('');
   const onViewableItemsChanged = React.useCallback(
-    info =>
+    (info: {changed: Array<ViewToken>, viewableItems: Array<ViewToken>, ...}) =>
       setOutput(
         info.viewableItems
           .filter(viewToken => viewToken.index != null && viewToken.isViewable)
diff --git a/packages/rn-tester/js/examples/FlatList/FlatList-withSeparators.js b/packages/rn-tester/js/examples/FlatList/FlatList-withSeparators.js
index 9a0f0294891f..9f8a8881bb8b 100644
--- a/packages/rn-tester/js/examples/FlatList/FlatList-withSeparators.js
+++ b/packages/rn-tester/js/examples/FlatList/FlatList-withSeparators.js
@@ -32,7 +32,7 @@ const Separator =
           styles.separator,
           {backgroundColor: highlighted ? highlightColor : defaultColor},
         ]}>
-        <Text style={styles.separtorText}>{text}</Text>
+        <Text style={styles.separatorText}>{text}</Text>
       </View>
     );
   };
@@ -50,7 +50,7 @@ const styles = StyleSheet.create({
   separator: {
     height: 12,
   },
-  separtorText: {
+  separatorText: {
     fontSize: 10,
   },
 });
diff --git a/packages/rn-tester/js/examples/FlatList/FlatListExampleIndex.js b/packages/rn-tester/js/examples/FlatList/FlatListExampleIndex.js
index 7bcfa14d7acc..2fc61e2f55fb 100644
--- a/packages/rn-tester/js/examples/FlatList/FlatListExampleIndex.js
+++ b/packages/rn-tester/js/examples/FlatList/FlatListExampleIndex.js
@@ -17,6 +17,7 @@ import onViewableItemsChangedExample from './FlatList-onViewableItemsChanged';
 import WithSeparatorsExample from './FlatList-withSeparators';
 import MultiColumnExample from './FlatList-multiColumn';
 import StickyHeadersExample from './FlatList-stickyHeaders';
+import NestedExample from './FlatList-nested';
 
 export default ({
   framework: 'React',
@@ -34,5 +35,6 @@ export default ({
     WithSeparatorsExample,
     MultiColumnExample,
     StickyHeadersExample,
+    NestedExample,
   ],
 }: RNTesterModule);
diff --git a/packages/rn-tester/js/examples/Image/ImageExample.js b/packages/rn-tester/js/examples/Image/ImageExample.js
index eacc26ec2750..8a129323d0dc 100644
--- a/packages/rn-tester/js/examples/Image/ImageExample.js
+++ b/packages/rn-tester/js/examples/Image/ImageExample.js
@@ -43,7 +43,7 @@ type BlobImageProps = $ReadOnly<{|
 |}>;
 
 class BlobImage extends React.Component<BlobImageProps, BlobImageState> {
-  state = {
+  state: BlobImageState = {
     objectURL: null,
   };
 
@@ -56,7 +56,7 @@ class BlobImage extends React.Component<BlobImageProps, BlobImageState> {
     })();
   }
 
-  render() {
+  render(): React.Node {
     return this.state.objectURL !== null ? (
       <Image source={{uri: this.state.objectURL}} style={styles.base} />
     ) : (
@@ -75,7 +75,7 @@ class BlobImageExample extends React.Component<
   BlobImageExampleProps,
   BlobImageExampleState,
 > {
-  render() {
+  render(): React.Node {
     return (
       <View style={styles.horizontal}>
         {this.props.urls.map(url => (
@@ -102,7 +102,7 @@ class NetworkImageCallbackExample extends React.Component<
   NetworkImageCallbackExampleProps,
   NetworkImageCallbackExampleState,
 > {
-  state = {
+  state: NetworkImageCallbackExampleState = {
     events: [],
     startLoadPrefetched: false,
     mountTime: Date.now(),
@@ -123,13 +123,13 @@ class NetworkImageCallbackExample extends React.Component<
     this.setState({imageHash: Date.now()});
   };
 
-  render() {
+  render(): React.Node {
     const {mountTime} = this.state;
     return (
       <View>
         <Image
           source={this.props.source}
-          style={[styles.base, {overflow: 'visible'}]}
+          style={[styles.base, styles.visibleOverflow]}
           onLoadStart={() =>
             this._loadEventFired(`✔ onLoadStart (+${Date.now() - mountTime}ms)`)
           }
@@ -185,7 +185,7 @@ class NetworkImageCallbackExample extends React.Component<
         {this.state.startLoadPrefetched ? (
           <Image
             source={this.props.prefetchedSource}
-            style={[styles.base, {overflow: 'visible'}]}
+            style={[styles.base, styles.visibleOverflow]}
             onLoadStart={() =>
               this._loadEventFired(
                 `✔ (prefetched) onLoadStart (+${Date.now() - mountTime}ms)`,
@@ -213,7 +213,9 @@ class NetworkImageCallbackExample extends React.Component<
             }
           />
         ) : null}
-        <Text style={{marginTop: 20}}>{this.state.events.join('\n')}</Text>
+        <Text style={styles.networkImageText}>
+          {this.state.events.join('\n')}
+        </Text>
       </View>
     );
   }
@@ -233,20 +235,20 @@ class NetworkImageExample extends React.Component<
   NetworkImageExampleProps,
   NetworkImageExampleState,
 > {
-  state = {
+  state: NetworkImageExampleState = {
     error: null,
     loading: false,
     progress: [],
   };
 
-  render() {
+  render(): React.Node {
     return this.state.error != null ? (
       <Text>{this.state.error}</Text>
     ) : (
       <>
         <Image
           source={this.props.source}
-          style={[styles.base, {overflow: 'visible'}]}
+          style={[styles.base, styles.visibleOverflow]}
           onLoadStart={e => this.setState({loading: true})}
           onError={e =>
             this.setState({error: e.nativeEvent.error, loading: false})
@@ -283,7 +285,7 @@ class ImageSizeExample extends React.Component<
   ImageSizeExampleProps,
   ImageSizeExampleState,
 > {
-  state = {
+  state: ImageSizeExampleState = {
     width: 0,
     height: 0,
   };
@@ -294,18 +296,10 @@ class ImageSizeExample extends React.Component<
     });
   }
 
-  render() {
+  render(): React.Node {
     return (
-      <View style={{flexDirection: 'row'}}>
-        <Image
-          style={{
-            width: 60,
-            height: 60,
-            backgroundColor: 'transparent',
-            marginRight: 10,
-          }}
-          source={this.props.source}
-        />
+      <View style={styles.flexRow}>
+        <Image style={styles.imageSizeExample} source={this.props.source} />
         <Text>
           Actual dimensions:{'\n'}
           Width: {this.state.width}, Height: {this.state.height}
@@ -326,7 +320,7 @@ class MultipleSourcesExample extends React.Component<
   MultipleSourcesExampleProps,
   MultipleSourcesExampleState,
 > {
-  state = {
+  state: MultipleSourcesExampleState = {
     width: 30,
     height: 30,
   };
@@ -351,10 +345,10 @@ class MultipleSourcesExample extends React.Component<
     });
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
-        <View style={{flexDirection: 'row', justifyContent: 'space-between'}}>
+        <View style={styles.spaceBetweenView}>
           <Text style={styles.touchableText} onPress={this.decreaseImageSize}>
             Decrease image size
           </Text>
@@ -367,7 +361,7 @@ class MultipleSourcesExample extends React.Component<
         </Text>
         <View style={{height: this.state.height, width: this.state.width}}>
           <Image
-            style={{flex: 1}}
+            style={styles.flex}
             source={[
               {
                 uri: 'https://www.facebook.com/favicon.ico',
@@ -397,7 +391,7 @@ class LoadingIndicatorSourceExample extends React.Component<
   LoadingIndicatorSourceExampleProps,
   LoadingIndicatorSourceExampleState,
 > {
-  state = {
+  state: LoadingIndicatorSourceExampleState = {
     imageHash: Date.now(),
   };
 
@@ -407,18 +401,18 @@ class LoadingIndicatorSourceExample extends React.Component<
     });
   };
 
-  loaderGif = {
+  loaderGif: {uri: string} = {
     uri: 'https://media1.giphy.com/media/3oEjI6SIIHBdRxXI40/200.gif',
   };
 
-  render() {
+  render(): React.Node {
     const loadingImage = {
       uri: `https://www.facebook.com/ads/pics/successstories.png?hash=${this.state.imageHash}`,
     };
 
     return (
       <View>
-        <View style={{flexDirection: 'row', justifyContent: 'space-between'}}>
+        <View style={styles.spaceBetweenView}>
           <Text style={styles.touchableText} onPress={this.reloadImage}>
             Refresh Image
           </Text>
@@ -447,7 +441,7 @@ class OnLayoutExample extends React.Component<
   OnLayoutExampleProps,
   OnLayoutExampleState,
 > {
-  state = {
+  state: OnLayoutExampleState = {
     width: 30,
     height: 30,
     layoutHandlerMessage: 'No Message',
@@ -482,11 +476,11 @@ class OnLayoutExample extends React.Component<
     });
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Text>Adjust the image size to trigger the OnLayout handler.</Text>
-        <View style={{flexDirection: 'row', justifyContent: 'space-between'}}>
+        <View style={styles.spaceBetweenView}>
           <Text style={styles.touchableText} onPress={this.decreaseImageSize}>
             Decrease image size
           </Text>
@@ -500,7 +494,7 @@ class OnLayoutExample extends React.Component<
         <View style={{height: this.state.height, width: this.state.width}}>
           <Image
             onLayout={this.onLayoutHandler}
-            style={{flex: 1}}
+            style={styles.flex}
             source={[
               {
                 uri: 'https://www.facebook.com/favicon.ico',
@@ -536,7 +530,7 @@ class OnPartialLoadExample extends React.Component<
   OnPartialLoadExampleProps,
   OnPartialLoadExampleState,
 > {
-  state = {
+  state: OnPartialLoadExampleState = {
     hasLoaded: false,
   };
 
@@ -546,7 +540,7 @@ class OnPartialLoadExample extends React.Component<
     });
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Text>
@@ -577,6 +571,9 @@ const styles = StyleSheet.create({
     height: 64,
     margin: 4,
   },
+  visibleOverflow: {
+    overflow: 'visible',
+  },
   leftMargin: {
     marginLeft: 10,
   },
@@ -624,6 +621,144 @@ const styles = StyleSheet.create({
     fontWeight: '500',
     color: 'blue',
   },
+  networkImageText: {
+    marginTop: 20,
+  },
+  flex: {
+    flex: 1,
+  },
+  imageWithBorderRadius: {
+    borderRadius: 5,
+  },
+  imageSizeExample: {
+    width: 60,
+    height: 60,
+    backgroundColor: 'transparent',
+    marginRight: 10,
+  },
+  flexRow: {
+    flexDirection: 'row',
+  },
+  spaceBetweenView: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+  },
+  customBorderColor: {
+    borderWidth: 5,
+    borderColor: '#f099f0',
+  },
+  borderTopLeftRadius: {
+    borderTopLeftRadius: 20,
+  },
+  opacity1: {
+    opacity: 1,
+  },
+  opacity2: {
+    opacity: 0.8,
+  },
+  opacity3: {
+    opacity: 0.6,
+  },
+  opacity4: {
+    opacity: 0.4,
+  },
+  opacity5: {
+    opacity: 0.2,
+  },
+  opacity6: {
+    opacity: 0,
+  },
+  transparentImageBackground: {
+    width: 60,
+    height: 60,
+    backgroundColor: 'transparent',
+  },
+  tintColor1: {
+    tintColor: '#ff2d55',
+  },
+  tintColor2: {
+    tintColor: '#5ac8fa',
+  },
+  tintColor3: {
+    tintColor: '#4cd964',
+  },
+  tintColor4: {
+    tintColor: '#8e8e93',
+  },
+  objectFitContain: {
+    objectFit: 'contain',
+  },
+  objectFitCover: {
+    objectFit: 'cover',
+  },
+  objectFitFill: {
+    objectFit: 'fill',
+  },
+  objectFitScaleDown: {
+    objectFit: 'scale-down',
+  },
+  imageInBundle: {
+    borderColor: 'yellow',
+    borderWidth: 4,
+  },
+  imageInAssetCatalog: {
+    marginLeft: 10,
+    borderColor: 'blue',
+    borderWidth: 4,
+  },
+  backgroundColor1: {
+    backgroundColor: 'rgba(0, 0, 100, 0.25)',
+  },
+  backgroundColor2: {
+    backgroundColor: 'red',
+  },
+  backgroundColor3: {
+    backgroundColor: 'red',
+    borderColor: 'green',
+    borderWidth: 3,
+    borderRadius: 25,
+  },
+  borderRadius1: {
+    borderRadius: 19,
+  },
+  borderRadius2: {
+    borderWidth: 4,
+    borderTopLeftRadius: 10,
+    borderBottomRightRadius: 20,
+    borderColor: 'green',
+  },
+  borderRadius3: {
+    resizeMode: 'cover',
+    width: 90,
+    borderWidth: 4,
+    borderTopLeftRadius: 10,
+    borderTopRightRadius: 20,
+    borderBottomRightRadius: 30,
+    borderBottomLeftRadius: 40,
+    borderColor: 'red',
+  },
+  borderRadius4: {
+    resizeMode: 'stretch',
+    width: 90,
+    borderWidth: 4,
+    borderTopLeftRadius: 10,
+    borderTopRightRadius: 20,
+    borderBottomRightRadius: 30,
+    borderBottomLeftRadius: 40,
+    borderColor: 'red',
+    backgroundColor: 'yellow',
+  },
+  borderRadius5: {
+    resizeMode: 'contain',
+    width: 90,
+    borderWidth: 4,
+    borderTopLeftRadius: 10,
+    borderTopRightRadius: 20,
+    borderBottomRightRadius: 30,
+    borderBottomLeftRadius: 40,
+    borderColor: 'red',
+    backgroundColor: 'yellow',
+  },
 });
 
 exports.displayName = (undefined: ?string);
@@ -635,13 +770,39 @@ exports.description =
 
 exports.examples = [
   {
-    title: 'Plain Network Image',
+    title: 'Plain Network Image with `source` prop.',
     description: ('If the `source` prop `uri` property is prefixed with ' +
       '"http", then it will be downloaded from the network.': string),
     render: function (): React.Node {
       return <Image source={fullImage} style={styles.base} />;
     },
   },
+  {
+    title: 'Plain Network Image with `src` prop.',
+    description: ('If the `src` prop is defined with ' +
+      '"http", then it will be downloaded from the network.': string),
+    render: function (): React.Node {
+      return <Image src={fullImage.uri} style={styles.base} />;
+    },
+  },
+  {
+    title: 'Multiple Image Source using the `srcSet` prop.',
+    description:
+      ('A list of comma seperated uris along with scale are provided in `srcSet`.' +
+        'An appropriate value will be used based on the scale of the device.': string),
+    render: function (): React.Node {
+      return (
+        <Image
+          width={64}
+          height={64}
+          srcSet={
+            'https://www.facebook.com/ads/pics/successstories.png 4x, https://www.facebook.com/favicon.ico 2x'
+          }
+          style={styles.base}
+        />
+      );
+    },
+  },
   {
     title: 'Plain Blob Image',
     description: ('If the `source` prop `uri` property is an object URL, ' +
@@ -777,11 +938,7 @@ exports.examples = [
         <View style={styles.horizontal}>
           <Image
             source={smallImage}
-            style={[
-              styles.base,
-              styles.background,
-              {borderWidth: 5, borderColor: '#f099f0'},
-            ]}
+            style={[styles.base, styles.background, styles.customBorderColor]}
           />
         </View>
       );
@@ -792,72 +949,32 @@ exports.examples = [
     render: function (): React.Node {
       return (
         <View style={styles.horizontal}>
-          <Image style={[styles.base, {borderRadius: 5}]} source={fullImage} />
-          <Image style={[styles.base, {borderRadius: 19}]} source={fullImage} />
           <Image
-            style={[styles.base, {borderTopLeftRadius: 20}]}
+            style={[styles.base, styles.imageWithBorderRadius]}
             source={fullImage}
           />
           <Image
-            style={[
-              styles.base,
-              {
-                borderWidth: 4,
-                borderTopLeftRadius: 10,
-                borderBottomRightRadius: 20,
-                borderColor: 'green',
-              },
-            ]}
+            style={[styles.base, styles.borderRadius1]}
             source={fullImage}
           />
           <Image
-            style={[
-              styles.base,
-              {
-                resizeMode: 'cover',
-                width: 90,
-                borderWidth: 4,
-                borderTopLeftRadius: 10,
-                borderTopRightRadius: 20,
-                borderBottomRightRadius: 30,
-                borderBottomLeftRadius: 40,
-                borderColor: 'red',
-              },
-            ]}
+            style={[styles.base, styles.borderTopLeftRadius]}
             source={fullImage}
           />
           <Image
-            style={[
-              styles.base,
-              {
-                resizeMode: 'stretch',
-                width: 90,
-                borderWidth: 4,
-                borderTopLeftRadius: 10,
-                borderTopRightRadius: 20,
-                borderBottomRightRadius: 30,
-                borderBottomLeftRadius: 40,
-                borderColor: 'red',
-                backgroundColor: 'yellow',
-              },
-            ]}
+            style={[styles.base, styles.borderRadius2]}
             source={fullImage}
           />
           <Image
-            style={[
-              styles.base,
-              {
-                resizeMode: 'contain',
-                width: 90,
-                borderWidth: 4,
-                borderTopLeftRadius: 10,
-                borderTopRightRadius: 20,
-                borderBottomRightRadius: 30,
-                borderBottomLeftRadius: 40,
-                borderColor: 'red',
-                backgroundColor: 'yellow',
-              },
-            ]}
+            style={[styles.base, styles.borderRadius3]}
+            source={fullImage}
+          />
+          <Image
+            style={[styles.base, styles.borderRadius4]}
+            source={fullImage}
+          />
+          <Image
+            style={[styles.base, styles.borderRadius5]}
             source={fullImage}
           />
         </View>
@@ -871,23 +988,15 @@ exports.examples = [
         <View style={styles.horizontal}>
           <Image source={smallImage} style={styles.base} />
           <Image
-            style={[styles.base, {backgroundColor: 'rgba(0, 0, 100, 0.25)'}]}
+            style={[styles.base, styles.backgroundColor1]}
             source={smallImage}
           />
           <Image
-            style={[styles.base, {backgroundColor: 'red'}]}
+            style={[styles.base, styles.backgroundColor2]}
             source={smallImage}
           />
           <Image
-            style={[
-              styles.base,
-              {
-                backgroundColor: 'red',
-                borderColor: 'green',
-                borderWidth: 3,
-                borderRadius: 25,
-              },
-            ]}
+            style={[styles.base, styles.backgroundColor3]}
             source={smallImage}
           />
         </View>
@@ -899,12 +1008,12 @@ exports.examples = [
     render: function (): React.Node {
       return (
         <View style={styles.horizontal}>
-          <Image style={[styles.base, {opacity: 1}]} source={fullImage} />
-          <Image style={[styles.base, {opacity: 0.8}]} source={fullImage} />
-          <Image style={[styles.base, {opacity: 0.6}]} source={fullImage} />
-          <Image style={[styles.base, {opacity: 0.4}]} source={fullImage} />
-          <Image style={[styles.base, {opacity: 0.2}]} source={fullImage} />
-          <Image style={[styles.base, {opacity: 0}]} source={fullImage} />
+          <Image style={[styles.base, styles.opacity1]} source={fullImage} />
+          <Image style={[styles.base, styles.opacity2]} source={fullImage} />
+          <Image style={[styles.base, styles.opacity3]} source={fullImage} />
+          <Image style={[styles.base, styles.opacity4]} source={fullImage} />
+          <Image style={[styles.base, styles.opacity5]} source={fullImage} />
+          <Image style={[styles.base, styles.opacity6]} source={fullImage} />
         </View>
       );
     },
@@ -913,7 +1022,7 @@ exports.examples = [
     title: 'Nesting content inside <Image> component',
     render: function (): React.Node {
       return (
-        <View style={{width: 60, height: 60}}>
+        <View style={styles.base}>
           <Image
             style={{...StyleSheet.absoluteFillObject}}
             source={fullImage}
@@ -928,7 +1037,7 @@ exports.examples = [
     render: function (): React.Node {
       return (
         <ImageBackground
-          style={{width: 60, height: 60, backgroundColor: 'transparent'}}
+          style={styles.transparentImageBackground}
           source={fullImage}>
           <Text style={styles.nestedText}>React</Text>
         </ImageBackground>
@@ -937,7 +1046,7 @@ exports.examples = [
   },
   {
     title: 'Tint Color',
-    description: ('The `tintColor` style prop changes all the non-alpha ' +
+    description: ('The `tintColor` prop changes all the non-alpha ' +
       'pixels to the tint color.': string),
     render: function (): React.Node {
       return (
@@ -945,19 +1054,105 @@ exports.examples = [
           <View style={styles.horizontal}>
             <Image
               source={require('../../assets/uie_thumb_normal.png')}
-              style={[styles.icon, {borderRadius: 5, tintColor: '#5ac8fa'}]}
+              style={[
+                styles.icon,
+                styles.imageWithBorderRadius,
+                styles.tintColor1,
+              ]}
+              tintColor={'#5ac8fa'}
+            />
+            <Image
+              source={require('../../assets/uie_thumb_normal.png')}
+              style={[styles.icon, styles.imageWithBorderRadius]}
+              tintColor={'#4cd964'}
+            />
+            <Image
+              source={require('../../assets/uie_thumb_normal.png')}
+              style={[styles.icon, styles.imageWithBorderRadius]}
+              tintColor={'#ff2d55'}
+            />
+            <Image
+              source={require('../../assets/uie_thumb_normal.png')}
+              style={[styles.icon, styles.imageWithBorderRadius]}
+              tintColor={'#8e8e93'}
+            />
+          </View>
+          <Text style={styles.sectionText}>
+            It also works using the `tintColor` style prop
+          </Text>
+          <View style={styles.horizontal}>
+            <Image
+              source={require('../../assets/uie_thumb_normal.png')}
+              style={[
+                styles.icon,
+                styles.imageWithBorderRadius,
+                styles.tintColor2,
+              ]}
+            />
+            <Image
+              source={require('../../assets/uie_thumb_normal.png')}
+              style={[
+                styles.icon,
+                styles.imageWithBorderRadius,
+                styles.tintColor3,
+              ]}
+            />
+            <Image
+              source={require('../../assets/uie_thumb_normal.png')}
+              style={[
+                styles.icon,
+                styles.imageWithBorderRadius,
+                styles.tintColor1,
+              ]}
+            />
+            <Image
+              source={require('../../assets/uie_thumb_normal.png')}
+              style={[
+                styles.icon,
+                styles.imageWithBorderRadius,
+                styles.tintColor4,
+              ]}
+            />
+          </View>
+          <Text style={styles.sectionText}>
+            The `tintColor` prop has precedence over the `tintColor` style prop
+          </Text>
+          <View style={styles.horizontal}>
+            <Image
+              source={require('../../assets/uie_thumb_normal.png')}
+              style={[
+                styles.icon,
+                styles.imageWithBorderRadius,
+                styles.tintColor2,
+              ]}
+              tintColor={'#5ac8fa'}
             />
             <Image
               source={require('../../assets/uie_thumb_normal.png')}
-              style={[styles.icon, {borderRadius: 5, tintColor: '#4cd964'}]}
+              style={[
+                styles.icon,
+                styles.imageWithBorderRadius,
+                styles.tintColor3,
+              ]}
+              tintColor={'#5ac8fa'}
             />
             <Image
               source={require('../../assets/uie_thumb_normal.png')}
-              style={[styles.icon, {borderRadius: 5, tintColor: '#ff2d55'}]}
+              style={[
+                styles.icon,
+                styles.imageWithBorderRadius,
+                styles.tintColor1,
+              ]}
+              tintColor={'#5ac8fa'}
             />
             <Image
               source={require('../../assets/uie_thumb_normal.png')}
-              style={[styles.icon, {borderRadius: 5, tintColor: '#8e8e93'}]}
+              style={[
+                styles.icon,
+                styles.imageWithBorderRadius,
+                styles.tintColor4,
+              ]}
+              tintColor={'#5ac8fa'}
             />
           </View>
           <Text style={styles.sectionText}>
@@ -966,25 +1161,90 @@ exports.examples = [
           <View style={styles.horizontal}>
             <Image
               source={smallImage}
-              style={[styles.base, {borderRadius: 5, tintColor: '#5ac8fa'}]}
+              style={[
+                styles.base,
+                styles.imageWithBorderRadius,
+                styles.tintColor2,
+              ]}
             />
             <Image
               source={smallImage}
-              style={[styles.base, {borderRadius: 5, tintColor: '#4cd964'}]}
+              style={[
+                styles.base,
+                styles.imageWithBorderRadius,
+                styles.tintColor3,
+              ]}
             />
             <Image
               source={smallImage}
-              style={[styles.base, {borderRadius: 5, tintColor: '#ff2d55'}]}
+              style={[
+                styles.base,
+                styles.imageWithBorderRadius,
+                styles.tintColor1,
+              ]}
             />
             <Image
               source={smallImage}
-              style={[styles.base, {borderRadius: 5, tintColor: '#8e8e93'}]}
+              style={[
+                styles.base,
+                styles.imageWithBorderRadius,
+                styles.tintColor4,
+              ]}
             />
           </View>
         </View>
       );
     },
   },
+  {
+    title: 'Object Fit',
+    description: ('The `objectFit` style prop controls how the image is ' +
+      'rendered within the frame.': string),
+    render: function (): React.Node {
+      return (
+        <View>
+          {[smallImage, fullImage].map((image, index) => {
+            return (
+              <View key={index}>
+                <View style={styles.horizontal}>
+                  <View>
+                    <Text style={styles.resizeModeText}>Contain</Text>
+                    <Image
+                      style={[styles.resizeMode, styles.objectFitContain]}
+                      source={image}
+                    />
+                  </View>
+                  <View style={styles.leftMargin}>
+                    <Text style={styles.resizeModeText}>Cover</Text>
+                    <Image
+                      style={[styles.resizeMode, styles.objectFitCover]}
+                      source={image}
+                    />
+                  </View>
+                </View>
+                <View style={styles.horizontal}>
+                  <View>
+                    <Text style={styles.resizeModeText}>Fill</Text>
+                    <Image
+                      style={[styles.resizeMode, styles.objectFitFill]}
+                      source={image}
+                    />
+                  </View>
+                  <View style={styles.leftMargin}>
+                    <Text style={styles.resizeModeText}>Scale Down</Text>
+                    <Image
+                      style={[styles.resizeMode, styles.objectFitScaleDown]}
+                      source={image}
+                    />
+                  </View>
+                </View>
+              </View>
+            );
+          })}
+        </View>
+      );
+    },
+  },
   {
     title: 'Resize Mode',
     description: ('The `resizeMode` style prop controls how the image is ' +
@@ -1107,7 +1367,7 @@ exports.examples = [
     description: 'Images shipped in a separate native bundle',
     render: function (): React.Node {
       return (
-        <View style={{flexDirection: 'row'}}>
+        <View style={styles.flexRow}>
           <Image
             source={{
               uri: 'ImageInBundle',
@@ -1115,7 +1375,7 @@ exports.examples = [
               width: 100,
               height: 100,
             }}
-            style={{borderColor: 'yellow', borderWidth: 4}}
+            style={styles.imageInBundle}
           />
           <Image
             source={{
@@ -1124,7 +1384,7 @@ exports.examples = [
               width: 100,
               height: 100,
             }}
-            style={{marginLeft: 10, borderColor: 'blue', borderWidth: 4}}
+            style={styles.imageInAssetCatalog}
           />
         </View>
       );
@@ -1169,6 +1429,20 @@ exports.examples = [
       );
     },
   },
+  {
+    title: 'Accessibility Label via alt prop',
+    description:
+      'Using the alt prop markes an element as being accessibile, and passes the alt text to accessibilityLabel',
+    render: function (): React.Node {
+      return (
+        <Image
+          alt="Picture of people standing around a table"
+          source={fullImage}
+          style={styles.base}
+        />
+      );
+    },
+  },
   {
     title: 'Fade Duration',
     description:
diff --git a/packages/rn-tester/js/examples/InputAccessoryView/InputAccessoryViewExample.js b/packages/rn-tester/js/examples/InputAccessoryView/InputAccessoryViewExample.js
index b19e559915fb..24d0af2bb193 100644
--- a/packages/rn-tester/js/examples/InputAccessoryView/InputAccessoryViewExample.js
+++ b/packages/rn-tester/js/examples/InputAccessoryView/InputAccessoryViewExample.js
@@ -24,7 +24,7 @@ const {
 
 type MessageProps = $ReadOnly<{||}>;
 class Message extends React.PureComponent<MessageProps> {
-  render() {
+  render(): React.Node {
     return (
       <View style={styles.textBubbleBackground}>
         <Text style={styles.text}>Text Message</Text>
@@ -36,9 +36,9 @@ class Message extends React.PureComponent<MessageProps> {
 type TextInputProps = $ReadOnly<{||}>;
 type TextInputState = {|text: string|};
 class TextInputBar extends React.PureComponent<TextInputProps, TextInputState> {
-  state = {text: ''};
+  state: TextInputState = {text: ''};
 
-  render() {
+  render(): React.Node {
     return (
       <View style={styles.textInputContainer}>
         <TextInput
@@ -63,7 +63,7 @@ class TextInputBar extends React.PureComponent<TextInputProps, TextInputState> {
 const BAR_HEIGHT = 44;
 type InputAccessoryProps = $ReadOnly<{||}>;
 class InputAccessoryViewExample extends React.Component<InputAccessoryProps> {
-  render() {
+  render(): React.Node {
     return (
       <>
         <ScrollView style={styles.fill} keyboardDismissMode="interactive">
diff --git a/packages/rn-tester/js/examples/Keyboard/KeyboardExample.js b/packages/rn-tester/js/examples/Keyboard/KeyboardExample.js
new file mode 100644
index 000000000000..becaea73e95f
--- /dev/null
+++ b/packages/rn-tester/js/examples/Keyboard/KeyboardExample.js
@@ -0,0 +1,113 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+import type {
+  RNTesterModule,
+  RNTesterModuleExample,
+} from '../../types/RNTesterTypes';
+import type {KeyboardEvent} from 'react-native/Libraries/Components/Keyboard/Keyboard';
+
+import * as React from 'react';
+import {useEffect, useState} from 'react';
+import {Keyboard, StyleSheet, Text, View} from 'react-native';
+
+type KeyboardEventViewerProps = {
+  showEvent: 'keyboardWillShow' | 'keyboardDidShow',
+  hideEvent: 'keyboardWillHide' | 'keyboardDidHide',
+};
+
+const KeyboardEventViewer = (props: KeyboardEventViewerProps): React.Node => {
+  const {showEvent, hideEvent} = props;
+  const [isShown, setIsShown] = useState(false);
+  const [lastEvent, setLastEvent] = useState<?KeyboardEvent>();
+
+  useEffect(() => {
+    const subscription = Keyboard.addListener(showEvent, ev => {
+      setIsShown(true);
+      setLastEvent(ev);
+    });
+    return () => subscription.remove();
+  }, [showEvent]);
+
+  useEffect(() => {
+    const subscription = Keyboard.addListener(hideEvent, ev => {
+      setIsShown(false);
+      setLastEvent(ev);
+    });
+    return () => subscription.remove();
+  }, [hideEvent]);
+
+  return (
+    <View>
+      <Text>
+        <Text>Keyboard is </Text>
+        {isShown ? (
+          <Text style={styles.openText}>open</Text>
+        ) : (
+          <Text style={styles.closeText}>closed</Text>
+        )}
+      </Text>
+      <View style={styles.eventBox}>
+        <Text>
+          {lastEvent
+            ? JSON.stringify(lastEvent, null, 2)
+            : 'No events observed'}
+        </Text>
+      </View>
+    </View>
+  );
+};
+
+const keyboardWillShowHideExample: RNTesterModuleExample = {
+  title: 'keyboardWillShow / keyboardWillHide',
+  platform: 'ios',
+  render: () => (
+    <KeyboardEventViewer
+      showEvent="keyboardWillShow"
+      hideEvent="keyboardWillHide"
+    />
+  ),
+};
+
+const keyboardDidShowHideExample: RNTesterModuleExample = {
+  title: 'keyboardDidShow / keyboardDidHide',
+  render: () => (
+    <KeyboardEventViewer
+      showEvent="keyboardDidShow"
+      hideEvent="keyboardDidHide"
+    />
+  ),
+};
+
+const styles = StyleSheet.create({
+  closeText: {
+    color: 'red',
+  },
+  openText: {
+    color: 'green',
+  },
+  eventBox: {
+    marginTop: 10,
+    padding: 5,
+    borderWidth: StyleSheet.hairlineWidth,
+  },
+});
+
+const KeyboardExample: RNTesterModule = {
+  title: 'Keyboard',
+  description: 'Demonstrates usage of the "Keyboard" static API',
+  documentationURL: 'https://reactnative.dev/docs/keyboard',
+  category: 'Basic',
+  examples: [keyboardWillShowHideExample, keyboardDidShowHideExample],
+};
+
+export default KeyboardExample;
diff --git a/packages/rn-tester/js/examples/Layout/LayoutAnimationExample.js b/packages/rn-tester/js/examples/Layout/LayoutAnimationExample.js
index e3c848ff237d..89ad7ae4fa95 100644
--- a/packages/rn-tester/js/examples/Layout/LayoutAnimationExample.js
+++ b/packages/rn-tester/js/examples/Layout/LayoutAnimationExample.js
@@ -49,7 +49,7 @@ function shuffleArray(array: Array<ExampleViewSpec>) {
 }
 
 class AddRemoveExample extends React.Component<{...}, AddRemoveExampleState> {
-  state = {
+  state: AddRemoveExampleState = {
     views: [],
     nextKey: 1,
   };
@@ -96,7 +96,7 @@ class AddRemoveExample extends React.Component<{...}, AddRemoveExampleState> {
     this.setState(state => ({views: shuffleArray(state.views)}));
   };
 
-  render() {
+  render(): React.Node {
     const views = this.state.views.map(({key}) => (
       <View
         key={key}
@@ -151,7 +151,7 @@ class ReparentingExample extends React.Component<
   {...},
   ReparentingExampleState,
 > {
-  state = {
+  state: ReparentingExampleState = {
     hasBorder: false,
   };
 
@@ -172,7 +172,7 @@ class ReparentingExample extends React.Component<
     this.setState(state => ({hasBorder: !state.hasBorder}));
   };
 
-  render() {
+  render(): React.Node {
     const parentStyle = this.state.hasBorder
       ? {borderWidth: 5, borderColor: 'red'}
       : {};
@@ -214,7 +214,7 @@ type CrossFadeExampleState = {|
 |};
 
 class CrossFadeExample extends React.Component<{...}, CrossFadeExampleState> {
-  state = {
+  state: CrossFadeExampleState = {
     toggled: false,
   };
 
@@ -225,7 +225,7 @@ class CrossFadeExample extends React.Component<{...}, CrossFadeExampleState> {
     this.setState(state => ({toggled: !state.toggled}));
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View style={styles.container}>
         <TouchableOpacity onPress={this._onPressToggle}>
@@ -250,7 +250,7 @@ class LayoutUpdateExample extends React.Component<
   {...},
   LayoutUpdateExampleState,
 > {
-  state = {
+  state: LayoutUpdateExampleState = {
     width: 200,
     height: 100,
   };
@@ -285,7 +285,7 @@ class LayoutUpdateExample extends React.Component<
     this.timeout = setTimeout(() => this.setState({width: 100}), 500);
   };
 
-  render() {
+  render(): React.Node {
     const {width, height} = this.state;
 
     return (
diff --git a/packages/rn-tester/js/examples/Layout/LayoutEventsExample.js b/packages/rn-tester/js/examples/Layout/LayoutEventsExample.js
index 51063d85d49d..4b23f887145c 100644
--- a/packages/rn-tester/js/examples/Layout/LayoutEventsExample.js
+++ b/packages/rn-tester/js/examples/Layout/LayoutEventsExample.js
@@ -81,7 +81,7 @@ class LayoutEventExample extends React.Component<Props, State> {
     this.setState({imageLayout: e.nativeEvent.layout});
   };
 
-  render() {
+  render(): React.Node {
     const viewStyle = [styles.view, this.state.viewStyle];
     const textLayout = this.state.textLayout || {width: '?', height: '?'};
     const imageLayout = this.state.imageLayout || {x: '?', y: '?'};
diff --git a/packages/rn-tester/js/examples/Layout/LayoutExample.js b/packages/rn-tester/js/examples/Layout/LayoutExample.js
index 36496894610a..ef7320c52589 100644
--- a/packages/rn-tester/js/examples/Layout/LayoutExample.js
+++ b/packages/rn-tester/js/examples/Layout/LayoutExample.js
@@ -17,7 +17,7 @@ const React = require('react');
 const {StyleSheet, Text, View} = require('react-native');
 
 class Circle extends React.Component<$FlowFixMeProps> {
-  render() {
+  render(): React.Node {
     const size = this.props.size || 20;
     const backgroundColor = this.props.bgColor || '#527fe4';
     return (
@@ -35,7 +35,7 @@ class Circle extends React.Component<$FlowFixMeProps> {
 }
 
 class CircleBlock extends React.Component<$FlowFixMeProps> {
-  render() {
+  render(): React.Node {
     const circleStyle = {
       flexDirection: 'row',
       backgroundColor: '#f6f7f8',
diff --git a/packages/rn-tester/js/examples/NativeAnimation/NativeAnimationsExample.js b/packages/rn-tester/js/examples/NativeAnimation/NativeAnimationsExample.js
index c5dabd8589cb..09caeb180394 100644
--- a/packages/rn-tester/js/examples/NativeAnimation/NativeAnimationsExample.js
+++ b/packages/rn-tester/js/examples/NativeAnimation/NativeAnimationsExample.js
@@ -14,6 +14,9 @@ import type AnimatedValue from 'react-native/Libraries/Animated/nodes/AnimatedVa
 
 const React = require('react');
 
+import RNTesterSettingSwitchRow from '../../components/RNTesterSettingSwitchRow';
+import useJsStalls from '../../utils/useJsStalls';
+
 const {
   View,
   Text,
@@ -26,7 +29,7 @@ const {
 const AnimatedSlider = Animated.createAnimatedComponent(Slider);
 
 class Tester extends React.Component<$FlowFixMeProps, $FlowFixMeState> {
-  state = {
+  state: any | {js: AnimatedValue, native: AnimatedValue} = {
     native: new Animated.Value(0),
     js: new Animated.Value(0),
   };
@@ -54,7 +57,7 @@ class Tester extends React.Component<$FlowFixMeProps, $FlowFixMeState> {
     }).start();
   };
 
-  render() {
+  render(): React.Node {
     return (
       <TouchableWithoutFeedback onPress={this.onPress}>
         <View>
@@ -75,7 +78,7 @@ class Tester extends React.Component<$FlowFixMeProps, $FlowFixMeState> {
 }
 
 class ValueListenerExample extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state: any | {anim: AnimatedValue, progress: number} = {
     anim: new Animated.Value(0),
     progress: 0,
   };
@@ -102,7 +105,7 @@ class ValueListenerExample extends React.Component<{...}, $FlowFixMeState> {
     }).start();
   };
 
-  render() {
+  render(): React.Node {
     return (
       <TouchableWithoutFeedback onPress={this._onPress}>
         <View>
@@ -124,7 +127,7 @@ class ValueListenerExample extends React.Component<{...}, $FlowFixMeState> {
 }
 
 class LoopExample extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state: any | {value: AnimatedValue} = {
     value: new Animated.Value(0),
   };
 
@@ -138,7 +141,7 @@ class LoopExample extends React.Component<{...}, $FlowFixMeState> {
     ).start();
   }
 
-  render() {
+  render(): React.Node {
     return (
       <View style={styles.row}>
         <Animated.View
@@ -157,81 +160,49 @@ class LoopExample extends React.Component<{...}, $FlowFixMeState> {
   }
 }
 
-const RNTesterSettingSwitchRow = require('../../components/RNTesterSettingSwitchRow');
-class InternalSettings extends React.Component<
-  {...},
-  {
-    busyTime: number | string,
-    filteredStall: number,
-    ...
-  },
-> {
-  _stallInterval: ?number;
-  render() {
-    return (
-      <View>
-        <RNTesterSettingSwitchRow
-          initialValue={false}
-          label="Force JS Stalls"
-          onEnable={() => {
-            /* $FlowFixMe[incompatible-type] (>=0.63.0 site=react_native_fb)
-             * This comment suppresses an error found when Flow v0.63 was
-             * deployed. To see the error delete this comment and run Flow. */
-            this._stallInterval = setInterval(() => {
-              const start = Date.now();
-              console.warn('burn CPU');
-              while (Date.now() - start < 100) {}
-            }, 300);
-          }}
-          onDisable={() => {
-            /* $FlowFixMe[incompatible-call] (>=0.63.0 site=react_native_fb)
-             * This comment suppresses an error found when Flow v0.63 was
-             * deployed. To see the error delete this comment and run Flow. */
-            clearInterval(this._stallInterval || 0);
-          }}
-        />
-        <RNTesterSettingSwitchRow
-          initialValue={false}
-          label="Track JS Stalls"
-          onEnable={() => {
-            require('react-native/Libraries/Interaction/JSEventLoopWatchdog').install(
-              {
-                thresholdMS: 25,
-              },
-            );
-            this.setState({busyTime: '<none>'});
-            require('react-native/Libraries/Interaction/JSEventLoopWatchdog').addHandler(
-              {
-                onStall: ({busyTime}) =>
-                  this.setState(state => ({
-                    busyTime,
-                    filteredStall:
-                      (state.filteredStall || 0) * 0.97 + busyTime * 0.03,
-                  })),
-              },
-            );
-          }}
-          onDisable={() => {
-            console.warn('Cannot disable yet....');
-          }}
-        />
-        {this.state && (
-          <Text>
-            {`JS Stall filtered: ${Math.round(this.state.filteredStall)}, `}
-            {`last: ${this.state.busyTime}`}
-          </Text>
-        )}
-      </View>
-    );
-  }
-}
+const InternalSettings = () => {
+  const {
+    state,
+    onDisableForceJsStalls,
+    onEnableForceJsStalls,
+    onEnableJsStallsTracking,
+    onDisableJsStallsTracking,
+  } = useJsStalls();
+
+  const {stallIntervalId, filteredStall, busyTime, tracking} = state;
+
+  return (
+    <View>
+      <RNTesterSettingSwitchRow
+        active={stallIntervalId != null}
+        label="Force JS Stalls"
+        onEnable={onEnableForceJsStalls}
+        onDisable={onDisableForceJsStalls}
+      />
+
+      <RNTesterSettingSwitchRow
+        active={tracking}
+        label="Track JS Stalls"
+        onEnable={onEnableJsStallsTracking}
+        onDisable={onDisableJsStallsTracking}
+      />
+
+      {tracking && (
+        <Text>
+          {`JS Stall filtered: ${Math.round(filteredStall)}, `}
+          {`last: ${busyTime !== null ? busyTime.toFixed(8) : '<none>'}`}
+        </Text>
+      )}
+    </View>
+  );
+};
 
 class EventExample extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state: any | {anim: AnimatedValue} = {
     anim: new Animated.Value(0),
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Animated.View
@@ -282,7 +253,14 @@ class TrackingExample extends React.Component<
   $FlowFixMeProps,
   $FlowFixMeState,
 > {
-  state = {
+  state:
+    | any
+    | {
+        js: AnimatedValue,
+        native: AnimatedValue,
+        toJS: AnimatedValue,
+        toNative: AnimatedValue,
+      } = {
     native: new Animated.Value(0),
     toNative: new Animated.Value(0),
     js: new Animated.Value(0),
@@ -315,7 +293,10 @@ class TrackingExample extends React.Component<
     this.state.toJS.setValue(nextValue);
   };
 
-  renderBlock = (anim: any | AnimatedValue, dest: any | AnimatedValue) => [
+  renderBlock = (
+    anim: any | AnimatedValue,
+    dest: any | AnimatedValue,
+  ): Array<React.Node> => [
     <Animated.View
       key="line"
       style={[styles.line, {transform: [{translateX: dest}]}]}
@@ -326,7 +307,7 @@ class TrackingExample extends React.Component<
     />,
   ];
 
-  render() {
+  render(): React.Node {
     return (
       <TouchableWithoutFeedback onPress={this.onPress}>
         <View>
diff --git a/packages/rn-tester/js/examples/OrientationChange/OrientationChangeExample.js b/packages/rn-tester/js/examples/OrientationChange/OrientationChangeExample.js
index ccaada8b572c..16a7260d3e9f 100644
--- a/packages/rn-tester/js/examples/OrientationChange/OrientationChangeExample.js
+++ b/packages/rn-tester/js/examples/OrientationChange/OrientationChangeExample.js
@@ -17,7 +17,13 @@ import {type EventSubscription} from 'react-native/Libraries/vendor/emitter/Even
 class OrientationChangeExample extends React.Component<{...}, $FlowFixMeState> {
   _orientationSubscription: EventSubscription;
 
-  state = {
+  state:
+    | any
+    | {
+        currentOrientation: string,
+        isLandscape: boolean,
+        orientationDegrees: number,
+      } = {
     currentOrientation: '',
     orientationDegrees: 0,
     isLandscape: false,
@@ -42,7 +48,7 @@ class OrientationChangeExample extends React.Component<{...}, $FlowFixMeState> {
     });
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Text>{JSON.stringify(this.state)}</Text>
diff --git a/packages/rn-tester/js/examples/PermissionsAndroid/PermissionsExample.js b/packages/rn-tester/js/examples/PermissionsAndroid/PermissionsExample.js
index a0e40519725d..cd7f3035f93e 100644
--- a/packages/rn-tester/js/examples/PermissionsAndroid/PermissionsExample.js
+++ b/packages/rn-tester/js/examples/PermissionsAndroid/PermissionsExample.js
@@ -82,6 +82,17 @@ function PermissionsExample() {
             }
             style={styles.option}
           />
+          <RNTOption
+            label={PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS}
+            key={PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS}
+            onPress={() =>
+              setPermission(PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS)
+            }
+            selected={
+              permission === PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS
+            }
+            style={styles.option}
+          />
         </View>
       </View>
       <RNTesterButton onPress={checkPermission}>
diff --git a/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js b/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js
index 6ca70fe28597..cb41b818280c 100644
--- a/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js
+++ b/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js
@@ -214,6 +214,7 @@ function FallbackColorsExample() {
           style={{
             ...styles.colorCell,
             backgroundColor: color.color,
+            borderColor: color.color,
           }}
         />
       </View>
diff --git a/packages/rn-tester/js/examples/PointerEvents/PointerEventsExample.js b/packages/rn-tester/js/examples/PointerEvents/PointerEventsExample.js
index 57654c0687bf..069ac9384f04 100644
--- a/packages/rn-tester/js/examples/PointerEvents/PointerEventsExample.js
+++ b/packages/rn-tester/js/examples/PointerEvents/PointerEventsExample.js
@@ -27,7 +27,7 @@ type ExampleBoxState = $ReadOnly<{|
 |}>;
 
 class ExampleBox extends React.Component<ExampleBoxProps, ExampleBoxState> {
-  state = {
+  state: ExampleBoxState = {
     log: [],
   };
 
@@ -49,7 +49,7 @@ class ExampleBox extends React.Component<ExampleBoxProps, ExampleBoxState> {
     this.state.log = this.state.log.concat(['---']);
   };
 
-  render() {
+  render(): React.Node {
     const {Component} = this.props;
     return (
       <View>
@@ -69,7 +69,7 @@ class ExampleBox extends React.Component<ExampleBoxProps, ExampleBoxState> {
 }
 
 class NoneExample extends React.Component<$FlowFixMeProps> {
-  render() {
+  render(): React.Node {
     return (
       <View
         onTouchStart={() => this.props.onLog('A unspecified touched')}
@@ -95,12 +95,42 @@ class NoneExample extends React.Component<$FlowFixMeProps> {
   }
 }
 
+class NoneStyleExample extends React.Component<$FlowFixMeProps> {
+  render(): React.Node {
+    return (
+      <View
+        onTouchStart={() => this.props.onLog('A unspecified touched')}
+        style={styles.box}>
+        <DemoText style={styles.text}>A: unspecified</DemoText>
+        <View
+          onTouchStart={() => this.props.onLog('B none touched')}
+          style={[
+            styles.box,
+            styles.boxPassedThrough,
+            styles.pointerEventNone,
+          ]}>
+          <DemoText style={[styles.text, styles.textPassedThrough]}>
+            B: none
+          </DemoText>
+          <View
+            onTouchStart={() => this.props.onLog('C unspecified touched')}
+            style={[styles.box, styles.boxPassedThrough]}>
+            <DemoText style={[styles.text, styles.textPassedThrough]}>
+              C: unspecified
+            </DemoText>
+          </View>
+        </View>
+      </View>
+    );
+  }
+}
+
 /**
  * Special demo text that makes itself untouchable so that it doesn't destroy
  * the experiment and confuse the output.
  */
 class DemoText extends React.Component<$FlowFixMeProps> {
-  render() {
+  render(): React.Node {
     return (
       <View pointerEvents="none">
         <Text style={this.props.style}>{this.props.children}</Text>
@@ -110,7 +140,7 @@ class DemoText extends React.Component<$FlowFixMeProps> {
 }
 
 class BoxNoneExample extends React.Component<$FlowFixMeProps> {
-  render() {
+  render(): React.Node {
     return (
       <View
         onTouchStart={() => this.props.onLog('A unspecified touched')}
@@ -142,8 +172,43 @@ class BoxNoneExample extends React.Component<$FlowFixMeProps> {
   }
 }
 
+class BoxNoneStyleExample extends React.Component<$FlowFixMeProps> {
+  render(): React.Node {
+    return (
+      <View
+        onTouchStart={() => this.props.onLog('A unspecified touched')}
+        style={styles.box}>
+        <DemoText style={styles.text}>A: unspecified</DemoText>
+        <View
+          onTouchStart={() => this.props.onLog('B box-none touched')}
+          style={[
+            styles.box,
+            styles.boxPassedThrough,
+            styles.pointerEventBoxNone,
+          ]}>
+          <DemoText style={[styles.text, styles.textPassedThrough]}>
+            B: box-none
+          </DemoText>
+          <View
+            onTouchStart={() => this.props.onLog('C unspecified touched')}
+            style={styles.box}>
+            <DemoText style={styles.text}>C: unspecified</DemoText>
+          </View>
+          <View
+            onTouchStart={() =>
+              this.props.onLog('C explicitly unspecified touched')
+            }
+            style={[styles.box, styles.pointerEventAuto]}>
+            <DemoText style={[styles.text]}>C: explicitly unspecified</DemoText>
+          </View>
+        </View>
+      </View>
+    );
+  }
+}
+
 class BoxOnlyExample extends React.Component<$FlowFixMeProps> {
-  render() {
+  render(): React.Node {
     return (
       <View
         onTouchStart={() => this.props.onLog('A unspecified touched')}
@@ -177,13 +242,50 @@ class BoxOnlyExample extends React.Component<$FlowFixMeProps> {
   }
 }
 
+class BoxOnlyStyleExample extends React.Component<$FlowFixMeProps> {
+  render(): React.Node {
+    return (
+      <View
+        onTouchStart={() => this.props.onLog('A unspecified touched')}
+        style={styles.box}>
+        <DemoText style={styles.text}>A: unspecified</DemoText>
+        <View
+          onTouchStart={() => this.props.onLog('B box-only touched')}
+          style={[styles.box, styles.pointerEventBoxOnly]}>
+          <DemoText style={styles.text}>B: box-only</DemoText>
+          <View
+            onTouchStart={() => this.props.onLog('C unspecified touched')}
+            style={[styles.box, styles.boxPassedThrough]}>
+            <DemoText style={[styles.text, styles.textPassedThrough]}>
+              C: unspecified
+            </DemoText>
+          </View>
+          <View
+            onTouchStart={() =>
+              this.props.onLog('C explicitly unspecified touched')
+            }
+            style={[
+              styles.box,
+              styles.boxPassedThrough,
+              styles.pointerEventAuto,
+            ]}>
+            <DemoText style={[styles.text, styles.textPassedThrough]}>
+              C: explicitly unspecified
+            </DemoText>
+          </View>
+        </View>
+      </View>
+    );
+  }
+}
+
 type OverflowExampleProps = $ReadOnly<{|
   overflow: 'hidden' | 'visible',
   onLog: (msg: string) => void,
 |}>;
 
 class OverflowExample extends React.Component<OverflowExampleProps> {
-  render() {
+  render(): React.Node {
     const {overflow} = this.props;
     return (
       <View
@@ -217,13 +319,13 @@ class OverflowExample extends React.Component<OverflowExampleProps> {
 }
 
 class OverflowVisibleExample extends React.Component<ExampleBoxComponentProps> {
-  render() {
+  render(): React.Node {
     return <OverflowExample {...this.props} overflow="visible" />;
   }
 }
 
 class OverflowHiddenExample extends React.Component<ExampleBoxComponentProps> {
-  render() {
+  render(): React.Node {
     return <OverflowExample {...this.props} overflow="hidden" />;
   }
 }
@@ -242,18 +344,36 @@ const exampleClasses: Array<ExampleClass> = [
     description:
       '`none` causes touch events on the container and its child components to pass through to the parent container.',
   },
+  {
+    Component: NoneStyleExample,
+    title: '`none` style',
+    description:
+      '`none` causes touch events on the container and its child components to pass through to the parent container.',
+  },
   {
     Component: BoxNoneExample,
     title: '`box-none`',
     description:
       '`box-none` causes touch events on the container to pass through and will only detect touch events on its child components.',
   },
+  {
+    Component: BoxNoneStyleExample,
+    title: '`box-none` style',
+    description:
+      '`box-none` causes touch events on the container to pass through and will only detect touch events on its child components.',
+  },
   {
     Component: BoxOnlyExample,
     title: '`box-only`',
     description:
       "`box-only` causes touch events on the container's child components to pass through and will only detect touch events on the container itself.",
   },
+  {
+    Component: BoxOnlyStyleExample,
+    title: '`box-only` style',
+    description:
+      "`box-only` causes touch events on the container's child components to pass through and will only detect touch events on the container itself.",
+  },
   {
     Component: OverflowVisibleExample,
     title: '`overflow: visible`',
@@ -326,6 +446,18 @@ const styles = StyleSheet.create({
     borderColor: '#f0f0f0',
     backgroundColor: '#f9f9f9',
   },
+  pointerEventBoxNone: {
+    pointerEvents: 'box-none',
+  },
+  pointerEventBoxOnly: {
+    pointerEvents: 'box-only',
+  },
+  pointerEventNone: {
+    pointerEvents: 'none',
+  },
+  pointerEventAuto: {
+    pointerEvents: 'auto',
+  },
 });
 
 exports.framework = 'React';
diff --git a/packages/rn-tester/js/examples/Pressable/PressableExample.js b/packages/rn-tester/js/examples/Pressable/PressableExample.js
index b13987f12465..bc3689ba5770 100644
--- a/packages/rn-tester/js/examples/Pressable/PressableExample.js
+++ b/packages/rn-tester/js/examples/Pressable/PressableExample.js
@@ -10,18 +10,23 @@
 
 import * as React from 'react';
 import {
+  Alert,
   Animated,
   Image,
+  Platform,
   Pressable,
   StyleSheet,
   Text,
-  Platform,
   View,
 } from 'react-native';
 import ReactNativeFeatureFlags from 'react-native/Libraries/ReactNative/ReactNativeFeatureFlags';
 
 const {useEffect, useRef, useState} = React;
 
+function onPressablePress(pressableName: string) {
+  Alert.alert(`Your application has been ${pressableName}!`);
+}
+
 const forceTouchAvailable =
   (Platform.OS === 'ios' && Platform.constants.forceTouchAvailable) || false;
 
@@ -81,8 +86,22 @@ function TextOnPressBox() {
   );
 }
 
+function PressableAriaLabel() {
+  return (
+    <View style={[styles.row, styles.centered]}>
+      <Pressable
+        style={styles.wrapper}
+        testID="pressable_aria_label"
+        aria-label="pressable with aria label"
+        accessibilityRole="button"
+        onPress={() => onPressablePress('pressed')}>
+        <Text style={styles.button}>Press Me</Text>
+      </Pressable>
+    </View>
+  );
+}
 function PressableFeedbackEvents() {
-  const [eventLog, setEventLog] = useState([]);
+  const [eventLog, setEventLog] = useState<Array<string>>([]);
 
   function appendEvent(eventName: string) {
     const limit = 6;
@@ -118,7 +137,7 @@ function PressableFeedbackEvents() {
 }
 
 function PressableDelayEvents() {
-  const [eventLog, setEventLog] = useState([]);
+  const [eventLog, setEventLog] = useState<Array<string>>([]);
 
   function appendEvent(eventName: string) {
     const limit = 6;
@@ -524,6 +543,14 @@ const examples = [
       return <PressableDisabled />;
     },
   },
+  {
+    title: 'Pressable with aria-label="label"',
+    description: ('Note: This prop changes the text that a screen ' +
+      'reader announces (there are no visual differences).': string),
+    render: function (): React.Node {
+      return <PressableAriaLabel />;
+    },
+  },
 ];
 
 if (ReactNativeFeatureFlags.shouldPressibilityUseW3CPointerEventsForHover()) {
diff --git a/packages/rn-tester/js/examples/RCTRootView/RCTRootViewIOSExample.js b/packages/rn-tester/js/examples/RCTRootView/RCTRootViewIOSExample.js
index aa953da5bbda..576f5f020d06 100644
--- a/packages/rn-tester/js/examples/RCTRootView/RCTRootViewIOSExample.js
+++ b/packages/rn-tester/js/examples/RCTRootView/RCTRootViewIOSExample.js
@@ -19,11 +19,12 @@ const {
 } = require('react-native');
 
 class AppPropertiesUpdateExample extends React.Component<{...}> {
-  render() {
+  render(): React.Node {
     // Do not require this unless we are actually rendering.
-    const UpdatePropertiesExampleView = requireNativeComponent(
-      'UpdatePropertiesExampleView',
-    );
+    const UpdatePropertiesExampleView = requireNativeComponent<
+      | any
+      | {children: React.MixedElement, style: {height: number, width: number}},
+    >('UpdatePropertiesExampleView');
     return (
       <View style={styles.container}>
         <Text style={styles.text}>
@@ -41,11 +42,12 @@ class AppPropertiesUpdateExample extends React.Component<{...}> {
 }
 
 class RootViewSizeFlexibilityExample extends React.Component<{...}> {
-  render() {
+  render(): React.Node {
     // Do not require this unless we are actually rendering.
-    const FlexibleSizeExampleView = requireNativeComponent(
-      'FlexibleSizeExampleView',
-    );
+    const FlexibleSizeExampleView = requireNativeComponent<
+      | any
+      | {children: React.MixedElement, style: {height: number, width: number}},
+    >('FlexibleSizeExampleView');
     return (
       <View style={styles.container}>
         <Text style={styles.text}>
diff --git a/packages/rn-tester/js/examples/RTL/RTLExample.js b/packages/rn-tester/js/examples/RTL/RTLExample.js
index 4d1dfb322da0..01bf6deea3e4 100644
--- a/packages/rn-tester/js/examples/RTL/RTLExample.js
+++ b/packages/rn-tester/js/examples/RTL/RTLExample.js
@@ -167,6 +167,7 @@ function withRTLState(
       };
     }
 
+    // $FlowFixMe[missing-local-annot]
     render() {
       const setRTL = (isRTL: boolean) => this.setState({isRTL: isRTL});
       return (
@@ -206,7 +207,7 @@ class RTLToggleExample extends React.Component<any, RTLToggleState> {
     };
   }
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <View style={styles.directionBox}>
@@ -267,7 +268,7 @@ class AnimationExample extends React.Component<any, AnimationState> {
     };
   }
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <RTLToggler setRTL={this.props.setRTL} isRTL={this.props.isRTL} />
diff --git a/packages/rn-tester/js/examples/SafeAreaView/SafeAreaViewExample.js b/packages/rn-tester/js/examples/SafeAreaView/SafeAreaViewExample.js
index 12268f6edee7..a57283becec0 100644
--- a/packages/rn-tester/js/examples/SafeAreaView/SafeAreaViewExample.js
+++ b/packages/rn-tester/js/examples/SafeAreaView/SafeAreaViewExample.js
@@ -28,7 +28,7 @@ class SafeAreaViewExample extends React.Component<
     modalVisible: boolean,
   |},
 > {
-  state = {
+  state: {modalVisible: boolean} = {
     modalVisible: false,
   };
 
@@ -36,7 +36,7 @@ class SafeAreaViewExample extends React.Component<
     this.setState({modalVisible: visible});
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Modal
@@ -65,7 +65,7 @@ class SafeAreaViewExample extends React.Component<
 }
 
 class IsIPhoneXExample extends React.Component<{...}> {
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Text>
diff --git a/packages/rn-tester/js/examples/ScrollView/ScrollViewAnimatedExample.js b/packages/rn-tester/js/examples/ScrollView/ScrollViewAnimatedExample.js
index 6b774ed8632c..f1263820f494 100644
--- a/packages/rn-tester/js/examples/ScrollView/ScrollViewAnimatedExample.js
+++ b/packages/rn-tester/js/examples/ScrollView/ScrollViewAnimatedExample.js
@@ -10,6 +10,8 @@
 
 'use strict';
 
+import type AnimatedValue from 'react-native/Libraries/Animated/nodes/AnimatedValue';
+
 const React = require('react');
 const ReactNative = require('react-native');
 const {Component} = React;
@@ -17,7 +19,7 @@ const {StyleSheet, Text, View, Animated, Easing, TouchableOpacity, Dimensions} =
   ReactNative;
 
 class ScrollViewAnimatedExample extends Component<{...}> {
-  _scrollViewPos = new Animated.Value(0);
+  _scrollViewPos: AnimatedValue = new Animated.Value(0);
 
   startAnimation: () => void = () => {
     this._scrollViewPos.setValue(0);
diff --git a/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js b/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
index 499a077e8635..33f467a49231 100644
--- a/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
+++ b/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
@@ -8,31 +8,29 @@
  * @format
  */
 
-import * as React from 'react';
+import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
+import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
 
+import ScrollViewPressableStickyHeaderExample from './ScrollViewPressableStickyHeaderExample';
+import nullthrows from 'nullthrows';
+import * as React from 'react';
+import {useCallback, useState} from 'react';
 import {
   Platform,
+  RefreshControl,
   ScrollView,
   StyleSheet,
   Text,
+  TextInput,
   TouchableOpacity,
   View,
-  TextInput,
-  RefreshControl,
 } from 'react-native';
 
-import nullthrows from 'nullthrows';
-
-import {useState, useCallback} from 'react';
-import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
-import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
-import ScrollViewPressableStickyHeaderExample from './ScrollViewPressableStickyHeaderExample';
-
 class EnableDisableList extends React.Component<{}, {scrollEnabled: boolean}> {
-  state = {
+  state: {scrollEnabled: boolean} = {
     scrollEnabled: true,
   };
-  render() {
+  render(): React.Node {
     return (
       <View>
         <ScrollView
@@ -64,14 +62,14 @@ class EnableDisableList extends React.Component<{}, {scrollEnabled: boolean}> {
 let AppendingListItemCount = 6;
 class AppendingList extends React.Component<
   {},
-  {items: Array<React.Element<typeof Item>>},
+  {items: Array<React$Element<Class<Item>>>},
 > {
-  state = {
+  state: {items: Array<React.Element<Class<Item>>>} = {
     items: [...Array(AppendingListItemCount)].map((_, ii) => (
       <Item msg={`Item ${ii}`} />
     )),
   };
-  render() {
+  render(): React.Node {
     return (
       <View>
         <ScrollView
@@ -205,6 +203,7 @@ const examples = ([
       return (
         <View>
           <ScrollView
+            accessibilityRole="grid"
             ref={scrollView => {
               _scrollView = scrollView;
             }}
@@ -220,21 +219,21 @@ const examples = ([
           <Button
             label="Scroll to top"
             onPress={() => {
-              nullthrows(_scrollView).scrollTo({y: 0});
+              nullthrows<$FlowFixMe>(_scrollView).scrollTo({y: 0});
             }}
             testID="scroll_to_top_button"
           />
           <Button
             label="Scroll to bottom"
             onPress={() => {
-              nullthrows(_scrollView).scrollToEnd({animated: true});
+              nullthrows<$FlowFixMe>(_scrollView).scrollToEnd({animated: true});
             }}
             testID="scroll_to_bottom_button"
           />
           <Button
             label="Flash scroll indicators"
             onPress={() => {
-              nullthrows(_scrollView).flashScrollIndicators();
+              nullthrows<$FlowFixMe>(_scrollView).flashScrollIndicators();
             }}
             testID="flash_scroll_indicators_button"
           />
@@ -521,14 +520,16 @@ const HorizontalScrollView = (props: {direction: 'ltr' | 'rtl'}) => {
       <Button
         label="Scroll to start"
         onPress={() => {
-          nullthrows(scrollRef.current).scrollTo({x: 0});
+          nullthrows<$FlowFixMe>(scrollRef.current).scrollTo({x: 0});
         }}
         testID={'scroll_to_start_button'}
       />
       <Button
         label="Scroll to end"
         onPress={() => {
-          nullthrows(scrollRef.current).scrollToEnd({animated: true});
+          nullthrows<$FlowFixMe>(scrollRef.current).scrollToEnd({
+            animated: true,
+          });
         }}
         testID={'scroll_to_end_button'}
       />
@@ -569,7 +570,7 @@ const SnapToOptions = () => {
   const snapToAlignmentModes = ['start', 'center', 'end'];
   const [snapToEnd, setSnapToEnd] = useState(true);
   const [snapToInterval, setSnapToInterval] = useState(0);
-  const [snapToOffsets, setSnapToOffsets] = useState([]);
+  const [snapToOffsets, setSnapToOffsets] = useState<Array<number>>([]);
   const [snapToStart, setSnapToStart] = useState(true);
 
   return (
@@ -654,10 +655,15 @@ const ScrollToOptions = () => {
 };
 
 const ScrollIndicatorExample = () => {
-  const [scrollIndicatorInsets, setScrollIndicatorInsets] = useState(null);
+  const [scrollIndicatorInsets, setScrollIndicatorInsets] = useState<null | {
+    bottom: number,
+    left: number,
+    right: number,
+    top: number,
+  }>(null);
   const [showsHorizontalScrollIndic, setShowsHorizontalScrollIndic] =
     useState(true);
-  const [showsVerticallScrollIndic, setShowsVerticalScrollIndic] =
+  const [showsVerticalScrollIndic, setShowsVerticalScrollIndic] =
     useState(true);
   return (
     <View>
@@ -666,7 +672,7 @@ const ScrollIndicatorExample = () => {
         contentInset={{top: 10, bottom: 10, left: 10, right: 10}}
         scrollIndicatorInsets={scrollIndicatorInsets}
         showsHorizontalScrollIndicator={showsHorizontalScrollIndic}
-        showsVerticalScrollIndicator={showsVerticallScrollIndic}
+        showsVerticalScrollIndicator={showsVerticalScrollIndic}
         nestedScrollEnabled>
         {ITEMS.map(createItemRow)}
       </ScrollView>
@@ -698,10 +704,9 @@ const ScrollIndicatorExample = () => {
       />
       <Button
         label={
-          'showsVerticalScrollIndicator: ' +
-          showsVerticallScrollIndic.toString()
+          'showsVerticalScrollIndicator: ' + showsVerticalScrollIndic.toString()
         }
-        onPress={() => setShowsVerticalScrollIndic(!showsVerticallScrollIndic)}
+        onPress={() => setShowsVerticalScrollIndic(!showsVerticalScrollIndic)}
       />
     </View>
   );
@@ -951,14 +956,16 @@ const InvertStickyHeaders = () => {
         <Button
           label="Scroll to top"
           onPress={() => {
-            nullthrows(_scrollView.current).scrollTo({y: 0});
+            nullthrows<$FlowFixMe>(_scrollView.current).scrollTo({y: 0});
           }}
           testID="scroll_to_top_button"
         />
         <Button
           label="Scroll to bottom"
           onPress={() => {
-            nullthrows(_scrollView.current).scrollToEnd({animated: true});
+            nullthrows<$FlowFixMe>(_scrollView.current).scrollToEnd({
+              animated: true,
+            });
           }}
           testID="scroll_to_bottom_button"
         />
@@ -989,14 +996,16 @@ const MultipleStickyHeaders = () => {
         <Button
           label="Scroll to top"
           onPress={() => {
-            nullthrows(_scrollView.current).scrollTo({y: 0});
+            nullthrows<$FlowFixMe>(_scrollView.current).scrollTo({y: 0});
           }}
           testID="scroll_to_top_button"
         />
         <Button
           label="Scroll to bottom"
           onPress={() => {
-            nullthrows(_scrollView.current).scrollToEnd({animated: true});
+            nullthrows<$FlowFixMe>(_scrollView.current).scrollToEnd({
+              animated: true,
+            });
           }}
           testID="scroll_to_bottom_button"
         />
@@ -1101,8 +1110,15 @@ const DecelerationRateExample = () => {
 
 const ContentExample = () => {
   const [canCancelContentTouches, setCanCancelContentTouches] = useState(false);
-  const [contentInset, setContentInset] = useState(null);
-  const [contentContainerStyle, setContentContainerStyle] = useState(null);
+  const [contentInset, setContentInset] = useState<null | {
+    bottom: number,
+    left: number,
+    right: number,
+    top: number,
+  }>(null);
+  const [contentContainerStyle, setContentContainerStyle] = useState<null | {
+    backgroundColor: string,
+  }>(null);
   const [contentInsetAdjustmentBehavior, setContentInsetAdjustmentBehavior] =
     useState('never');
   return (
@@ -1242,7 +1258,7 @@ class Item extends React.PureComponent<{|
   msg?: string,
   style?: ViewStyleProp,
 |}> {
-  render() {
+  render(): $FlowFixMe {
     return (
       <View style={[styles.item, this.props.style]}>
         <Text>{this.props.msg}</Text>
diff --git a/packages/rn-tester/js/examples/SectionList/SectionList-withSeparators.js b/packages/rn-tester/js/examples/SectionList/SectionList-withSeparators.js
index 9042f205d334..a203be611826 100644
--- a/packages/rn-tester/js/examples/SectionList/SectionList-withSeparators.js
+++ b/packages/rn-tester/js/examples/SectionList/SectionList-withSeparators.js
@@ -27,7 +27,7 @@ const Separator =
           styles.separator,
           {backgroundColor: highlighted ? highlightColor : defaultColor},
         ]}>
-        <Text style={styles.separtorText}>{text}</Text>
+        <Text style={styles.separatorText}>{text}</Text>
       </View>
     );
   };
@@ -46,7 +46,7 @@ const styles = StyleSheet.create({
   separator: {
     height: 12,
   },
-  separtorText: {
+  separatorText: {
     fontSize: 10,
   },
 });
diff --git a/packages/rn-tester/js/examples/Share/ShareExample.js b/packages/rn-tester/js/examples/Share/ShareExample.js
index 77963337b28f..3b441201fe02 100644
--- a/packages/rn-tester/js/examples/Share/ShareExample.js
+++ b/packages/rn-tester/js/examples/Share/ShareExample.js
@@ -79,7 +79,7 @@ const ShareMessageWithTitle = () => {
 };
 
 const SharedAction = () => {
-  const [shared, setShared] = React.useState();
+  const [shared, setShared] = React.useState<?string>();
 
   const sharedAction = async () => {
     try {
diff --git a/packages/rn-tester/js/examples/Snapshot/SnapshotExample.js b/packages/rn-tester/js/examples/Snapshot/SnapshotExample.js
index 854cbbf4477e..df15929e706a 100644
--- a/packages/rn-tester/js/examples/Snapshot/SnapshotExample.js
+++ b/packages/rn-tester/js/examples/Snapshot/SnapshotExample.js
@@ -15,11 +15,11 @@ const {Alert, Image, StyleSheet, Text, View} = require('react-native');
 const ScreenshotManager = require('../../../NativeModuleExample/NativeScreenshotManager');
 
 class ScreenshotExample extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state: any | {uri: void} = {
     uri: undefined,
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View style={style.container}>
         <Text onPress={this.takeScreenshot} style={style.button}>
diff --git a/packages/rn-tester/js/examples/StatusBar/StatusBarExample.js b/packages/rn-tester/js/examples/StatusBar/StatusBarExample.js
index 452e04e1d149..16aa1c42e61a 100644
--- a/packages/rn-tester/js/examples/StatusBar/StatusBarExample.js
+++ b/packages/rn-tester/js/examples/StatusBar/StatusBarExample.js
@@ -32,7 +32,9 @@ function getValue<T>(values: Array<T>, index: number): T {
 }
 
 class StatusBarHiddenExample extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state:
+    | $FlowFixMe
+    | {animated: boolean, hidden: boolean, showHideTransition: string} = {
     animated: true,
     hidden: false,
     showHideTransition: getValue(showHideTransitions, 0),
@@ -58,11 +60,12 @@ class StatusBarHiddenExample extends React.Component<{...}, $FlowFixMeState> {
     });
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <StatusBar
           hidden={this.state.hidden}
+          // $FlowFixMe[incompatible-type]
           showHideTransition={this.state.showHideTransition}
           animated={this.state.animated}
         />
@@ -110,16 +113,17 @@ class StatusBarStyleExample extends React.Component<{...}, $FlowFixMeState> {
     this.setState({animated: !this.state.animated});
   };
 
-  state = {
+  state: $FlowFixMe | {animated: boolean, barStyle: string} = {
     animated: true,
     barStyle: getValue(barStyles, this._barStyleIndex),
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <StatusBar
           animated={this.state.animated}
+          // $FlowFixMe[incompatible-type]
           barStyle={this.state.barStyle}
         />
         <TouchableHighlight
@@ -150,7 +154,7 @@ class StatusBarNetworkActivityExample extends React.Component<
   {...},
   $FlowFixMeState,
 > {
-  state = {
+  state: $FlowFixMe | {networkActivityIndicatorVisible: boolean} = {
     networkActivityIndicatorVisible: false,
   };
 
@@ -161,7 +165,7 @@ class StatusBarNetworkActivityExample extends React.Component<
     });
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <StatusBar
@@ -188,7 +192,7 @@ class StatusBarBackgroundColorExample extends React.Component<
   {...},
   $FlowFixMeState,
 > {
-  state = {
+  state: $FlowFixMe | {animated: boolean, backgroundColor: string} = {
     animated: true,
     backgroundColor: getValue(colors, 0),
   };
@@ -204,7 +208,7 @@ class StatusBarBackgroundColorExample extends React.Component<
     this.setState({animated: !this.state.animated});
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <StatusBar
@@ -234,7 +238,7 @@ class StatusBarTranslucentExample extends React.Component<
   {...},
   $FlowFixMeState,
 > {
-  state = {
+  state: $FlowFixMe | {translucent: boolean} = {
     translucent: false,
   };
 
@@ -244,7 +248,7 @@ class StatusBarTranslucentExample extends React.Component<
     });
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <StatusBar translucent={this.state.translucent} />
@@ -263,7 +267,7 @@ class StatusBarTranslucentExample extends React.Component<
 }
 
 class StatusBarStaticIOSExample extends React.Component<{...}> {
-  render() {
+  render(): React.Node {
     return (
       <View>
         <TouchableHighlight
@@ -329,7 +333,7 @@ class StatusBarStaticIOSExample extends React.Component<{...}> {
 }
 
 class StatusBarStaticAndroidExample extends React.Component<{...}> {
-  render() {
+  render(): React.Node {
     return (
       <View>
         <TouchableHighlight
@@ -429,7 +433,7 @@ class StatusBarStaticAndroidExample extends React.Component<{...}> {
 }
 
 class ModalExample extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state: $FlowFixMe | {modalVisible: boolean} = {
     modalVisible: false,
   };
 
@@ -437,7 +441,7 @@ class ModalExample extends React.Component<{...}, $FlowFixMeState> {
     this.setState({modalVisible: !this.state.modalVisible});
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <TouchableHighlight
diff --git a/packages/rn-tester/js/examples/Switch/SwitchExample.js b/packages/rn-tester/js/examples/Switch/SwitchExample.js
index c3bb82728ac7..3f0056576f12 100644
--- a/packages/rn-tester/js/examples/Switch/SwitchExample.js
+++ b/packages/rn-tester/js/examples/Switch/SwitchExample.js
@@ -42,12 +42,12 @@ class BasicSwitchExample extends React.Component<
   {||},
   SimpleSwitchExampleState,
 > {
-  state = {
+  state: SimpleSwitchExampleState = {
     trueSwitchIsOn: true,
     falseSwitchIsOn: false,
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <ExampleRow>
@@ -85,12 +85,12 @@ class DisabledSwitchExample extends React.Component<
   {||},
   SimpleSwitchExampleState,
 > {
-  state = {
+  state: SimpleSwitchExampleState = {
     trueSwitchIsOn: true,
     falseSwitchIsOn: false,
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <ExampleRow>
@@ -126,12 +126,12 @@ class DisabledSwitchExample extends React.Component<
 }
 
 class ColorSwitchExample extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state: any | {colorFalseSwitchIsOn: boolean, colorTrueSwitchIsOn: boolean} = {
     colorTrueSwitchIsOn: true,
     colorFalseSwitchIsOn: false,
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Switch
@@ -161,12 +161,13 @@ class ColorSwitchExample extends React.Component<{...}, $FlowFixMeState> {
 }
 
 class EventSwitchExample extends React.Component<{...}, $FlowFixMeState> {
-  state = {
-    eventSwitchIsOn: false,
-    eventSwitchRegressionIsOn: true,
-  };
+  state: any | {eventSwitchIsOn: boolean, eventSwitchRegressionIsOn: boolean} =
+    {
+      eventSwitchIsOn: false,
+      eventSwitchRegressionIsOn: true,
+    };
 
-  render() {
+  render(): React.Node {
     return (
       <View style={{flexDirection: 'row', justifyContent: 'space-around'}}>
         <View>
@@ -213,11 +214,11 @@ class EventSwitchExample extends React.Component<{...}, $FlowFixMeState> {
 }
 
 class IOSBackgroundColEx extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state: any | {iosBackgroundColor: string} = {
     iosBackgroundColor: '#ffa500',
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Switch
@@ -235,7 +236,7 @@ class IOSBackgroundColEx extends React.Component<{...}, $FlowFixMeState> {
 }
 
 class OnChangeExample extends React.Component<{...}, $FlowFixMeState> {
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Switch
@@ -253,7 +254,7 @@ class ContainerBackgroundColorStyleExample extends React.Component<
   {...},
   $FlowFixMeState,
 > {
-  render() {
+  render(): React.Node {
     return (
       <View>
         <Switch
diff --git a/packages/rn-tester/js/examples/Text/TextExample.android.js b/packages/rn-tester/js/examples/Text/TextExample.android.js
index 61581d724d9b..5f5b4a1f7f2d 100644
--- a/packages/rn-tester/js/examples/Text/TextExample.android.js
+++ b/packages/rn-tester/js/examples/Text/TextExample.android.js
@@ -21,7 +21,7 @@ import TextLegend from '../../components/TextLegend';
 const {LayoutAnimation, StyleSheet, Text, View} = require('react-native');
 
 class Entity extends React.Component<{|children: React.Node|}> {
-  render() {
+  render(): React.Node {
     return (
       <Text style={{fontWeight: 'bold', color: '#527fe4'}}>
         {this.props.children}
@@ -30,7 +30,10 @@ class Entity extends React.Component<{|children: React.Node|}> {
   }
 }
 class AttributeToggler extends React.Component<{...}, $FlowFixMeState> {
-  state = {fontWeight: 'bold', fontSize: 15};
+  state: {fontSize: number, fontWeight: 'bold' | 'normal'} = {
+    fontWeight: 'bold',
+    fontSize: 15,
+  };
 
   toggleWeight = () => {
     this.setState({
@@ -44,7 +47,7 @@ class AttributeToggler extends React.Component<{...}, $FlowFixMeState> {
     });
   };
 
-  render() {
+  render(): React.Node {
     const curStyle = {
       fontWeight: this.state.fontWeight,
       fontSize: this.state.fontSize,
@@ -83,7 +86,7 @@ class AdjustingFontSize extends React.Component<
   AdjustingFontSizeProps,
   AdjustingFontSizeState,
 > {
-  state = {
+  state: AdjustingFontSizeState = {
     dynamicText: '',
     shouldRender: true,
   };
@@ -119,7 +122,7 @@ class AdjustingFontSize extends React.Component<
     });
   };
 
-  render() {
+  render(): React.Node {
     if (!this.state.shouldRender) {
       return <View />;
     }
@@ -389,6 +392,15 @@ class TextExample extends React.Component<{...}> {
           <Text style={{fontWeight: '300'}}>FONT WEIGHT 300</Text>
           <Text style={{fontWeight: '200'}}>FONT WEIGHT 200</Text>
           <Text style={{fontWeight: '100'}}>FONT WEIGHT 100</Text>
+          <Text style={{fontWeight: 900}}>FONT WEIGHT 900</Text>
+          <Text style={{fontWeight: 800}}>FONT WEIGHT 800</Text>
+          <Text style={{fontWeight: 700}}>FONT WEIGHT 700</Text>
+          <Text style={{fontWeight: 600}}>FONT WEIGHT 600</Text>
+          <Text style={{fontWeight: 500}}>FONT WEIGHT 500</Text>
+          <Text style={{fontWeight: 400}}>FONT WEIGHT 400</Text>
+          <Text style={{fontWeight: 300}}>FONT WEIGHT 300</Text>
+          <Text style={{fontWeight: 200}}>FONT WEIGHT 200</Text>
+          <Text style={{fontWeight: 100}}>FONT WEIGHT 100</Text>
         </RNTesterBlock>
         <RNTesterBlock title="Font Style">
           <Text style={{fontStyle: 'italic'}}>Move fast and be italic</Text>
@@ -979,4 +991,36 @@ exports.examples = [
       return <TextBaseLineLayoutExample />;
     },
   },
+  {
+    title: 'Selectable Text',
+    render: function (): React.Node {
+      return (
+        <View>
+          <Text style={{userSelect: 'auto'}}>Text element is selectable</Text>
+        </View>
+      );
+    },
+  },
+  {
+    title: 'Text alignment',
+    render: function (): React.Node {
+      return (
+        <View>
+          <Text style={{textAlignVertical: 'top', borderWidth: 1, height: 75}}>
+            Text element aligned to the top via textAlignVertical
+          </Text>
+          <Text style={{verticalAlign: 'top', borderWidth: 1, height: 75}}>
+            Text element aligned to the top via verticalAlign
+          </Text>
+          <Text
+            style={{textAlignVertical: 'center', borderWidth: 1, height: 75}}>
+            Text element aligned to the middle via textAlignVertical
+          </Text>
+          <Text style={{verticalAlign: 'middle', borderWidth: 1, height: 75}}>
+            Text element aligned to the middle via verticalAlign
+          </Text>
+        </View>
+      );
+    },
+  },
 ];
diff --git a/packages/rn-tester/js/examples/Text/TextExample.ios.js b/packages/rn-tester/js/examples/Text/TextExample.ios.js
index dde6ab21a374..4a4edacc5c69 100644
--- a/packages/rn-tester/js/examples/Text/TextExample.ios.js
+++ b/packages/rn-tester/js/examples/Text/TextExample.ios.js
@@ -53,7 +53,7 @@ class TextAlignRTLExample extends React.Component<
     };
   }
 
-  render() {
+  render(): React.Node {
     const {isRTL} = this.state;
     const toggleRTL = () => this.setState({isRTL: !isRTL});
     return (
@@ -90,7 +90,7 @@ class TextAlignRTLExample extends React.Component<
 }
 
 class Entity extends React.Component<$FlowFixMeProps> {
-  render() {
+  render(): React.Node {
     return (
       <Text style={{fontWeight: '500', color: '#527fe4'}}>
         {this.props.children}
@@ -100,7 +100,10 @@ class Entity extends React.Component<$FlowFixMeProps> {
 }
 
 class AttributeToggler extends React.Component<{...}, $FlowFixMeState> {
-  state = {fontWeight: 'bold', fontSize: 15};
+  state: any | {fontSize: number, fontWeight: string} = {
+    fontWeight: 'bold',
+    fontSize: 15,
+  };
 
   toggleWeight = () => {
     this.setState({
@@ -114,19 +117,20 @@ class AttributeToggler extends React.Component<{...}, $FlowFixMeState> {
     });
   };
 
-  render() {
+  render(): React.Node {
     const curStyle = {
       fontWeight: this.state.fontWeight,
       fontSize: this.state.fontSize,
     };
     return (
       <View>
+        {/* $FlowFixMe[incompatible-type] */}
         <Text style={curStyle}>
           Tap the controls below to change attributes.
         </Text>
         <Text>
           <Text>
-            See how it will even work on{' '}
+            See how it will even work on {/* $FlowFixMe[incompatible-type] */}
             <Text style={curStyle}>this nested text</Text>
           </Text>
         </Text>
@@ -156,7 +160,7 @@ class AdjustingFontSize extends React.Component<
   AdjustingFontSizeProps,
   AdjustingFontSizeState,
 > {
-  state = {
+  state: AdjustingFontSizeState = {
     dynamicText: '',
     shouldRender: true,
   };
@@ -192,7 +196,7 @@ class AdjustingFontSize extends React.Component<
     });
   };
 
-  render() {
+  render(): React.Node {
     if (!this.state.shouldRender) {
       return <View />;
     }
@@ -270,7 +274,7 @@ class AdjustingFontSize extends React.Component<
 }
 
 class TextBaseLineLayoutExample extends React.Component<{}, mixed> {
-  render() {
+  render(): React.Node {
     const texts = [];
     for (let i = 9; i >= 0; i--) {
       texts.push(
@@ -378,7 +382,21 @@ class TextRenderInfoExample extends React.Component<
     }>,
   },
 > {
-  state = {
+  state: {
+    fontSize: number,
+    numberOfTextBlocks: number,
+    textMetrics: $ReadOnly<{
+      ascender: number,
+      capHeight: number,
+      descender: number,
+      height: number,
+      text?: string,
+      width: number,
+      x: number,
+      xHeight: number,
+      y: number,
+    }>,
+  } = {
     textMetrics: {
       x: 0,
       y: 0,
@@ -393,7 +411,7 @@ class TextRenderInfoExample extends React.Component<
     fontSize: 14,
   };
 
-  render() {
+  render(): React.Node {
     const topOfBox =
       this.state.textMetrics.y +
       this.state.textMetrics.height -
@@ -477,7 +495,19 @@ class TextWithCapBaseBox extends React.Component<
     }>,
   },
 > {
-  state = {
+  state: {
+    textMetrics: $ReadOnly<{
+      ascender: number,
+      capHeight: number,
+      descender: number,
+      height: number,
+      text?: string,
+      width: number,
+      x: number,
+      xHeight: number,
+      y: number,
+    }>,
+  } = {
     textMetrics: {
       x: 0,
       y: 0,
@@ -489,7 +519,7 @@ class TextWithCapBaseBox extends React.Component<
       xHeight: 0,
     },
   };
-  render() {
+  render(): React.Node {
     return (
       <Text
         onTextLayout={event => {
@@ -651,6 +681,15 @@ exports.examples = [
           <Text style={{fontWeight: '300'}}>FONT WEIGHT 300</Text>
           <Text style={{fontWeight: '200'}}>FONT WEIGHT 200</Text>
           <Text style={{fontWeight: '100'}}>FONT WEIGHT 100</Text>
+          <Text style={{fontWeight: 900}}>FONT WEIGHT 900</Text>
+          <Text style={{fontWeight: 800}}>FONT WEIGHT 800</Text>
+          <Text style={{fontWeight: 700}}>FONT WEIGHT 700</Text>
+          <Text style={{fontWeight: 600}}>FONT WEIGHT 600</Text>
+          <Text style={{fontWeight: 500}}>FONT WEIGHT 500</Text>
+          <Text style={{fontWeight: 400}}>FONT WEIGHT 400</Text>
+          <Text style={{fontWeight: 300}}>FONT WEIGHT 300</Text>
+          <Text style={{fontWeight: 200}}>FONT WEIGHT 200</Text>
+          <Text style={{fontWeight: 100}}>FONT WEIGHT 100</Text>
         </View>
       );
     },
@@ -1197,4 +1236,96 @@ exports.examples = [
       );
     },
   },
+  {
+    title: 'Selectable Text',
+    render: function (): React.Node {
+      return (
+        <View>
+          <Text style={{userSelect: 'auto'}}>Text element is selectable</Text>
+        </View>
+      );
+    },
+  },
+  {
+    title: 'Line Break Strategy',
+    render: function (): React.Node {
+      const lineBreakStrategy = ['none', 'standard', 'hangul-word', 'push-out'];
+      const textByCode = {
+        en: 'lineBreakStrategy lineBreakStrategy lineBreakStrategy lineBreakStrategy',
+        ko: '한글개행 한글개행 한글개행 한글개행 한글개행 한글개행 한글개행 한글개행',
+        ja: 'かいぎょう かいぎょう かいぎょう かいぎょう かいぎょう かいぎょう',
+        cn: '改行 改行 改行 改行 改行 改行 改行 改行 改行 改行 改行 改行',
+      };
+
+      return (
+        <View>
+          {lineBreakStrategy.map(strategy => {
+            return (
+              <View key={strategy} style={{marginBottom: 12}}>
+                <Text
+                  style={{
+                    backgroundColor: 'lightgrey',
+                  }}>{`Strategy: ${strategy}`}</Text>
+                {Object.keys(textByCode).map(code => {
+                  return (
+                    <View key={code}>
+                      <Text style={{fontWeight: 'bold'}}>{`[${code}]`}</Text>
+                      <Text lineBreakStrategyIOS={strategy}>
+                        {textByCode[code]}
+                      </Text>
+                    </View>
+                  );
+                })}
+              </View>
+            );
+          })}
+        </View>
+      );
+    },
+  },
+  {
+    title: 'Dynamic Type (iOS only)',
+    render: function (): React.Node {
+      const boldStyle = {fontWeight: 'bold'};
+      const boxStyle = {
+        borderWidth: 1,
+        padding: 8,
+        margin: 8,
+      };
+      return (
+        <View style={{marginTop: 10, marginBottom: 10}}>
+          <Text>
+            Adjust text size in Accessibility settings and watch how the font
+            sizes change relative to each other.
+          </Text>
+          <View style={boxStyle}>
+            <Text style={boldStyle}>With `dynamicTypeRamp`:</Text>
+            <Text style={{fontSize: 34}} dynamicTypeRamp="largeTitle">
+              Large Title
+            </Text>
+            <Text style={{fontSize: 28}} dynamicTypeRamp="title1">
+              Title
+            </Text>
+            <Text style={{fontSize: 22}} dynamicTypeRamp="title2">
+              Title 2
+            </Text>
+            <Text style={{fontSize: 20}} dynamicTypeRamp="title3">
+              Title 3
+            </Text>
+            <Text style={{fontSize: 17}} dynamicTypeRamp="body">
+              Body
+            </Text>
+          </View>
+          <View style={boxStyle}>
+            <Text style={boldStyle}>Without `dynamicTypeRamp`:</Text>
+            <Text style={{fontSize: 34}}>Large Title</Text>
+            <Text style={{fontSize: 28}}>Title</Text>
+            <Text style={{fontSize: 22}}>Title 2</Text>
+            <Text style={{fontSize: 20}}>Title 3</Text>
+            <Text style={{fontSize: 17}}>Body</Text>
+          </View>
+        </View>
+      );
+    },
+  },
 ];
diff --git a/packages/rn-tester/js/examples/TextInput/TextInputExample.android.js b/packages/rn-tester/js/examples/TextInput/TextInputExample.android.js
index 48f1e531e159..dd228211744f 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputExample.android.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputExample.android.js
@@ -35,7 +35,7 @@ class ToggleDefaultPaddingExample extends React.Component<
     super(props);
     this.state = {hasPadding: false};
   }
-  render() {
+  render(): React.Node {
     return (
       <View>
         <TextInput style={this.state.hasPadding ? {padding: 0} : null} />
@@ -79,7 +79,7 @@ class AutogrowingTextInputExample extends React.Component<{...}> {
     });
   }
 
-  render() {
+  render(): React.Node {
     /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
      * when making Flow check .android.js files. */
     const {style, multiline, ...props} = this.props;
@@ -148,6 +148,13 @@ const styles = StyleSheet.create({
   singleLineWithHeightTextInput: {
     height: 30,
   },
+  default: {
+    borderWidth: StyleSheet.hairlineWidth,
+    borderColor: '#0f0f0f',
+    flex: 1,
+    fontSize: 13,
+    padding: 4,
+  },
 });
 
 exports.title = 'TextInput';
@@ -347,6 +354,35 @@ exports.examples = ([
       );
     },
   },
+  {
+    title: 'Editable and Read only',
+    render: function (): React.Node {
+      return (
+        <View>
+          <TextInput
+            placeholder="editable text input using editable prop"
+            style={styles.default}
+            editable
+          />
+          <TextInput
+            placeholder="uneditable text input using editable prop"
+            style={styles.default}
+            editable={false}
+          />
+          <TextInput
+            placeholder="editable text input using readOnly prop"
+            style={styles.default}
+            readOnly={false}
+          />
+          <TextInput
+            placeholder="uneditable text input using readOnly prop"
+            style={styles.default}
+            readOnly
+          />
+        </View>
+      );
+    },
+  },
   {
     title: 'Fixed number of lines',
     platform: 'android',
@@ -356,12 +392,22 @@ exports.examples = ([
           <TextInput
             numberOfLines={2}
             multiline={true}
-            placeholder="Two line input"
+            placeholder="Two line input using numberOfLines prop"
           />
           <TextInput
             numberOfLines={5}
             multiline={true}
-            placeholder="Five line input"
+            placeholder="Five line input using numberOfLines prop"
+          />
+          <TextInput
+            rows={2}
+            multiline={true}
+            placeholder="Two line input using rows prop"
+          />
+          <TextInput
+            rows={5}
+            multiline={true}
+            placeholder="Five line input using rows prop"
           />
         </View>
       );
@@ -391,6 +437,35 @@ exports.examples = ([
       );
     },
   },
+  {
+    title: 'Text Auto Complete',
+    render: function (): React.Node {
+      return (
+        <View>
+          <TextInput
+            autoComplete="country"
+            placeholder="country"
+            style={styles.default}
+          />
+          <TextInput
+            autoComplete="postal-address-country"
+            placeholder="postal-address-country"
+            style={styles.default}
+          />
+          <TextInput
+            autoComplete="one-time-code"
+            placeholder="one-time-code"
+            style={styles.default}
+          />
+          <TextInput
+            autoComplete="sms-otp"
+            placeholder="sms-otp"
+            style={styles.default}
+          />
+        </View>
+      );
+    },
+  },
   {
     title: 'Return key',
     render: function (): React.Node {
diff --git a/packages/rn-tester/js/examples/TextInput/TextInputExample.ios.js b/packages/rn-tester/js/examples/TextInput/TextInputExample.ios.js
index 5d27d97eccbc..7cff25b37ada 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputExample.ios.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputExample.ios.js
@@ -30,7 +30,7 @@ const TextInputSharedExamples = require('./TextInputSharedExamples.js');
 import type {RNTesterModuleExample} from '../../types/RNTesterTypes';
 
 class WithLabel extends React.Component<$FlowFixMeProps> {
-  render() {
+  render(): React.Node {
     return (
       <View style={styles.labelContainer}>
         <View style={styles.label}>
@@ -51,7 +51,7 @@ class TextInputAccessoryViewChangeTextExample extends React.Component<
     this.state = {text: 'Placeholder Text'};
   }
 
-  render() {
+  render(): React.Node {
     const inputAccessoryViewID = 'inputAccessoryView1';
     return (
       <View>
@@ -91,11 +91,12 @@ class TextInputAccessoryViewChangeKeyboardExample extends React.Component<
     });
   };
 
-  render() {
+  render(): React.Node {
     const inputAccessoryViewID = 'inputAccessoryView2';
     return (
       <View>
         <Text>Set InputAccessoryView with ID & switch keyboard:</Text>
+        {/* $FlowFixMe[incompatible-use] */}
         <TextInput
           style={styles.default}
           inputAccessoryViewID={inputAccessoryViewID}
@@ -126,7 +127,7 @@ class TextInputAccessoryViewDefaultDoneButtonExample extends React.Component<
     this.state = {text: ''};
   }
 
-  render() {
+  render(): React.Node {
     return (
       <TextInput
         style={styles.default}
@@ -144,7 +145,7 @@ class RewriteExampleKana extends React.Component<$FlowFixMeProps, any> {
     super(props);
     this.state = {text: ''};
   }
-  render() {
+  render(): React.Node {
     return (
       <View style={styles.rewriteContainer}>
         <TextInput
@@ -169,7 +170,7 @@ class SecureEntryExample extends React.Component<$FlowFixMeProps, any> {
       isSecureTextEntry: true,
     };
   }
-  render() {
+  render(): React.Node {
     return (
       <View>
         <TextInput
@@ -229,7 +230,7 @@ class AutogrowingTextInputExample extends React.Component<
     });
   }
 
-  render() {
+  render(): React.Node {
     const {style, multiline, ...props} = this.props;
     return (
       <View>
@@ -620,6 +621,35 @@ exports.examples = ([
       );
     },
   },
+  {
+    title: 'Editable and Read only',
+    render: function (): React.Node {
+      return (
+        <View>
+          <TextInput
+            placeholder="editable text input using editable prop"
+            style={styles.default}
+            editable
+          />
+          <TextInput
+            placeholder="uneditable text input using editable prop"
+            style={styles.default}
+            editable={false}
+          />
+          <TextInput
+            placeholder="editable text input using readOnly prop"
+            style={styles.default}
+            readOnly={false}
+          />
+          <TextInput
+            placeholder="uneditable text input using readOnly prop"
+            style={styles.default}
+            readOnly
+          />
+        </View>
+      );
+    },
+  },
   {
     title: 'TextInput Intrinsic Size',
     render: function (): React.Node {
@@ -768,6 +798,21 @@ exports.examples = ([
       );
     },
   },
+  {
+    title: 'Text Auto Complete',
+    render: function (): React.Node {
+      return (
+        <View>
+          <WithLabel label="country">
+            <TextInput autoComplete="country" style={styles.default} />
+          </WithLabel>
+          <WithLabel label="one-time-code">
+            <TextInput autoComplete="one-time-code" style={styles.default} />
+          </WithLabel>
+        </View>
+      );
+    },
+  },
   {
     title: 'Text Content Type',
     render: function (): React.Node {
@@ -817,4 +862,43 @@ exports.examples = ([
       );
     },
   },
+  {
+    title: 'Line Break Strategy',
+    render: function (): React.Node {
+      const lineBreakStrategy = ['none', 'standard', 'hangul-word', 'push-out'];
+      const textByCode = {
+        en: 'lineBreakStrategy lineBreakStrategy lineBreakStrategy lineBreakStrategy',
+        ko: '한글개행한글개행 한글개행한글개행 한글개행한글개행 한글개행한글개행 한글개행한글개행 한글개행한글개행',
+        ja: 'かいぎょう かいぎょう かいぎょう かいぎょう かいぎょう かいぎょう',
+        cn: '改行 改行 改行 改行 改行 改行 改行 改行 改行 改行 改行 改行',
+      };
+      return (
+        <View>
+          {lineBreakStrategy.map(strategy => {
+            return (
+              <View key={strategy} style={{marginBottom: 12}}>
+                <Text
+                  style={{
+                    backgroundColor: 'lightgrey',
+                  }}>{`Strategy: ${strategy}`}</Text>
+                {Object.keys(textByCode).map(code => {
+                  return (
+                    <View key={code}>
+                      <Text style={{fontWeight: 'bold'}}>{`[${code}]`}</Text>
+                      <TextInput
+                        multiline
+                        lineBreakStrategyIOS={strategy}
+                        style={styles.default}
+                        defaultValue={textByCode[code]}
+                      />
+                    </View>
+                  );
+                })}
+              </View>
+            );
+          })}
+        </View>
+      );
+    },
+  },
 ]: Array<RNTesterModuleExample>);
diff --git a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
index 44304d8d7765..e5b1c4f580bf 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
@@ -72,10 +72,18 @@ const styles = StyleSheet.create({
     margin: 3,
     fontSize: 12,
   },
+  focusedUncontrolled: {
+    margin: -2,
+    borderWidth: 2,
+    borderColor: '#0a0a0a',
+    flex: 1,
+    fontSize: 13,
+    padding: 4,
+  },
 });
 
 class WithLabel extends React.Component<$FlowFixMeProps> {
-  render() {
+  render(): React.Node {
     return (
       <View style={styles.labelContainer}>
         <View style={styles.label}>
@@ -92,7 +100,7 @@ class RewriteExample extends React.Component<$FlowFixMeProps, any> {
     super(props);
     this.state = {text: ''};
   }
-  render() {
+  render(): React.Node {
     const limit = 20;
     const remainder = limit - this.state.text.length;
     const remainderColor = remainder > 5 ? 'blue' : 'red';
@@ -126,7 +134,7 @@ class RewriteExampleInvalidCharacters extends React.Component<
     super(props);
     this.state = {text: ''};
   }
-  render() {
+  render(): React.Node {
     return (
       <View style={styles.rewriteContainer}>
         <TextInput
@@ -154,7 +162,7 @@ class RewriteInvalidCharactersAndClearExample extends React.Component<
     super(props);
     this.state = {text: ''};
   }
-  render() {
+  render(): React.Node {
     return (
       <View style={styles.rewriteContainer}>
         <TextInput
@@ -184,14 +192,16 @@ class RewriteInvalidCharactersAndClearExample extends React.Component<
   }
 }
 
+type ExampleRef = {current: null | {focus(): void, ...}};
+
 class BlurOnSubmitExample extends React.Component<{...}> {
-  ref1 = React.createRef();
-  ref2 = React.createRef();
-  ref3 = React.createRef();
-  ref4 = React.createRef();
-  ref5 = React.createRef();
+  ref1: ExampleRef = React.createRef();
+  ref2: ExampleRef = React.createRef();
+  ref3: ExampleRef = React.createRef();
+  ref4: ExampleRef = React.createRef();
+  ref5: ExampleRef = React.createRef();
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <TextInput
@@ -240,8 +250,99 @@ class BlurOnSubmitExample extends React.Component<{...}> {
   }
 }
 
+class SubmitBehaviorExample extends React.Component<{...}> {
+  ref1: ExampleRef = React.createRef();
+  ref2: ExampleRef = React.createRef();
+  ref3: ExampleRef = React.createRef();
+  ref4: ExampleRef = React.createRef();
+  ref5: ExampleRef = React.createRef();
+  ref6: ExampleRef = React.createRef();
+  ref7: ExampleRef = React.createRef();
+  ref8: ExampleRef = React.createRef();
+  ref9: ExampleRef = React.createRef();
+  ref10: ExampleRef = React.createRef();
+  ref11: ExampleRef = React.createRef();
+
+  render(): React.Node {
+    return (
+      <View>
+        <TextInput
+          ref={this.ref1}
+          placeholder="single line submit"
+          submitBehavior="submit"
+          onSubmitEditing={() => this.ref2.current?.focus()}
+        />
+        <TextInput
+          ref={this.ref2}
+          placeholder="single line blurAndSubmit"
+          submitBehavior="blurAndSubmit"
+          onSubmitEditing={() => this.ref3.current?.focus()}
+        />
+        <TextInput
+          ref={this.ref3}
+          placeholder="single line default"
+          onSubmitEditing={() => this.ref4.current?.focus()}
+        />
+        <TextInput
+          ref={this.ref4}
+          blurOnSubmit
+          placeholder="single line blurOnSubmit true"
+          onSubmitEditing={() => this.ref5.current?.focus()}
+        />
+        <TextInput
+          ref={this.ref5}
+          blurOnSubmit={false}
+          placeholder="single line blurOnSubmit false"
+          onSubmitEditing={() => this.ref6.current?.focus()}
+        />
+        <TextInput
+          ref={this.ref6}
+          multiline
+          placeholder="multiline submit"
+          submitBehavior="submit"
+          onSubmitEditing={() => this.ref7.current?.focus()}
+        />
+        <TextInput
+          ref={this.ref7}
+          multiline
+          placeholder="multiline blurAndSubmit"
+          submitBehavior="blurAndSubmit"
+          onSubmitEditing={() => this.ref8.current?.focus()}
+        />
+        <TextInput
+          ref={this.ref8}
+          multiline
+          blurOnSubmit
+          placeholder="multiline blurOnSubmit true"
+          onSubmitEditing={() => this.ref9.current?.focus()}
+        />
+        <TextInput
+          ref={this.ref9}
+          multiline
+          blurOnSubmit={false}
+          placeholder="multiline blurOnSubmit false"
+        />
+        <TextInput
+          ref={this.ref10}
+          multiline
+          placeholder="multiline newline"
+          submitBehavior="newline"
+        />
+        <TextInput ref={this.ref11} multiline placeholder="multiline default" />
+      </View>
+    );
+  }
+}
+
 class TextEventsExample extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state:
+    | any
+    | {
+        curText: string,
+        prev2Text: string,
+        prev3Text: string,
+        prevText: string,
+      } = {
     curText: '<No Event>',
     prevText: '<No Event>',
     prev2Text: '<No Event>',
@@ -259,7 +360,7 @@ class TextEventsExample extends React.Component<{...}, $FlowFixMeState> {
     });
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         <TextInput
@@ -309,7 +410,7 @@ class TokenizedTextExample extends React.Component<
     super(props);
     this.state = {text: 'Hello #World'};
   }
-  render() {
+  render(): React.Node {
     //define delimiter
     let delimiter = /\s+/;
 
@@ -395,7 +496,7 @@ class SelectionExample extends React.Component<
     this.setState({selection});
   }
 
-  getRandomPosition() {
+  getRandomPosition(): number {
     const length = this.state.value.length;
     return Math.round(Math.random() * length);
   }
@@ -424,7 +525,7 @@ class SelectionExample extends React.Component<
     this.placeAt(this.getRandomPosition());
   }
 
-  render() {
+  render(): React.Node {
     const length = this.state.value.length;
 
     return (
@@ -477,6 +578,20 @@ class SelectionExample extends React.Component<
   }
 }
 
+function UncontrolledExample() {
+  const [isFocused, setIsFocused] = React.useState(false);
+
+  return (
+    <TextInput
+      defaultValue="Hello World!"
+      testID="uncontrolled-textinput"
+      style={isFocused ? styles.focusedUncontrolled : styles.default}
+      onFocus={() => setIsFocused(true)}
+      onBlur={() => setIsFocused(false)}
+    />
+  );
+}
+
 module.exports = ([
   {
     title: 'Auto-focus',
@@ -592,12 +707,65 @@ module.exports = ([
       return <View>{examples}</View>;
     },
   },
+  {
+    title: 'Input modes',
+    name: 'inputModes',
+    render: function (): React.Node {
+      const inputMode = [
+        'none',
+        'text',
+        'decimal',
+        'numeric',
+        'tel',
+        'search',
+        'email',
+        'url',
+      ];
+      const examples = inputMode.map(mode => {
+        return (
+          <WithLabel key={mode} label={mode}>
+            <TextInput inputMode={mode} style={styles.default} />
+          </WithLabel>
+        );
+      });
+      return <View>{examples}</View>;
+    },
+  },
   {
     title: 'Blur on submit',
     render: function (): React.Element<any> {
       return <BlurOnSubmitExample />;
     },
   },
+  {
+    title: 'enterKeyHint modes',
+    name: 'enterKeyHintTypes',
+    render: function (): React.Node {
+      const enterKeyHintTypesHints = [
+        'enter',
+        'done',
+        'go',
+        'next',
+        'previous',
+        'search',
+        'send',
+      ];
+      const examples = enterKeyHintTypesHints.map(hint => {
+        return (
+          <WithLabel key={hint} label={hint}>
+            <TextInput enterKeyHint={hint} style={styles.default} />
+          </WithLabel>
+        );
+      });
+      return <View>{examples}</View>;
+    },
+  },
+  {
+    title: 'Submit behavior',
+    render: function (): React.Element<any> {
+      return <SubmitBehaviorExample />;
+    },
+  },
   {
     title: 'Event handling',
     render: function (): React.Element<any> {
@@ -696,4 +864,11 @@ module.exports = ([
       );
     },
   },
+  {
+    title: 'Uncontrolled component with layout changes',
+    name: 'uncontrolledComponent',
+    render: function (): React.Node {
+      return <UncontrolledExample />;
+    },
+  },
 ]: Array<RNTesterModuleExample>);
diff --git a/packages/rn-tester/js/examples/Timer/TimerExample.js b/packages/rn-tester/js/examples/Timer/TimerExample.js
index 2a4b75849fc4..166674d31aa4 100644
--- a/packages/rn-tester/js/examples/Timer/TimerExample.js
+++ b/packages/rn-tester/js/examples/Timer/TimerExample.js
@@ -27,7 +27,7 @@ class RequestIdleCallbackTester extends React.Component<
   RequestIdleCallbackTesterProps,
   RequestIdleCallbackTesterState,
 > {
-  state = {
+  state: RequestIdleCallbackTesterState = {
     message: '-',
   };
 
@@ -41,7 +41,7 @@ class RequestIdleCallbackTester extends React.Component<
     }
   }
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         {/* $FlowFixMe[method-unbinding] added when improving typing for this
@@ -159,7 +159,7 @@ class TimerTester extends React.Component<TimerTesterProps> {
   _immediateId: ?Object = null;
   _timerFn: ?() => any = null;
 
-  render() {
+  render(): any {
     const args =
       'fn' + (this.props.dt !== undefined ? ', ' + this.props.dt : '');
     return (
@@ -274,13 +274,13 @@ class IntervalExample extends React.Component<
     showTimer: boolean,
   |},
 > {
-  state = {
+  state: {showTimer: boolean} = {
     showTimer: true,
   };
 
   _timerTester: ?React.ElementRef<typeof TimerTester>;
 
-  render() {
+  render(): React.Node {
     return (
       <View>
         {this.state.showTimer && this._renderTimer()}
@@ -291,7 +291,7 @@ class IntervalExample extends React.Component<
     );
   }
 
-  _renderTimer = () => {
+  _renderTimer = (): React.Node => {
     return (
       <View>
         <TimerTester
diff --git a/packages/rn-tester/js/examples/Touchable/TouchableExample.js b/packages/rn-tester/js/examples/Touchable/TouchableExample.js
index a4df8b52ada0..6cf75c1dc980 100644
--- a/packages/rn-tester/js/examples/Touchable/TouchableExample.js
+++ b/packages/rn-tester/js/examples/Touchable/TouchableExample.js
@@ -29,7 +29,7 @@ const forceTouchAvailable =
   (Platform.OS === 'ios' && Platform.constants.forceTouchAvailable) || false;
 
 class TouchableHighlightBox extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state: any | {timesPressed: number} = {
     timesPressed: 0,
   };
 
@@ -39,7 +39,7 @@ class TouchableHighlightBox extends React.Component<{...}, $FlowFixMeState> {
     });
   };
 
-  render() {
+  render(): React.Node {
     let textLog = '';
     if (this.state.timesPressed > 1) {
       textLog = this.state.timesPressed + 'x TouchableHighlight onPress';
@@ -79,7 +79,7 @@ class TouchableWithoutFeedbackBox extends React.Component<
   {...},
   $FlowFixMeState,
 > {
-  state = {
+  state: any | {timesPressed: number} = {
     timesPressed: 0,
   };
 
@@ -89,7 +89,7 @@ class TouchableWithoutFeedbackBox extends React.Component<
     });
   };
 
-  render() {
+  render(): React.Node {
     let textLog = '';
     if (this.state.timesPressed > 1) {
       textLog = this.state.timesPressed + 'x TouchableWithoutFeedback onPress';
@@ -115,7 +115,7 @@ class TouchableWithoutFeedbackBox extends React.Component<
 }
 
 class TextOnPressBox extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state: any | {timesPressed: number} = {
     timesPressed: 0,
   };
 
@@ -125,7 +125,7 @@ class TextOnPressBox extends React.Component<{...}, $FlowFixMeState> {
     });
   };
 
-  render() {
+  render(): React.Node {
     let textLog = '';
     if (this.state.timesPressed > 1) {
       textLog = this.state.timesPressed + 'x text onPress';
@@ -150,11 +150,11 @@ class TextOnPressBox extends React.Component<{...}, $FlowFixMeState> {
 }
 
 class TouchableFeedbackEvents extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state: any | {eventLog: Array<string>} = {
     eventLog: [],
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View testID="touchable_feedback_events">
         <View style={[styles.row, styles.centered]}>
@@ -190,11 +190,11 @@ class TouchableFeedbackEvents extends React.Component<{...}, $FlowFixMeState> {
 }
 
 class TouchableDelayEvents extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state: any | {eventLog: Array<string>} = {
     eventLog: [],
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View testID="touchable_delay_events">
         <View style={[styles.row, styles.centered]}>
@@ -231,17 +231,17 @@ class TouchableDelayEvents extends React.Component<{...}, $FlowFixMeState> {
 }
 
 class ForceTouchExample extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state: any | {force: number} = {
     force: 0,
   };
 
-  _renderConsoleText = () => {
+  _renderConsoleText = (): string => {
     return forceTouchAvailable
       ? 'Force: ' + this.state.force.toFixed(3)
       : '3D Touch is not available on this device';
   };
 
-  render() {
+  render(): React.Node {
     return (
       <View testID="touchable_3dtouch_event">
         <View style={styles.forceTouchBox} testID="touchable_3dtouch_output">
@@ -265,7 +265,7 @@ class ForceTouchExample extends React.Component<{...}, $FlowFixMeState> {
 }
 
 class TouchableHitSlop extends React.Component<{...}, $FlowFixMeState> {
-  state = {
+  state: any | {timesPressed: number} = {
     timesPressed: 0,
   };
 
@@ -275,7 +275,7 @@ class TouchableHitSlop extends React.Component<{...}, $FlowFixMeState> {
     });
   };
 
-  render() {
+  render(): React.Node {
     let log = '';
     if (this.state.timesPressed > 1) {
       log = this.state.timesPressed + 'x onPress';
@@ -345,7 +345,7 @@ function TouchableNativeMethods() {
 }
 
 class TouchableDisabled extends React.Component<{...}> {
-  render() {
+  render(): React.Node {
     return (
       <View>
         <TouchableOpacity disabled={true} style={[styles.row, styles.block]}>
diff --git a/packages/rn-tester/js/examples/Transform/TransformExample.js b/packages/rn-tester/js/examples/Transform/TransformExample.js
index 02f152cc2d33..74798f619fc3 100644
--- a/packages/rn-tester/js/examples/Transform/TransformExample.js
+++ b/packages/rn-tester/js/examples/Transform/TransformExample.js
@@ -13,7 +13,7 @@ import {Animated, StyleSheet, Text, View} from 'react-native';
 
 import type {Node, Element} from 'react';
 
-function AnimateTansformSingleProp() {
+function AnimateTransformSingleProp() {
   const [theta] = useState(new Animated.Value(45));
   const animate = () => {
     theta.setValue(0);
@@ -199,6 +199,17 @@ const styles = StyleSheet.create({
     backgroundColor: 'salmon',
     alignSelf: 'center',
   },
+  box7: {
+    backgroundColor: 'lightseagreen',
+    height: 50,
+    position: 'absolute',
+    right: 0,
+    top: 0,
+    width: 50,
+  },
+  box7Transform: {
+    transform: 'translate(-50, 35) rotate(50deg) scale(2)',
+  },
   flipCardContainer: {
     marginVertical: 40,
     flex: 1,
@@ -318,10 +329,21 @@ exports.examples = [
     },
   },
   {
-    title: 'Amimate Translate single prop',
+    title: 'Animate Translate single prop',
     description: "rotate: '360deg'",
     render(): Node {
-      return <AnimateTansformSingleProp />;
+      return <AnimateTransformSingleProp />;
+    },
+  },
+  {
+    title: 'Transform using a string',
+    description: "transform: 'translate(-50, 35) rotate(50deg) scale(2)'",
+    render(): Node {
+      return (
+        <View style={styles.container}>
+          <View style={[styles.box7, styles.box7Transform]} />
+        </View>
+      );
     },
   },
 ];
diff --git a/packages/rn-tester/js/examples/TransparentHitTest/TransparentHitTestExample.js b/packages/rn-tester/js/examples/TransparentHitTest/TransparentHitTestExample.js
index 26ac6f5f68a8..cf9885d25205 100644
--- a/packages/rn-tester/js/examples/TransparentHitTest/TransparentHitTestExample.js
+++ b/packages/rn-tester/js/examples/TransparentHitTest/TransparentHitTestExample.js
@@ -14,7 +14,7 @@ const React = require('react');
 const {Text, View, TouchableOpacity, Alert} = require('react-native');
 
 class TransparentHitTestExample extends React.Component<{...}> {
-  render() {
+  render(): React.Node {
     return (
       <View style={{flex: 1}}>
         <TouchableOpacity onPress={() => Alert.alert('Alert', 'Hi!')}>
diff --git a/packages/rn-tester/js/examples/TurboModule/NativeCxxModuleExampleExample.js b/packages/rn-tester/js/examples/TurboModule/NativeCxxModuleExampleExample.js
new file mode 100644
index 000000000000..ba62ba6e64ef
--- /dev/null
+++ b/packages/rn-tester/js/examples/TurboModule/NativeCxxModuleExampleExample.js
@@ -0,0 +1,222 @@
+/**
+ * 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 type {RootTag} from 'react-native/Libraries/ReactNative/RootTag';
+
+import {
+  StyleSheet,
+  Text,
+  View,
+  FlatList,
+  Platform,
+  TouchableOpacity,
+  RootTagContext,
+} from 'react-native';
+import * as React from 'react';
+import NativeCxxModuleExample /*EnumInt,*/ from '../../../NativeCxxModuleExample/NativeCxxModuleExample';
+
+type State = {|
+  testResults: {
+    [string]: {
+      type: string,
+      value: mixed,
+      ...
+    },
+    ...
+  },
+|};
+
+type Examples =
+  | 'callback'
+  | 'getArray'
+  | 'getBool'
+  | 'getConstants'
+  | 'getEnum'
+  | 'getMap'
+  | 'getNumber'
+  | 'getObject'
+  | 'getSet'
+  | 'getString'
+  | 'getUnion'
+  | 'getValue'
+  | 'promise'
+  | 'rejectPromise'
+  | 'voidFunc';
+
+class NativeCxxModuleExampleExample extends React.Component<{||}, State> {
+  static contextType: React$Context<RootTag> = RootTagContext;
+
+  state: State = {
+    testResults: {},
+  };
+
+  // Add calls to methods in TurboModule here
+  // $FlowFixMe[missing-local-annot]
+  _tests = {
+    callback: () =>
+      NativeCxxModuleExample?.getValueWithCallback(callbackValue =>
+        this._setResult('callback', callbackValue),
+      ),
+    getArray: () =>
+      NativeCxxModuleExample?.getArray([
+        {a: 1, b: 'foo'},
+        {a: 2, b: 'bar'},
+        null,
+      ]),
+    getBool: () => NativeCxxModuleExample?.getBool(true),
+    getConstants: () => NativeCxxModuleExample?.getConstants(),
+    getEnum: () => NativeCxxModuleExample?.getEnum(/*EnumInt.A*/ 2),
+    getMap: () => NativeCxxModuleExample?.getMap({a: 1, b: null, c: 3}),
+    getNumber: () => NativeCxxModuleExample?.getNumber(99.95),
+    getObject: () =>
+      NativeCxxModuleExample?.getObject({a: 1, b: 'foo', c: null}),
+    getSet: () => NativeCxxModuleExample?.getSet([1, 1.1, 1.1, 1.1, 2]),
+    getString: () => NativeCxxModuleExample?.getString('Hello'),
+    getUnion: () => NativeCxxModuleExample?.getUnion(1.44, 'Two', {low: '12'}),
+    getValue: () =>
+      NativeCxxModuleExample?.getValue(5, 'test', {a: 1, b: 'foo'}),
+    promise: () =>
+      NativeCxxModuleExample?.getValueWithPromise(false).then(valuePromise =>
+        this._setResult('promise', valuePromise),
+      ),
+    rejectPromise: () =>
+      NativeCxxModuleExample?.getValueWithPromise(true)
+        .then(() => {})
+        .catch(e => this._setResult('rejectPromise', e.message)),
+    voidFunc: () => NativeCxxModuleExample?.voidFunc(),
+  };
+
+  _setResult(
+    name: string | Examples,
+    result:
+      | $FlowFixMe
+      | void
+      | Array<$FlowFixMe>
+      | boolean
+      | {const1: boolean, const2: number, const3: string}
+      | number
+      | {[key: string]: ?number}
+      | Promise<mixed>
+      | number
+      | string,
+  ) {
+    this.setState(({testResults}) => ({
+      testResults: {
+        ...testResults,
+        /* $FlowFixMe[invalid-computed-prop] (>=0.111.0 site=react_native_fb)
+         * This comment suppresses an error found when Flow v0.111 was
+         * deployed. To see the error, delete this comment and run Flow. */
+        [name]: {value: result, type: typeof result},
+      },
+    }));
+  }
+
+  _renderResult(name: Examples): React.Node {
+    const result = this.state.testResults[name] || {};
+    return (
+      <View style={styles.result}>
+        <Text style={[styles.value]}>{JSON.stringify(result.value)}</Text>
+        <Text style={[styles.type]}>{result.type}</Text>
+      </View>
+    );
+  }
+
+  componentDidMount(): void {
+    if (global.__turboModuleProxy == null) {
+      throw new Error(
+        'Cannot load this example because TurboModule is not configured.',
+      );
+    }
+    Object.keys(this._tests).forEach(item =>
+      this._setResult(item, this._tests[item]()),
+    );
+  }
+
+  render(): React.Node {
+    return (
+      <View style={styles.container}>
+        <View style={styles.item}>
+          <TouchableOpacity
+            style={[styles.column, styles.button]}
+            onPress={() =>
+              Object.keys(this._tests).forEach(item =>
+                this._setResult(item, this._tests[item]()),
+              )
+            }>
+            <Text style={styles.buttonTextLarge}>Run all tests</Text>
+          </TouchableOpacity>
+          <TouchableOpacity
+            onPress={() => this.setState({testResults: {}})}
+            style={[styles.column, styles.button]}>
+            <Text style={styles.buttonTextLarge}>Clear results</Text>
+          </TouchableOpacity>
+        </View>
+        <FlatList
+          data={Object.keys(this._tests)}
+          keyExtractor={item => item}
+          renderItem={({item}) => (
+            <View style={styles.item}>
+              <TouchableOpacity
+                style={[styles.column, styles.button]}
+                onPress={e => this._setResult(item, this._tests[item]())}>
+                <Text style={styles.buttonText}>{item}</Text>
+              </TouchableOpacity>
+              <View style={[styles.column]}>{this._renderResult(item)}</View>
+            </View>
+          )}
+        />
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+  item: {
+    flexDirection: 'row',
+    margin: 6,
+  },
+  column: {
+    flex: 2,
+    justifyContent: 'center',
+    padding: 3,
+  },
+  result: {
+    alignItems: 'stretch',
+    justifyContent: 'space-between',
+  },
+  value: {
+    fontFamily: Platform.OS === 'ios' ? 'Menlo' : 'monospace',
+    fontSize: 12,
+  },
+  type: {
+    color: '#333',
+    fontSize: 10,
+  },
+  button: {
+    borderColor: '#444',
+    padding: 3,
+    flex: 1,
+  },
+  buttonTextLarge: {
+    textAlign: 'center',
+    color: 'rgb(0,122,255)',
+    fontSize: 16,
+    padding: 6,
+  },
+  buttonText: {
+    color: 'rgb(0,122,255)',
+    textAlign: 'center',
+  },
+});
+
+module.exports = NativeCxxModuleExampleExample;
diff --git a/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js b/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js
index 09e14a94e247..01f7a2c70007 100644
--- a/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js
+++ b/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js
@@ -40,6 +40,7 @@ class SampleTurboModuleExample extends React.Component<{||}, State> {
   };
 
   // Add calls to methods in TurboModule here
+  // $FlowFixMe[missing-local-annot]
   _tests = {
     callback: () =>
       NativeSampleTurboModule.getValueWithCallback(callbackValue =>
@@ -129,7 +130,7 @@ class SampleTurboModuleExample extends React.Component<{||}, State> {
       | 'promise'
       | 'rejectPromise'
       | 'voidFunc',
-  ) {
+  ): React.Node {
     const result = this.state.testResults[name] || {};
     return (
       <View style={styles.result}>
@@ -139,7 +140,7 @@ class SampleTurboModuleExample extends React.Component<{||}, State> {
     );
   }
 
-  componentDidMount() {
+  componentDidMount(): void {
     if (global.__turboModuleProxy == null) {
       throw new Error(
         'Cannot load this example because TurboModule is not configured.',
diff --git a/packages/rn-tester/js/examples/TurboModule/TurboCxxModuleExample.js b/packages/rn-tester/js/examples/TurboModule/TurboCxxModuleExample.js
new file mode 100644
index 000000000000..18e9f53ae249
--- /dev/null
+++ b/packages/rn-tester/js/examples/TurboModule/TurboCxxModuleExample.js
@@ -0,0 +1,27 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+const React = require('react');
+const NativeCxxModuleExampleExample = require('./NativeCxxModuleExampleExample');
+
+exports.displayName = (undefined: ?string);
+exports.title = 'Cxx TurboModule';
+exports.category = 'Basic';
+exports.description = 'Usage of Cxx TurboModule';
+exports.examples = [
+  {
+    title: 'TurboCxxModuleExample',
+    render: function (): React.Element<any> {
+      return <NativeCxxModuleExampleExample />;
+    },
+  },
+];
diff --git a/packages/rn-tester/js/examples/View/ViewExample.js b/packages/rn-tester/js/examples/View/ViewExample.js
index 2ea127b9df19..7a073a3a4916 100644
--- a/packages/rn-tester/js/examples/View/ViewExample.js
+++ b/packages/rn-tester/js/examples/View/ViewExample.js
@@ -17,17 +17,18 @@ const {
   Text,
   TouchableWithoutFeedback,
   View,
+  Platform,
 } = require('react-native');
 
 class ViewBorderStyleExample extends React.Component<
   $ReadOnly<{||}>,
   {|showBorder: boolean|},
 > {
-  state = {
+  state: {showBorder: boolean} = {
     showBorder: true,
   };
 
-  render() {
+  render(): React.Node {
     return (
       <TouchableWithoutFeedback onPress={this._handlePress}>
         <View>
@@ -86,11 +87,11 @@ class OffscreenAlphaCompositing extends React.Component<
     active: boolean,
   |},
 > {
-  state = {
+  state: {active: boolean} = {
     active: false,
   };
 
-  render() {
+  render(): React.Node {
     return (
       <TouchableWithoutFeedback onPress={this._handlePress}>
         <View>
@@ -168,11 +169,11 @@ class ZIndexExample extends React.Component<
     flipped: boolean,
   |},
 > {
-  state = {
+  state: {flipped: boolean} = {
     flipped: false,
   };
 
-  render() {
+  render(): React.Node {
     const indices = this.state.flipped ? [-1, 0, 1, 2] : [2, 1, 0, -1];
     return (
       <TouchableWithoutFeedback onPress={this._handlePress}>
@@ -238,11 +239,11 @@ class DisplayNoneStyle extends React.Component<
     index: number,
   |},
 > {
-  state = {
+  state: {index: number} = {
     index: 0,
   };
 
-  render() {
+  render(): React.Node {
     return (
       <TouchableWithoutFeedback onPress={this._handlePress}>
         <View>
@@ -298,6 +299,40 @@ class DisplayNoneStyle extends React.Component<
     this.setState({index: this.state.index + 1});
   };
 }
+
+class FlexGapExample extends React.Component<$ReadOnly<{||}>> {
+  render(): React.Node {
+    return (
+      <View
+        style={{
+          flexDirection: 'row',
+          flexWrap: 'wrap',
+          borderWidth: 1,
+          rowGap: 20,
+          columnGap: 30,
+        }}>
+        <View style={{backgroundColor: 'black', height: 30, width: 30}} />
+        <View style={{backgroundColor: 'black', height: 30, width: 30}} />
+        <View
+          style={{
+            backgroundColor: 'pink',
+            height: 30,
+            flexBasis: 30,
+          }}
+        />
+        <View style={{backgroundColor: 'black', height: 30, width: 30}} />
+        <View style={{backgroundColor: 'black', height: 30, width: 30}} />
+        <View style={{backgroundColor: 'black', height: 30, width: 30}} />
+        <View style={{backgroundColor: 'black', height: 30, width: 30}} />
+        <View style={{backgroundColor: 'pink', height: 30, width: 30}} />
+        <View style={{backgroundColor: 'pink', height: 30, width: 30}} />
+        <View style={{backgroundColor: 'pink', height: 30, width: 30}} />
+        <View style={{backgroundColor: 'pink', height: 30, width: 30}} />
+      </View>
+    );
+  }
+}
+
 exports.title = 'View';
 exports.documentationURL = 'https://reactnative.dev/docs/view';
 exports.category = 'Basic';
@@ -360,12 +395,29 @@ exports.examples = [
     title: 'Border Radius',
     render(): React.Node {
       return (
-        <View style={{borderWidth: 0.5, borderRadius: 5, padding: 5}}>
-          <Text style={{fontSize: 11}}>
-            Too much use of `borderRadius` (especially large radii) on anything
-            which is scrolling may result in dropped frames. Use sparingly.
-          </Text>
-        </View>
+        <>
+          <View style={{borderWidth: 0.5, borderRadius: 5, padding: 5}}>
+            <Text style={{fontSize: 11}}>
+              Too much use of `borderRadius` (especially large radii) on
+              anything which is scrolling may result in dropped frames. Use
+              sparingly.
+            </Text>
+          </View>
+          {Platform.OS === 'ios' && (
+            <View
+              style={{
+                borderRadius: 20,
+                padding: 8,
+                marginTop: 12,
+                backgroundColor: '#527FE4',
+                borderCurve: 'continuous',
+              }}>
+              <Text style={{fontSize: 16, color: 'white'}}>
+                View with continuous border curve
+              </Text>
+            </View>
+          )}
+        </>
       );
     },
   },
@@ -582,4 +634,22 @@ exports.examples = [
       );
     },
   },
+  {
+    title: 'View with aria-label="label"',
+    render(): React.Node {
+      return (
+        <View
+          aria-label="Blue background View with Text"
+          style={{backgroundColor: '#527FE4', padding: 5}}>
+          <Text style={{fontSize: 11}}>Blue background</Text>
+        </View>
+      );
+    },
+  },
+  {
+    title: 'FlexGap',
+    render(): React.Node {
+      return <FlexGapExample />;
+    },
+  },
 ];
diff --git a/packages/rn-tester/js/examples/XHR/XHRExampleFetch.js b/packages/rn-tester/js/examples/XHR/XHRExampleFetch.js
index 30590a3b3c84..159a447a1311 100644
--- a/packages/rn-tester/js/examples/XHR/XHRExampleFetch.js
+++ b/packages/rn-tester/js/examples/XHR/XHRExampleFetch.js
@@ -39,12 +39,12 @@ class XHRExampleFetch extends React.Component<any, any> {
       });
   }
 
-  _renderHeaders() {
+  _renderHeaders(): null | Array<React.Node> {
     if (!this.responseHeaders) {
       return null;
     }
 
-    const responseHeaders = [];
+    const responseHeaders: Array<React.Node> = [];
     const keys = Object.keys(this.responseHeaders.map);
     for (let i = 0; i < keys.length; i++) {
       const key = keys[i];
diff --git a/packages/rn-tester/js/types/RNTesterTypes.js b/packages/rn-tester/js/types/RNTesterTypes.js
index e6f3d9142a30..76416a5cf400 100644
--- a/packages/rn-tester/js/types/RNTesterTypes.js
+++ b/packages/rn-tester/js/types/RNTesterTypes.js
@@ -59,7 +59,7 @@ export type ScreenTypes = 'components' | 'apis' | 'bookmarks' | null;
 
 export type ComponentList = null | {components: string[], apis: string[]};
 
-export type RNTesterState = {
+export type RNTesterNavigationState = {
   activeModuleKey: null | string,
   activeModuleTitle: null | string,
   activeModuleExampleKey: null | string,
@@ -67,3 +67,10 @@ export type RNTesterState = {
   bookmarks: ComponentList,
   recentlyUsed: ComponentList,
 };
+
+export type RNTesterJsStallsState = {
+  stallIntervalId: ?IntervalID,
+  busyTime: null | number,
+  filteredStall: number,
+  tracking: boolean,
+};
diff --git a/packages/rn-tester/js/utils/RNTesterList.android.js b/packages/rn-tester/js/utils/RNTesterList.android.js
index f150ea666b11..c8e836e82d01 100644
--- a/packages/rn-tester/js/utils/RNTesterList.android.js
+++ b/packages/rn-tester/js/utils/RNTesterList.android.js
@@ -142,7 +142,7 @@ const APIs: Array<RNTesterModuleInfo> = [
   {
     key: 'AlertExample',
     category: 'UI',
-    module: require('../examples/Alert/AlertExample'),
+    module: require('../examples/Alert/AlertExample').default,
   },
   {
     key: 'AnimatedIndex',
@@ -184,6 +184,11 @@ const APIs: Array<RNTesterModuleInfo> = [
     category: 'UI',
     module: require('../examples/Dimensions/DimensionsExample'),
   },
+  {
+    key: 'Keyboard',
+    category: 'Basic',
+    module: require('../examples/Keyboard/KeyboardExample').default,
+  },
   {
     key: 'LayoutEventsExample',
     category: 'UI',
@@ -274,15 +279,17 @@ const APIs: Array<RNTesterModuleInfo> = [
     category: 'Basic',
     module: require('../examples/XHR/XHRExample'),
   },
-];
-
-if (global.__turboModuleProxy) {
-  APIs.push({
+  {
     key: 'TurboModuleExample',
     category: 'Basic',
     module: require('../examples/TurboModule/TurboModuleExample'),
-  });
-}
+  },
+  {
+    key: 'TurboCxxModuleExample',
+    category: 'Basic',
+    module: require('../examples/TurboModule/TurboCxxModuleExample'),
+  },
+];
 
 if (ReactNativeFeatureFlags.shouldEmitW3CPointerEvents()) {
   APIs.push({
diff --git a/packages/rn-tester/js/utils/RNTesterList.ios.js b/packages/rn-tester/js/utils/RNTesterList.ios.js
index 42cb9027bd81..6b92e41d15a6 100644
--- a/packages/rn-tester/js/utils/RNTesterList.ios.js
+++ b/packages/rn-tester/js/utils/RNTesterList.ios.js
@@ -231,6 +231,11 @@ const APIs: Array<RNTesterModuleInfo> = [
     module: require('../examples/Dimensions/DimensionsExample'),
     supportsTVOS: true,
   },
+  {
+    key: 'Keyboard',
+    module: require('../examples/Keyboard/KeyboardExample').default,
+    supportsTVOS: true,
+  },
   {
     key: 'LayoutAnimationExample',
     module: require('../examples/Layout/LayoutAnimationExample'),
@@ -306,6 +311,10 @@ const APIs: Array<RNTesterModuleInfo> = [
     module: require('../examples/TurboModule/TurboModuleExample'),
     supportsTVOS: false,
   },
+  {
+    key: 'TurboCxxModuleExample',
+    module: require('../examples/TurboModule/TurboCxxModuleExample'),
+  },
   {
     key: 'VibrationExample',
     module: require('../examples/Vibration/VibrationExample'),
diff --git a/packages/rn-tester/js/utils/RNTesterReducer.js b/packages/rn-tester/js/utils/RNTesterNavigationReducer.js
similarity index 65%
rename from packages/rn-tester/js/utils/RNTesterReducer.js
rename to packages/rn-tester/js/utils/RNTesterNavigationReducer.js
index d0b0444905fe..797f5a02e800 100644
--- a/packages/rn-tester/js/utils/RNTesterReducer.js
+++ b/packages/rn-tester/js/utils/RNTesterNavigationReducer.js
@@ -8,10 +8,12 @@
  * @flow
  */
 
-import type {RNTesterState, ComponentList} from '../types/RNTesterTypes';
+import type {
+  RNTesterNavigationState,
+  ComponentList,
+} from '../types/RNTesterTypes';
 
-export const RNTesterActionsType = {
-  INIT_FROM_STORAGE: 'INIT_FROM_STORAGE',
+export const RNTesterNavigationActionsType = {
   NAVBAR_PRESS: 'NAVBAR_PRESS',
   BOOKMARK_PRESS: 'BOOKMARK_PRESS',
   BACK_BUTTON_PRESS: 'BACK_BUTTON_PRESS',
@@ -24,14 +26,18 @@ const getUpdatedBookmarks = ({
   key,
   bookmarks,
 }: {
-  exampleType: string,
-  key: string,
+  exampleType: 'apis' | 'components' | null,
+  key: string | null,
   bookmarks: ComponentList,
 }) => {
   const updatedBookmarks = bookmarks
     ? {...bookmarks}
     : {components: [], apis: []};
 
+  if (!exampleType || !key) {
+    return null;
+  }
+
   if (updatedBookmarks[exampleType].includes(key)) {
     updatedBookmarks[exampleType] = updatedBookmarks[exampleType].filter(
       k => k !== key,
@@ -39,6 +45,7 @@ const getUpdatedBookmarks = ({
   } else {
     updatedBookmarks[exampleType].push(key);
   }
+
   return updatedBookmarks;
 };
 
@@ -47,14 +54,18 @@ const getUpdatedRecentlyUsed = ({
   key,
   recentlyUsed,
 }: {
-  exampleType: string,
-  key: string,
+  exampleType: 'apis' | 'components' | null,
+  key: string | null,
   recentlyUsed: ComponentList,
 }) => {
   const updatedRecentlyUsed = recentlyUsed
     ? {...recentlyUsed}
     : {components: [], apis: []};
 
+  if (!exampleType || !key) {
+    return updatedRecentlyUsed;
+  }
+
   let existingKeys = updatedRecentlyUsed[exampleType];
 
   if (existingKeys.includes(key)) {
@@ -67,48 +78,54 @@ const getUpdatedRecentlyUsed = ({
   return updatedRecentlyUsed;
 };
 
-export const RNTesterReducer = (
-  state: RNTesterState,
-  action: {type: string, data: any},
-): RNTesterState => {
+export const RNTesterNavigationReducer = (
+  state: RNTesterNavigationState,
+  action: {type: $Keys<typeof RNTesterNavigationActionsType>, data?: any},
+): RNTesterNavigationState => {
+  const {
+    data: {key = null, title = null, exampleType = null, screen = null} = {},
+  } = action;
+
   switch (action.type) {
-    case RNTesterActionsType.INIT_FROM_STORAGE:
-      return action.data;
-    case RNTesterActionsType.NAVBAR_PRESS:
+    case RNTesterNavigationActionsType.NAVBAR_PRESS:
       return {
         ...state,
         activeModuleKey: null,
         activeModuleTitle: null,
         activeModuleExampleKey: null,
-        screen: action.data.screen,
+        screen,
       };
-    case RNTesterActionsType.MODULE_CARD_PRESS:
+
+    case RNTesterNavigationActionsType.MODULE_CARD_PRESS:
       return {
         ...state,
-        activeModuleKey: action.data.key,
-        activeModuleTitle: action.data.title,
+        activeModuleKey: key,
+        activeModuleTitle: title,
         activeModuleExampleKey: null,
         recentlyUsed: getUpdatedRecentlyUsed({
-          exampleType: action.data.exampleType,
-          key: action.data.key,
+          exampleType: exampleType,
+          key: key,
           recentlyUsed: state.recentlyUsed,
         }),
       };
-    case RNTesterActionsType.EXAMPLE_CARD_PRESS:
+
+    case RNTesterNavigationActionsType.EXAMPLE_CARD_PRESS:
       return {
         ...state,
-        activeModuleExampleKey: action.data.key,
+        activeModuleExampleKey: key,
       };
-    case RNTesterActionsType.BOOKMARK_PRESS:
+
+    case RNTesterNavigationActionsType.BOOKMARK_PRESS:
       return {
         ...state,
         bookmarks: getUpdatedBookmarks({
-          exampleType: action.data.exampleType,
-          key: action.data.key,
+          exampleType: exampleType,
+          key: key,
           bookmarks: state.bookmarks,
         }),
       };
-    case RNTesterActionsType.BACK_BUTTON_PRESS:
+
+    case RNTesterNavigationActionsType.BACK_BUTTON_PRESS:
       // Go back to module or list
       return {
         ...state,
@@ -118,6 +135,7 @@ export const RNTesterReducer = (
         activeModuleTitle:
           state.activeModuleExampleKey != null ? state.activeModuleTitle : null,
       };
+
     default:
       throw new Error(`Invalid action type ${action.type}`);
   }
diff --git a/packages/rn-tester/js/utils/RNTesterStatePersister.js b/packages/rn-tester/js/utils/RNTesterStatePersister.js
deleted file mode 100644
index 4839327bbe84..000000000000
--- a/packages/rn-tester/js/utils/RNTesterStatePersister.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow
- */
-
-const React = require('react');
-import {AsyncStorage} from 'react-native';
-
-export type PassProps<State> = {
-  state: State,
-  setState: (stateLamda: (state: State) => State) => void,
-  ...
-};
-
-/**
- * A simple container for persisting some state and passing it into the wrapped component as
- * `props.persister.state`. Update it with `props.persister.setState`. The component is initially
- * rendered using `getInitialState` in the spec and is then re-rendered with the persisted data
- * once it's fetched.
- *
- * This is currently tied to RNTester because it's generally not good to use AsyncStorage like
- * this in real apps with user data, but we could maybe pull it out for other internal settings-type
- * usage.
- */
-function createContainer<Props: Object, State>(
-  Component: React.ComponentType<Props & {persister: PassProps<State>, ...}>,
-  spec: {
-    cacheKeySuffix: (props: Props) => string,
-    getInitialState: (props: Props) => State,
-    version?: string,
-    ...
-  },
-): React.ComponentType<Props> {
-  return class ComponentWithPersistedState extends React.Component<
-    Props,
-    $FlowFixMeState,
-  > {
-    static displayName = `RNTesterStatePersister(${String(
-      Component.displayName ?? Component.name,
-    )})`;
-    state = {value: spec.getInitialState(this.props)};
-    _cacheKey = `RNTester:${spec.version || 'v1'}:${spec.cacheKeySuffix(
-      this.props,
-    )}`;
-    componentDidMount() {
-      AsyncStorage.getItem(this._cacheKey, (err, value) => {
-        if (!err && value) {
-          this.setState({value: JSON.parse(value)});
-        }
-      });
-    }
-    _passSetState = (stateLamda: (state: State) => State): void => {
-      this.setState(state => {
-        const value = stateLamda(state.value);
-        // $FlowFixMe[incompatible-call]
-        AsyncStorage.setItem(this._cacheKey, JSON.stringify(value));
-        return {value};
-      });
-    };
-    render(): React.Node {
-      return (
-        <Component
-          {...this.props}
-          persister={{
-            state: this.state.value,
-            setState: this._passSetState,
-          }}
-        />
-      );
-    }
-  };
-}
-
-const RNTesterStatePersister = {
-  createContainer,
-};
-
-module.exports = RNTesterStatePersister;
diff --git a/packages/rn-tester/js/utils/testerStateUtils.js b/packages/rn-tester/js/utils/testerStateUtils.js
index dc5aa44f30a0..a7ec6ae7c4d0 100644
--- a/packages/rn-tester/js/utils/testerStateUtils.js
+++ b/packages/rn-tester/js/utils/testerStateUtils.js
@@ -12,12 +12,11 @@ import type {
   ComponentList,
   ExamplesList,
   RNTesterModuleInfo,
-  RNTesterState,
+  RNTesterNavigationState,
   SectionData,
 } from '../types/RNTesterTypes';
 
 import RNTesterList from './RNTesterList';
-import {AsyncStorage} from 'react-native';
 
 export const Screens = {
   COMPONENTS: 'components',
@@ -25,13 +24,13 @@ export const Screens = {
   BOOKMARKS: 'bookmarks',
 };
 
-export const initialState: RNTesterState = {
+export const initialNavigationState: RNTesterNavigationState = {
   activeModuleKey: null,
   activeModuleTitle: null,
   activeModuleExampleKey: null,
-  screen: null,
-  bookmarks: null,
-  recentlyUsed: null,
+  screen: Screens.COMPONENTS,
+  bookmarks: {components: [], apis: []},
+  recentlyUsed: {components: [], apis: []},
 };
 
 const filterEmptySections = (examplesList: ExamplesList): any => {
@@ -63,11 +62,13 @@ export const getExamplesListWithBookmarksAndRecentlyUsed = ({
     return null;
   }
 
-  const components = RNTesterList.Components.map(componentExample => ({
-    ...componentExample,
-    isBookmarked: bookmarks.components.includes(componentExample.key),
-    exampleType: Screens.COMPONENTS,
-  }));
+  const components = RNTesterList.Components.map(
+    (componentExample): RNTesterModuleInfo => ({
+      ...componentExample,
+      isBookmarked: bookmarks.components.includes(componentExample.key),
+      exampleType: Screens.COMPONENTS,
+    }),
+  );
 
   const recentlyUsedComponents = recentlyUsed.components
     .map(recentComponentKey =>
@@ -79,17 +80,19 @@ export const getExamplesListWithBookmarksAndRecentlyUsed = ({
     component => component.isBookmarked,
   );
 
-  const apis = RNTesterList.APIs.map(apiExample => ({
+  const apis = RNTesterList.APIs.map((apiExample): RNTesterModuleInfo => ({
     ...apiExample,
     isBookmarked: bookmarks.apis.includes(apiExample.key),
     exampleType: Screens.APIS,
   }));
 
   const recentlyUsedAPIs = recentlyUsed.apis
-    .map(recentAPIKey => apis.find(apiEample => apiEample.key === recentAPIKey))
+    .map(recentAPIKey =>
+      apis.find(apiExample => apiExample.key === recentAPIKey),
+    )
     .filter(Boolean);
 
-  const bookmarkedAPIs = apis.filter(apiEample => apiEample.isBookmarked);
+  const bookmarkedAPIs = apis.filter(apiExample => apiExample.isBookmarked);
 
   const examplesList: ExamplesList = {
     [Screens.COMPONENTS]: [
@@ -132,22 +135,3 @@ export const getExamplesListWithBookmarksAndRecentlyUsed = ({
 
   return filterEmptySections(examplesList);
 };
-
-export const getInitialStateFromAsyncStorage = async (
-  storageKey: string,
-): Promise<RNTesterState> => {
-  const initialStateString = await AsyncStorage.getItem(storageKey);
-
-  if (!initialStateString) {
-    return {
-      activeModuleKey: null,
-      activeModuleTitle: null,
-      activeModuleExampleKey: null,
-      screen: Screens.COMPONENTS,
-      bookmarks: {components: [], apis: []},
-      recentlyUsed: {components: [], apis: []},
-    };
-  } else {
-    return JSON.parse(initialStateString);
-  }
-};
diff --git a/packages/rn-tester/js/utils/useAsyncStorageReducer.js b/packages/rn-tester/js/utils/useAsyncStorageReducer.js
deleted file mode 100644
index d9f1842ed4b7..000000000000
--- a/packages/rn-tester/js/utils/useAsyncStorageReducer.js
+++ /dev/null
@@ -1,33 +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
- */
-
-import * as React from 'react';
-import {AsyncStorage} from 'react-native';
-
-import type {RNTesterState} from '../types/RNTesterTypes';
-
-export const useAsyncStorageReducer = (
-  reducer: Function,
-  initialState: RNTesterState,
-  storageKey: string,
-): [RNTesterState, Function] => {
-  const [state, dispatch] = React.useReducer<Function, Object>(
-    reducer,
-    initialState,
-  );
-
-  React.useEffect(() => {
-    if (state !== initialState) {
-      AsyncStorage.setItem(storageKey, JSON.stringify(state));
-    }
-  }, [state, storageKey, initialState]);
-
-  return [state, dispatch];
-};
diff --git a/packages/rn-tester/js/utils/useJsStalls.js b/packages/rn-tester/js/utils/useJsStalls.js
new file mode 100644
index 000000000000..a38af819a35d
--- /dev/null
+++ b/packages/rn-tester/js/utils/useJsStalls.js
@@ -0,0 +1,97 @@
+/**
+ * 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
+ */
+
+import * as React from 'react';
+
+import type {RNTesterJsStallsState} from '../types/RNTesterTypes';
+
+const INITIAL_STATE: RNTesterJsStallsState = {
+  stallIntervalId: null,
+  busyTime: null,
+  filteredStall: 0,
+  tracking: false,
+};
+
+const FILTERED_STALL_MULTIPLIER = 0.97;
+const BUSY_TIME_MULTIPLIER = 1 - FILTERED_STALL_MULTIPLIER;
+
+const useJsStalls = (): ({
+  onDisableForceJsStalls: () => void,
+  onDisableJsStallsTracking: () => void,
+  onEnableForceJsStalls: () => void,
+  onEnableJsStallsTracking: () => void,
+  state: RNTesterJsStallsState,
+}) => {
+  const [stallsState, setStallsState] =
+    React.useState<RNTesterJsStallsState>(INITIAL_STATE);
+
+  const {stallIntervalId} = stallsState;
+
+  React.useEffect(() => {
+    return () => clearInterval(stallIntervalId);
+  }, [stallIntervalId]);
+
+  const onDisableForceJsStalls = React.useCallback(
+    () => setStallsState(state => ({...state, stallIntervalId: null})),
+    [],
+  );
+
+  const onEnableForceJsStalls = React.useCallback(() => {
+    const intervalId = setInterval(() => {
+      const start = Date.now();
+
+      console.warn('burn CPU');
+
+      while (Date.now() - start < 100) {}
+    }, 300);
+
+    setStallsState(state => ({...state, stallIntervalId: intervalId}));
+  }, []);
+
+  const onEnableJsStallsTracking = React.useCallback(() => {
+    const JSEventLoopWatchdog = require('react-native/Libraries/Interaction/JSEventLoopWatchdog');
+
+    JSEventLoopWatchdog.install({thresholdMS: 25});
+
+    setStallsState(state => ({...state, tracking: true}));
+
+    JSEventLoopWatchdog.addHandler({
+      onStall: ({busyTime}) =>
+        setStallsState(state => {
+          // If previous interval was cleared
+          if (!state.stallIntervalId) {
+            return state;
+          }
+
+          return {
+            ...state,
+            busyTime: busyTime || state.busyTime,
+            filteredStall:
+              state.filteredStall * FILTERED_STALL_MULTIPLIER +
+              (busyTime || 0) * BUSY_TIME_MULTIPLIER,
+          };
+        }),
+    });
+  }, []);
+
+  const onDisableJsStallsTracking = React.useCallback(() => {
+    console.warn('Cannot disable yet...');
+  }, []);
+
+  return {
+    state: stallsState,
+    onDisableForceJsStalls,
+    onEnableForceJsStalls,
+    onEnableJsStallsTracking,
+    onDisableJsStallsTracking,
+  };
+};
+
+export default useJsStalls;
diff --git a/packages/rn-tester/package.json b/packages/rn-tester/package.json
index c201f167c2eb..6f4b740cd474 100644
--- a/packages/rn-tester/package.json
+++ b/packages/rn-tester/package.json
@@ -1,4 +1,5 @@
 {
+  "private": true,
   "name": "@react-native/tester",
   "version": "0.0.1",
   "license": "MIT",
@@ -16,19 +17,19 @@
     "clean-android": "rm -rf android/app/build",
     "setup-ios-jsc": "bundle install && USE_HERMES=0 bundle exec pod install",
     "setup-ios-hermes": "bundle install && USE_HERMES=1 bundle exec pod install",
-    "clean-ios": "rm -rf build/generated/ios && rm -rf Pods && rm Podfile.lock"
+    "clean-ios": "rm -rf build/generated/ios Pods Podfile.lock"
   },
   "dependencies": {
     "invariant": "^2.2.4",
     "nullthrows": "^1.1.1"
   },
   "peerDependencies": {
-    "react": "18.1.0",
+    "react": "18.2.0",
     "react-native": "*"
   },
   "devDependencies": {
     "connect": "^3.6.5",
-    "ws": "^6.1.4"
+    "ws": "^6.2.2"
   },
   "codegenConfig": {
     "name": "AppSpecs",
diff --git a/packages/rn-tester/react-native.config.js b/packages/rn-tester/react-native.config.js
index df48de8b0958..9e9896b9a35b 100644
--- a/packages/rn-tester/react-native.config.js
+++ b/packages/rn-tester/react-native.config.js
@@ -29,8 +29,5 @@ module.exports = {
     ios: {
       sourceDir: '.',
     },
-    android: {
-      sourceDir: '.',
-    },
   },
 };
diff --git a/react.gradle b/react.gradle
index 2e9d8e51fb61..250299bb7835 100644
--- a/react.gradle
+++ b/react.gradle
@@ -7,6 +7,24 @@
 
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.internal.jvm.Jvm
+import org.gradle.internal.logging.text.StyledTextOutput
+import org.gradle.internal.logging.text.StyledTextOutputFactory
+import org.gradle.internal.logging.text.StyledTextOutput.Style
+
+def out = services.get(StyledTextOutputFactory).create("ouput")
+out.style(Style.Info)
+    .text('##############################')
+    .text('\n\n')
+    .text('Using react.gradle in your project is deprecated! You should move to "apply plugin: com.facebook.react"')
+    .text('\n')
+    .text('react.gradle is going to be removed in a future React Native project and your project will not build anymore.')
+    .text('\n')
+    .text('You can use the template as a reference:')
+    .text('\n')
+    .text('https://github.com/facebook/react-native/blob/main/template/android/app/build.gradle')
+    .text('\n\n')
+    .text('##############################')
+    .println('')
 
 def config = project.hasProperty("react") ? project.react : [:];
 
@@ -53,7 +71,7 @@ def detectCliPath(config, reactRoot) {
     }
 
     // 2. node module path
-    def cliJsFromNode = new File(["node", "--print", "require.resolve('react-native/cli').bin"].execute(null, rootDir).text.trim())
+    def cliJsFromNode = new File(["node", "--print", "require.resolve('react-native/cli')"].execute(null, rootDir).text.trim())
     if (cliJsFromNode.exists()) {
         return cliJsFromNode.getAbsolutePath()
     }
@@ -102,20 +120,22 @@ def getHermesCommand = {
         }
     }
 
+    def hermescBin = Os.isFamily(Os.FAMILY_WINDOWS) ? 'hermesc.exe' : 'hermesc'
+
     // 2. If the project is building hermes-engine from source, use hermesc from there
     // Also note that user can override the hermes source location with
     // the `REACT_NATIVE_OVERRIDE_HERMES_DIR` env variable.
     def hermesOverrideDir = System.getenv("REACT_NATIVE_OVERRIDE_HERMES_DIR")
     def builtHermesc = hermesOverrideDir ?
-        new File(hermesOverrideDir, "build/bin/hermesc") :
-        new File(reactRoot, "node_modules/react-native/ReactAndroid/hermes-engine/build/hermes/bin/hermesc")
+        new File(hermesOverrideDir, "build/bin/$hermescBin") :
+        new File(reactRoot, "node_modules/react-native/ReactAndroid/hermes-engine/build/hermes/bin/$hermescBin")
 
     if (builtHermesc.exists()) {
         return builtHermesc.getAbsolutePath()
     }
 
     // 3. If the react-native contains a pre-built hermesc, use it.
-    def prebuiltHermesPath = "node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
+    def prebuiltHermesPath = "node_modules/react-native/sdks/hermesc/%OS-BIN%/$hermescBin"
         .replaceAll("%OS-BIN%", getHermesOSBin())
         .replace('/' as char, File.separatorChar);
     def prebuiltHermes = new File(reactRoot, prebuiltHermesPath)
@@ -385,7 +405,7 @@ afterEvaluate {
                     into ("merged_assets/${variant.name}/out")
 
                     // Workaround for Android Gradle Plugin 7.1 asset directory
-                    into("$buildDir/intermediates/assets/${variant.name}/merge${targetName}Assets")
+                    into("$buildDir/intermediates/assets/${variant.name}")
                 }
             }
 
@@ -422,11 +442,11 @@ afterEvaluate {
 
                     if (cleanup) {
                         // Reduce size by deleting the debugger/inspector
-                        include '**/libhermes-executor-debug.so'
+                        include '**/libhermes_executor_debug.so'
                     } else {
                         // Release libs take precedence and must be removed
                         // to allow debugging
-                        include '**/libhermes-executor-release.so'
+                        include '**/libhermes_executor_release.so'
                     }
                 } else {
                     // For JSC, delete all the libhermes* files
diff --git a/repo-config/package.json b/repo-config/package.json
index b332353dfebc..bc0f0241b245 100644
--- a/repo-config/package.json
+++ b/repo-config/package.json
@@ -13,42 +13,49 @@
     "@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.0.2",
+    "@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.2.4",
+    "clang-format": "^1.8.0",
     "connect": "^3.6.5",
     "coveralls": "^3.1.1",
-    "eslint": "^7.32.0",
-    "eslint-config-fb-strict": "^26.0.0",
-    "eslint-config-fbjs": "^3.1.1",
-    "eslint-config-prettier": "^8.3.0",
+    "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-flowtype": "^7.0.0",
-    "eslint-plugin-jest": "^25.2.4",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.26.1",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "eslint-plugin-react-native": "^3.11.0",
-    "eslint-plugin-relay": "^1.8.2",
-    "flow-bin": "^0.182.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",
+    "flow-bin": "^0.191.0",
     "inquirer": "^7.1.0",
-    "jest": "^26.6.3",
+    "jest": "^29.2.1",
     "jest-junit": "^10.0.0",
     "jscodeshift": "^0.13.1",
-    "metro-babel-register": "0.71.3",
-    "metro-memory-fs": "0.71.3",
+    "metro-babel-register": "0.73.5",
+    "metro-memory-fs": "0.73.5",
     "mkdirp": "^0.5.1",
     "prettier": "^2.4.1",
-    "react": "18.1.0",
-    "react-native-codegen": "^0.70.3",
-    "react-test-renderer": "18.1.0",
+    "react": "18.2.0",
+    "react-native-codegen": "^0.71.3",
+    "react-test-renderer": "18.2.0",
     "shelljs": "^0.8.5",
     "signedsource": "^1.0.0",
-    "ws": "^6.1.4",
-    "yargs": "^15.3.1"
+    "typescript": "4.1.3",
+    "ws": "^6.2.2",
+    "yargs": "^17.5.1"
+  },
+  "devDependencies": {
+    "mock-fs": "^5.1.4"
   }
 }
diff --git a/scripts/.npmignore b/scripts/.npmignore
index ee653fdf1e65..6f5224b22643 100644
--- a/scripts/.npmignore
+++ b/scripts/.npmignore
@@ -1,2 +1,2 @@
 # Make sure we never publish __test__ folders (Gradle output)
-**/__tests__/
+**/__*tests__/
diff --git a/scripts/.tests.env b/scripts/.tests.env
index e6ab94a81176..1220edfc8c37 100644
--- a/scripts/.tests.env
+++ b/scripts/.tests.env
@@ -4,15 +4,15 @@
 
 ## ANDROID ##
 # Android SDK Build Tools revision
-export ANDROID_SDK_BUILD_TOOLS_REVISION=31.0.0
+export ANDROID_SDK_BUILD_TOOLS_REVISION=33.0.0
 # Android API Level we build with
-export ANDROID_SDK_BUILD_API_LEVEL="31"
+export ANDROID_SDK_BUILD_API_LEVEL="33"
 # Google APIs for Android level
 export ANDROID_GOOGLE_API_LEVEL="23"
 # Minimum Android API SDK Level we target
 export ANDROID_SDK_MINIMUM_API_LEVEL="21"
 # Target API SDK level to build for
-export ANDROID_SDK_TARGET_API_LEVEL="31"
+export ANDROID_SDK_TARGET_API_LEVEL="33"
 # Android Image SDK level to install on the emulator
 export ANDROID_SYSTEM_IMAGE_API_LEVEL="21"
 
@@ -25,7 +25,7 @@ export ANDROID_DISABLE_AVD_TESTS=1
 
 ## IOS ##
 export IOS_TARGET_OS="latest"
-export IOS_DEVICE="iPhone 8"
+export IOS_DEVICE="iPhone 14"
 export SDK_IOS="iphonesimulator"
 
 ## CI OVERRIDES ##
diff --git a/scripts/__tests__/create_github_release_test.sh b/scripts/__tests__/create_github_release_test.sh
deleted file mode 100755
index da66c1bb684f..000000000000
--- a/scripts/__tests__/create_github_release_test.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-# 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.
-
-# Add your own Personal Access Token here.
-# Create it at https://github.com/settings/tokens
-GITHUB_TOKEN=""
-
-# Setup Circle CI envvars
-CIRCLE_TAG=""
-CIRCLE_PROJECT_USERNAME=""
-CIRCLE_PROJECT_REPONAME=""
-
-if [ -z "$GITHUB_TOKEN" ]
-then
-      echo "\$GITHUB_TOKEN is empty"
-      exit 1
-fi
-if [ -z "$CIRCLE_TAG" ]
-then
-      echo "\$CIRCLE_TAG is empty"
-      exit 1
-fi
-if [ -z "$CIRCLE_PROJECT_USERNAME" ]
-then
-      echo "\$CIRCLE_PROJECT_USERNAME is empty"
-      exit 1
-fi
-if [ -z "$CIRCLE_PROJECT_REPONAME" ]
-then
-      echo "\$CIRCLE_PROJECT_REPONAME is empty"
-      exit 1
-fi
-
-# Dummy artifacts to upload
-ARTIFACTS=("hermes-runtime-darwin-$CIRCLE_TAG.tar.gz")
-for ARTIFACT_PATH in "${ARTIFACTS[@]}"
-do
-    :
-    head -c 1024 </dev/urandom >"$ARTIFACT_PATH"
-done
-
-../circleci/create_github_release.sh "$CIRCLE_TAG" "$CIRCLE_PROJECT_USERNAME" "$CIRCLE_PROJECT_REPONAME" "$GITHUB_TOKEN" "${ARTIFACTS[@]}"
diff --git a/scripts/__tests__/hermes-utils-test.js b/scripts/__tests__/hermes-utils-test.js
deleted file mode 100644
index fbd9fed7f8e1..000000000000
--- a/scripts/__tests__/hermes-utils-test.js
+++ /dev/null
@@ -1,287 +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
- */
-
-import * as path from 'path';
-
-const {
-  configureMakeForPrebuiltHermesC,
-  copyBuildScripts,
-  copyPodSpec,
-  downloadHermesTarball,
-  expandHermesTarball,
-  getHermesTagSHA,
-  readHermesTag,
-  setHermesTag,
-  shouldUsePrebuiltHermesC,
-} = require('../hermes/hermes-utils');
-
-const hermesTag =
-  'hermes-2022-04-28-RNv0.69.0-15d07c2edd29a4ea0b8f15ab0588a0c1adb1200f';
-const tarballContents = 'dummy string';
-const hermescContents = 'dummy string';
-const hermesTagSha = '5244f819b2f3949ca94a3a1bf75d54a8ed59d94a';
-
-const ROOT_DIR = path.normalize(path.join(__dirname, '..', '..'));
-const SDKS_DIR = path.join(ROOT_DIR, 'sdks');
-
-const MemoryFs = require('metro-memory-fs');
-
-let execCalls;
-let fs;
-
-jest.mock('child_process', () => ({
-  execSync: jest.fn(command => {
-    if (command.startsWith('curl')) {
-      fs.writeFileSync(
-        path.join(SDKS_DIR, 'download', `hermes-${hermesTagSha}.tgz`),
-        tarballContents,
-      );
-      execCalls.curl = true;
-      return {code: 0};
-    }
-
-    if (command.startsWith('git')) {
-      execCalls.git = true;
-      return hermesTagSha + '\n';
-    }
-
-    if (command.startsWith('tar')) {
-      fs.mkdirSync(path.join(SDKS_DIR, 'hermes', 'utils'), {
-        recursive: true,
-      });
-      fs.writeFileSync(path.join(SDKS_DIR, 'hermes', `package.json`), '{}');
-      execCalls.tar = true;
-      return {code: 0};
-    }
-  }),
-}));
-
-function populateMockFilesystem() {
-  fs.mkdirSync(path.join(SDKS_DIR, 'hermes-engine', 'utils'), {
-    recursive: true,
-  });
-  fs.writeFileSync(
-    path.join(
-      ROOT_DIR,
-      'sdks',
-      'hermes-engine',
-      'utils',
-      'build-apple-framework.sh',
-    ),
-    'Dummy file',
-  );
-  fs.writeFileSync(
-    path.join(
-      ROOT_DIR,
-      'sdks',
-      'hermes-engine',
-      'utils',
-      'build-ios-framework.sh',
-    ),
-    'Dummy file',
-  );
-  fs.writeFileSync(
-    path.join(
-      ROOT_DIR,
-      'sdks',
-      'hermes-engine',
-      'utils',
-      'build-mac-framework.sh',
-    ),
-    'Dummy file',
-  );
-  fs.writeFileSync(
-    path.join(SDKS_DIR, 'hermes-engine', 'hermes-engine.podspec'),
-    'Dummy file',
-  );
-}
-
-describe('hermes-utils', () => {
-  beforeEach(() => {
-    jest.resetModules();
-
-    jest.mock(
-      'fs',
-      () =>
-        new MemoryFs({
-          platform: process.platform === 'win32' ? 'win32' : 'posix',
-        }),
-    );
-    fs = require('fs');
-    fs.reset();
-
-    populateMockFilesystem();
-
-    execCalls = Object.create(null);
-  });
-  describe('readHermesTag', () => {
-    it('should return main if .hermesversion does not exist', () => {
-      expect(readHermesTag()).toEqual('main');
-    });
-    it('should fail if hermes tag is empty', () => {
-      fs.writeFileSync(path.join(SDKS_DIR, '.hermesversion'), '');
-      expect(() => {
-        readHermesTag();
-      }).toThrow('[Hermes] .hermesversion file is empty.');
-    });
-    it('should return tag from .hermesversion if file exists', () => {
-      fs.writeFileSync(path.join(SDKS_DIR, '.hermesversion'), hermesTag);
-      expect(readHermesTag()).toEqual(hermesTag);
-    });
-  });
-  describe('setHermesTag', () => {
-    it('should write tag to .hermesversion file', () => {
-      setHermesTag(hermesTag);
-      expect(
-        fs.readFileSync(path.join(SDKS_DIR, '.hermesversion'), {
-          encoding: 'utf8',
-          flag: 'r',
-        }),
-      ).toEqual(hermesTag);
-    });
-    it('should set Hermes tag and read it back', () => {
-      setHermesTag(hermesTag);
-      expect(readHermesTag()).toEqual(hermesTag);
-    });
-  });
-  describe('getHermesTagSHA', () => {
-    it('should return trimmed commit SHA for Hermes tag', () => {
-      expect(getHermesTagSHA(hermesTag)).toEqual(hermesTagSha);
-      expect(execCalls.git).toBe(true);
-    });
-  });
-  describe('downloadHermesTarball', () => {
-    it('should download Hermes tarball to download dir', () => {
-      fs.writeFileSync(path.join(SDKS_DIR, '.hermesversion'), hermesTag);
-      downloadHermesTarball();
-      expect(execCalls.curl).toBe(true);
-      expect(
-        fs.readFileSync(
-          path.join(SDKS_DIR, 'download', `hermes-${hermesTagSha}.tgz`),
-          {
-            encoding: 'utf8',
-            flag: 'r',
-          },
-        ),
-      ).toEqual(tarballContents);
-    });
-    it('should not re-download Hermes tarball if tarball exists', () => {
-      fs.mkdirSync(path.join(SDKS_DIR, 'download'), {recursive: true});
-      fs.writeFileSync(
-        path.join(SDKS_DIR, 'download', `hermes-${hermesTagSha}.tgz`),
-        tarballContents,
-      );
-
-      downloadHermesTarball();
-      expect(execCalls.curl).toBeUndefined();
-    });
-  });
-  describe('expandHermesTarball', () => {
-    it('should expand Hermes tarball to Hermes source dir', () => {
-      fs.mkdirSync(path.join(SDKS_DIR, 'download'), {recursive: true});
-      fs.writeFileSync(
-        path.join(SDKS_DIR, 'download', `hermes-${hermesTagSha}.tgz`),
-        tarballContents,
-      );
-      expect(fs.existsSync(path.join(SDKS_DIR, 'hermes'))).toBeFalsy();
-      expandHermesTarball();
-      expect(execCalls.tar).toBe(true);
-      expect(fs.existsSync(path.join(SDKS_DIR, 'hermes'))).toBe(true);
-    });
-    it('should fail if Hermes tarball does not exist', () => {
-      expect(() => {
-        expandHermesTarball();
-      }).toThrow('[Hermes] Could not locate Hermes tarball.');
-      expect(execCalls.tar).toBeUndefined();
-    });
-  });
-  describe('copyBuildScripts', () => {
-    it('should copy React Native Hermes build scripts to Hermes source directory', () => {
-      copyBuildScripts();
-
-      [
-        'build-apple-framework.sh',
-        'build-ios-framework.sh',
-        'build-mac-framework.sh',
-      ].forEach(buildScript => {
-        expect(
-          fs.readFileSync(
-            path.join(ROOT_DIR, 'sdks', 'hermes', 'utils', buildScript),
-            {
-              encoding: 'utf8',
-              flag: 'r',
-            },
-          ),
-        ).toEqual(
-          fs.readFileSync(
-            path.join(ROOT_DIR, 'sdks', 'hermes-engine', 'utils', buildScript),
-            {
-              encoding: 'utf8',
-              flag: 'r',
-            },
-          ),
-        );
-      });
-    });
-  });
-  describe('copyPodSpec', () => {
-    it('should copy React Native Hermes Podspec to Hermes source directory', () => {
-      copyPodSpec();
-      expect(
-        fs.readFileSync(
-          path.join(SDKS_DIR, 'hermes', 'hermes-engine.podspec'),
-          {
-            encoding: 'utf8',
-            flag: 'r',
-          },
-        ),
-      ).toEqual(
-        fs.readFileSync(
-          path.join(SDKS_DIR, 'hermes-engine', 'hermes-engine.podspec'),
-          {
-            encoding: 'utf8',
-            flag: 'r',
-          },
-        ),
-      );
-    });
-  });
-  describe('shouldUsePrebuiltHermesC', () => {
-    it('returns false if path to osx hermesc does not exist', () => {
-      expect(shouldUsePrebuiltHermesC('macos')).toBeFalsy();
-    });
-    it('returns false for non-macOS', () => {
-      expect(shouldUsePrebuiltHermesC('windows')).toBeFalsy();
-    });
-    it('return true only if path to hermesc exists', () => {
-      fs.mkdirSync(path.join(SDKS_DIR, 'hermesc', 'osx-bin'), {
-        recursive: true,
-      });
-      fs.writeFileSync(
-        path.join(SDKS_DIR, 'hermesc', 'osx-bin', 'hermesc'),
-        hermescContents,
-      );
-      expect(shouldUsePrebuiltHermesC('macos')).toBe(true);
-    });
-  });
-
-  describe('configureMakeForPrebuiltHermesC', () => {
-    it('creates ImportHermesC file', () => {
-      fs.mkdirSync(path.join(SDKS_DIR, 'hermesc', 'osx-bin'), {
-        recursive: true,
-      });
-      configureMakeForPrebuiltHermesC();
-      expect(
-        fs.existsSync(
-          path.join(SDKS_DIR, 'hermesc', 'osx-bin', 'ImportHermesc.cmake'),
-        ),
-      ).toBe(true);
-    });
-  });
-});
diff --git a/scripts/__tests__/scm-utils-test.js b/scripts/__tests__/scm-utils-test.js
new file mode 100644
index 000000000000..46db3361fd2f
--- /dev/null
+++ b/scripts/__tests__/scm-utils-test.js
@@ -0,0 +1,97 @@
+/**
+ * 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
+ */
+
+const {isTaggedLatest, saveFiles, revertFiles} = require('../scm-utils');
+
+let execResult = null;
+const cpMock = jest.fn();
+const mkdirpSyncMock = jest.fn();
+jest
+  .mock('shelljs', () => ({
+    exec: () => {
+      return {
+        stdout: execResult,
+      };
+    },
+    echo: message => {
+      console.log(message);
+    },
+    exit: exitCode => {
+      exit(exitCode);
+    },
+    cp: cpMock,
+  }))
+  .mock('fs', () => ({
+    existsSync: jest.fn().mockImplementation(_ => true),
+  }))
+  .mock('path', () => ({
+    dirname: jest
+      .fn()
+      .mockImplementation(filePath =>
+        filePath.includes('/') ? filePath.split('/')[0] : '.',
+      ),
+  }))
+  .mock('mkdirp', () => ({
+    sync: mkdirpSyncMock,
+  }));
+
+describe('scm-utils', () => {
+  beforeEach(() => {
+    jest.resetModules();
+    jest.resetAllMocks();
+  });
+
+  describe('isTaggedLatest', () => {
+    it('it should identify commit as tagged `latest`', () => {
+      execResult = '6c19dc3266b84f47a076b647a1c93b3c3b69d2c5\n';
+      expect(isTaggedLatest('6c19dc3266b84f47a076b647a1c93b3c3b69d2c5')).toBe(
+        true,
+      );
+    });
+    it('it should not identify commit as tagged `latest`', () => {
+      execResult = '6c19dc3266b84f47a076b647a1c93b3c3b69d2c5\n';
+      expect(isTaggedLatest('6c19dc3266b8')).toBe(false);
+    });
+  });
+
+  describe('saveFiles', () => {
+    it('it should save files in the temp folder', () => {
+      const tmpFolder = '/tmp';
+      saveFiles(['package.json', 'android/package.json'], tmpFolder);
+      expect(mkdirpSyncMock).toHaveBeenCalledWith(`${tmpFolder}/android`);
+      expect(cpMock).toHaveBeenNthCalledWith(
+        1,
+        'package.json',
+        '/tmp/package.json',
+      );
+      expect(cpMock).toHaveBeenNthCalledWith(
+        2,
+        'android/package.json',
+        `${tmpFolder}/android/package.json`,
+      );
+    });
+  });
+
+  describe('revertFiles', () => {
+    it('it should revert files from the temp folder', () => {
+      const tmpFolder = '/tmp';
+      revertFiles(['package.json', 'android/package.json'], tmpFolder);
+      expect(cpMock).toHaveBeenNthCalledWith(
+        1,
+        `${tmpFolder}/package.json`,
+        'package.json',
+      );
+      expect(cpMock).toHaveBeenNthCalledWith(
+        2,
+        `${tmpFolder}/android/package.json`,
+        'android/package.json',
+      );
+    });
+  });
+});
diff --git a/scripts/__tests__/version-utils-test.js b/scripts/__tests__/version-utils-test.js
index d8bf22f400a9..0dd087e20b01 100644
--- a/scripts/__tests__/version-utils-test.js
+++ b/scripts/__tests__/version-utils-test.js
@@ -9,8 +9,8 @@
 
 const {
   parseVersion,
-  isTaggedLatest,
   isReleaseBranch,
+  validateBuildType,
 } = require('../version-utils');
 
 let execResult = null;
@@ -20,6 +20,12 @@ jest.mock('shelljs', () => ({
       stdout: execResult,
     };
   },
+  echo: message => {
+    console.log(message);
+  },
+  exit: exitCode => {
+    exit(exitCode);
+  },
 }));
 
 describe('version-utils', () => {
@@ -34,32 +40,55 @@ describe('version-utils', () => {
       expect(isReleaseBranch('pull/32659')).toBe(false);
     });
   });
-  describe('isTaggedLatest', () => {
-    it('it should identify commit as tagged `latest`', () => {
-      execResult = '6c19dc3266b84f47a076b647a1c93b3c3b69d2c5\n';
-      expect(isTaggedLatest('6c19dc3266b84f47a076b647a1c93b3c3b69d2c5')).toBe(
-        true,
+
+  describe('parseVersion', () => {
+    it('should throw error if buildType is undefined', () => {
+      function testInvalidVersion() {
+        parseVersion('v0.10.5');
+      }
+      expect(testInvalidVersion).toThrowErrorMatchingInlineSnapshot(
+        `"Unsupported build type: undefined"`,
       );
     });
-    it('it should not identify commit as tagged `latest`', () => {
-      execResult = '6c19dc3266b84f47a076b647a1c93b3c3b69d2c5\n';
-      expect(isTaggedLatest('6c19dc3266b8')).toBe(false);
-    });
-  });
 
-  describe('parseVersion', () => {
-    it('should throw error if invalid match', () => {
+    it('should throw error if buildType is not `release`, `dry-run` or `nightly`', () => {
+      function testInvalidVersion() {
+        parseVersion('v0.10.5', 'invalid_build_type');
+      }
+      expect(testInvalidVersion).toThrowErrorMatchingInlineSnapshot(
+        `"Unsupported build type: invalid_build_type"`,
+      );
+    });
+    it('should throw error if invalid match with release', () => {
       function testInvalidVersion() {
-        parseVersion('<invalid version>');
+        parseVersion('<invalid version>', 'release');
+      }
+      expect(testInvalidVersion).toThrowErrorMatchingInlineSnapshot(
+        `"You must pass a correctly formatted version; couldn't parse <invalid version>"`,
+      );
+    });
+    it('should throw error if invalid match with dry-run', () => {
+      function testInvalidVersion() {
+        parseVersion('<invalid version>', 'dry-run');
+      }
+      expect(testInvalidVersion).toThrowErrorMatchingInlineSnapshot(
+        `"You must pass a correctly formatted version; couldn't parse <invalid version>"`,
+      );
+    });
+    it('should throw error if invalid match with nightly', () => {
+      function testInvalidVersion() {
+        parseVersion('<invalid version>', 'nightly');
       }
       expect(testInvalidVersion).toThrowErrorMatchingInlineSnapshot(
         `"You must pass a correctly formatted version; couldn't parse <invalid version>"`,
       );
     });
 
-    it('should parse pre-release version with .', () => {
-      const {version, major, minor, patch, prerelease} =
-        parseVersion('0.66.0-rc.4');
+    it('should parse pre-release version with release and `.`', () => {
+      const {version, major, minor, patch, prerelease} = parseVersion(
+        '0.66.0-rc.4',
+        'release',
+      );
       expect(version).toBe('0.66.0-rc.4');
       expect(major).toBe('0');
       expect(minor).toBe('66');
@@ -67,9 +96,11 @@ describe('version-utils', () => {
       expect(prerelease).toBe('rc.4');
     });
 
-    it('should parse pre-release version with -', () => {
-      const {version, major, minor, patch, prerelease} =
-        parseVersion('0.66.0-rc-4');
+    it('should parse pre-release version with release and `-`', () => {
+      const {version, major, minor, patch, prerelease} = parseVersion(
+        '0.66.0-rc-4',
+        'release',
+      );
       expect(version).toBe('0.66.0-rc-4');
       expect(major).toBe('0');
       expect(minor).toBe('66');
@@ -77,27 +108,62 @@ describe('version-utils', () => {
       expect(prerelease).toBe('rc-4');
     });
 
+    it('should reject pre-release version with random prerelease pattern', () => {
+      function testInvalidVersion() {
+        parseVersion('0.66.0-something_invalid', 'release');
+      }
+      expect(testInvalidVersion).toThrowErrorMatchingInlineSnapshot(
+        `"Version 0.66.0-something_invalid is not valid for Release"`,
+      );
+    });
+
     it('should parse stable version', () => {
-      const {version, major, minor, patch, prerelease} = parseVersion('0.66.0');
+      const {version, major, minor, patch, prerelease} = parseVersion(
+        '0.66.0',
+        'release',
+      );
       expect(version).toBe('0.66.0');
       expect(major).toBe('0');
       expect(minor).toBe('66');
       expect(patch).toBe('0');
       expect(prerelease).toBeUndefined();
     });
+
     it('should parse pre-release version from tag', () => {
-      const {version, major, minor, patch, prerelease} =
-        parseVersion('v0.66.1-rc.4');
-      expect(version).toBe('0.66.1-rc.4');
+      const {version, major, minor, patch, prerelease} = parseVersion(
+        'v0.66.0-rc.4',
+        'release',
+      );
+      expect(version).toBe('0.66.0-rc.4');
       expect(major).toBe('0');
       expect(minor).toBe('66');
-      expect(patch).toBe('1');
+      expect(patch).toBe('0');
       expect(prerelease).toBe('rc.4');
     });
 
+    it('should reject pre-release version with patch != 0', () => {
+      function testInvalidVersion() {
+        parseVersion('0.66.3-rc.4', 'release');
+      }
+      expect(testInvalidVersion).toThrowErrorMatchingInlineSnapshot(
+        `"Version 0.66.3-rc.4 is not valid for Release"`,
+      );
+    });
+
+    it('should reject pre-release version from tag with random prerelease pattern', () => {
+      function testInvalidVersion() {
+        parseVersion('v0.66.0-something_invalid', 'release');
+      }
+      expect(testInvalidVersion).toThrowErrorMatchingInlineSnapshot(
+        `"Version 0.66.0-something_invalid is not valid for Release"`,
+      );
+    });
+
     it('should parse stable version from tag', () => {
-      const {version, major, minor, patch, prerelease} =
-        parseVersion('v0.66.0');
+      const {version, major, minor, patch, prerelease} = parseVersion(
+        'v0.66.0',
+        'release',
+      );
       expect(version).toBe('0.66.0');
       expect(major).toBe('0');
       expect(minor).toBe('66');
@@ -105,23 +171,179 @@ describe('version-utils', () => {
       expect(prerelease).toBeUndefined();
     });
 
-    it('should parse nightly fake version', () => {
-      const {version, major, minor, patch, prerelease} = parseVersion('0.0.0');
-      expect(version).toBe('0.0.0');
+    it('should reject nightly with no prerelease', () => {
+      // this should fail
+      function testInvalidFunction() {
+        parseVersion('0.0.0', 'nightly');
+      }
+      expect(testInvalidFunction).toThrowErrorMatchingInlineSnapshot(
+        `"Version 0.0.0 is not valid for nightlies"`,
+      );
+    });
+
+    it('should reject nightly with prerelease but wrong version numbers', () => {
+      // this should fail
+      function testInvalidFunction() {
+        parseVersion('1.2.3-pre-release', 'nightly');
+      }
+      expect(testInvalidFunction).toThrowErrorMatchingInlineSnapshot(
+        `"Version 1.2.3-pre-release is not valid for nightlies"`,
+      );
+    });
+
+    it('should parse nightly with 0.0.0 and a prerelease part', () => {
+      // this should fail
+      const {version, major, minor, patch, prerelease} = parseVersion(
+        '0.0.0-pre-release',
+        'nightly',
+      );
+
+      expect(version).toBe('0.0.0-pre-release');
       expect(major).toBe('0');
       expect(minor).toBe('0');
       expect(patch).toBe('0');
+      expect(prerelease).toBe('pre-release');
+    });
+    it('should parse dryrun with release version', () => {
+      const {version, major, minor, patch, prerelease} = parseVersion(
+        '0.7.3',
+        'dry-run',
+      );
+      expect(version).toBe('0.7.3');
+      expect(major).toBe('0');
+      expect(minor).toBe('7');
+      expect(patch).toBe('3');
       expect(prerelease).toBeUndefined();
     });
 
-    it('should parse dryrun fake version', () => {
-      const {version, major, minor, patch, prerelease} =
-        parseVersion('1000.0.0');
+    it('should parse dryrun with prerelease . version', () => {
+      const {version, major, minor, patch, prerelease} = parseVersion(
+        '0.20.0-rc.0',
+        'dry-run',
+      );
+      expect(version).toBe('0.20.0-rc.0');
+      expect(major).toBe('0');
+      expect(minor).toBe('20');
+      expect(patch).toBe('0');
+      expect(prerelease).toBe('rc.0');
+    });
+
+    it('should reject dryrun with prerelease . version with patch different from 0', () => {
+      function testInvalidFunction() {
+        parseVersion('0.20.3-rc.0', 'dry-run');
+      }
+      expect(testInvalidFunction).toThrowErrorMatchingInlineSnapshot(
+        `"Version 0.20.3-rc.0 is not valid for dry-runs"`,
+      );
+    });
+
+    it('should parse dryrun with prerelease - version', () => {
+      const {version, major, minor, patch, prerelease} = parseVersion(
+        '0.20.0-rc-0',
+        'dry-run',
+      );
+      expect(version).toBe('0.20.0-rc-0');
+      expect(major).toBe('0');
+      expect(minor).toBe('20');
+      expect(patch).toBe('0');
+      expect(prerelease).toBe('rc-0');
+    });
+
+    it('should reject dryrun with prerelease - version with patch different from 0', () => {
+      function testInvalidFunction() {
+        parseVersion('0.20.3-rc-0', 'dry-run');
+      }
+      expect(testInvalidFunction).toThrowErrorMatchingInlineSnapshot(
+        `"Version 0.20.3-rc-0 is not valid for dry-runs"`,
+      );
+    });
+
+    it('should parse dryrun with main version', () => {
+      const {version, major, minor, patch, prerelease} = parseVersion(
+        '1000.0.0',
+        'dry-run',
+      );
       expect(version).toBe('1000.0.0');
       expect(major).toBe('1000');
       expect(minor).toBe('0');
       expect(patch).toBe('0');
       expect(prerelease).toBeUndefined();
     });
+
+    it('should fail for dryrun with v1000.0.1 version', () => {
+      function testInvalidFunction() {
+        parseVersion('v1000.0.1', 'dry-run');
+      }
+      expect(testInvalidFunction).toThrowErrorMatchingInlineSnapshot(
+        `"Version 1000.0.1 is not valid for dry-runs"`,
+      );
+    });
+    it('should parse dryrun with nightly version', () => {
+      const {version, major, minor, patch, prerelease} = parseVersion(
+        '0.0.0-something-else',
+        'dry-run',
+      );
+      expect(version).toBe('0.0.0-something-else');
+      expect(major).toBe('0');
+      expect(minor).toBe('0');
+      expect(patch).toBe('0');
+      expect(prerelease).toBe('something-else');
+    });
+
+    it('should reject dryrun invalid values', () => {
+      function testInvalidFunction() {
+        parseVersion('1000.0.4', 'dry-run');
+      }
+      expect(testInvalidFunction).toThrowErrorMatchingInlineSnapshot(
+        `"Version 1000.0.4 is not valid for dry-runs"`,
+      );
+    });
+
+    it('should reject dryrun for invalid prerelease', () => {
+      function testInvalidFunction() {
+        parseVersion('0.6.4-something-else', 'dry-run');
+      }
+      expect(testInvalidFunction).toThrowErrorMatchingInlineSnapshot(
+        `"Version 0.6.4-something-else is not valid for dry-runs"`,
+      );
+    });
+
+    it('should reject dryrun for nightlies with invalid prerelease', () => {
+      function testInvalidFunction() {
+        parseVersion('0.0.0', 'dry-run');
+      }
+      expect(testInvalidFunction).toThrowErrorMatchingInlineSnapshot(
+        `"Version 0.0.0 is not valid for dry-runs"`,
+      );
+    });
+  });
+
+  describe('Validate version', () => {
+    it('Throw error if the buildType is unknown', () => {
+      function testInvalidFunction() {
+        validateBuildType('wrong_build');
+      }
+      expect(testInvalidFunction).toThrowErrorMatchingInlineSnapshot(
+        `"Unsupported build type: wrong_build"`,
+      );
+    });
+    it('Does not throw if the buildType is release', () => {
+      function testValidCall() {
+        validateBuildType('release');
+      }
+      expect(testValidCall).not.toThrowError();
+    });
+    it('Does not throw if the buildType is nightly', () => {
+      function testValidCall() {
+        validateBuildType('nightly');
+      }
+      expect(testValidCall).not.toThrowError();
+    });
+    it('Does not throw if the buildType is dry-run', () => {
+      function testValidCall() {
+        validateBuildType('dry-run');
+      }
+      expect(testValidCall).not.toThrowError();
+    });
   });
 });
diff --git a/scripts/android-setup.sh b/scripts/android-setup.sh
index 34eb008f480f..854140435c27 100755
--- a/scripts/android-setup.sh
+++ b/scripts/android-setup.sh
@@ -94,21 +94,3 @@ function waitForAVD {
     echo "Skipping AVD-related test setup..."
   fi
 }
-
-function retry3 {
-  local n=1
-  local max=3
-  local delay=1
-  while true; do
-    "$@" && break || {
-      if [[ $n -lt $max ]]; then
-        ((n++))
-        echo "Command failed. Attempt $n/$max:"
-        sleep $delay;
-      else
-        echo "The command has failed after $n attempts." >&2
-        return 1
-      fi
-    }
-  done
-}
diff --git a/scripts/bump-oss-version.js b/scripts/bump-oss-version.js
index a1ae79bc2140..bf8c3d8e9139 100755
--- a/scripts/bump-oss-version.js
+++ b/scripts/bump-oss-version.js
@@ -18,12 +18,10 @@ const {exit} = require('shelljs');
 const yargs = require('yargs');
 const inquirer = require('inquirer');
 const request = require('request');
+const {getBranchName, exitIfNotOnGit} = require('./scm-utils');
 
-const {
-  parseVersion,
-  isReleaseBranch,
-  getBranchName,
-} = require('./version-utils');
+const {parseVersion, isReleaseBranch} = require('./version-utils');
+const {failIfTagExists} = require('./release-utils');
 
 let argv = yargs
   .option('r', {
@@ -42,7 +40,10 @@ let argv = yargs
     required: true,
   })
   .check(() => {
-    const branch = getBranchName();
+    const branch = exitIfNotOnGit(
+      () => getBranchName(),
+      "Not in git. You can't invoke bump-oss-versions.js from outside a git repo.",
+    );
     exitIfNotOnReleaseBranch(branch);
     return true;
   }).argv;
@@ -69,9 +70,13 @@ function triggerReleaseWorkflow(options) {
 }
 
 async function main() {
-  const branch = getBranchName();
+  const branch = exitIfNotOnGit(
+    () => getBranchName(),
+    "Not in git. You can't invoke bump-oss-versions.js from outside a git repo.",
+  );
   const token = argv.token;
   const releaseVersion = argv.toVersion;
+  failIfTagExists(releaseVersion, 'release');
 
   const {pushed} = await inquirer.prompt({
     type: 'confirm',
@@ -86,7 +91,7 @@ async function main() {
   }
 
   let latest = false;
-  const {version, prerelease} = parseVersion(releaseVersion);
+  const {version, prerelease} = parseVersion(releaseVersion, 'release');
   if (!prerelease) {
     const {setLatest} = await inquirer.prompt({
       type: 'confirm',
diff --git a/scripts/circleci/analyze_code.sh b/scripts/circleci/analyze_code.sh
index 08f9af88eaca..d2735898149c 100755
--- a/scripts/circleci/analyze_code.sh
+++ b/scripts/circleci/analyze_code.sh
@@ -9,7 +9,7 @@ GITHUB_REPO=${CIRCLE_PROJECT_REPONAME:-react-native}
 export GITHUB_OWNER
 export GITHUB_REPO
 
-cat <(echo eslint; npm run lint --silent -- --format=json; echo flow; npm run flow-check-ios --silent --json; echo flow; npm run flow-check-android --silent --json; echo google-java-format; node scripts/lint-java.js --diff) | GITHUB_PR_NUMBER="$CIRCLE_PR_NUMBER" node bots/code-analysis-bot.js
+cat <(echo eslint; npm run lint --silent -- --format=json; echo flow; npm run flow-check-ios --silent --json; echo flow; npm run flow-check-android --silent --json; echo google-java-format; node scripts/lint-java.js --diff) | GITHUB_PR_NUMBER="$CIRCLE_PR_NUMBER" node packages/react-native-bots/code-analysis-bot.js
 
 STATUS=$?
 if [ $STATUS == 0 ]; then
diff --git a/scripts/circleci/buckToJunit/buckToJunit.sh b/scripts/circleci/buckToJunit/buckToJunit.sh
new file mode 100755
index 000000000000..276e13833f6b
--- /dev/null
+++ b/scripts/circleci/buckToJunit/buckToJunit.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+# 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.
+
+# Get script directory
+prog="$0"
+while [ -h "${prog}" ]; do
+    newProg=$(/bin/ls -ld "${prog}")
+    newProg=$(expr "${newProg}" : ".* -> \(.*\)$")
+    if expr "x${newProg}" : 'x/' >/dev/null; then
+        prog="${newProg}"
+    else
+        progdir=$(dirname "${prog}")
+        prog="${progdir}/${newProg}"
+    fi
+done
+DIR=$(dirname "${prog}")
+
+# We download saxon from Maven Central rather than copying it over.
+curl https://repo1.maven.org/maven2/net/sf/saxon/Saxon-HE/9.7.0-11/Saxon-HE-9.7.0-11.jar --output "$DIR/saxon.jar"
+
+# Perform conversion
+java -jar "$DIR/saxon.jar" -xsl:"$DIR/buckToJunit.xsl" -s:"$1" -o:"$2"
diff --git a/scripts/circleci/buckToJunit/buckToJunit.xsl b/scripts/circleci/buckToJunit/buckToJunit.xsl
new file mode 100644
index 000000000000..bf01ebcf144e
--- /dev/null
+++ b/scripts/circleci/buckToJunit/buckToJunit.xsl
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) 2015 The Android Open Source Project
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:func="com.google.gerrit" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    exclude-result-prefixes="func" version="2.0">
+  <xsl:output method="xml" omit-xml-declaration="no" indent="yes" encoding="UTF-8"/>
+  <xsl:strip-space elements="*"/>
+
+  <xsl:template match="/tests">
+    <xsl:result-document method="xml">
+    <testsuites>
+      <xsl:apply-templates/>
+    </testsuites>
+    </xsl:result-document>
+  </xsl:template>
+
+  <xsl:template match="test">
+      <xsl:variable name="testCount" select="count(testresult)"/>
+      <xsl:variable name="nonEmptyStacks" select="count(testresult[stacktrace != ''])"/>
+      <xsl:variable name="failures"
+          select="count(testresult[contains(stacktrace, 'java.lang.AssertionError')])"/>
+      <xsl:variable name="errors" select="$nonEmptyStacks - $failures"/>
+      <testsuite failures="{$failures}" time="{func:toMS(@time)}" errors="{$errors}" skipped="0"
+          tests="{$testCount}" name="{@name}">
+        <xsl:apply-templates/>
+      </testsuite>
+  </xsl:template>
+
+  <xsl:template match="testresult">
+    <testcase time="{func:toMS(@time)}" classname="{../@name}" name="{@name}">
+      <xsl:apply-templates/>
+    </testcase>
+  </xsl:template>
+
+  <xsl:template match="message"/>
+
+  <xsl:template match="stacktrace[. != '']">
+    <failure message="{../message}" type="{substring-before(., ':')}">
+      <xsl:value-of select="."/>
+    </failure>
+  </xsl:template>
+
+  <xsl:function name="func:toMS">
+    <xsl:param name="sec" as="xs:decimal"/>
+    <xsl:value-of select="$sec div 1000"/>
+  </xsl:function>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/scripts/circleci/create_github_release.sh b/scripts/circleci/create_github_release.sh
deleted file mode 100755
index 27681b83f47c..000000000000
--- a/scripts/circleci/create_github_release.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-# 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.
-
-GIT_TAG="$1"; shift
-GITHUB_OWNER="$1"; shift
-GITHUB_REPO="$1"; shift
-GITHUB_TOKEN="$1"; shift
-ARTIFACTS=("$@")
-
-describe_header () {
-  printf "\\n\\n>>>>> %s\\n\\n\\n" "$1"
-}
-
-describe () {
-  printf "\\n\\n%s\\n\\n" "$1"
-}
-
-# Format our desired React Native version strings based on incoming git tag parameter.
-# GIT_TAG=v0.69.0-rc.4
-# 0.69.0-rc.4
-RN_VERSION=${GIT_TAG:1}
-# 0690rc4
-RN_SHORT_VERSION=${RN_VERSION//[.-]/}
-
-PRERELEASE=false
-if [[ "$RN_VERSION" == *"rc"* ]]; then
-    PRERELEASE=true
-fi
-
-RELEASE_TEMPLATE_PATH=../../.github/RELEASE_TEMPLATE.md
-
-# Replace placeholders in template with actual RN version strings
-RELEASE_BODY=$(sed -e "s/__VERSION__/$RN_VERSION/g" -e "s/__SHORT_VERSION__/$RN_SHORT_VERSION/g" $RELEASE_TEMPLATE_PATH)
-
-# Format and encode JSON payload
-RELEASE_DATA=$(jo tag_name="$GIT_TAG" name="$RN_VERSION" body="$RELEASE_BODY" draft=true prerelease="$PRERELEASE" generate_release_notes=false)
-
-# Create prerelease GitHub Release draft
-describe_header "Creating GitHub release."
-describe "Release payload: $RELEASE_DATA"
-
-CREATE_RELEASE_RESPONSE=$(curl -X POST \
-    -H "Accept: application/vnd.github.v3+json" \
-    -H "Authorization: Bearer $GITHUB_TOKEN" \
-    -d "$RELEASE_DATA" \
-    "https://api.github.com/repos/$GITHUB_OWNER/$GITHUB_REPO/releases"
-)
-STATUS=$?
-if [ $STATUS == 0 ]; then
-  describe "Created GitHub release successfully."
-else
-  describe "Could not create GitHub release, request failed with $STATUS."
-fi
-
-RELEASE_ID=$(echo "$CREATE_RELEASE_RESPONSE" | jq '.id')
-
-# Upload artifacts
-for ARTIFACT_PATH in "${ARTIFACTS[@]}"
-do
-    :
-    # Upload Hermes artifacts to GitHub Release
-    ARTIFACT_NAME=$(basename "$ARTIFACT_PATH")
-    describe_header "Uploading $ARTIFACT_NAME..."
-
-    if curl -X POST \
-        -H "Accept: application/vnd.github.v3+json" \
-        -H "Authorization: Bearer $GITHUB_TOKEN" \
-        -H "Content-Length: $(wc -c "$ARTIFACT_PATH" | awk '{print $1}')" \
-        -H "Content-Type: application/gzip" \
-        -T "$ARTIFACT_PATH" \
-        --progress-bar \
-        "https://uploads.github.com/repos/$GITHUB_OWNER/$GITHUB_REPO/releases/$RELEASE_ID/assets?name=$ARTIFACT_NAME"; then
-        describe "Uploaded $ARTIFACT_NAME."
-    else
-        describe "Could not upload $ARTIFACT_NAME to GitHub release."
-    fi
-done
diff --git a/scripts/circleci/post-artifacts-link.sh b/scripts/circleci/post-artifacts-link.sh
index ce8c87a84112..21771e4fd493 100755
--- a/scripts/circleci/post-artifacts-link.sh
+++ b/scripts/circleci/post-artifacts-link.sh
@@ -7,5 +7,6 @@
 GITHUB_OWNER=${CIRCLE_PROJECT_USERNAME:-facebook} \
 GITHUB_REPO=${CIRCLE_PROJECT_REPONAME:-react-native} \
 GITHUB_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}" \
+GITHUB_REF=${CIRCLE_BRANCH} \
 GITHUB_SHA=${CIRCLE_SHA1} \
-exec node bots/post-artifacts-link.js
+exec node packages/react-native-bots/post-artifacts-link.js
diff --git a/scripts/circleci/report-bundle-size.sh b/scripts/circleci/report-bundle-size.sh
index bf1ea43fa318..a5b7d7033022 100755
--- a/scripts/circleci/report-bundle-size.sh
+++ b/scripts/circleci/report-bundle-size.sh
@@ -11,7 +11,7 @@ case $1 in
     GITHUB_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}" \
     GITHUB_REF=${CIRCLE_BRANCH} \
     GITHUB_SHA=${CIRCLE_SHA1} \
-    exec node bots/report-bundle-size.js "$1"
+    exec node packages/react-native-bots/report-bundle-size.js "$1"
     ;;
   *)
     echo "Syntax: $0 [android | ios]"
diff --git a/scripts/cocoapods/__tests__/codegen-test.rb b/scripts/cocoapods/__tests__/codegen-test.rb
index 62526d9b4b50..ef574251c366 100644
--- a/scripts/cocoapods/__tests__/codegen-test.rb
+++ b/scripts/cocoapods/__tests__/codegen-test.rb
@@ -10,6 +10,7 @@
 require_relative "./test_utils/FileMock.rb"
 require_relative "./test_utils/DirMock.rb"
 require_relative "./test_utils/systemUtils.rb"
+require_relative "./test_utils/CodegenUtilsMock.rb"
 
 class CodegenTests < Test::Unit::TestCase
     :third_party_provider_header
@@ -182,4 +183,62 @@ def testCheckAndGenerateEmptyThirdPartyProvider_whenBothMissing_buildCodegen()
             ]
         })
     end
+
+    # ================= #
+    # Test - RunCodegen #
+    # ================= #
+    def testRunCodegen_whenNewArchEnabled_runsCodegen
+        # Arrange
+        app_path = "~/app"
+        config_file = ""
+        codegen_utils_mock = CodegenUtilsMock.new()
+
+        # Act
+        run_codegen!(app_path, config_file, :new_arch_enabled => true, :codegen_utils => codegen_utils_mock)
+
+        # Assert
+        assert_equal(codegen_utils_mock.use_react_native_codegen_discovery_params, [{
+            :app_path=>"~/app",
+            :codegen_disabled=>false,
+            :codegen_output_dir=>"build/generated/ios",
+            :config_file_dir=>"",
+            :fabric_enabled=>false,
+            :folly_version=>"2021.07.22.00",
+            :react_native_path=>"../node_modules/react-native"
+        }])
+        assert_equal(codegen_utils_mock.get_react_codegen_spec_params, [])
+        assert_equal(codegen_utils_mock.generate_react_codegen_spec_params, [])
+    end
+
+    def testRunCodegen_whenNewArchDisabled_runsCodegen
+        # Arrange
+        app_path = "~/app"
+        config_file = ""
+        package_json_file = "~/app/package.json"
+        codegen_specs = { "name" => "React-Codegen" }
+        codegen_utils_mock = CodegenUtilsMock.new(:react_codegen_spec => codegen_specs)
+
+        # Act
+        run_codegen!(
+            app_path,
+            config_file,
+            :new_arch_enabled => false,
+            :fabric_enabled => true,
+            :package_json_file => package_json_file,
+            :codegen_utils => codegen_utils_mock)
+
+        # Assert
+        assert_equal(codegen_utils_mock.use_react_native_codegen_discovery_params, [])
+        assert_equal(codegen_utils_mock.get_react_codegen_spec_params, [{
+            :fabric_enabled => true,
+            :folly_version=>"2021.07.22.00",
+            :package_json_file => "~/app/package.json",
+            :script_phases => nil
+        }])
+        assert_equal(codegen_utils_mock.generate_react_codegen_spec_params, [{
+            :codegen_output_dir=>"build/generated/ios",
+            :react_codegen_spec=>{"name"=>"React-Codegen"}
+        }])
+
+    end
 end
diff --git a/scripts/cocoapods/__tests__/codegen_utils-test.rb b/scripts/cocoapods/__tests__/codegen_utils-test.rb
new file mode 100644
index 000000000000..f8580d20288b
--- /dev/null
+++ b/scripts/cocoapods/__tests__/codegen_utils-test.rb
@@ -0,0 +1,540 @@
+# 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 "test/unit"
+require "json"
+require_relative "../codegen_utils.rb"
+require_relative "./test_utils/FileMock.rb"
+require_relative "./test_utils/DirMock.rb"
+require_relative "./test_utils/PodMock.rb"
+require_relative "./test_utils/PathnameMock.rb"
+require_relative "./test_utils/FinderMock.rb"
+require_relative "./test_utils/CodegenUtilsMock.rb"
+require_relative "./test_utils/CodegenScriptPhaseExtractorMock.rb"
+require_relative "./test_utils/FileUtilsMock.rb"
+
+class CodegenUtilsTests < Test::Unit::TestCase
+    :base_path
+
+    def setup
+        CodegenUtils.set_react_codegen_discovery_done(false)
+        CodegenUtils.set_react_codegen_podspec_generated(false)
+        Pod::Config.reset()
+        File.enable_testing_mode!
+        Dir.enable_testing_mode!
+        @base_path = "~/app/ios"
+        Pathname.pwd!(@base_path)
+        Pod::Config.instance.installation_root.relative_path_from = @base_path
+    end
+
+    def teardown
+        FileUtils::FileUtilsStorage.reset()
+        Finder.reset()
+        Pathname.reset()
+        Pod::UI.reset()
+        Pod::Executable.reset()
+        File.reset()
+        Dir.reset()
+    end
+
+    # ================================== #
+    # Test - GenerateReactCodegenPodspec #
+    # ================================== #
+
+    def testGenerateReactCodegenPodspec_whenItHasBeenAlreadyGenerated_doesNothing
+        # Arrange
+        spec = { :name => "Test Podspec" }
+        codegen_output_dir = "build"
+        CodegenUtils.set_react_codegen_podspec_generated(true)
+
+        # Act
+        CodegenUtils.new().generate_react_codegen_podspec!(spec, codegen_output_dir)
+
+        # Assert
+        assert_equal(Pod::UI.collected_messages, ["[Codegen] Skipping React-Codegen podspec generation."])
+        assert_equal(Pathname.pwd_invocation_count, 0)
+        assert_equal(Pod::Executable.executed_commands, [])
+        assert_equal(Pod::Config.instance.installation_root.relative_path_from_invocation_count, 0)
+        assert_true(CodegenUtils.react_codegen_podspec_generated)
+    end
+
+    def testGenerateReactCodegenPodspec_whenItHasNotBeenAlreadyGenerated_generatesIt
+        # Arrange
+        spec = { :name => "Test Podspec" }
+        codegen_output_dir = "build"
+
+        # Act
+        CodegenUtils.new().generate_react_codegen_podspec!(spec, codegen_output_dir)
+
+        # Assert
+        assert_equal(Pathname.pwd_invocation_count, 1)
+        assert_equal(Pod::Config.instance.installation_root.relative_path_from_invocation_count, 1)
+        assert_equal(Pod::Executable.executed_commands, [{ "command" => 'mkdir', "arguments" => ["-p", "~/app/ios/build"]}])
+        assert_equal(Pod::UI.collected_messages, ["[Codegen] Generating ~/app/ios/build/React-Codegen.podspec.json"])
+        assert_equal(File.open_files_with_mode["~/app/ios/build/React-Codegen.podspec.json"], 'w')
+        assert_equal(File.open_files[0].collected_write, ['{"name":"Test Podspec"}'])
+        assert_equal(File.open_files[0].fsync_invocation_count, 1)
+
+        assert_true(CodegenUtils.react_codegen_podspec_generated)
+    end
+
+    # ========================== #
+    # Test - GetReactCodegenSpec #
+    # ========================== #
+
+    def testGetReactCodegenSpec_whenFabricDisabledAndNoScriptPhases_generatesAPodspec
+        # Arrange
+        File.files_to_read('package.json' => '{ "version": "99.98.97"}')
+
+        # Act
+        podspec = CodegenUtils.new().get_react_codegen_spec(
+            'package.json',
+            :fabric_enabled => false,
+            :hermes_enabled => true,
+            :script_phases => nil
+        )
+
+        # Assert
+        assert_equal(podspec, get_podspec_no_fabric_no_script())
+        assert_equal(Pod::UI.collected_messages, [])
+    end
+
+    def testGetReactCodegenSpec_whenFabricEnabledAndScriptPhases_generatesAPodspec
+        # Arrange
+        File.files_to_read('package.json' => '{ "version": "99.98.97"}')
+
+        # Act
+        podspec = CodegenUtils.new().get_react_codegen_spec(
+            'package.json',
+            :fabric_enabled => true,
+            :hermes_enabled => true,
+            :script_phases => "echo Test Script Phase"
+        )
+
+        # Assert
+        assert_equal(podspec, get_podspec_fabric_and_script_phases("echo Test Script Phase"))
+        assert_equal(Pod::UI.collected_messages, ["[Codegen] Adding script_phases to React-Codegen."])
+    end
+
+    # =============================== #
+    # Test - GetCodegenConfigFromFile #
+    # =============================== #
+
+    def testGetCodegenConfigFromFile_whenFileDoesNotExists_returnEmpty
+        # Arrange
+
+        # Act
+        codegen = CodegenUtils.new().get_codegen_config_from_file('package.json', 'codegenConfig')
+
+        # Assert
+        assert_equal(codegen, {})
+    end
+
+    def testGetCodegenConfigFromFile_whenFileExistsButHasNoKey_returnEmpty
+        # Arrange
+        File.mocked_existing_files(['package.json'])
+        File.files_to_read('package.json' => '{ "codegenConfig": {}}')
+
+        # Act
+        codegen = CodegenUtils.new().get_codegen_config_from_file('package.json', 'codegen')
+
+        # Assert
+        assert_equal(codegen, {})
+    end
+
+    def testGetCodegenConfigFromFile_whenFileExistsAndHasKey_returnObject
+        # Arrange
+        File.mocked_existing_files(['package.json'])
+        File.files_to_read('package.json' => '{ "codegenConfig": {"name": "MySpec"}}')
+
+        # Act
+        codegen = CodegenUtils.new().get_codegen_config_from_file('package.json', 'codegenConfig')
+
+        # Assert
+        assert_equal(codegen, { "name" => "MySpec"})
+    end
+
+    # ======================= #
+    # Test - GetListOfJSSpecs #
+    # ======================= #
+    def testGetListOfJSSpecs_whenUsesLibraries_returnAListOfFiles
+        # Arrange
+        app_codegen_config = {
+            'libraries' => [
+                {
+                    'name' => 'First Lib',
+                    'jsSrcsDir' => './firstlib/js'
+                },
+                {
+                    'name' => 'Second Lib',
+                    'jsSrcsDir' => './secondlib/js'
+                },
+            ]
+        }
+        app_path = "~/MyApp/"
+        Finder.set_files_for_paths({
+            '~/MyApp/./firstlib/js' => ["MyFabricComponent1NativeComponent.js", "MyFabricComponent2NativeComponent.js"],
+            '~/MyApp/./secondlib/js' => ["NativeModule1.js", "NativeModule2.js"],
+        })
+
+        # Act
+        files = CodegenUtils.new().get_list_of_js_specs(app_codegen_config, app_path)
+
+        # Assert
+        assert_equal(Pod::UI.collected_warns , ["[Deprecated] You are using the old `libraries` array to list all your codegen.\\nThis method will be removed in the future.\\nUpdate your `package.json` with a single object."])
+        assert_equal(Finder.captured_paths, ['~/MyApp/./firstlib/js', '~/MyApp/./secondlib/js'])
+        assert_equal(files, [
+            "${PODS_ROOT}/../MyFabricComponent1NativeComponent.js",
+            "${PODS_ROOT}/../MyFabricComponent2NativeComponent.js",
+            "${PODS_ROOT}/../NativeModule1.js",
+            "${PODS_ROOT}/../NativeModule2.js",
+        ])
+    end
+
+    def testGetListOfJSSpecs_whenDoesNotUsesLibraries_returnAListOfFiles
+        # Arrange
+        app_codegen_config = {
+                'name' => 'First Lib',
+                'jsSrcsDir' => './js'
+            }
+
+        app_path = "~/MyApp/"
+        Finder.set_files_for_paths({
+            '~/MyApp/./js' => ["MyFabricComponent1NativeComponent.js", "NativeModule1.js"],
+        })
+
+        # Act
+        files = CodegenUtils.new().get_list_of_js_specs(app_codegen_config, app_path)
+
+        # Assert
+        assert_equal(Pod::UI.collected_warns , [])
+        assert_equal(Finder.captured_paths, ['~/MyApp/./js'])
+        assert_equal(files, [
+            "${PODS_ROOT}/../MyFabricComponent1NativeComponent.js",
+            "${PODS_ROOT}/../NativeModule1.js",
+        ])
+    end
+
+    # ================================== #
+    # Test - GetReactCodegenScriptPhases #
+    # ================================== #
+
+    def testGetReactCodegenScriptPhases_whenAppPathNotDefined_abort
+        # Arrange
+
+        # Act
+        assert_raises() {
+            CodegenUtils.new().get_react_codegen_script_phases(nil)
+        }
+        # Assert
+        assert_equal(Pod::UI.collected_warns, ["[Codegen] error: app_path is requried to use codegen discovery."])
+    end
+
+    def testGetReactCodegenScriptPhases_returnTheScriptObject
+        # Arrange
+        app_path = "~/MyApp"
+        input_files = ["${PODS_ROOT}/../MyFabricComponent1NativeComponent.js", "${PODS_ROOT}/../NativeModule1.js"]
+        computed_script = "echo ScriptPhases"
+        codegen_config = { "name" => "MyCodegenModule", "jsSrcsDir" => "./js"}
+        codegen_utils_mock = CodegenUtilsMock.new(:js_spec_list => input_files, :codegen_config => codegen_config)
+        script_phase_extractor_mock = CodegenScriptPhaseExtractorMock.new(computed_script)
+
+        # Act
+
+        scripts = CodegenUtils.new().get_react_codegen_script_phases(
+            app_path,
+            :codegen_utils => codegen_utils_mock,
+            :script_phase_extractor => script_phase_extractor_mock
+        )
+
+        # Assert
+        assert_equal(codegen_utils_mock.get_codegen_config_from_file_params, [{
+            "config_key" => "codegenConfig",
+            "config_path" => "~/MyApp/package.json"
+        }])
+        assert_equal(codegen_utils_mock.get_list_of_js_specs_params, [{
+            "app_codegen_config" => {"jsSrcsDir"=>"./js", "name"=>"MyCodegenModule"},
+            "app_path" => "~/MyApp"
+        }])
+        assert_equal(script_phase_extractor_mock.extract_script_phase_params, [{
+            fabric_enabled: false,
+            react_native_path: "../node_modules/react-native",
+            relative_app_root: "~/MyApp",
+            relative_config_file_dir: ""
+        }])
+        assert_equal(scripts, {
+            'name': 'Generate Specs',
+            'execution_position': :before_compile,
+            'input_files' => input_files,
+            'show_env_vars_in_log': true,
+            'output_files': ["${DERIVED_FILE_DIR}/react-codegen.log"],
+            'script': computed_script
+        })
+    end
+
+    # ================================ #
+    # Test - UseReactCodegenDiscovery! #
+    # ================================ #
+
+    def testUseReactCodegenDiscovery_whenCodegenDisabled_doNothing
+        # Arrange
+
+        # Act
+        CodegenUtils.new().use_react_native_codegen_discovery!(true, nil)
+
+        # Assert
+        assert_false(CodegenUtils.react_codegen_discovery_done())
+        assert_equal(Pod::UI.collected_messages, [])
+        assert_equal(Pod::UI.collected_warns, [])
+    end
+
+    def testUseReactCodegenDiscovery_whenDiscoveryDone_doNothing
+        # Arrange
+        CodegenUtils.set_react_codegen_discovery_done(true)
+
+        # Act
+        CodegenUtils.new().use_react_native_codegen_discovery!(false, nil)
+
+        # Assert
+        assert_true(CodegenUtils.react_codegen_discovery_done())
+        assert_equal(Pod::UI.collected_messages, ["[Codegen] Skipping use_react_native_codegen_discovery."])
+        assert_equal(Pod::UI.collected_warns, [])
+    end
+
+    def testUseReactCodegenDiscovery_whenAppPathUndefined_abort
+        # Arrange
+
+        # Act
+        assert_raises(){
+            CodegenUtils.new().use_react_native_codegen_discovery!(false, nil)
+        }
+
+        # Assert
+        assert_false(CodegenUtils.react_codegen_discovery_done())
+        assert_equal(Pod::UI.collected_messages, [])
+        assert_equal(Pod::UI.collected_warns, [
+            '[Codegen] Error: app_path is required for use_react_native_codegen_discovery.',
+            '[Codegen] If you are calling use_react_native_codegen_discovery! in your Podfile, please remove the call and pass `app_path` and/or `config_file_dir` to `use_react_native!`.'
+        ])
+    end
+
+    def testUseReactCodegenDiscovery_whenParametersAreGood_executeCodegen
+        # Arrange
+        app_path = "~/app"
+        computed_script = "echo TestScript"
+        codegen_spec = {"name" => "React-Codegen"}
+
+        codegen_utils_mock = CodegenUtilsMock.new(
+            :react_codegen_script_phases => computed_script,
+            :react_codegen_spec => codegen_spec
+        )
+
+        # Act
+        CodegenUtils.new().use_react_native_codegen_discovery!(
+            false,
+            app_path,
+            :codegen_utils => codegen_utils_mock
+        )
+
+        # Assert
+        assert_true(CodegenUtils.react_codegen_discovery_done())
+        assert_equal(Pod::UI.collected_warns, [
+            '[Codegen] warn: using experimental new codegen integration'
+        ])
+        assert_equal(codegen_utils_mock.get_react_codegen_script_phases_params,  [{
+            :app_path => "~/app",
+            :config_file_dir => "",
+            :config_key => "codegenConfig",
+            :fabric_enabled => false,
+            :react_native_path => "../node_modules/react-native"}
+        ])
+        assert_equal(codegen_utils_mock.get_react_codegen_spec_params,  [{
+            :fabric_enabled => false,
+            :folly_version=>"2021.07.22.00",
+            :package_json_file => "../node_modules/react-native/package.json",
+            :script_phases => "echo TestScript"
+        }])
+        assert_equal(codegen_utils_mock.generate_react_codegen_spec_params,  [{
+            :codegen_output_dir=>"build/generated/ios",
+            :react_codegen_spec=>{"name"=>"React-Codegen"}
+        }])
+        assert_equal(Pod::Executable.executed_commands, [
+            {
+                "command" => "node",
+                "arguments"=> ["~/app/ios/../node_modules/react-native/scripts/generate-codegen-artifacts.js",
+                    "-p", "~/app",
+                    "-o", Pod::Config.instance.installation_root,
+                    "-e", "false",
+                    "-c", ""]
+            }
+        ])
+    end
+
+    # ============================= #
+    # Test - CleanUpCodegenFolder #
+    # ============================= #
+
+    def testCleanUpCodegenFolder_whenCleanupDone_doNothing
+        # Arrange
+        CodegenUtils.set_cleanup_done(true)
+        codegen_dir = "build/generated/ios"
+        ios_folder = '.'
+
+        # Act
+        CodegenUtils.clean_up_build_folder(@base_path, ios_folder, codegen_dir)
+
+        # Assert
+        assert_equal(FileUtils::FileUtilsStorage.rmrf_invocation_count, 0)
+        assert_equal(FileUtils::FileUtilsStorage.rmrf_paths, [])
+        assert_equal(CodegenUtils.cleanup_done(), true)
+    end
+
+    def testCleanUpCodegenFolder_whenFolderDoesNotExists_markAsCleanupDone
+        # Arrange
+        CodegenUtils.set_cleanup_done(false)
+        codegen_dir = "build/generated/ios"
+        ios_folder = '.'
+
+        # Act
+        CodegenUtils.clean_up_build_folder(@base_path, ios_folder, codegen_dir)
+
+        # Assert
+        assert_equal(FileUtils::FileUtilsStorage.rmrf_invocation_count, 0)
+        assert_equal(FileUtils::FileUtilsStorage.rmrf_paths, [])
+        assert_equal(Dir.glob_invocation, [])
+        assert_equal(CodegenUtils.cleanup_done(), true)
+    end
+
+    def testCleanUpCodegenFolder_whenFolderExists_deleteItAndSetCleanupDone
+        # Arrange
+        CodegenUtils.set_cleanup_done(false)
+        codegen_dir = "build/generated/ios"
+        ios_folder = '.'
+        codegen_path = "#{@base_path}/./#{codegen_dir}"
+        globs = [
+            "/MyModuleSpecs/MyModule.h",
+            "#{codegen_path}/MyModuleSpecs/MyModule.mm",
+            "#{codegen_path}/react/components/MyComponent/ShadowNode.h",
+            "#{codegen_path}/react/components/MyComponent/ShadowNode.mm",
+        ]
+        Dir.mocked_existing_dirs(codegen_path)
+        Dir.mocked_existing_globs(globs, "#{codegen_path}/*")
+
+        # Act
+        CodegenUtils.clean_up_build_folder(@base_path, ios_folder, codegen_dir)
+
+        # Assert
+        assert_equal(Dir.exist_invocation_params, [codegen_path, codegen_path])
+        assert_equal(Dir.glob_invocation, ["#{codegen_path}/*", "#{codegen_path}/*"])
+        assert_equal(FileUtils::FileUtilsStorage.rmrf_invocation_count, 1)
+        assert_equal(FileUtils::FileUtilsStorage.rmrf_paths, [globs])
+        assert_equal(CodegenUtils.cleanup_done(), true)
+    end
+
+    # ===================================== #
+    # Test - Assert Codegen Folder Is Empty #
+    # ===================================== #
+
+    def test_assertCodegenFolderIsEmpty_whenItDoesNotExists_doesNotAbort
+        # Arrange
+        codegen_dir = "build/generated/ios"
+        codegen_path = "#{@base_path}/./#{codegen_dir}"
+        ios_folder = '.'
+
+        # Act
+        CodegenUtils.assert_codegen_folder_is_empty(@base_path, ios_folder, codegen_dir)
+
+        # Assert
+        assert_equal(Pod::UI.collected_warns, [])
+    end
+
+    def test_assertCodegenFolderIsEmpty_whenItExistsAndIsEmpty_doesNotAbort
+        # Arrange
+        codegen_dir = "build/generated/ios"
+        codegen_path = "#{@base_path}/./#{codegen_dir}"
+        ios_folder = '.'
+        Dir.mocked_existing_dirs(codegen_path)
+        Dir.mocked_existing_globs([], "#{codegen_path}/*")
+
+        # Act
+        CodegenUtils.assert_codegen_folder_is_empty(@base_path, ios_folder, codegen_dir)
+
+        # Assert
+        assert_equal(Pod::UI.collected_warns, [])
+    end
+
+    def test_assertCodegenFolderIsEmpty_whenItIsNotEmpty_itAborts
+        # Arrange
+        codegen_dir = "build/generated/ios"
+        codegen_path = "#{@base_path}/./#{codegen_dir}"
+        ios_folder = '.'
+        Dir.mocked_existing_dirs(codegen_path)
+        Dir.mocked_existing_globs(["#{codegen_path}/MyModuleSpecs/MyModule.mm",], "#{codegen_path}/*")
+
+        # Act
+        assert_raises() {
+            CodegenUtils.assert_codegen_folder_is_empty(@base_path, ios_folder, codegen_dir)
+        }
+
+        # Assert
+        assert_equal(Pod::UI.collected_warns, [
+            "Unable to remove the content of ~/app/ios/./build/generated/ios folder. Please run rm -rf ~/app/ios/./build/generated/ios and try again."
+        ])
+    end
+
+    private
+
+    def get_podspec_no_fabric_no_script
+        spec = {
+          'name' => "React-Codegen",
+          'version' => "99.98.97",
+          'summary' => 'Temp pod for generated files for React Native',
+          'homepage' => 'https://facebook.com/',
+          'license' => 'Unlicense',
+          'authors' => 'Facebook',
+          'compiler_flags'  => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation -Wno-nullability-completeness -std=c++17",
+          'source' => { :git => '' },
+          'header_mappings_dir' => './',
+          'platforms' => {
+            'ios' => '11.0',
+          },
+          'source_files' => "**/*.{h,mm,cpp}",
+          'pod_target_xcconfig' => { "HEADER_SEARCH_PATHS" =>
+            [
+              "\"$(PODS_ROOT)/boost\"",
+              "\"$(PODS_ROOT)/RCT-Folly\"",
+              "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
+              "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
+              "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
+            ].join(' ')
+          },
+          'dependencies': {
+            "FBReactNativeSpec":  [],
+            "React-jsiexecutor":  [],
+            "RCT-Folly": [],
+            "RCTRequired": [],
+            "RCTTypeSafety": [],
+            "React-Core": [],
+            "React-jsi": [],
+            "hermes-engine": [],
+            "ReactCommon/turbomodule/bridging": [],
+            "ReactCommon/turbomodule/core": []
+          }
+        }
+    end
+
+    def get_podspec_fabric_and_script_phases(script_phases)
+        specs = get_podspec_no_fabric_no_script()
+
+        specs[:dependencies].merge!({
+            'React-graphics': [],
+            'React-rncore':  [],
+        })
+
+        specs[:'script_phases'] = script_phases
+
+        return specs
+    end
+end
diff --git a/scripts/cocoapods/__tests__/fabric-test.rb b/scripts/cocoapods/__tests__/fabric-test.rb
index 0cb0a6316161..9ded6bd22028 100644
--- a/scripts/cocoapods/__tests__/fabric-test.rb
+++ b/scripts/cocoapods/__tests__/fabric-test.rb
@@ -5,6 +5,7 @@
 
 require "test/unit"
 require_relative "../fabric.rb"
+require_relative "../utils.rb"
 require_relative "./test_utils/podSpy.rb"
 
 class FabricTest < Test::Unit::TestCase
@@ -13,24 +14,30 @@ def setup
         podSpy_cleanUp()
     end
 
+    def teardown
+        podSpy_cleanUp()
+    end
+
+    # ================== #
+    # TEST - setupFabric #
+    # ================== #
     def test_setupFabric_installsPods
         # Arrange
         prefix = "../.."
 
         # Act
-        setup_fabric!(prefix)
+        setup_fabric!(:react_native_path => prefix)
 
         # Assert
         check_installed_pods(prefix)
     end
 
     def check_installed_pods(prefix)
-        assert_equal($podInvocationCount, 6)
+        assert_equal($podInvocationCount, 5)
 
         check_pod("React-Fabric", :path => "#{prefix}/ReactCommon")
         check_pod("React-rncore", :path => "#{prefix}/ReactCommon")
         check_pod("React-graphics", :path => "#{prefix}/ReactCommon/react/renderer/graphics")
-        check_pod("React-jsi/Fabric", :path => "#{prefix}/ReactCommon/jsi")
         check_pod("React-RCTFabric", :path => "#{prefix}/React", :modular_headers => true)
         check_pod("RCT-Folly/Fabric", :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec")
     end
@@ -45,5 +52,4 @@ def check_pod(name, path: nil, modular_headers: nil, podspec: nil)
 
         assert_equal(params, expected_params)
     end
-
 end
diff --git a/scripts/cocoapods/__tests__/flipper-test.rb b/scripts/cocoapods/__tests__/flipper-test.rb
index feffeb5c49a6..abea34a157e7 100644
--- a/scripts/cocoapods/__tests__/flipper-test.rb
+++ b/scripts/cocoapods/__tests__/flipper-test.rb
@@ -85,7 +85,7 @@ def test_postInstall_updatesThePodCorrectly
 
         reactCore_target = installer.target_with_name("React-Core")
         reactCore_target.build_configurations.each do |config|
-            if config.name == 'Debug' then
+            if config.name == 'Debug' || config.name == 'CustomConfig' then
                 assert_equal(config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'], ['$(inherited)', 'FB_SONARKIT_ENABLED=1'])
             else
                 assert_true(config.build_settings.empty?)
@@ -134,15 +134,17 @@ def prepare_mocked_installer
                     TargetMock.new(
                         "YogaKit",
                         [
-                            BuildConfigurationMock.new("Debug"),
-                            BuildConfigurationMock.new("Release"),
+                            BuildConfigurationMock.new("Debug", is_debug: true),
+                            BuildConfigurationMock.new("Release", is_debug: false),
+                            BuildConfigurationMock.new("CustomConfig", is_debug: true),
                         ]
                     ),
                     TargetMock.new(
                         "React-Core",
                         [
-                            BuildConfigurationMock.new("Debug"),
-                            BuildConfigurationMock.new("Release"),
+                            BuildConfigurationMock.new("Debug", is_debug: true),
+                            BuildConfigurationMock.new("Release", is_debug: false),
+                            BuildConfigurationMock.new("CustomConfig", is_debug: true),
                         ]
                     )
                 ]
diff --git a/scripts/cocoapods/__tests__/hermes-test.rb b/scripts/cocoapods/__tests__/hermes-test.rb
deleted file mode 100644
index 0d22d40a02f6..000000000000
--- a/scripts/cocoapods/__tests__/hermes-test.rb
+++ /dev/null
@@ -1,85 +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 "test/unit"
-require_relative "../hermes.rb"
-require_relative "./test_utils/podSpy.rb"
-require_relative "./test_utils/PodMock.rb"
-require_relative "./test_utils/Open3Mock.rb"
-
-class HermesTests < Test::Unit::TestCase
-
-    :prefix
-
-    def setup
-        @prefix = "../.."
-    end
-
-    def teardown
-        Open3.reset()
-        Pod::Config.reset()
-        Pod::UI.reset()
-        podSpy_cleanUp()
-    end
-
-    def test_installHermesIfEnabled_whenHermesIsDisabled_doesNothing
-        # Arrange
-
-        # Act
-        install_hermes_if_enabled(false, @prefix)
-
-        # Assert
-        assert_equal($podInvocationCount, 0)
-        assert_equal($podInvocation, {})
-        assert_equal(Pod::UI.collected_infoes, [])
-        assert_equal(Open3.collected_commands, [])
-        assert_equal(Open3.collected_dirs, [])
-    end
-
-    def test_installHermesIfEnabled_whenHermesIsEnabledAndHermesScriptFails_abort
-        # Arrange
-        Pod::Config.instance.installation_root.set_installation_root("Pods/")
-        Open3.set_returned_status(1)
-        Open3.set_returned_text("This test\nshould fail")
-
-        # Act
-        assert_raises {
-            install_hermes_if_enabled(true, @prefix)
-        }
-
-        # Assert
-        assert_equal(Open3.collected_commands, ["node scripts/hermes/prepare-hermes-for-build"])
-        assert_equal(Open3.collected_dirs, ["Pods/../.."])
-        assert_equal(Pod::UI.collected_infoes, ["This test", "should fail"])
-        assert_equal($podInvocationCount, 0)
-        assert_equal($podInvocation, {})
-    end
-
-    def test_installHermesIfEnabled_whenHermesIsEnabledAndHermesScriptSucceeds_installsPods
-        # Arrange
-        Pod::Config.instance.installation_root.set_installation_root("Pods/")
-        Open3.set_returned_status(0)
-        Open3.set_returned_text("This is\nthe text\nreturned by\nprepare-hermes-for-build")
-
-        # Act
-        install_hermes_if_enabled(true, @prefix)
-
-        # Assert
-        assert_equal(Open3.collected_commands, ["node scripts/hermes/prepare-hermes-for-build"])
-        assert_equal(Open3.collected_dirs, ["Pods/../.."])
-        assert_equal(Pod::UI.collected_infoes, [
-            "This is",
-            "the text",
-            "returned by",
-            "prepare-hermes-for-build",
-        ])
-        assert_equal($podInvocationCount, 3)
-        assert_equal($podInvocation["React-hermes"][:path], "../../ReactCommon/hermes")
-        assert_equal($podInvocation["libevent"][:version], "~> 2.1.12")
-        assert_equal($podInvocation["hermes-engine"][:podspec], "../../sdks/hermes/hermes-engine.podspec")
-    end
-
-
-end
diff --git a/scripts/cocoapods/__tests__/jsengine-test.rb b/scripts/cocoapods/__tests__/jsengine-test.rb
new file mode 100644
index 000000000000..8ea0b4cfd816
--- /dev/null
+++ b/scripts/cocoapods/__tests__/jsengine-test.rb
@@ -0,0 +1,154 @@
+# 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 "test/unit"
+require_relative "../jsengine.rb"
+require_relative "./test_utils/podSpy.rb"
+require_relative "./test_utils/PodMock.rb"
+require_relative "./test_utils/Open3Mock.rb"
+
+class JSEngineTests < Test::Unit::TestCase
+
+    :react_native_path
+
+    def setup
+        File.enable_testing_mode!
+        @react_native_path = "../.."
+        podSpy_cleanUp()
+
+    end
+
+    def teardown
+        ENV['HERMES_ENGINE_TARBALL_PATH'] = nil
+        Open3.reset()
+        Pod::Config.reset()
+        Pod::UI.reset()
+        podSpy_cleanUp()
+        ENV['USE_HERMES'] = '1'
+        ENV['REACT_NATIVE_CI'] = nil
+        File.reset()
+    end
+
+    # =============== #
+    # TEST - setupJsc #
+    # =============== #
+    def test_setupJsc_installsPods
+        # Arrange
+        fabric_enabled = false
+
+        # Act
+        setup_jsc!(:react_native_path => @react_native_path, :fabric_enabled => fabric_enabled)
+
+        # Assert
+        assert_equal($podInvocationCount, 2)
+        assert_equal($podInvocation["React-jsi"][:path], "../../ReactCommon/jsi")
+        assert_equal($podInvocation["React-jsc"][:path], "../../ReactCommon/jsc")
+    end
+
+    def test_setupJsc_installsPods_installsFabricSubspecWhenFabricEnabled
+        # Arrange
+        fabric_enabled = true
+
+        # Act
+        setup_jsc!(:react_native_path => @react_native_path, :fabric_enabled => fabric_enabled)
+
+        # Assert
+        assert_equal($podInvocationCount, 3)
+        assert_equal($podInvocation["React-jsi"][:path], "../../ReactCommon/jsi")
+        assert_equal($podInvocation["React-jsc"][:path], "../../ReactCommon/jsc")
+        assert_equal($podInvocation["React-jsc/Fabric"][:path], "../../ReactCommon/jsc")
+    end
+
+    # ================== #
+    # TEST - setupHermes #
+    # ================== #
+    def test_setupHermes_whenHermesScriptFails_abort
+        # Arrange
+        fabric_enabled = false
+        Pod::Config.instance.installation_root.set_installation_root("Pods/")
+        Open3.set_returned_status(1)
+        Open3.set_returned_text("This test\nshould fail")
+
+        # Act
+        assert_raises {
+            setup_hermes!(:react_native_path => @react_native_path, :fabric_enabled => fabric_enabled)
+        }
+
+        # Assert
+        assert_equal(Open3.collected_commands, ["node scripts/hermes/prepare-hermes-for-build"])
+        assert_equal(Open3.collected_dirs, ["Pods/../.."])
+        assert_equal(Pod::UI.collected_infoes, ["This test", "should fail"])
+        assert_equal($podInvocationCount, 0)
+        assert_equal($podInvocation, {})
+    end
+
+    def test_setupHermes_whenHermesScriptSucceeds_installsPods
+        # Arrange
+        fabric_enabled = false
+        Pod::Config.instance.installation_root.set_installation_root("Pods/")
+        Open3.set_returned_status(0)
+        Open3.set_returned_text("This is\nthe text\nreturned by\nprepare-hermes-for-build")
+
+        # Act
+        setup_hermes!(:react_native_path => @react_native_path, :fabric_enabled => fabric_enabled)
+
+        # Assert
+        assert_equal(Open3.collected_commands, ["node scripts/hermes/prepare-hermes-for-build"])
+        assert_equal(Open3.collected_dirs, ["Pods/../.."])
+        assert_equal(Pod::UI.collected_infoes, [
+            "This is",
+            "the text",
+            "returned by",
+            "prepare-hermes-for-build",
+        ])
+        assert_equal($podInvocationCount, 4)
+        assert_equal($podInvocation["React-jsi"][:path], "../../ReactCommon/jsi")
+        assert_equal($podInvocation["React-hermes"][:path], "../../ReactCommon/hermes")
+        assert_equal($podInvocation["libevent"][:version], "~> 2.1.12")
+        assert_equal($podInvocation["hermes-engine"][:podspec], "../../sdks/hermes-engine/hermes-engine.podspec")
+    end
+
+    def test_setupHermes_installsPods_installsFabricSubspecWhenFabricEnabled
+        # Arrange
+        fabric_enabled = true
+
+        # Act
+        setup_hermes!(:react_native_path => @react_native_path, :fabric_enabled => fabric_enabled)
+
+        # Assert
+        assert_equal($podInvocationCount, 4)
+        assert_equal($podInvocation["React-jsi"][:path], "../../ReactCommon/jsi")
+        assert_equal($podInvocation["hermes-engine"][:podspec], "../../sdks/hermes-engine/hermes-engine.podspec")
+        assert_equal($podInvocation["React-hermes"][:path], "../../ReactCommon/hermes")
+        assert_equal($podInvocation["libevent"][:version], "~> 2.1.12")
+    end
+
+    # ================================= #
+    # TEST - isBuildingHermesFromSource #
+    # ================================= #
+    def test_isBuildingHermesFromSource_whenTarballIsNilAndVersionIsNotNightly_returnTrue
+        assert_true(is_building_hermes_from_source("1000.0.0", '../..'))
+    end
+
+    def test_isBuildingHermesFromSource_whenTarballIsNilAndInReleaseBranch_returnTrue
+        ENV['REACT_NATIVE_CI'] = 'true'
+        File.mocked_existing_files(['../../sdks/.hermesversion'])
+        assert_true(is_building_hermes_from_source("0.999.0", '../..'))
+    end
+
+    def test_isBuildingHermesFromSource_whenTarballIsNotNil_returnFalse
+        ENV['HERMES_ENGINE_TARBALL_PATH'] = "~/Downloads/hermes-ios-debug.tar.gz"
+        assert_false(is_building_hermes_from_source("1000.0.0", '../..'))
+    end
+
+    def test_isBuildingHermesFromSource_whenIsNigthly_returnsFalse
+        assert_false(is_building_hermes_from_source("0.0.0-", '../..'))
+    end
+
+    def test_isBuildingHermesFromSource_whenIsStbleRelease_returnsFalse
+        assert_false(is_building_hermes_from_source("0.71.0", '../..'))
+    end
+
+end
diff --git a/scripts/cocoapods/__tests__/new_architecture-test.rb b/scripts/cocoapods/__tests__/new_architecture-test.rb
index d1593b83cb8d..35394fd1ae56 100644
--- a/scripts/cocoapods/__tests__/new_architecture-test.rb
+++ b/scripts/cocoapods/__tests__/new_architecture-test.rb
@@ -7,6 +7,7 @@
 require_relative "../new_architecture.rb"
 require_relative "./test_utils/InstallerMock.rb"
 require_relative "./test_utils/PodMock.rb"
+require_relative "./test_utils/SpecMock.rb"
 
 class NewArchitectureTests < Test::Unit::TestCase
     def teardown
@@ -109,6 +110,60 @@ def test_modifyFlagsForNewArch_whenOnNewArch_updateFlags
         assert_equal(yoga_debug_config.build_settings["OTHER_CPLUSPLUSFLAGS"], "$(inherited)")
         assert_equal(yoga_release_config.build_settings["OTHER_CPLUSPLUSFLAGS"], "$(inherited)")
     end
+
+    # =================================== #
+    # Test - install Modules Dependencies #
+    # =================================== #
+    def test_installModulesDependencies_whenNewArchEnabledAndNewArchAndNoSearchPathsNorCompilerFlagsArePresent_itInstallDependencies
+        #  Arrange
+        spec = SpecMock.new
+
+        # Act
+        NewArchitectureHelper.install_modules_dependencies(spec, true, '2021.07.22.00')
+
+        # Assert
+        assert_equal(spec.compiler_flags, NewArchitectureHelper.folly_compiler_flags)
+        assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\"")
+        assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
+        assert_equal(spec.pod_target_xcconfig["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1")
+        assert_equal(
+            spec.dependencies,
+            [
+                { :dependency_name => "React-Core" },
+                { :dependency_name => "RCT-Folly", "version"=>"2021.07.22.00" },
+                { :dependency_name => "React-RCTFabric" },
+                { :dependency_name => "React-Codegen" },
+                { :dependency_name => "RCTRequired" },
+                { :dependency_name => "RCTTypeSafety" },
+                { :dependency_name => "ReactCommon/turbomodule/bridging" },
+                { :dependency_name => "ReactCommon/turbomodule/core" }
+        ])
+    end
+
+    def test_installModulesDependencies_whenNewArchDisabledAndSearchPathsAndCompilerFlagsArePresent_itInstallDependenciesAndPreserveOtherSettings
+        #  Arrange
+        spec = SpecMock.new
+        spec.compiler_flags = '-Wno-nullability-completeness'
+        other_flags = "\"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/boost\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
+        spec.pod_target_xcconfig = {
+            "HEADER_SEARCH_PATHS" => other_flags
+        }
+
+        # Act
+        NewArchitectureHelper.install_modules_dependencies(spec, false, '2021.07.22.00')
+
+        # Assert
+        assert_equal(spec.compiler_flags, "-Wno-nullability-completeness #{NewArchitectureHelper.folly_compiler_flags}")
+        assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\"")
+        assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17")
+        assert_equal(
+            spec.dependencies,
+            [
+                { :dependency_name => "React-Core" },
+                { :dependency_name => "RCT-Folly", "version"=>"2021.07.22.00" },
+            ]
+        )
+    end
 end
 
 # ================ #
@@ -208,10 +263,8 @@ def prepare_CXX_Flags_build_configuration(name)
 end
 
 def prepare_pod_target_installation_results_mock(name, configs)
-    return PodTargetInstallationResultsMock.new(
-        :name => name,
-        :native_target => TargetMock.new(name, configs)
-    )
+    target = TargetMock.new(name, configs)
+    return TargetInstallationResultMock.new(target, target)
 end
 
 def prepare_installer_for_cpp_flags(xcconfigs, build_configs)
@@ -232,8 +285,6 @@ def prepare_installer_for_cpp_flags(xcconfigs, build_configs)
         [
             AggregatedProjectMock.new(:xcconfigs => xcconfigs_map, :base_path => "a/path/")
         ],
-        :target_installation_results => TargetInstallationResultsMock.new(
-            :pod_target_installation_results => pod_target_installation_results_map
-        )
+        :pod_target_installation_results => pod_target_installation_results_map
     )
 end
diff --git a/scripts/cocoapods/__tests__/test_utils/CodegenScriptPhaseExtractorMock.rb b/scripts/cocoapods/__tests__/test_utils/CodegenScriptPhaseExtractorMock.rb
new file mode 100644
index 000000000000..621419d52a69
--- /dev/null
+++ b/scripts/cocoapods/__tests__/test_utils/CodegenScriptPhaseExtractorMock.rb
@@ -0,0 +1,21 @@
+# 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.
+
+class CodegenScriptPhaseExtractorMock
+
+    attr_reader :extract_script_phase_params
+    @script_phase
+
+    def initialize(script_phase)
+        @script_phase = script_phase
+        @extract_script_phase_params = []
+    end
+
+    def extract_script_phase(options)
+        @extract_script_phase_params.push(options)
+        return @script_phase
+    end
+
+end
diff --git a/scripts/cocoapods/__tests__/test_utils/CodegenUtilsMock.rb b/scripts/cocoapods/__tests__/test_utils/CodegenUtilsMock.rb
new file mode 100644
index 000000000000..d5d3f5b73bb6
--- /dev/null
+++ b/scripts/cocoapods/__tests__/test_utils/CodegenUtilsMock.rb
@@ -0,0 +1,108 @@
+# 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.
+
+class CodegenUtilsMock
+    @js_spec_list
+    @codegen_config
+
+    @react_codegen_script_phases
+    @react_codegen_spec
+
+    attr_reader :get_codegen_config_from_file_params
+    attr_reader :get_list_of_js_specs_params
+    attr_reader :get_react_codegen_script_phases_params
+    attr_reader :get_react_codegen_spec_params
+    attr_reader :generate_react_codegen_spec_params
+    attr_reader :use_react_native_codegen_discovery_params
+
+    def initialize(js_spec_list: [], codegen_config: {}, react_codegen_script_phases: "", react_codegen_spec: {})
+        @js_spec_list = js_spec_list
+        @codegen_config = codegen_config
+        @get_codegen_config_from_file_params = []
+        @get_list_of_js_specs_params = []
+
+        @react_codegen_script_phases = react_codegen_script_phases
+        @react_codegen_spec = react_codegen_spec
+        @get_react_codegen_script_phases_params = []
+        @get_react_codegen_spec_params = []
+        @generate_react_codegen_spec_params = []
+        @use_react_native_codegen_discovery_params = []
+    end
+
+    def get_codegen_config_from_file(config_path, config_key)
+        @get_codegen_config_from_file_params.push({
+            "config_path" => config_path,
+            "config_key" => config_key
+        })
+        return @codegen_config
+    end
+
+    def get_list_of_js_specs(app_codegen_config, app_path)
+        @get_list_of_js_specs_params.push({
+            "app_codegen_config" => app_codegen_config,
+            "app_path" => app_path
+        })
+        return @js_spec_list
+    end
+
+    def get_react_codegen_script_phases(
+        app_path,
+        fabric_enabled: false,
+        config_file_dir: '',
+        react_native_path: "../node_modules/react-native",
+        config_key: 'codegenConfig',
+        codegen_utils: CodegenUtils.new(),
+        script_phase_extractor: CodegenScriptPhaseExtractor.new()
+    )
+        @get_react_codegen_script_phases_params.push({
+            app_path: app_path,
+            fabric_enabled: fabric_enabled,
+            config_file_dir: config_file_dir,
+            react_native_path: react_native_path,
+            config_key: config_key
+        })
+        return @react_codegen_script_phases
+    end
+
+    def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fabric_enabled: false, hermes_enabled: true, script_phases: nil)
+        @get_react_codegen_spec_params.push({
+            package_json_file: package_json_file,
+            folly_version: folly_version,
+            fabric_enabled: fabric_enabled,
+            script_phases: script_phases
+        })
+        return @react_codegen_spec
+    end
+
+    def generate_react_codegen_podspec!(react_codegen_spec, codegen_output_dir)
+        @generate_react_codegen_spec_params.push({
+            react_codegen_spec: react_codegen_spec,
+            codegen_output_dir: codegen_output_dir
+        })
+    end
+
+    def use_react_native_codegen_discovery!(
+        codegen_disabled,
+        app_path,
+        react_native_path: "../node_modules/react-native",
+        fabric_enabled: false,
+        hermes_enabled: true,
+        config_file_dir: '',
+        codegen_output_dir: 'build/generated/ios',
+        config_key: 'codegenConfig',
+        folly_version: "2021.07.22.00",
+        codegen_utils: CodegenUtils.new()
+    )
+        @use_react_native_codegen_discovery_params.push({
+            codegen_disabled: codegen_disabled,
+            app_path: app_path,
+            react_native_path: react_native_path,
+            fabric_enabled: fabric_enabled,
+            config_file_dir: config_file_dir,
+            codegen_output_dir: codegen_output_dir,
+            folly_version: folly_version
+        })
+    end
+end
diff --git a/scripts/cocoapods/__tests__/test_utils/DirMock.rb b/scripts/cocoapods/__tests__/test_utils/DirMock.rb
index 9c7a91328a76..c8c229b05c3b 100644
--- a/scripts/cocoapods/__tests__/test_utils/DirMock.rb
+++ b/scripts/cocoapods/__tests__/test_utils/DirMock.rb
@@ -49,7 +49,11 @@ def self.glob_invocation
 
     def self.glob(path)
         @@glob_invocation.push(path)
-        return @@mocked_existing_globs[path]
+        return @@mocked_existing_globs[path] != nil ? @@mocked_existing_globs[path] : []
+    end
+
+    def self.remove_mocked_paths(path)
+        @@mocked_existing_globs = @@mocked_existing_globs.select { |k, v| v != path }
     end
 
     def self.set_pwd(pwd)
diff --git a/scripts/cocoapods/__tests__/test_utils/FileUtilsMock.rb b/scripts/cocoapods/__tests__/test_utils/FileUtilsMock.rb
new file mode 100644
index 000000000000..cb2155a5e366
--- /dev/null
+++ b/scripts/cocoapods/__tests__/test_utils/FileUtilsMock.rb
@@ -0,0 +1,40 @@
+# 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_relative './DirMock.rb'
+
+module FileUtils
+    class FileUtilsStorage
+        @@RMRF_INVOCATION_COUNT = 0
+        @@RMRF_PATHS = []
+
+        def self.rmrf_invocation_count
+            return @@RMRF_INVOCATION_COUNT
+        end
+
+        def self.increase_rmrfi_invocation_count
+            @@RMRF_INVOCATION_COUNT += 1
+        end
+
+        def self.rmrf_paths
+            return @@RMRF_PATHS
+        end
+
+        def self.push_rmrf_path(path)
+            @@RMRF_PATHS.push(path)
+        end
+
+        def self.reset
+            @@RMRF_INVOCATION_COUNT = 0
+            @@RMRF_PATHS = []
+        end
+    end
+
+    def self.rm_rf(path)
+        FileUtilsStorage.push_rmrf_path(path)
+        FileUtilsStorage.increase_rmrfi_invocation_count
+        Dir.remove_mocked_paths(path)
+    end
+end
diff --git a/scripts/cocoapods/__tests__/test_utils/FinderMock.rb b/scripts/cocoapods/__tests__/test_utils/FinderMock.rb
new file mode 100644
index 000000000000..2d91d160104c
--- /dev/null
+++ b/scripts/cocoapods/__tests__/test_utils/FinderMock.rb
@@ -0,0 +1,28 @@
+# 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.
+
+class Finder
+    @@captured_paths = []
+    @@files_for_paths = {}
+
+
+    def self.find_codegen_file(path)
+        @@captured_paths.push(path)
+        return @@files_for_paths[path]
+    end
+
+    def self.set_files_for_paths(files_for_paths)
+        @@files_for_paths = files_for_paths
+    end
+
+    def self.captured_paths
+        return @@captured_paths
+    end
+
+    def self.reset()
+        @@captured_paths = []
+        @@files_for_paths = {}
+    end
+end
diff --git a/scripts/cocoapods/__tests__/test_utils/InstallerMock.rb b/scripts/cocoapods/__tests__/test_utils/InstallerMock.rb
index 59a3aef80b40..f10a6109b694 100644
--- a/scripts/cocoapods/__tests__/test_utils/InstallerMock.rb
+++ b/scripts/cocoapods/__tests__/test_utils/InstallerMock.rb
@@ -41,10 +41,23 @@ class InstallerMock
     attr_reader :aggregate_targets
     attr_reader :target_installation_results
 
-    def initialize(pods_project = PodsProjectMock.new, aggregate_targets = [AggregatedProjectMock.new], target_installation_results: [])
+    InstallationResults = Struct.new(:pod_target_installation_results, :aggregate_target_installation_results)
+
+    def initialize(pods_project = PodsProjectMock.new, aggregate_targets = [AggregatedProjectMock.new],
+                   pod_target_installation_results: {},
+                   aggregate_target_installation_results: {})
         @pods_project = pods_project
         @aggregate_targets = aggregate_targets
-        @target_installation_results = target_installation_results
+
+        @target_installation_results = InstallationResults.new(pod_target_installation_results, aggregate_target_installation_results)
+        aggregate_targets.each do |aggregate_target|
+            aggregate_target.user_project.native_targets.each do |target|
+                @target_installation_results.pod_target_installation_results[target.name] = TargetInstallationResultMock.new(target, target)
+            end
+        end
+        pods_project.native_targets.each do |target|
+            @target_installation_results.pod_target_installation_results[target.name] = TargetInstallationResultMock.new(target, target)
+        end
     end
 
     def target_with_name(name)
@@ -161,27 +174,40 @@ def resolved_build_setting(key, resolve_against_xcconfig: false)
 class BuildConfigurationMock
     attr_reader :name
     attr_reader :build_settings
+    @is_debug
 
-    def initialize(name, build_settings = {})
+    def initialize(name, build_settings = {}, is_debug: false)
         @name = name
         @build_settings = build_settings
+        @is_debug = is_debug
     end
-end
 
-class TargetInstallationResultsMock
-    attr_reader :pod_target_installation_results
-
-    def initialize(pod_target_installation_results: {})
-        @pod_target_installation_results = pod_target_installation_results
+    def debug?
+      return @is_debug
     end
 end
 
-class PodTargetInstallationResultsMock
-    attr_reader :name
+class TargetInstallationResultMock
+    attr_reader :target
     attr_reader :native_target
-
-    def initialize(name: "", native_target: TargetMock.new())
-        @name = name
+    attr_reader :resource_bundle_targets
+    attr_reader :test_native_targets
+    attr_reader :test_resource_bundle_targets
+    attr_reader :test_app_host_targets
+    attr_reader :app_native_targets
+    attr_reader :app_resource_bundle_targets
+
+    def initialize(target = TargetMock, native_target = TargetMock,
+                   resource_bundle_targets = [], test_native_targets = [],
+                   test_resource_bundle_targets = {}, test_app_host_targets = [],
+                   app_native_targets = {}, app_resource_bundle_targets = {})
+        @target = target
         @native_target = native_target
+        @resource_bundle_targets = resource_bundle_targets
+        @test_native_targets = test_native_targets
+        @test_resource_bundle_targets = test_resource_bundle_targets
+        @test_app_host_targets = test_app_host_targets
+        @app_native_targets = app_native_targets
+        @app_resource_bundle_targets = app_resource_bundle_targets
     end
 end
diff --git a/scripts/cocoapods/__tests__/test_utils/PathnameMock.rb b/scripts/cocoapods/__tests__/test_utils/PathnameMock.rb
index 7aa763bc2e5c..0e4078fa0345 100644
--- a/scripts/cocoapods/__tests__/test_utils/PathnameMock.rb
+++ b/scripts/cocoapods/__tests__/test_utils/PathnameMock.rb
@@ -7,6 +7,20 @@ class Pathname
     @@pwd = ""
     @@pwd_invocation_count = 0
 
+    attr_reader :path
+
+    def initialize(path)
+        @path = path
+    end
+
+    def realpath
+        return self
+    end
+
+    def relative_path_from(path)
+        return @path
+    end
+
     def self.pwd!(pwd)
         @@pwd = pwd
     end
diff --git a/scripts/cocoapods/__tests__/test_utils/SpecMock.rb b/scripts/cocoapods/__tests__/test_utils/SpecMock.rb
new file mode 100644
index 000000000000..f53e190c2f03
--- /dev/null
+++ b/scripts/cocoapods/__tests__/test_utils/SpecMock.rb
@@ -0,0 +1,30 @@
+# 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.
+
+class SpecMock
+
+    attr_accessor :compiler_flags
+    attr_accessor :pod_target_xcconfig
+    attr_reader :dependencies
+
+    def initialize
+        @compiler_flags = ""
+        @pod_target_xcconfig = Hash.new
+        @dependencies = []
+    end
+
+    def dependency(dependency_name, version = nil)
+        toPush = {"dependency_name": dependency_name}
+        toPush["version"] = version if version
+        @dependencies.push(toPush)
+    end
+
+    def to_hash
+        return {
+            "compiler_flags" => @compiler_flags,
+            "pod_target_xcconfig" => @pod_target_xcconfig,
+        }
+    end
+end
diff --git a/scripts/cocoapods/__tests__/test_utils/TargetDefinitionMock.rb b/scripts/cocoapods/__tests__/test_utils/TargetDefinitionMock.rb
new file mode 100644
index 000000000000..0a4ddfab6d82
--- /dev/null
+++ b/scripts/cocoapods/__tests__/test_utils/TargetDefinitionMock.rb
@@ -0,0 +1,12 @@
+# 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.
+
+class TargetDefinitionMock
+    attr_reader :build_type
+
+    def initialize(build_type)
+        @build_type = build_type
+    end
+end
diff --git a/scripts/cocoapods/__tests__/utils-test.rb b/scripts/cocoapods/__tests__/utils-test.rb
index b4cbaddca9d4..fd1fdc3c5a15 100644
--- a/scripts/cocoapods/__tests__/utils-test.rb
+++ b/scripts/cocoapods/__tests__/utils-test.rb
@@ -10,14 +10,29 @@
 require_relative "./test_utils/InstallerMock.rb"
 require_relative "./test_utils/EnvironmentMock.rb"
 require_relative "./test_utils/SysctlCheckerMock.rb"
+require_relative "./test_utils/FileMock.rb"
+require_relative "./test_utils/systemUtils.rb"
+require_relative "./test_utils/PathnameMock.rb"
+require_relative "./test_utils/TargetDefinitionMock.rb"
 
 class UtilsTests < Test::Unit::TestCase
+    def setup
+        @base_path = "~/app/ios"
+        Pathname.pwd!(@base_path)
+        File.enable_testing_mode!
+    end
+
     def teardown
+        File.reset()
         Pod::UI.reset()
+        Pathname.reset()
+        Pod::Config.reset()
         SysctlChecker.reset()
         Environment.reset()
         ENV['RCT_NEW_ARCH_ENABLED'] = '0'
         ENV['USE_HERMES'] = '1'
+        ENV['USE_FRAMEWORKS'] = nil
+        system_reset_commands
     end
 
     # ======================= #
@@ -315,6 +330,62 @@ def test_fixLibrarySearchPaths_correctlySetsTheSearchPathsForAllProjects
         assert_equal(pods_projects_mock.save_invocation_count, 1)
     end
 
+    # ===================================== #
+    # Test - Apply Xcode14 React-Core patch #
+    # ===================================== #
+
+    def test_turnOffResourceBundleReactCore_correctlyAppliesPatch
+        # Arrange
+        react_core_target = TargetMock.new('React-Core')
+        react_core_target_native_target = react_core_target
+        react_core_debug_config = prepare_Code_Signing_build_configuration("Debug", "YES")
+        react_core_release_config = prepare_Code_Signing_build_configuration("Release", "YES")
+
+        hermes_engine_target = TargetMock.new('hermes-engine')
+        hermes_engine_target_native_target = hermes_engine_target
+        hermes_engine_debug_config = prepare_Code_Signing_build_configuration("Debug", "NO")
+        hermes_engine_release_config = prepare_Code_Signing_build_configuration("Release", "NO")
+
+        assets_target = TargetMock.new('assets')
+        assets_target_native_target = assets_target
+        assets_debug_config = prepare_Code_Signing_build_configuration("Debug", "YES")
+        assets_release_config = prepare_Code_Signing_build_configuration("Release", "YES")
+
+        installer = InstallerMock.new(pod_target_installation_results: {
+            'React-Core':
+                TargetInstallationResultMock.new(
+                    react_core_target,
+                    react_core_target_native_target,
+                    [TargetMock.new('React-Core',[react_core_debug_config, react_core_release_config])]
+                ),
+            'hermes-engine':
+                TargetInstallationResultMock.new(
+                    hermes_engine_target,
+                    hermes_engine_target_native_target,
+                    [TargetMock.new('hermes-engine',[hermes_engine_debug_config, hermes_engine_release_config])]
+                ),
+            'assets':
+                TargetInstallationResultMock.new(
+                    assets_target,
+                    assets_target_native_target,
+                    [TargetMock.new('assets',[assets_debug_config, assets_release_config])]
+                ),
+        })
+
+        # Act
+        ReactNativePodsUtils.turn_off_resource_bundle_react_core(installer)
+
+        # Assert
+        # these must have changed
+        assert_equal(react_core_debug_config.build_settings["CODE_SIGNING_ALLOWED"], "NO")
+        assert_equal(react_core_release_config.build_settings["CODE_SIGNING_ALLOWED"], "NO")
+        # these needs to stay the same
+        assert_equal(hermes_engine_debug_config.build_settings["CODE_SIGNING_ALLOWED"], "NO")
+        assert_equal(hermes_engine_release_config.build_settings["CODE_SIGNING_ALLOWED"], "NO")
+        assert_equal(assets_debug_config.build_settings["CODE_SIGNING_ALLOWED"], "YES")
+        assert_equal(assets_release_config.build_settings["CODE_SIGNING_ALLOWED"], "YES")
+    end
+
     # ================================= #
     # Test - Apply Mac Catalyst Patches #
     # ================================= #
@@ -352,7 +423,7 @@ def test_applyMacCatalystPatches_correctlyAppliesNecessaryPatches
         third_target.build_configurations.each do |config|
           assert_equal(config.build_settings["CODE_SIGN_IDENTITY[sdk=macosx*]"], "-")
         end
-        
+
         user_project_mock.native_targets.each do |target|
             target.build_configurations.each do |config|
                 assert_equal(config.build_settings["DEAD_CODE_STRIPPING"], "YES")
@@ -389,6 +460,80 @@ def test_setNodeModulesUserSettings_addTheUserSetting
         assert_equal(pods_projects_mock.save_invocation_count, 1)
         assert_equal(Pod::UI.collected_messages, ["Setting REACT_NATIVE build settings"])
     end
+
+    # =================================== #
+    # Test - Prepare React Native Project #
+    # =================================== #
+    def test_createXcodeEnvIfMissing_whenItIsPresent_doNothing
+        # Arrange
+        File.mocked_existing_files("/.xcode.env")
+        # Act
+        ReactNativePodsUtils.create_xcode_env_if_missing
+        # Assert
+        assert_equal(File.exist_invocation_params, ["/.xcode.env"])
+        assert_equal($collected_commands, [])
+    end
+
+    def test_createXcodeEnvIfMissing_whenItIsNotPresent_createsIt
+        # Arrange
+
+        # Act
+        ReactNativePodsUtils.create_xcode_env_if_missing
+        # Assert
+        assert_equal(File.exist_invocation_params, ["/.xcode.env"])
+        assert_equal($collected_commands, ["echo 'export NODE_BINARY=$(command -v node)' > /.xcode.env"])
+    end
+
+    # ============================ #
+    # Test - Detect Use Frameworks #
+    # ============================ #
+    def test_detectUseFrameworks_whenEnvAlreadySet_DoesNothing
+        # Arrange
+        ENV['USE_FRAMEWORKS'] = 'static'
+        target_definition = TargetDefinitionMock.new('something')
+
+        # Act
+        ReactNativePodsUtils.detect_use_frameworks(target_definition)
+
+        # Assert
+        assert_equal(Pod::UI.collected_messages, [])
+    end
+
+    def test_detectUseFrameworks_whenEnvNotSetAndNotUsed_setEnvVarToNil
+        # Arrange
+        target_definition = TargetDefinitionMock.new('static library')
+
+        # Act
+        ReactNativePodsUtils.detect_use_frameworks(target_definition)
+
+        # Assert
+        assert_equal(Pod::UI.collected_messages, ["Framework build type is static library"])
+        assert_nil(ENV['USE_FRAMEWORKS'])
+    end
+
+    def test_detectUseFrameworks_whenEnvNotSetAndStaticFrameworks_setEnvVarToStatic
+        # Arrange
+        target_definition = TargetDefinitionMock.new('static framework')
+
+        # Act
+        ReactNativePodsUtils.detect_use_frameworks(target_definition)
+
+        # Assert
+        assert_equal(Pod::UI.collected_messages, ["Framework build type is static framework"])
+        assert_equal(ENV['USE_FRAMEWORKS'], 'static')
+    end
+
+    def test_detectUseFrameworks_whenEnvNotSetAndDynamicFrameworks_setEnvVarToDynamic
+        # Arrange
+        target_definition = TargetDefinitionMock.new('dynamic framework')
+
+        # Act
+        ReactNativePodsUtils.detect_use_frameworks(target_definition)
+
+        # Assert
+        assert_equal(Pod::UI.collected_messages, ["Framework build type is dynamic framework"])
+        assert_equal(ENV['USE_FRAMEWORKS'], 'dynamic')
+    end
 end
 
 def prepare_empty_user_project_mock
@@ -412,3 +557,9 @@ def prepare_target(name, product_type = nil)
       prepare_config("Release")
   ], product_type)
 end
+
+def prepare_Code_Signing_build_configuration(name, param)
+    return BuildConfigurationMock.new(name, {
+        "CODE_SIGNING_ALLOWED" => param
+    })
+end
diff --git a/scripts/cocoapods/codegen.rb b/scripts/cocoapods/codegen.rb
index fff57845ef12..f3c214de8193 100644
--- a/scripts/cocoapods/codegen.rb
+++ b/scripts/cocoapods/codegen.rb
@@ -65,3 +65,42 @@ def checkAndGenerateEmptyThirdPartyProvider!(react_native_path, new_arch_enabled
         File.delete(temp_schema_list_path) if File.exist?(temp_schema_list_path)
     end
 end
+
+def run_codegen!(
+  app_path,
+  config_file_dir,
+  new_arch_enabled: false,
+  disable_codegen: false,
+  react_native_path: "../node_modules/react-native",
+  fabric_enabled: false,
+  hermes_enabled: true,
+  codegen_output_dir: 'build/generated/ios',
+  config_key: 'codegenConfig',
+  package_json_file: '~/app/package.json',
+  folly_version: '2021.07.22.00',
+  codegen_utils: CodegenUtils.new()
+  )
+
+  if new_arch_enabled
+    codegen_utils.use_react_native_codegen_discovery!(
+      disable_codegen,
+      app_path,
+      :react_native_path => react_native_path,
+      :fabric_enabled => fabric_enabled,
+      :hermes_enabled => hermes_enabled,
+      :config_file_dir => config_file_dir,
+      :codegen_output_dir => codegen_output_dir,
+      :config_key => config_key,
+      :folly_version => folly_version
+    )
+  else
+    # Generate a podspec file for generated files.
+    # This gets generated in use_react_native_codegen_discovery when codegen discovery is enabled.
+    react_codegen_spec = codegen_utils.get_react_codegen_spec(
+      package_json_file,
+      :fabric_enabled => fabric_enabled,
+      :hermes_enabled => hermes_enabled
+    )
+    codegen_utils.generate_react_codegen_podspec!(react_codegen_spec, codegen_output_dir)
+  end
+end
diff --git a/scripts/cocoapods/codegen_script_phase_extractor.rb b/scripts/cocoapods/codegen_script_phase_extractor.rb
new file mode 100644
index 000000000000..225ede7d2c47
--- /dev/null
+++ b/scripts/cocoapods/codegen_script_phase_extractor.rb
@@ -0,0 +1,13 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+class CodegenScriptPhaseExtractor
+    def initialize()
+    end
+
+    def extract_script_phase(options)
+        get_script_phases_with_codegen_discovery(options)
+    end
+end
diff --git a/scripts/cocoapods/codegen_utils.rb b/scripts/cocoapods/codegen_utils.rb
new file mode 100644
index 000000000000..3694e686b79a
--- /dev/null
+++ b/scripts/cocoapods/codegen_utils.rb
@@ -0,0 +1,330 @@
+# 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'
+require_relative './helpers.rb'
+require_relative './codegen_script_phase_extractor.rb'
+
+class CodegenUtils
+
+    def initialize()
+    end
+
+    @@REACT_CODEGEN_PODSPEC_GENERATED = false
+
+    def self.set_react_codegen_podspec_generated(value)
+        @@REACT_CODEGEN_PODSPEC_GENERATED = value
+    end
+
+    def self.react_codegen_podspec_generated
+        @@REACT_CODEGEN_PODSPEC_GENERATED
+    end
+
+    @@REACT_CODEGEN_DISCOVERY_DONE = false
+
+    def self.set_react_codegen_discovery_done(value)
+        @@REACT_CODEGEN_DISCOVERY_DONE = value
+    end
+
+    def self.react_codegen_discovery_done
+        @@REACT_CODEGEN_DISCOVERY_DONE
+    end
+
+    # It takes some cocoapods specs and writes them into a file
+    #
+    # Parameters
+    # - spec: the cocoapod specs
+    # - codegen_output_dir: the output directory for the codegen
+    def generate_react_codegen_podspec!(spec, codegen_output_dir)
+        # This podspec file should only be create once in the session/pod install.
+        # This happens when multiple targets are calling use_react_native!.
+        if @@REACT_CODEGEN_PODSPEC_GENERATED
+          Pod::UI.puts "[Codegen] Skipping React-Codegen podspec generation."
+          return
+        end
+
+        relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
+        output_dir = "#{relative_installation_root}/#{codegen_output_dir}"
+        Pod::Executable.execute_command("mkdir", ["-p", output_dir]);
+
+        podspec_path = File.join(output_dir, 'React-Codegen.podspec.json')
+        Pod::UI.puts "[Codegen] Generating #{podspec_path}"
+
+        File.open(podspec_path, 'w') do |f|
+          f.write(spec.to_json)
+          f.fsync
+        end
+
+        @@REACT_CODEGEN_PODSPEC_GENERATED = true
+    end
+
+    # It generates the podspec object that represents the `React-Codegen.podspec` file
+    #
+    # Parameters
+    # - package_json_file: the path to the `package.json`, required to extract the proper React Native version
+    # - fabric_enabled: whether fabric is enabled or not.
+    # - hermes_enabled: whether hermes is enabled or not.
+    # - script_phases: whether we want to add some build script phases or not.
+    def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fabric_enabled: false, hermes_enabled: true, script_phases: nil)
+        package = JSON.parse(File.read(package_json_file))
+        version = package['version']
+
+        folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+        boost_compiler_flags = '-Wno-documentation'
+
+        spec = {
+          'name' => "React-Codegen",
+          'version' => version,
+          'summary' => 'Temp pod for generated files for React Native',
+          'homepage' => 'https://facebook.com/',
+          'license' => 'Unlicense',
+          'authors' => 'Facebook',
+          'compiler_flags'  => "#{folly_compiler_flags} #{boost_compiler_flags} -Wno-nullability-completeness -std=c++17",
+          'source' => { :git => '' },
+          'header_mappings_dir' => './',
+          'platforms' => {
+            'ios' => '11.0',
+          },
+          'source_files' => "**/*.{h,mm,cpp}",
+          'pod_target_xcconfig' => { "HEADER_SEARCH_PATHS" =>
+            [
+              "\"$(PODS_ROOT)/boost\"",
+              "\"$(PODS_ROOT)/RCT-Folly\"",
+              "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
+              "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
+              "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
+            ].join(' ')
+          },
+          'dependencies': {
+            "FBReactNativeSpec": [],
+            "React-jsiexecutor": [],
+            "RCT-Folly": [],
+            "RCTRequired": [],
+            "RCTTypeSafety": [],
+            "React-Core": [],
+            "React-jsi": [],
+            "ReactCommon/turbomodule/bridging": [],
+            "ReactCommon/turbomodule/core": []
+          }
+        }
+
+        if fabric_enabled
+          spec[:'dependencies'].merge!({
+            'React-graphics': [],
+            'React-rncore':  [],
+          });
+        end
+
+        if hermes_enabled
+          spec[:'dependencies'].merge!({
+            'hermes-engine': [], # let React Native decide which version of Hermes Engine to be used. Otherwise, this can create conflicts.
+          });
+        else
+          spec[:'dependencies'].merge!({
+            'React-jsc': [],
+          });
+        end
+
+        if script_phases
+          Pod::UI.puts "[Codegen] Adding script_phases to React-Codegen."
+          spec[:'script_phases'] = script_phases
+        end
+
+        return spec
+    end
+
+    # It extracts the codegen config from the configuration file
+    #
+    # Parameters
+    # - config_path: a path to the configuration file
+    # - config_key: the codegen configuration key
+    #
+    # Returns: the list of dependencies as extracted from the package.json
+    def get_codegen_config_from_file(config_path, config_key)
+      empty = {}
+      if !File.exist?(config_path)
+        return empty
+      end
+
+      config = JSON.parse(File.read(config_path))
+      return config[config_key] ? config[config_key] : empty
+    end
+
+    # It creates a list of JS files that contains the JS specifications that Codegen needs to use to generate the code
+    #
+    # Parameters
+    # - app_codegen_config: an object that contains the configurations
+    # - app_path: path to the app
+    #
+    # Returns: the list of files that needs to be used by Codegen
+    def get_list_of_js_specs(app_codegen_config, app_path)
+      file_list = []
+
+      if app_codegen_config['libraries'] then
+        Pod::UI.warn '[Deprecated] You are using the old `libraries` array to list all your codegen.\nThis method will be removed in the future.\nUpdate your `package.json` with a single object.'
+        app_codegen_config['libraries'].each do |library|
+          library_dir = File.join(app_path, library['jsSrcsDir'])
+          file_list.concat(Finder.find_codegen_file(library_dir))
+        end
+      elsif app_codegen_config['jsSrcsDir'] then
+        codegen_dir = File.join(app_path, app_codegen_config['jsSrcsDir'])
+        file_list.concat (Finder.find_codegen_file(codegen_dir))
+      end
+
+      input_files = file_list.map { |filename| "${PODS_ROOT}/../#{Pathname.new(filename).realpath().relative_path_from(Pod::Config.instance.installation_root)}" }
+
+      return input_files
+    end
+
+    # It generates the build script phase for the codegen
+    #
+    # Parameters
+    # - app_path: the path to the app
+    # - fabric_enabled: whether fabric is enabled or not
+    # - config_file_dir: the directory of the config file
+    # - react_native_path: the path to React Native
+    # - config_key: the configuration key to use in the package.json for the Codegen
+    # - codegen_utils: an object which exposes utilities functions for the codegen
+    # - script_phase_extractor: an object that is able to extract the Xcode Script Phases for React Native
+    #
+    # Return: an object containing the script phase
+    def get_react_codegen_script_phases(
+      app_path,
+      fabric_enabled: false,
+      hermes_enabled: false,
+      config_file_dir: '',
+      react_native_path: "../node_modules/react-native",
+      config_key: 'codegenConfig',
+      codegen_utils: CodegenUtils.new(),
+      script_phase_extractor: CodegenScriptPhaseExtractor.new()
+      )
+      if !app_path
+        Pod::UI.warn '[Codegen] error: app_path is requried to use codegen discovery.'
+        abort
+      end
+
+      # We need to convert paths to relative path from installation_root for the script phase for CI.
+      relative_app_root = Pathname.new(app_path).realpath().relative_path_from(Pod::Config.instance.installation_root)
+
+      relative_config_file_dir = ''
+      if config_file_dir != ''
+        relative_config_file_dir = Pathname.new(config_file_dir).relative_path_from(Pod::Config.instance.installation_root)
+      end
+
+      # Generate input files for in-app libaraies which will be used to check if the script needs to be run.
+      # TODO: Ideally, we generate the input_files list from generate-codegen-artifacts.js and read the result here.
+      #       Or, generate this podspec in generate-codegen-artifacts.js as well.
+      app_package_path = File.join(app_path, 'package.json')
+      app_codegen_config = codegen_utils.get_codegen_config_from_file(app_package_path, config_key)
+      input_files = codegen_utils.get_list_of_js_specs(app_codegen_config, app_path)
+
+      # Add a script phase to trigger generate artifact.
+      # Some code is duplicated so that it's easier to delete the old way and switch over to this once it's stabilized.
+      return {
+        'name': 'Generate Specs',
+        'execution_position': :before_compile,
+        'input_files' => input_files,
+        'show_env_vars_in_log': true,
+        'output_files': ["${DERIVED_FILE_DIR}/react-codegen.log"],
+        'script': script_phase_extractor.extract_script_phase(
+          react_native_path: react_native_path,
+          relative_app_root: relative_app_root,
+          relative_config_file_dir: relative_config_file_dir,
+          fabric_enabled: fabric_enabled
+        ),
+      }
+    end
+
+    def use_react_native_codegen_discovery!(
+      codegen_disabled,
+      app_path,
+      react_native_path: "../node_modules/react-native",
+      fabric_enabled: false,
+      hermes_enabled: true,
+      config_file_dir: '',
+      codegen_output_dir: 'build/generated/ios',
+      config_key: 'codegenConfig',
+      folly_version: '2021.07.22.00',
+      codegen_utils: CodegenUtils.new()
+      )
+      return if codegen_disabled
+
+      if CodegenUtils.react_codegen_discovery_done()
+        Pod::UI.puts "[Codegen] Skipping use_react_native_codegen_discovery."
+        return
+      end
+
+      if !app_path
+        Pod::UI.warn '[Codegen] Error: app_path is required for use_react_native_codegen_discovery.'
+        Pod::UI.warn '[Codegen] If you are calling use_react_native_codegen_discovery! in your Podfile, please remove the call and pass `app_path` and/or `config_file_dir` to `use_react_native!`.'
+        abort
+      end
+
+      Pod::UI.warn '[Codegen] warn: using experimental new codegen integration'
+      relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
+
+      # Generate React-Codegen podspec here to add the script phases.
+      script_phases = codegen_utils.get_react_codegen_script_phases(
+        app_path,
+        :fabric_enabled => fabric_enabled,
+        :config_file_dir => config_file_dir,
+        :react_native_path => react_native_path,
+        :config_key => config_key
+      )
+      react_codegen_spec = codegen_utils.get_react_codegen_spec(
+        File.join(react_native_path, "package.json"),
+        :folly_version => folly_version,
+        :fabric_enabled => fabric_enabled,
+        :hermes_enabled => hermes_enabled,
+        :script_phases => script_phases
+      )
+      codegen_utils.generate_react_codegen_podspec!(react_codegen_spec, codegen_output_dir)
+
+      out = Pod::Executable.execute_command(
+        'node',
+        [
+          "#{relative_installation_root}/#{react_native_path}/scripts/generate-codegen-artifacts.js",
+          "-p", "#{app_path}",
+          "-o", Pod::Config.instance.installation_root,
+          "-e", "#{fabric_enabled}",
+          "-c", "#{config_file_dir}",
+        ])
+      Pod::UI.puts out;
+
+      CodegenUtils.set_react_codegen_discovery_done(true)
+    end
+
+    @@CLEANUP_DONE = false
+
+    def self.set_cleanup_done(newValue)
+      @@CLEANUP_DONE = newValue
+    end
+
+    def self.cleanup_done
+      return @@CLEANUP_DONE
+    end
+
+    def self.clean_up_build_folder(app_path, ios_folder, codegen_dir)
+      return if CodegenUtils.cleanup_done()
+      CodegenUtils.set_cleanup_done(true)
+
+      codegen_path = File.join(app_path, ios_folder, codegen_dir)
+      return if !Dir.exist?(codegen_path)
+
+      FileUtils.rm_rf(Dir.glob("#{codegen_path}/*"))
+      CodegenUtils.assert_codegen_folder_is_empty(app_path, ios_folder, codegen_dir)
+    end
+
+    # Need to split this function from the previous one to be able to test it properly.
+    def self.assert_codegen_folder_is_empty(app_path, ios_folder, codegen_dir)
+      # double check that the files have actually been deleted.
+      # Emit an error message if not.
+      codegen_path = File.join(app_path, ios_folder, codegen_dir)
+      if Dir.exist?(codegen_path) && Dir.glob("#{codegen_path}/*").length() != 0
+        Pod::UI.warn "Unable to remove the content of #{codegen_path} folder. Please run rm -rf #{codegen_path} and try again."
+        abort
+      end
+    end
+end
diff --git a/scripts/cocoapods/fabric.rb b/scripts/cocoapods/fabric.rb
index c27bf7975ed8..b694bb64d972 100644
--- a/scripts/cocoapods/fabric.rb
+++ b/scripts/cocoapods/fabric.rb
@@ -4,16 +4,13 @@
 # LICENSE file in the root directory of this source tree.
 
 
-# It sets up the faric dependencies.
+# It sets up the Fabric dependencies.
 #
-# @parameter prefix: prefix to use to reach react-native
-# @parameter new_arch_enabled: whether the new arch is enabled or not
-# @parameter codegen_output_dir: the directory where the code is generated
-def setup_fabric!(prefix)
-    pod 'React-Fabric', :path => "#{prefix}/ReactCommon"
-    pod 'React-rncore', :path => "#{prefix}/ReactCommon"
-    pod 'React-graphics', :path => "#{prefix}/ReactCommon/react/renderer/graphics"
-    pod 'React-jsi/Fabric', :path => "#{prefix}/ReactCommon/jsi"
-    pod 'React-RCTFabric', :path => "#{prefix}/React", :modular_headers => true
-    pod 'RCT-Folly/Fabric', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec"
+# @parameter react_native_path: relative path to react-native
+def setup_fabric!(react_native_path: "../node_modules/react-native")
+    pod 'React-Fabric', :path => "#{react_native_path}/ReactCommon"
+    pod 'React-rncore', :path => "#{react_native_path}/ReactCommon"
+    pod 'React-graphics', :path => "#{react_native_path}/ReactCommon/react/renderer/graphics"
+    pod 'React-RCTFabric', :path => "#{react_native_path}/React", :modular_headers => true
+    pod 'RCT-Folly/Fabric', :podspec => "#{react_native_path}/third-party-podspecs/RCT-Folly.podspec"
 end
diff --git a/scripts/cocoapods/flipper.rb b/scripts/cocoapods/flipper.rb
index e2bfe76fdf67..5bf0d01c5b61 100644
--- a/scripts/cocoapods/flipper.rb
+++ b/scripts/cocoapods/flipper.rb
@@ -83,7 +83,7 @@ def flipper_post_install(installer)
         # Enable flipper for React-Core Debug configuration
         if target.name == 'React-Core'
             target.build_configurations.each do |config|
-                if config.name == 'Debug'
+                if config.debug?
                     config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = ['$(inherited)', 'FB_SONARKIT_ENABLED=1']
                 end
             end
diff --git a/scripts/cocoapods/helpers.rb b/scripts/cocoapods/helpers.rb
index 9008968393bb..03e3a5cbeac6 100644
--- a/scripts/cocoapods/helpers.rb
+++ b/scripts/cocoapods/helpers.rb
@@ -18,3 +18,11 @@ def ruby_platform
         return RUBY_PLATFORM
     end
 end
+
+class Finder
+    def self.find_codegen_file(path)
+        js_files = '-name "Native*.js" -or -name "*NativeComponent.js"'
+        ts_files = '-name "Native*.ts" -or -name "*NativeComponent.ts"'
+        return `find #{path} -type f \\( #{js_files} -or #{ts_files} \\)`.split("\n").sort()
+    end
+end
diff --git a/scripts/cocoapods/hermes.rb b/scripts/cocoapods/hermes.rb
deleted file mode 100644
index 747b744c87d7..000000000000
--- a/scripts/cocoapods/hermes.rb
+++ /dev/null
@@ -1,20 +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.
-
-def install_hermes_if_enabled(hermes_enabled, react_native_path)
-    unless hermes_enabled
-        return
-    end
-
-    prepare_hermes = 'node scripts/hermes/prepare-hermes-for-build'
-    react_native_dir = Pod::Config.instance.installation_root.join(react_native_path)
-    prep_output, prep_status = Open3.capture2e(prepare_hermes, :chdir => react_native_dir)
-    prep_output.split("\n").each { |line| Pod::UI.info line }
-    abort unless prep_status == 0
-
-    pod 'React-hermes', :path => "#{react_native_path}/ReactCommon/hermes"
-    pod 'libevent', '~> 2.1.12'
-    pod 'hermes-engine', :podspec => "#{react_native_path}/sdks/hermes/hermes-engine.podspec"
-end
diff --git a/scripts/cocoapods/jsengine.rb b/scripts/cocoapods/jsengine.rb
new file mode 100644
index 000000000000..6551ef3e50fd
--- /dev/null
+++ b/scripts/cocoapods/jsengine.rb
@@ -0,0 +1,81 @@
+# 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_relative './utils.rb'
+
+# It sets up the JavaScriptCore and JSI pods.
+#
+# @parameter react_native_path: relative path to react-native
+# @parameter fabric_enabled: whether Fabirc is enabled
+def setup_jsc!(react_native_path: "../node_modules/react-native", fabric_enabled: false)
+    pod 'React-jsi', :path => "#{react_native_path}/ReactCommon/jsi"
+    pod 'React-jsc', :path => "#{react_native_path}/ReactCommon/jsc"
+    if fabric_enabled
+        pod 'React-jsc/Fabric', :path => "#{react_native_path}/ReactCommon/jsc"
+    end
+end
+
+# It sets up the Hermes and JSI pods.
+#
+# @parameter react_native_path: relative path to react-native
+# @parameter fabric_enabled: whether Fabirc is enabled
+def setup_hermes!(react_native_path: "../node_modules/react-native", fabric_enabled: false)
+    # The following captures the output of prepare_hermes for use in tests
+    prepare_hermes = 'node scripts/hermes/prepare-hermes-for-build'
+    react_native_dir = Pod::Config.instance.installation_root.join(react_native_path)
+    prep_output, prep_status = Open3.capture2e(prepare_hermes, :chdir => react_native_dir)
+    prep_output.split("\n").each { |line| Pod::UI.info line }
+    abort unless prep_status == 0
+
+    pod 'React-jsi', :path => "#{react_native_path}/ReactCommon/jsi"
+    pod 'hermes-engine', :podspec => "#{react_native_path}/sdks/hermes-engine/hermes-engine.podspec"
+    pod 'React-hermes', :path => "#{react_native_path}/ReactCommon/hermes"
+    pod 'libevent', '~> 2.1.12'
+end
+
+def add_copy_hermes_framework_script_phase(installer, react_native_path)
+    utils_dir = File.join(react_native_path, "sdks", "hermes-engine", "utils")
+    phase_name = "[RN] Copy Hermes Framework"
+    project = installer.generated_aggregate_targets.first.user_project
+    target = project.targets.first
+    if target.shell_script_build_phases.none? { |phase| phase.name == phase_name }
+        phase = target.new_shell_script_build_phase(phase_name)
+        phase.shell_script = ". #{utils_dir}/copy-hermes-xcode.sh"
+        project.save()
+    end
+end
+
+def remove_copy_hermes_framework_script_phase(installer, react_native_path)
+    utils_dir = File.join(react_native_path, "sdks", "hermes-engine", "utils")
+    phase_name = "[RN] Copy Hermes Framework"
+    project = installer.generated_aggregate_targets.first.user_project
+    target = project.native_targets.first
+    target.shell_script_build_phases.each do |phase|
+        if phase.name == phase_name
+            target.build_phases.delete(phase)
+        end
+    end
+    project.save()
+end
+
+def remove_hermesc_build_dir(react_native_path)
+    %x(rm -rf #{react_native_path}/sdks/hermes-engine/build_host_hermesc)
+end
+
+def is_building_hermes_from_source(react_native_version, react_native_path)
+    if ENV['HERMES_ENGINE_TARBALL_PATH'] != nil
+        return false
+    end
+
+    isInMain = react_native_version.include?('1000.0.0')
+
+    hermestag_file = File.join(react_native_path, "sdks", ".hermesversion")
+    isInCI = ENV['REACT_NATIVE_CI'] === 'true'
+
+    isReleaseBranch = File.exist?(hermestag_file) && isInCI
+
+
+    return isInMain || isReleaseBranch
+end
diff --git a/scripts/cocoapods/new_architecture.rb b/scripts/cocoapods/new_architecture.rb
index 166a2ed78799..90141cd004c9 100644
--- a/scripts/cocoapods/new_architecture.rb
+++ b/scripts/cocoapods/new_architecture.rb
@@ -4,8 +4,13 @@
 # LICENSE file in the root directory of this source tree.
 
 class NewArchitectureHelper
+    @@shared_flags = "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1"
 
-    @@new_arch_cpp_flags = '$(inherited) -DRCT_NEW_ARCH_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1'
+    @@folly_compiler_flags = "#{@@shared_flags} -Wno-comma -Wno-shorten-64-to-32"
+
+    @@new_arch_cpp_flags = "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 #{@@shared_flags}"
+
+    @@cplusplus_version = "c++17"
 
     def self.set_clang_cxx_language_standard_if_needed(installer)
         language_standard = nil
@@ -56,4 +61,41 @@ def self.modify_flags_for_new_architecture(installer, is_new_arch_enabled)
             end
         end
     end
+
+    def self.install_modules_dependencies(spec, new_arch_enabled, folly_version)
+        # Pod::Specification does not have getters so, we have to read
+        # the existing values from a hash representation of the object.
+        hash = spec.to_hash
+
+        compiler_flags = hash["compiler_flags"] ? hash["compiler_flags"] : ""
+        current_config = hash["pod_target_xcconfig"] != nil ? hash["pod_target_xcconfig"] : {}
+        current_headers = current_config["HEADER_SEARCH_PATHS"] != nil ? current_config["HEADER_SEARCH_PATHS"] : ""
+
+        boost_search_path = "\"$(PODS_ROOT)/boost\""
+
+        spec.compiler_flags = compiler_flags.empty? ? @@folly_compiler_flags : "#{compiler_flags} #{@@folly_compiler_flags}"
+        current_config["HEADER_SEARCH_PATHS"] = current_headers.empty? ? boost_search_path : "#{current_headers} #{boost_search_path}"
+        current_config["CLANG_CXX_LANGUAGE_STANDARD"] = @@cplusplus_version
+
+
+        spec.dependency "React-Core"
+        spec.dependency "RCT-Folly", '2021.07.22.00'
+
+        if new_arch_enabled
+            current_config["OTHER_CPLUSPLUSFLAGS"] = @@new_arch_cpp_flags
+            spec.dependency "React-RCTFabric" # This is for Fabric Component
+            spec.dependency "React-Codegen"
+
+            spec.dependency "RCTRequired"
+            spec.dependency "RCTTypeSafety"
+            spec.dependency "ReactCommon/turbomodule/bridging"
+            spec.dependency "ReactCommon/turbomodule/core"
+        end
+
+        spec.pod_target_xcconfig = current_config
+    end
+
+    def self.folly_compiler_flags
+        return @@folly_compiler_flags
+    end
 end
diff --git a/scripts/cocoapods/utils.rb b/scripts/cocoapods/utils.rb
index 732329f21b36..e5cc2e3c3df7 100644
--- a/scripts/cocoapods/utils.rb
+++ b/scripts/cocoapods/utils.rb
@@ -39,6 +39,20 @@ def self.has_pod(installer, name)
         installer.pods_project.pod_group(name) != nil
     end
 
+    def self.turn_off_resource_bundle_react_core(installer)
+        # this is needed for Xcode 14, see more details here https://github.com/facebook/react-native/issues/34673
+        # we should be able to remove this once CocoaPods catches up to it, see more details here https://github.com/CocoaPods/CocoaPods/issues/11402
+        installer.target_installation_results.pod_target_installation_results.each do |pod_name, target_installation_result|
+            if pod_name.to_s == 'React-Core'
+                target_installation_result.resource_bundle_targets.each do |resource_bundle_target|
+                    resource_bundle_target.build_configurations.each do |config|
+                        config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+                    end
+                end
+            end
+        end
+    end
+
     def self.exclude_i386_architecture_while_using_hermes(installer)
         projects = installer.aggregate_targets
             .map{ |t| t.user_project }
@@ -127,10 +141,12 @@ def self.fix_library_search_path(config)
             return
         end
 
-        # $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME) causes problem with Xcode 12.5 + arm64 (Apple M1)
-        # since the libraries there are only built for x86_64 and i386.
-        lib_search_paths.delete("$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)")
-        lib_search_paths.delete("\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"")
+        if lib_search_paths.include?("$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)") || lib_search_paths.include?("\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"")
+            # $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME) causes problem with Xcode 12.5 + arm64 (Apple M1)
+            # since the libraries there are only built for x86_64 and i386.
+            lib_search_paths.delete("$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)")
+            lib_search_paths.delete("\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"")
+        end
 
         if !(lib_search_paths.include?("$(SDKROOT)/usr/lib/swift") || lib_search_paths.include?("\"$(SDKROOT)/usr/lib/swift\""))
             # however, $(SDKROOT)/usr/lib/swift is required, at least if user is not running CocoaPods 1.11
@@ -138,5 +154,35 @@ def self.fix_library_search_path(config)
         end
     end
 
+    def self.create_xcode_env_if_missing
+        relative_path = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
+        file_path = File.join(relative_path, '.xcode.env')
+        if File.exist?(file_path)
+            return
+        end
 
+        system("echo 'export NODE_BINARY=$(command -v node)' > #{file_path}")
+    end
+
+    # It examines the target_definition property and sets the appropriate value for
+    # ENV['USE_FRAMEWORKS'] variable.
+    #
+    # - parameter target_definition: The current target definition
+    def self.detect_use_frameworks(target_definition)
+        if ENV['USE_FRAMEWORKS'] != nil
+            return
+        end
+
+        framework_build_type = target_definition.build_type.to_s
+
+        Pod::UI.puts("Framework build type is #{framework_build_type}")
+
+        if framework_build_type === "static framework"
+            ENV['USE_FRAMEWORKS'] = 'static'
+        elsif framework_build_type === "dynamic framework"
+            ENV['USE_FRAMEWORKS'] = 'dynamic'
+        else
+            ENV['USE_FRAMEWORKS'] = nil
+        end
+    end
 end
diff --git a/scripts/codegen/__test_fixtures__/fixtures.js b/scripts/codegen/__test_fixtures__/fixtures.js
index 86adfa0cd594..5d48be4eaab4 100644
--- a/scripts/codegen/__test_fixtures__/fixtures.js
+++ b/scripts/codegen/__test_fixtures__/fixtures.js
@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @format
+ * @oncall react_native
  */
 
 'use-strict';
diff --git a/scripts/codegen/__tests__/generate-artifacts-executor-test.js b/scripts/codegen/__tests__/generate-artifacts-executor-test.js
index c59592201c98..4924e2597390 100644
--- a/scripts/codegen/__tests__/generate-artifacts-executor-test.js
+++ b/scripts/codegen/__tests__/generate-artifacts-executor-test.js
@@ -4,8 +4,8 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @format
+ * @oncall react_native
  */
 
 'use strict';
@@ -13,13 +13,20 @@
 const underTest = require('../generate-artifacts-executor');
 const fixtures = require('../__test_fixtures__/fixtures');
 const path = require('path');
+const fs = require('fs');
+const child_process = require('child_process');
 
 const codegenConfigKey = 'codegenConfig';
 const reactNativeDependencyName = 'react-native';
 const rootPath = path.join(__dirname, '../../..');
 
 describe('generateCode', () => {
-  it('executeNodes with the right arguents', () => {
+  afterEach(() => {
+    jest.resetModules();
+    jest.resetAllMocks();
+  });
+
+  it('executeNodes with the right arguments', () => {
     // Define variables and expected values
     const iosOutputDir = 'app/ios/build/generated/ios';
     const library = {config: {name: 'library', type: 'all'}};
@@ -32,46 +39,32 @@ describe('generateCode', () => {
     const tmpOutDir = path.join(tmpDir, 'out');
 
     // mock used functions
-    let mkdirSyncInvocationCount = 0;
-    jest.mock('fs', () => ({
-      mkdirSync: (location, config) => {
-        if (mkdirSyncInvocationCount === 0) {
-          expect(location).toEqual(tmpOutDir);
-        }
-        if (mkdirSyncInvocationCount === 1) {
-          expect(location).toEqual(iosOutputDir);
-        }
-
-        mkdirSyncInvocationCount += 1;
-      },
-    }));
-
-    let execSyncInvocationCount = 0;
-    jest.mock('child_process', () => ({
-      execSync: command => {
-        if (execSyncInvocationCount === 0) {
-          const expectedCommand = `${node} ${path.join(
-            rnRoot,
-            'generate-specs-cli.js',
-          )} \
-        --platform ios \
-        --schemaPath ${pathToSchema} \
-        --outputDir ${tmpOutDir} \
-        --libraryName ${library.config.name} \
-        --libraryType ${libraryType}`;
-          expect(command).toEqual(expectedCommand);
-        }
-
-        if (execSyncInvocationCount === 1) {
-          expect(command).toEqual(`cp -R ${tmpOutDir}/* ${iosOutputDir}`);
-        }
-
-        execSyncInvocationCount += 1;
-      },
-    }));
+    jest.spyOn(fs, 'mkdirSync').mockImplementation();
+    jest.spyOn(child_process, 'execSync').mockImplementation();
 
     underTest._generateCode(iosOutputDir, library, tmpDir, node, pathToSchema);
-    expect(mkdirSyncInvocationCount).toBe(2);
+
+    const expectedCommand = `${node} ${path.join(
+      rnRoot,
+      'generate-specs-cli.js',
+    )}         --platform ios         --schemaPath ${pathToSchema}         --outputDir ${tmpOutDir}         --libraryName ${
+      library.config.name
+    }         --libraryType ${libraryType}`;
+
+    expect(child_process.execSync).toHaveBeenCalledTimes(2);
+    expect(child_process.execSync).toHaveBeenNthCalledWith(1, expectedCommand);
+    expect(child_process.execSync).toHaveBeenNthCalledWith(
+      2,
+      `cp -R ${tmpOutDir}/* ${iosOutputDir}`,
+    );
+
+    expect(fs.mkdirSync).toHaveBeenCalledTimes(2);
+    expect(fs.mkdirSync).toHaveBeenNthCalledWith(1, tmpOutDir, {
+      recursive: true,
+    });
+    expect(fs.mkdirSync).toHaveBeenNthCalledWith(2, iosOutputDir, {
+      recursive: true,
+    });
   });
 });
 
@@ -202,6 +195,83 @@ describe('extractLibrariesFromJSON', () => {
   });
 });
 
+describe('findCodegenEnabledLibraries', () => {
+  const mock = require('mock-fs');
+  const {
+    _findCodegenEnabledLibraries: findCodegenEnabledLibraries,
+  } = require('../generate-artifacts-executor');
+
+  afterEach(() => {
+    mock.restore();
+  });
+
+  it('returns libraries defined in react-native.config.js', () => {
+    const projectDir = path.join(__dirname, '../../../../test-project');
+    const baseCodegenConfigFileDir = path.join(__dirname, '../../..');
+    const baseCodegenConfigFilePath = path.join(
+      baseCodegenConfigFileDir,
+      'package.json',
+    );
+
+    mock({
+      [baseCodegenConfigFilePath]: `
+      {
+        "codegenConfig": {}
+      }
+      `,
+      [projectDir]: {
+        app: {
+          'package.json': `{
+            "name": "my-app"
+          }`,
+          'react-native.config.js': '',
+        },
+        'library-foo': {
+          'package.json': `{
+            "name": "react-native-foo",
+            "codegenConfig": {
+              "name": "RNFooSpec",
+              "type": "modules",
+              "jsSrcsDir": "src"
+            }
+          }`,
+        },
+      },
+    });
+
+    jest.mock(path.join(projectDir, 'app', 'react-native.config.js'), () => ({
+      dependencies: {
+        'react-native-foo': {
+          root: path.join(projectDir, 'library-foo'),
+        },
+        'react-native-bar': {
+          root: path.join(projectDir, 'library-bar'),
+        },
+      },
+    }));
+
+    const libraries = findCodegenEnabledLibraries(
+      `${projectDir}/app`,
+      baseCodegenConfigFileDir,
+      `package.json`,
+      'codegenConfig',
+    );
+
+    expect(libraries).toEqual([
+      {
+        library: 'react-native',
+        config: {},
+        libraryPath: baseCodegenConfigFileDir,
+      },
+      {
+        library: 'react-native-foo',
+        config: {name: 'RNFooSpec', type: 'modules', jsSrcsDir: 'src'},
+        libraryPath: path.join(projectDir, 'library-foo'),
+      },
+    ]);
+  });
+});
+
 describe('delete empty files and folders', () => {
   beforeEach(() => {
     jest.resetModules();
diff --git a/scripts/codegen/__tests__/generate-specs-cli-executor-test.js b/scripts/codegen/__tests__/generate-specs-cli-executor-test.js
index ce63546a566b..463ed28dbf6b 100644
--- a/scripts/codegen/__tests__/generate-specs-cli-executor-test.js
+++ b/scripts/codegen/__tests__/generate-specs-cli-executor-test.js
@@ -4,31 +4,29 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @emails oncall+react_native
  * @format
+ * @oncall react_native
  */
 
 'use strict';
 
 const sut = require('../generate-specs-cli-executor');
 const fixtures = require('../__test_fixtures__/fixtures');
-const path = require('path');
+const {normalize} = require('path');
 
 describe('generateSpec', () => {
   it('invokes RNCodegen with the right params', () => {
     const platform = 'ios';
     const libraryType = 'all';
     const schemaPath = './';
-    const componentsOutputDir = path.normalize(
+    const componentsOutputDir = normalize(
       'app/ios/build/generated/ios/react/renderer/components/library',
     );
-    const modulesOutputDir = path.normalize(
-      'app/ios/build/generated/ios/library',
-    );
-    const outputDirectory = path.normalize('app/ios/build/generated/ios');
+    const modulesOutputDir = normalize('app/ios/build/generated/ios/library');
+    const outputDirectory = normalize('app/ios/build/generated/ios');
     const libraryName = 'library';
     const packageName = 'com.library';
-    const generators = ['componentsIOS', 'modulesIOS'];
+    const generators = ['componentsIOS', 'modulesIOS', 'modulesCxx'];
 
     jest.mock('fs', () => ({
       readFileSync: (path, encoding) => {
diff --git a/scripts/codegen/generate-artifacts-executor.js b/scripts/codegen/generate-artifacts-executor.js
index abae278a9111..68a47b6fab5b 100644
--- a/scripts/codegen/generate-artifacts-executor.js
+++ b/scripts/codegen/generate-artifacts-executor.js
@@ -51,6 +51,44 @@ function readPackageJSON(appRootDir) {
   return JSON.parse(fs.readFileSync(path.join(appRootDir, 'package.json')));
 }
 
+function printDeprecationWarningIfNeeded(dependency) {
+  if (dependency === REACT_NATIVE_DEPENDENCY_NAME) {
+    return;
+  }
+  console.log(`[Codegen] CodegenConfig Deprecated Setup for ${dependency}.
+    The configuration file still contains the codegen in the libraries array.
+    If possible, replace it with a single object.
+  `);
+  console.debug(`BEFORE:
+    {
+      // ...
+      "codegenConfig": {
+        "libraries": [
+          {
+            "name": "libName1",
+            "type": "all|components|modules",
+            "jsSrcsRoot": "libName1/js"
+          },
+          {
+            "name": "libName2",
+            "type": "all|components|modules",
+            "jsSrcsRoot": "libName2/src"
+          }
+        ]
+      }
+    }
+
+    AFTER:
+    {
+      "codegenConfig": {
+        "name": "libraries",
+        "type": "all",
+        "jsSrcsRoot": "."
+      }
+    }
+  `);
+}
+
 // Reading Libraries
 function extractLibrariesFromConfigurationArray(
   configFile,
@@ -102,38 +140,7 @@ function extractLibrariesFromJSON(
       libraryPath: dependencyPath,
     });
   } else {
-    console.log(`[Codegen] CodegenConfig Deprecated Setup for ${dependency}.
-      The configuration file still contains the codegen in the libraries array.
-      If possible, replace it with a single object.
-    `);
-    console.debug(`BEFORE:
-      {
-        // ...
-        "codegenConfig": {
-          "libraries": [
-            {
-              "name": "libName1",
-              "type": "all|components|modules",
-              "jsSrcsRoot": "libName1/js"
-            },
-            {
-              "name": "libName2",
-              "type": "all|components|modules",
-              "jsSrcsRoot": "libName2/src"
-            }
-          ]
-        }
-      }
-
-      AFTER:
-      {
-        "codegenConfig": {
-          "name": "libraries",
-          "type": "all",
-          "jsSrcsRoot": "."
-        }
-      }
-    `);
+    printDeprecationWarningIfNeeded(dependency);
     extractLibrariesFromConfigurationArray(
       configFile,
       codegenConfigKey,
@@ -197,6 +204,55 @@ function handleThirdPartyLibraries(
   });
 }
 
+function handleLibrariesFromReactNativeConfig(
+  libraries,
+  codegenConfigKey,
+  codegenConfigFilename,
+  appRootDir,
+) {
+  const rnConfigFileName = 'react-native.config.js';
+
+  console.log(
+    `\n\n[Codegen] >>>>> Searching for codegen-enabled libraries in ${rnConfigFileName}`,
+  );
+
+  const rnConfigFilePath = path.resolve(appRootDir, rnConfigFileName);
+
+  if (fs.existsSync(rnConfigFilePath)) {
+    const rnConfig = require(rnConfigFilePath);
+
+    if (rnConfig.dependencies != null) {
+      Object.keys(rnConfig.dependencies).forEach(name => {
+        const dependencyConfig = rnConfig.dependencies[name];
+
+        if (dependencyConfig.root) {
+          const codegenConfigFileDir = path.resolve(
+            appRootDir,
+            dependencyConfig.root,
+          );
+          const configFilePath = path.join(
+            codegenConfigFileDir,
+            codegenConfigFilename,
+          );
+          const pkgJsonPath = path.join(codegenConfigFileDir, 'package.json');
+
+          if (fs.existsSync(configFilePath)) {
+            const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath));
+            const configFile = JSON.parse(fs.readFileSync(configFilePath));
+            extractLibrariesFromJSON(
+              configFile,
+              libraries,
+              codegenConfigKey,
+              pkgJson.name,
+              codegenConfigFileDir,
+            );
+          }
+        }
+      });
+    }
+  }
+}
+
 function handleInAppLibraries(
   libraries,
   pkgJson,
@@ -263,7 +319,7 @@ function generateSchema(tmpDir, library, node, codegenCliPath) {
       'cli',
       'combine',
       'combine-js-to-schema-cli.js',
-    )} ${pathToSchema} ${pathToJavaScriptSources}`,
+    )} --platform ios ${pathToSchema} ${pathToJavaScriptSources}`,
   );
   console.log(`[Codegen] Generated schema: ${pathToSchema}`);
   return pathToSchema;
@@ -355,6 +411,39 @@ function createComponentProvider(
   }
 }
 
+function findCodegenEnabledLibraries(
+  appRootDir,
+  baseCodegenConfigFileDir,
+  codegenConfigFilename,
+  codegenConfigKey,
+) {
+  const pkgJson = readPackageJSON(appRootDir);
+  const dependencies = {...pkgJson.dependencies, ...pkgJson.devDependencies};
+  const libraries = [];
+
+  handleReactNativeCodeLibraries(
+    libraries,
+    codegenConfigFilename,
+    codegenConfigKey,
+  );
+  handleThirdPartyLibraries(
+    libraries,
+    baseCodegenConfigFileDir,
+    dependencies,
+    codegenConfigFilename,
+    codegenConfigKey,
+  );
+  handleLibrariesFromReactNativeConfig(
+    libraries,
+    codegenConfigKey,
+    codegenConfigFilename,
+    appRootDir,
+  );
+  handleInAppLibraries(libraries, pkgJson, codegenConfigKey, appRootDir);
+
+  return libraries;
+}
+
 // It removes all the empty files and empty folders
 // it finds, starting from `filepath`, recursively.
 //
@@ -422,23 +511,12 @@ function execute(
   }
 
   try {
-    const pkgJson = readPackageJSON(appRootDir);
-    const dependencies = {...pkgJson.dependencies, ...pkgJson.devDependencies};
-    const libraries = [];
-
-    handleReactNativeCodeLibraries(
-      libraries,
-      codegenConfigFilename,
-      codegenConfigKey,
-    );
-    handleThirdPartyLibraries(
-      libraries,
+    const libraries = findCodegenEnabledLibraries(
+      appRootDir,
       baseCodegenConfigFileDir,
-      dependencies,
       codegenConfigFilename,
       codegenConfigKey,
     );
-    handleInAppLibraries(libraries, pkgJson, codegenConfigKey, appRootDir);
 
     if (libraries.length === 0) {
       console.log('[Codegen] No codegen-enabled libraries found.');
@@ -475,6 +553,7 @@ module.exports = {
   execute: execute,
   // exported for testing purposes only:
   _extractLibrariesFromJSON: extractLibrariesFromJSON,
+  _findCodegenEnabledLibraries: findCodegenEnabledLibraries,
   _executeNodeScript: executeNodeScript,
   _generateCode: generateCode,
   _cleanupEmptyFilesAndFolders: cleanupEmptyFilesAndFolders,
diff --git a/scripts/codegen/generate-specs-cli-executor.js b/scripts/codegen/generate-specs-cli-executor.js
index fe37b07fd9db..8eda8012c8be 100644
--- a/scripts/codegen/generate-specs-cli-executor.js
+++ b/scripts/codegen/generate-specs-cli-executor.js
@@ -17,16 +17,16 @@ const RNCodegen = utils.getCodegen();
 
 const GENERATORS = {
   all: {
-    android: ['componentsAndroid', 'modulesAndroid'],
-    ios: ['componentsIOS', 'modulesIOS'],
+    android: ['componentsAndroid', 'modulesAndroid', 'modulesCxx'],
+    ios: ['componentsIOS', 'modulesIOS', 'modulesCxx'],
   },
   components: {
     android: ['componentsAndroid'],
     ios: ['componentsIOS'],
   },
   modules: {
-    android: ['modulesAndroid'],
-    ios: ['modulesIOS'],
+    android: ['modulesAndroid', 'modulesCxx'],
+    ios: ['modulesIOS', 'modulesCxx'],
   },
 };
 
diff --git a/scripts/generate-artifacts.js b/scripts/generate-codegen-artifacts.js
similarity index 100%
rename from scripts/generate-artifacts.js
rename to scripts/generate-codegen-artifacts.js
diff --git a/scripts/hermes/__tests__/hermes-utils-test.js b/scripts/hermes/__tests__/hermes-utils-test.js
new file mode 100644
index 000000000000..dc81266293e5
--- /dev/null
+++ b/scripts/hermes/__tests__/hermes-utils-test.js
@@ -0,0 +1,449 @@
+/**
+ * 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
+ */
+
+import * as path from 'path';
+
+const os = require('os');
+
+const {
+  configureMakeForPrebuiltHermesC,
+  copyBuildScripts,
+  copyPodSpec,
+  createHermesPrebuiltArtifactsTarball,
+  createTarballFromDirectory,
+  downloadHermesSourceTarball,
+  expandHermesSourceTarball,
+  getHermesTarballDownloadPath,
+  getHermesPrebuiltArtifactsTarballName,
+  getHermesTagSHA,
+  readHermesTag,
+  setHermesTag,
+  shouldUsePrebuiltHermesC,
+} = require('../hermes-utils');
+
+const hermesTag =
+  'hermes-2022-04-28-RNv0.69.0-15d07c2edd29a4ea0b8f15ab0588a0c1adb1200f';
+const tarballContents = 'dummy string';
+const hermescContents = 'dummy string';
+const hermesTagSha = '5244f819b2f3949ca94a3a1bf75d54a8ed59d94a';
+
+const ROOT_DIR = path.normalize(path.join(__dirname, '../../..'));
+const SDKS_DIR = path.join(ROOT_DIR, 'sdks');
+
+const MemoryFs = require('metro-memory-fs');
+
+let execCalls, spawnCalls;
+let fs;
+
+jest.mock('child_process', () => ({
+  execSync: jest.fn((command, options) => {
+    // git is used in getHermesTagSHA to obtain the commit sha for the latest commit to Hermes main
+    if (command.startsWith('git')) {
+      execCalls.git = true;
+      return hermesTagSha + '\n';
+    }
+  }),
+  spawnSync: jest.fn((command, args, options) => {
+    // curl is used in downloadHermesSourceTarball to fetch the source code from github.com/facebook/hermes for a specific Hermes commit sha
+    if (command === 'curl') {
+      const downloadPath = args[2];
+      fs.writeFileSync(downloadPath, tarballContents);
+      spawnCalls.curl = true;
+      return {code: 0};
+    }
+
+    // tar is used in createTarballFromDirectory
+    if (command === 'tar') {
+      spawnCalls.tar = true;
+
+      if (args[0] === '-zxf') {
+        // We are expanding the tarball
+        fs.mkdirSync(path.join(SDKS_DIR, 'hermes/utils'), {
+          recursive: true,
+        });
+        fs.writeFileSync(path.join(SDKS_DIR, 'hermes/package.json'), '{}');
+        return {code: 0};
+      } else if (args[2] === '-czvf') {
+        // We are creating the tarball
+        const filename = args[3];
+        fs.writeFileSync(filename, tarballContents);
+        return {code: 0};
+      }
+    }
+
+    // rsync is used in createHermesPrebuiltArtifactsTarball
+    if (command === 'rsync') {
+      spawnCalls.rsync = true;
+      spawnCalls.rsyncArgs = args;
+      const destination = args[args.length - 1];
+
+      // Create destination directory
+      fs.mkdirSync(path.join(options.cwd, destination), {
+        recursive: true,
+      });
+    }
+  }),
+}));
+
+function populateMockFilesystemWithHermesBuildScripts() {
+  fs.mkdirSync(path.join(SDKS_DIR, 'hermes-engine/utils'), {
+    recursive: true,
+  });
+  fs.writeFileSync(
+    path.join(SDKS_DIR, 'hermes-engine/utils/build-apple-framework.sh'),
+    'Dummy file',
+  );
+  fs.writeFileSync(
+    path.join(SDKS_DIR, 'hermes-engine/utils/build-ios-framework.sh'),
+    'Dummy file',
+  );
+  fs.writeFileSync(
+    path.join(SDKS_DIR, 'hermes-engine/utils/build-mac-framework.sh'),
+    'Dummy file',
+  );
+  fs.writeFileSync(
+    path.join(SDKS_DIR, 'hermes-engine/hermes-engine.podspec'),
+    'Dummy file',
+  );
+  fs.writeFileSync(
+    path.join(SDKS_DIR, 'hermes-engine/hermes-utils.rb'),
+    'Dummy file',
+  );
+}
+
+function populateMockFilesystemWithHermesBuildArtifacts() {
+  fs.mkdirSync(os.tmpdir(), {recursive: true});
+  const frameworksDir = path.join(
+    SDKS_DIR,
+    'hermes/destroot/Library/Frameworks',
+  );
+  fs.mkdirSync(path.join(frameworksDir, 'macosx/hermes.framework'), {
+    recursive: true,
+  });
+  fs.mkdirSync(path.join(frameworksDir, 'universal/hermes.xcframework'), {
+    recursive: true,
+  });
+
+  const dsymsDirs = [
+    'macosx',
+    'universal/hermes.xcframework/ios-arm64/dSYMs',
+    'universal/hermes.xcframework/ios-arm64_x86_64-simulator/dSYMs',
+    'universal/hermes.xcframework/ios-arm64_x86_64-maccatalyst/dSYMs',
+  ];
+
+  for (const dsymsDir of dsymsDirs) {
+    fs.mkdirSync(path.join(frameworksDir, dsymsDir, 'hermes.framework.dSYM'), {
+      recursive: true,
+    });
+  }
+}
+
+describe('hermes-utils', () => {
+  beforeEach(() => {
+    jest.resetModules();
+
+    jest.mock(
+      'fs',
+      () =>
+        new MemoryFs({
+          platform: process.platform === 'win32' ? 'win32' : 'posix',
+        }),
+    );
+    fs = require('fs');
+    fs.reset();
+
+    populateMockFilesystemWithHermesBuildScripts();
+
+    execCalls = Object.create(null);
+    spawnCalls = Object.create(null);
+  });
+
+  describe('Versioning Hermes', () => {
+    describe('readHermesTag', () => {
+      it('should return main if .hermesversion does not exist', () => {
+        expect(readHermesTag()).toEqual('main');
+      });
+      it('should fail if hermes tag is empty', () => {
+        fs.writeFileSync(path.join(SDKS_DIR, '.hermesversion'), '');
+        expect(() => {
+          readHermesTag();
+        }).toThrow('[Hermes] .hermesversion file is empty.');
+      });
+      it('should return tag from .hermesversion if file exists', () => {
+        fs.writeFileSync(path.join(SDKS_DIR, '.hermesversion'), hermesTag);
+        expect(readHermesTag()).toEqual(hermesTag);
+      });
+    });
+
+    describe('setHermesTag', () => {
+      it('should write tag to .hermesversion file', () => {
+        setHermesTag(hermesTag);
+        expect(
+          fs.readFileSync(path.join(SDKS_DIR, '.hermesversion'), {
+            encoding: 'utf8',
+            flag: 'r',
+          }),
+        ).toEqual(hermesTag);
+      });
+      it('should set Hermes tag and read it back', () => {
+        setHermesTag(hermesTag);
+        expect(readHermesTag()).toEqual(hermesTag);
+      });
+    });
+
+    describe('getHermesTagSHA', () => {
+      it('should return trimmed commit SHA for Hermes tag', () => {
+        expect(getHermesTagSHA(hermesTag)).toEqual(hermesTagSha);
+        expect(execCalls.git).toBe(true);
+      });
+    });
+  });
+
+  describe('Downloading Hermes', () => {
+    describe('getHermesTarballDownloadPath', () => {
+      it('returns download path with Hermes tag sha', () => {
+        const hermesTarballDownloadPath =
+          getHermesTarballDownloadPath(hermesTag);
+        expect(hermesTarballDownloadPath).toEqual(
+          path.join(
+            SDKS_DIR,
+            'download',
+            `hermes-${getHermesTagSHA(hermesTag)}.tgz`,
+          ),
+        );
+      });
+    });
+    describe('downloadHermesSourceTarball', () => {
+      it('should download Hermes source tarball to download dir', () => {
+        fs.writeFileSync(path.join(SDKS_DIR, '.hermesversion'), hermesTag);
+        const hermesTarballDownloadPath =
+          getHermesTarballDownloadPath(hermesTag);
+        downloadHermesSourceTarball();
+        expect(spawnCalls.curl).toBe(true);
+        expect(
+          fs.readFileSync(hermesTarballDownloadPath, {
+            encoding: 'utf8',
+            flag: 'r',
+          }),
+        ).toEqual(tarballContents);
+      });
+      it('should not re-download Hermes source tarball if tarball exists', () => {
+        fs.mkdirSync(path.join(SDKS_DIR, 'download'), {recursive: true});
+        fs.writeFileSync(
+          path.join(SDKS_DIR, 'download', `hermes-${hermesTagSha}.tgz`),
+          tarballContents,
+        );
+
+        downloadHermesSourceTarball();
+        expect(spawnCalls.curl).toBeUndefined();
+      });
+    });
+
+    describe('expandHermesSourceTarball', () => {
+      it('should expand Hermes source tarball to Hermes source dir', () => {
+        fs.mkdirSync(path.join(SDKS_DIR, 'download'), {recursive: true});
+        fs.writeFileSync(
+          path.join(SDKS_DIR, 'download', `hermes-${hermesTagSha}.tgz`),
+          tarballContents,
+        );
+        expect(fs.existsSync(path.join(SDKS_DIR, 'hermes'))).toBeFalsy();
+        expandHermesSourceTarball();
+        expect(fs.existsSync(path.join(SDKS_DIR, 'hermes'))).toBe(true);
+      });
+      it('should fail if Hermes source tarball does not exist', () => {
+        expect(() => {
+          expandHermesSourceTarball();
+        }).toThrow('[Hermes] Could not locate Hermes tarball.');
+      });
+    });
+  });
+
+  describe('Configuring Hermes Build', () => {
+    describe('copyBuildScripts', () => {
+      it('should copy React Native Hermes build scripts to Hermes source directory', () => {
+        copyBuildScripts();
+
+        [
+          'build-apple-framework.sh',
+          'build-ios-framework.sh',
+          'build-mac-framework.sh',
+        ].forEach(buildScript => {
+          expect(
+            fs.readFileSync(
+              path.join(ROOT_DIR, 'sdks/hermes/utils', buildScript),
+              {
+                encoding: 'utf8',
+                flag: 'r',
+              },
+            ),
+          ).toEqual(
+            fs.readFileSync(
+              path.join(ROOT_DIR, 'sdks/hermes-engine/utils', buildScript),
+              {
+                encoding: 'utf8',
+                flag: 'r',
+              },
+            ),
+          );
+        });
+      });
+    });
+    describe('copyPodSpec', () => {
+      it('should copy React Native Hermes Podspec to Hermes source directory', () => {
+        copyPodSpec();
+        expect(
+          fs.readFileSync(path.join(SDKS_DIR, 'hermes/hermes-engine.podspec'), {
+            encoding: 'utf8',
+            flag: 'r',
+          }),
+        ).toEqual(
+          fs.readFileSync(
+            path.join(SDKS_DIR, 'hermes-engine/hermes-engine.podspec'),
+            {
+              encoding: 'utf8',
+              flag: 'r',
+            },
+          ),
+        );
+      });
+      it('should copy hermes-utils.rb to Hermes source directory', () => {
+        copyPodSpec();
+        expect(
+          fs.readFileSync(path.join(SDKS_DIR, 'hermes/hermes-utils.rb'), {
+            encoding: 'utf8',
+            flag: 'r',
+          }),
+        ).toEqual(
+          fs.readFileSync(
+            path.join(SDKS_DIR, 'hermes-engine/hermes-utils.rb'),
+            {
+              encoding: 'utf8',
+              flag: 'r',
+            },
+          ),
+        );
+      });
+    });
+    describe('shouldUsePrebuiltHermesC', () => {
+      it('returns false if path to osx hermesc does not exist', () => {
+        expect(shouldUsePrebuiltHermesC('macos')).toBeFalsy();
+      });
+      it('returns false for non-macOS', () => {
+        expect(shouldUsePrebuiltHermesC('windows')).toBeFalsy();
+      });
+      it('return true only if path to hermesc exists', () => {
+        fs.mkdirSync(path.join(SDKS_DIR, 'hermesc/osx-bin'), {
+          recursive: true,
+        });
+        fs.writeFileSync(
+          path.join(SDKS_DIR, 'hermesc/osx-bin/hermesc'),
+          hermescContents,
+        );
+        expect(shouldUsePrebuiltHermesC('macos')).toBe(true);
+      });
+    });
+
+    describe('configureMakeForPrebuiltHermesC', () => {
+      it('creates ImportHermesC file', () => {
+        fs.mkdirSync(path.join(SDKS_DIR, 'hermesc/osx-bin'), {
+          recursive: true,
+        });
+        configureMakeForPrebuiltHermesC();
+        expect(
+          fs.existsSync(
+            path.join(SDKS_DIR, 'hermesc/osx-bin/ImportHermesc.cmake'),
+          ),
+        ).toBe(true);
+      });
+    });
+  });
+
+  describe('Packaging Hermes', () => {
+    beforeEach(() => {
+      populateMockFilesystemWithHermesBuildArtifacts();
+    });
+
+    describe('createTarballFromDirectory', () => {
+      it('should create the tarball', () => {
+        fs.mkdirSync(path.join(SDKS_DIR, 'downloads'), {recursive: true});
+        const tarballFilename = path.join(
+          SDKS_DIR,
+          'downloads/hermes-runtime-darwin.tar.gz',
+        );
+        createTarballFromDirectory(
+          path.join(SDKS_DIR, 'hermes/destroot'),
+          tarballFilename,
+        );
+        expect(spawnCalls.tar).toBe(true);
+        expect(fs.existsSync(tarballFilename)).toBe(true);
+      });
+    });
+
+    describe('getHermesPrebuiltArtifactsTarballName', () => {
+      it('should return Hermes prebuilts tarball name', () => {
+        expect(getHermesPrebuiltArtifactsTarballName('Debug')).toEqual(
+          'hermes-ios-debug.tar.gz',
+        );
+      });
+      it('should throw if build type is undefined', () => {
+        expect(() => {
+          getHermesPrebuiltArtifactsTarballName();
+        }).toThrow('Did not specify build type.');
+      });
+    });
+
+    describe('createHermesPrebuiltArtifactsTarball', () => {
+      it('creates tarball', () => {
+        const tarballOutputDir = fs.mkdtempSync(
+          path.join(os.tmpdir(), 'hermes-prebuilts-'),
+        );
+        fs.mkdirSync(tarballOutputDir, {
+          recursive: true,
+        });
+
+        const excludeDebugSymbols = false;
+        const tarballOutputPath = createHermesPrebuiltArtifactsTarball(
+          path.join(SDKS_DIR, 'hermes'),
+          'Debug',
+          tarballOutputDir,
+          excludeDebugSymbols,
+        );
+        expect(fs.existsSync(tarballOutputPath)).toBe(true);
+        expect(spawnCalls.rsync).toBe(true);
+        // rsync -a src dest
+        expect(spawnCalls.rsyncArgs.length).toEqual(3);
+      });
+
+      it('creates tarball with debug symbols excluded', () => {
+        const tarballOutputDir = fs.mkdtempSync(
+          path.join(os.tmpdir(), 'hermes-prebuilts-'),
+        );
+        fs.mkdirSync(tarballOutputDir, {
+          recursive: true,
+        });
+
+        const excludeDebugSymbols = true;
+        const tarballOutputPath = createHermesPrebuiltArtifactsTarball(
+          path.join(SDKS_DIR, 'hermes'),
+          'Debug',
+          tarballOutputDir,
+          excludeDebugSymbols,
+        );
+        expect(fs.existsSync(tarballOutputPath)).toBe(true);
+        expect(spawnCalls.rsync).toBe(true);
+
+        // When the debug symbols are excluded, we pass an additional two parameters to rsync:
+        // rsync -a --exclude=dSYMs/ --exclude=*.dSYM/ src dest
+        expect(spawnCalls.rsyncArgs.length).toEqual(5);
+        expect(spawnCalls.rsyncArgs[1]).toEqual('--exclude=dSYMs/');
+        expect(spawnCalls.rsyncArgs[2]).toEqual('--exclude=*.dSYM/');
+      });
+    });
+  });
+});
diff --git a/scripts/hermes/create-tarball.js b/scripts/hermes/create-tarball.js
new file mode 100644
index 000000000000..29f6c1f416da
--- /dev/null
+++ b/scripts/hermes/create-tarball.js
@@ -0,0 +1,74 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+
+/**
+ * This script creates a Hermes prebuilt artifacts tarball.
+ * Must be invoked after Hermes has been built.
+ */
+const yargs = require('yargs');
+const {createHermesPrebuiltArtifactsTarball} = require('./hermes-utils');
+
+let argv = yargs
+  .option('i', {
+    alias: 'inputDir',
+    describe: 'Path to directory where Hermes build artifacts were generated.',
+  })
+  .option('b', {
+    alias: 'buildType',
+    type: 'string',
+    describe: 'Specifies whether Hermes was built for Debug or Release.',
+    default: 'Debug',
+  })
+  .option('o', {
+    alias: 'outputDir',
+    describe: 'Location where the tarball will be saved to.',
+  })
+  .option('exclude-debug-symbols', {
+    describe: 'Whether dSYMs should be excluded from the tarball.',
+    type: 'boolean',
+    default: true,
+  }).argv;
+
+async function main() {
+  const hermesDir = argv.inputDir;
+  const buildType = argv.buildType;
+  const excludeDebugSymbols = argv.excludeDebugSymbols;
+  let tarballOutputDir = argv.outputDir;
+
+  if (!tarballOutputDir) {
+    try {
+      tarballOutputDir = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'hermes-engine-tarball-'),
+      );
+    } catch (error) {
+      throw new Error(
+        `[Hermes] Failed to create temporary output directory: ${error}`,
+      );
+    }
+  }
+
+  const tarballOutputPath = createHermesPrebuiltArtifactsTarball(
+    hermesDir,
+    buildType,
+    tarballOutputDir,
+    excludeDebugSymbols,
+  );
+  console.log(tarballOutputPath);
+  return tarballOutputPath;
+}
+
+main().then(() => {
+  process.exit(0);
+});
diff --git a/scripts/hermes/get-tarball-name.js b/scripts/hermes/get-tarball-name.js
new file mode 100644
index 000000000000..acb7817d0bf7
--- /dev/null
+++ b/scripts/hermes/get-tarball-name.js
@@ -0,0 +1,34 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+/**
+ * This script returns the filename that would be used for a
+ * Hermes tarball for the given build type and release version.
+ */
+const yargs = require('yargs');
+const {getHermesPrebuiltArtifactsTarballName} = require('./hermes-utils');
+
+let argv = yargs.option('b', {
+  alias: 'buildType',
+  type: 'string',
+  describe: 'Specifies whether Hermes was built for Debug or Release.',
+  default: 'Debug',
+}).argv;
+
+async function main() {
+  const tarballName = getHermesPrebuiltArtifactsTarballName(argv.buildType);
+  console.log(tarballName);
+  return tarballName;
+}
+
+main().then(() => {
+  process.exit(0);
+});
diff --git a/scripts/hermes/hermes-utils.js b/scripts/hermes/hermes-utils.js
index 588c11c52e97..c55969ef8daf 100644
--- a/scripts/hermes/hermes-utils.js
+++ b/scripts/hermes/hermes-utils.js
@@ -10,14 +10,15 @@
 'use strict';
 
 const fs = require('fs');
+const os = require('os');
 const path = require('path');
-const {execSync} = require('child_process');
+const {execSync, spawnSync} = require('child_process');
 
 const SDKS_DIR = path.normalize(path.join(__dirname, '..', '..', 'sdks'));
 const HERMES_DIR = path.join(SDKS_DIR, 'hermes');
-const DEFAULT_HERMES_TAG = 'main';
 const HERMES_TAG_FILE_PATH = path.join(SDKS_DIR, '.hermesversion');
-const HERMES_TARBALL_BASE_URL = 'https://github.com/facebook/hermes/tarball/';
+const HERMES_SOURCE_TARBALL_BASE_URL =
+  'https://github.com/facebook/hermes/tarball/';
 const HERMES_TARBALL_DOWNLOAD_DIR = path.join(SDKS_DIR, 'download');
 const MACOS_BIN_DIR = path.join(SDKS_DIR, 'hermesc', 'osx-bin');
 const MACOS_HERMESC_PATH = path.join(MACOS_BIN_DIR, 'hermesc');
@@ -26,6 +27,17 @@ const MACOS_IMPORT_HERMESC_PATH = path.join(
   'ImportHermesc.cmake',
 );
 
+/**
+ * Delegate execution to the supplied command.
+ *
+ * @param command Path to the command.
+ * @param args Array of arguments pass to the command.
+ * @param options child process options.
+ */
+function delegateSync(command, args, options) {
+  return spawnSync(command, args, {stdio: 'inherit', ...options});
+}
+
 function readHermesTag() {
   if (fs.existsSync(HERMES_TAG_FILE_PATH)) {
     const data = fs
@@ -71,11 +83,11 @@ function getHermesTarballDownloadPath(hermesTag) {
   return path.join(HERMES_TARBALL_DOWNLOAD_DIR, `hermes-${hermesTagSHA}.tgz`);
 }
 
-function downloadHermesTarball() {
+function downloadHermesSourceTarball() {
   const hermesTag = readHermesTag();
   const hermesTagSHA = getHermesTagSHA(hermesTag);
   const hermesTarballDownloadPath = getHermesTarballDownloadPath(hermesTag);
-  let hermesTarballUrl = HERMES_TARBALL_BASE_URL + hermesTag;
+  let hermesTarballUrl = HERMES_SOURCE_TARBALL_BASE_URL + hermesTag;
 
   if (fs.existsSync(hermesTarballDownloadPath)) {
     return;
@@ -89,13 +101,13 @@ function downloadHermesTarball() {
     `[Hermes] Downloading Hermes source code for commit ${hermesTagSHA}`,
   );
   try {
-    execSync(`curl ${hermesTarballUrl} -Lo ${hermesTarballDownloadPath}`);
+    delegateSync('curl', [hermesTarballUrl, '-Lo', hermesTarballDownloadPath]);
   } catch (error) {
     throw new Error(`[Hermes] Failed to download Hermes tarball. ${error}`);
   }
 }
 
-function expandHermesTarball() {
+function expandHermesSourceTarball() {
   const hermesTag = readHermesTag();
   const hermesTagSHA = getHermesTagSHA(hermesTag);
   const hermesTarballDownloadPath = getHermesTarballDownloadPath(hermesTag);
@@ -109,9 +121,13 @@ function expandHermesTarball() {
   }
   console.info(`[Hermes] Expanding Hermes tarball for commit ${hermesTagSHA}`);
   try {
-    execSync(
-      `tar -zxf ${hermesTarballDownloadPath} --strip-components=1 --directory ${HERMES_DIR}`,
-    );
+    delegateSync('tar', [
+      '-zxf',
+      hermesTarballDownloadPath,
+      '--strip-components=1',
+      '--directory',
+      HERMES_DIR,
+    ]);
   } catch (error) {
     throw new Error('[Hermes] Failed to expand Hermes tarball.');
   }
@@ -152,9 +168,15 @@ function copyPodSpec() {
   if (!fs.existsSync(HERMES_DIR)) {
     fs.mkdirSync(HERMES_DIR, {recursive: true});
   }
+  const podspec = 'hermes-engine.podspec';
+  fs.copyFileSync(
+    path.join(SDKS_DIR, 'hermes-engine', podspec),
+    path.join(HERMES_DIR, podspec),
+  );
+  const utils = 'hermes-utils.rb';
   fs.copyFileSync(
-    path.join(SDKS_DIR, 'hermes-engine', 'hermes-engine.podspec'),
-    path.join(HERMES_DIR, 'hermes-engine.podspec'),
+    path.join(SDKS_DIR, 'hermes-engine', utils),
+    path.join(HERMES_DIR, utils),
   );
 }
 
@@ -162,54 +184,12 @@ function isTestingAgainstLocalHermesTarball() {
   return 'HERMES_ENGINE_TARBALL_PATH' in process.env;
 }
 
-function isOnAReactNativeReleaseBranch() {
-  try {
-    let currentBranch = execSync('git rev-parse --abbrev-ref HEAD')
-      .toString()
-      .trim();
-    let currentRemote = execSync('git config --get remote.origin.url')
-      .toString()
-      .trim();
-    return (
-      currentBranch.endsWith('-stable') &&
-      currentRemote.endsWith('facebook/react-native.git')
-    );
-  } catch (error) {
-    // If not inside a git repo, we're going to fail here and return.
-    return false;
-  }
+function shouldBuildHermesFromSource(isInCI) {
+  return !isTestingAgainstLocalHermesTarball() && isInCI;
 }
 
-function isOnAReactNativeReleaseTag() {
-  try {
-    // If on a named tag, this method will return the tag name.
-    // If not, it will throw as the return code is not 0.
-    execSync('git describe --exact-match HEAD', {stdio: 'ignore'});
-  } catch (error) {
-    return false;
-  }
-  let currentRemote = execSync('git config --get remote.origin.url')
-    .toString()
-    .trim();
-  return currentRemote.endsWith('facebook/react-native.git');
-}
-
-function isRequestingLatestCommitFromHermesMainBranch() {
-  const hermesTag = readHermesTag();
-  return hermesTag === DEFAULT_HERMES_TAG;
-}
-
-function shouldBuildHermesFromSource() {
-  return (
-    !isTestingAgainstLocalHermesTarball() &&
-    (isOnAReactNativeReleaseBranch() ||
-      isOnAReactNativeReleaseTag() ||
-      isRequestingLatestCommitFromHermesMainBranch())
-  );
-}
-
-function shouldUsePrebuiltHermesC(os) {
-  if (os === 'macos') {
+function shouldUsePrebuiltHermesC(platform) {
+  if (platform === 'macos') {
     return fs.existsSync(MACOS_HERMESC_PATH);
   }
 
@@ -232,13 +212,108 @@ set_target_properties(native-hermesc PROPERTIES
   }
 }
 
+function getHermesPrebuiltArtifactsTarballName(buildType) {
+  if (!buildType) {
+    throw Error('Did not specify build type.');
+  }
+  return `hermes-ios-${buildType.toLowerCase()}.tar.gz`;
+}
+
+/**
+ * Creates a tarball with the contents of the supplied directory.
+ */
+function createTarballFromDirectory(directory, filename) {
+  const args = ['-C', directory, '-czvf', filename, '.'];
+  delegateSync('tar', args);
+}
+
+function createHermesPrebuiltArtifactsTarball(
+  hermesDir,
+  buildType,
+  tarballOutputDir,
+  excludeDebugSymbols,
+) {
+  validateHermesFrameworksExist(path.join(hermesDir, 'destroot'));
+
+  if (!fs.existsSync(tarballOutputDir)) {
+    fs.mkdirSync(tarballOutputDir, {recursive: true});
+  }
+
+  let tarballTempDir;
+  try {
+    tarballTempDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), 'hermes-engine-destroot-'),
+    );
+
+    let args = ['-a'];
+    if (excludeDebugSymbols) {
+      args.push('--exclude=dSYMs/');
+      args.push('--exclude=*.dSYM/');
+    }
+    args.push('./destroot');
+    args.push(tarballTempDir);
+    delegateSync('rsync', args, {
+      cwd: hermesDir,
+    });
+    if (fs.existsSync(path.join(hermesDir, 'LICENSE'))) {
+      delegateSync('cp', ['LICENSE', tarballTempDir], {cwd: hermesDir});
+    }
+  } catch (error) {
+    throw new Error(`Failed to copy destroot to tempdir: ${error}`);
+  }
+
+  const tarballFilename = path.join(
+    tarballOutputDir,
+    getHermesPrebuiltArtifactsTarballName(buildType),
+  );
+
+  try {
+    createTarballFromDirectory(tarballTempDir, tarballFilename);
+  } catch (error) {
+    throw new Error(`[Hermes] Failed to create tarball: ${error}`);
+  }
+
+  if (!fs.existsSync(tarballFilename)) {
+    throw new Error(
+      `Tarball creation failed, could not locate tarball at ${tarballFilename}`,
+    );
+  }
+
+  return tarballFilename;
+}
+
+function validateHermesFrameworksExist(destrootDir) {
+  if (
+    !fs.existsSync(
+      path.join(destrootDir, 'Library/Frameworks/macosx/hermes.framework'),
+    )
+  ) {
+    throw new Error(
+      'Error: Hermes macOS Framework not found. Are you sure Hermes has been built?',
+    );
+  }
+  if (
+    !fs.existsSync(
+      path.join(destrootDir, 'Library/Frameworks/universal/hermes.xcframework'),
+    )
+  ) {
+    throw new Error(
+      'Error: Hermes iOS XCFramework not found. Are you sure Hermes has been built?',
+    );
+  }
+}
+
 module.exports = {
   configureMakeForPrebuiltHermesC,
   copyBuildScripts,
   copyPodSpec,
-  downloadHermesTarball,
-  expandHermesTarball,
+  createHermesPrebuiltArtifactsTarball,
+  createTarballFromDirectory,
+  downloadHermesSourceTarball,
+  expandHermesSourceTarball,
   getHermesTagSHA,
+  getHermesTarballDownloadPath,
+  getHermesPrebuiltArtifactsTarballName,
   readHermesTag,
   setHermesTag,
   shouldBuildHermesFromSource,
diff --git a/scripts/hermes/prepare-hermes-for-build.js b/scripts/hermes/prepare-hermes-for-build.js
index 29a5d9ae27ad..711de87d90b5 100644
--- a/scripts/hermes/prepare-hermes-for-build.js
+++ b/scripts/hermes/prepare-hermes-for-build.js
@@ -17,20 +17,19 @@ const {
   configureMakeForPrebuiltHermesC,
   copyBuildScripts,
   copyPodSpec,
-  downloadHermesTarball,
-  expandHermesTarball,
+  downloadHermesSourceTarball,
+  expandHermesSourceTarball,
   shouldUsePrebuiltHermesC,
   shouldBuildHermesFromSource,
 } = require('./hermes-utils');
 
-async function main() {
-  if (!shouldBuildHermesFromSource()) {
+async function main(isInCI) {
+  if (!shouldBuildHermesFromSource(isInCI)) {
     copyPodSpec();
     return;
   }
-
-  downloadHermesTarball();
-  expandHermesTarball();
+  downloadHermesSourceTarball();
+  expandHermesSourceTarball();
   copyPodSpec();
   copyBuildScripts();
 
@@ -40,6 +39,8 @@ async function main() {
   }
 }
 
-main().then(() => {
+const isInCI = process.env.REACT_NATIVE_CI === 'true';
+
+main(isInCI).then(() => {
   process.exit(0);
 });
diff --git a/scripts/native_modules.rb b/scripts/native_modules.rb
new file mode 100644
index 000000000000..729035ddd91d
--- /dev/null
+++ b/scripts/native_modules.rb
@@ -0,0 +1,6 @@
+# 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_relative '../../@react-native-community/cli-platform-ios/native_modules'
diff --git a/scripts/packager.sh b/scripts/packager.sh
index b9f90160f1ae..acb158125786 100755
--- a/scripts/packager.sh
+++ b/scripts/packager.sh
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree.
 
 # scripts directory
-THIS_DIR=$(cd -P "$(dirname "$(realpath "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 REACT_NATIVE_ROOT="$THIS_DIR/.."
 # Application root directory - General use case: react-native is a dependency
 PROJECT_ROOT="$THIS_DIR/../../.."
diff --git a/scripts/prepare-package-for-release.js b/scripts/prepare-package-for-release.js
index 845303ff8e06..2a61023caef8 100755
--- a/scripts/prepare-package-for-release.js
+++ b/scripts/prepare-package-for-release.js
@@ -21,6 +21,7 @@
 const {echo, exec, exit} = require('shelljs');
 const yargs = require('yargs');
 const {isReleaseBranch, parseVersion} = require('./version-utils');
+const {failIfTagExists} = require('./release-utils');
 
 const argv = yargs
   .option('r', {
@@ -36,25 +37,46 @@ const argv = yargs
     alias: 'latest',
     type: 'boolean',
     default: false,
+  })
+  .option('d', {
+    alias: 'dry-run',
+    type: 'boolean',
+    default: false,
   }).argv;
 
 const branch = process.env.CIRCLE_BRANCH;
 const remote = argv.remote;
 const releaseVersion = argv.toVersion;
 const isLatest = argv.latest;
+const isDryRun = argv.dryRun;
+
+const buildType = isDryRun
+  ? 'dry-run'
+  : isReleaseBranch(branch)
+  ? 'release'
+  : 'nightly';
 
-if (!isReleaseBranch(branch)) {
+failIfTagExists(releaseVersion, buildType);
+
+if (branch && !isReleaseBranch(branch) && !isDryRun) {
   console.error(`This needs to be on a release branch. On branch: ${branch}`);
   exit(1);
+} else if (!branch && !isDryRun) {
+  console.error('This needs to be on a release branch.');
+  exit(1);
 }
 
-const {version} = parseVersion(releaseVersion);
+const {version} = parseVersion(releaseVersion, buildType);
 if (version == null) {
   console.error(`Invalid version provided: ${releaseVersion}`);
   exit(1);
 }
 
-if (exec(`node scripts/set-rn-version.js --to-version ${version}`).code) {
+if (
+  exec(
+    `node scripts/set-rn-version.js --to-version ${version} --build-type ${buildType}`,
+  ).code
+) {
   echo(`Failed to set React Native version to ${version}`);
   exit(1);
 }
@@ -67,6 +89,12 @@ if (exec('source scripts/update_podfile_lock.sh && update_pods').code) {
   exit(1);
 }
 
+echo(`Local checkout has been prepared for release version ${version}.`);
+if (isDryRun) {
+  echo('Changes will not be committed because --dry-run was set to true.');
+  exit(0);
+}
+
 // Make commit [0.21.0-rc] Bump version numbers
 if (exec(`git commit -a -m "[${version}] Bump version numbers"`).code) {
   echo('failed to commit');
diff --git a/scripts/publish-npm.js b/scripts/publish-npm.js
index 156c896f2cb3..3cf96f5f1783 100755
--- a/scripts/publish-npm.js
+++ b/scripts/publish-npm.js
@@ -31,8 +31,18 @@
  *     * or otherwise `{major}.{minor}-stable`
  */
 
-const {exec, echo, exit, test, env} = require('shelljs');
-const {parseVersion, isTaggedLatest} = require('./version-utils');
+const {exec, echo, exit} = require('shelljs');
+const {parseVersion} = require('./version-utils');
+const {
+  exitIfNotOnGit,
+  getCurrentCommit,
+  isTaggedLatest,
+} = require('./scm-utils');
+const {
+  generateAndroidArtifacts,
+  publishAndroidArtifactsToMaven,
+  saveFilesToRestore,
+} = require('./release-utils');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
@@ -40,6 +50,9 @@ const yargs = require('yargs');
 
 const buildTag = process.env.CIRCLE_TAG;
 const otp = process.env.NPM_CONFIG_OTP;
+const tmpPublishingFolder = fs.mkdtempSync(
+  path.join(os.tmpdir(), 'rn-publish-'),
+);
 
 const argv = yargs
   .option('n', {
@@ -52,75 +65,31 @@ const argv = yargs
     type: 'boolean',
     default: false,
   })
-  .option('h', {
-    alias: 'include-hermes',
+  .option('r', {
+    alias: 'release',
     type: 'boolean',
     default: false,
-  }).argv;
+  })
+  .strict().argv;
 const nightlyBuild = argv.nightly;
 const dryRunBuild = argv.dryRun;
-const includeHermes = argv.includeHermes;
+const releaseBuild = argv.release;
 const isCommitly = nightlyBuild || dryRunBuild;
 
-if (includeHermes) {
-  const HERMES_INSTALL_LOCATION = 'sdks';
-  const HERMES_SOURCE_DEST_PATH = `${HERMES_INSTALL_LOCATION}/hermes`;
-
-  let hermesReleaseTag;
-  let hermesReleaseURI;
-  if (isCommitly) {
-    // use latest commit / tarball
-    hermesReleaseURI = 'https://github.com/facebook/hermes/tarball/main';
-  } else {
-    // use one configured in disk
-    fs.readFile(
-      `${HERMES_INSTALL_LOCATION}/.hermesversion`,
-      {
-        encoding: 'utf8',
-        flag: 'r',
-      },
-      function (err, data) {
-        if (err) {
-          echo('Failed to read current Hermes release tag.');
-          // TODO: We'll need to make sure every release going forward has one of these.
-          exit(1);
-        } else {
-          hermesReleaseTag = data.trim();
-          hermesReleaseURI = `https://github.com/facebook/hermes/archive/refs/tags/${hermesReleaseTag}.tar.gz`;
-        }
-      },
-    );
-  }
+const buildType = releaseBuild
+  ? 'release'
+  : nightlyBuild
+  ? 'nightly'
+  : 'dry-run';
 
-  const tmpDownloadDir = fs.mkdtempSync(
-    path.join(os.tmpdir(), 'hermes-tarball'),
-  );
-  const tmpExtractDir = fs.mkdtempSync(path.join(os.tmpdir(), 'hermes'));
-
-  const hermesInstallScript = `
-    mkdir -p ${HERMES_SOURCE_DEST_PATH} && \
-    wget ${hermesReleaseURI} -O ${tmpDownloadDir}/hermes.tar.gz && \
-    tar -xzf ${tmpDownloadDir}/hermes.tar.gz -C ${tmpExtractDir} && \
-    HERMES_SOURCE_EXTRACT_PATH=$(ls -d ${tmpExtractDir}/*) && \
-    mv $HERMES_SOURCE_EXTRACT_PATH ${HERMES_SOURCE_DEST_PATH}
-  `;
-
-  if (fs.existsSync(`${HERMES_SOURCE_DEST_PATH}`)) {
-    if (exec(`rm -rf ./${HERMES_SOURCE_DEST_PATH}`).code) {
-      echo('Failed to clean up previous Hermes installation.');
-      exit(1);
-    }
-  }
-  if (exec(hermesInstallScript).code) {
-    echo('Failed to include Hermes in release.');
-    exit(1);
-  }
+if (!argv.help) {
+  echo(`The temp publishing folder is ${tmpPublishingFolder}`);
 }
 
+saveFilesToRestore(tmpPublishingFolder);
+
 // 34c034298dc9cad5a4553964a5a324450fda0385
-const currentCommit = exec('git rev-parse HEAD', {
-  silent: true,
-}).stdout.trim();
+const currentCommit = getCurrentCommit();
 const shortCommit = currentCommit.slice(0, 9);
 
 const rawVersion =
@@ -138,7 +107,7 @@ let version,
   minor,
   prerelease = null;
 try {
-  ({version, major, minor, prerelease} = parseVersion(rawVersion));
+  ({version, major, minor, prerelease} = parseVersion(rawVersion, buildType));
 } catch (e) {
   echo(e.message);
   exit(1);
@@ -163,53 +132,20 @@ if (dryRunBuild) {
 // For stable, pre-release releases, we rely on CircleCI job `prepare_package_for_release` to handle this
 if (isCommitly) {
   if (
-    exec(`node scripts/set-rn-version.js --to-version ${releaseVersion}`).code
+    exec(
+      `node scripts/set-rn-version.js --to-version ${releaseVersion} --build-type ${buildType}`,
+    ).code
   ) {
     echo(`Failed to set version number to ${releaseVersion}`);
     exit(1);
   }
 }
 
-// -------- Generating Android Artifacts
-if (exec('./gradlew :ReactAndroid:installArchives').code) {
-  echo('Could not generate artifacts');
-  exit(1);
-}
-
-// -------- Generating the Hermes Engine Artifacts
-env.REACT_NATIVE_HERMES_SKIP_PREFAB = true;
-if (exec('./gradlew :ReactAndroid:hermes-engine:installArchives').code) {
-  echo('Could not generate artifacts');
-  exit(1);
-}
-
-// undo uncommenting javadoc setting
-exec('git checkout ReactAndroid/gradle.properties');
-
-echo('Generated artifacts for Maven');
-
-let artifacts = [
-  '.module',
-  '.pom',
-  '-debug.aar',
-  '-release.aar',
-  '-debug-sources.jar',
-  '-release-sources.jar',
-].map(suffix => {
-  return `react-native-${releaseVersion}${suffix}`;
-});
+generateAndroidArtifacts(releaseVersion, tmpPublishingFolder);
 
-artifacts.forEach(name => {
-  if (
-    !test(
-      '-e',
-      `./android/com/facebook/react/react-native/${releaseVersion}/${name}`,
-    )
-  ) {
-    echo(`Failing as expected file: ${name} was not correctly generated.`);
-    exit(1);
-  }
-});
+// Write version number to the build folder
+const releaseVersionFile = path.join('build', '.version');
+fs.writeFileSync(releaseVersionFile, releaseVersion);
 
 if (dryRunBuild) {
   echo('Skipping `npm publish` because --dry-run is set.');
@@ -217,7 +153,14 @@ if (dryRunBuild) {
 }
 
 // Running to see if this commit has been git tagged as `latest`
-const isLatest = isTaggedLatest(currentCommit);
+const isLatest = exitIfNotOnGit(
+  () => isTaggedLatest(currentCommit),
+  'Not in git. We do not want to publish anything',
+);
+
+// We first publish on Maven Central all the necessary artifacts.
+// NPM publishing is done just after.
+publishAndroidArtifactsToMaven(releaseVersion, nightlyBuild);
 
 const releaseBranch = `${major}.${minor}-stable`;
 
diff --git a/scripts/react-native-xcode.sh b/scripts/react-native-xcode.sh
index 7fb2a3d001c6..30a5ac2227af 100755
--- a/scripts/react-native-xcode.sh
+++ b/scripts/react-native-xcode.sh
@@ -13,7 +13,7 @@ set -x
 DEST=$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH
 
 # Enables iOS devices to get the IP address of the machine running Metro
-if [[ "$CONFIGURATION" = *Debug* && ! "$PLATFORM_NAME" == *simulator ]]; then
+if [[ ! "$SKIP_BUNDLING_METRO_IP" && "$CONFIGURATION" = *Debug* && ! "$PLATFORM_NAME" == *simulator ]]; then
   for num in 0 1 2 3 4 5 6 7 8; do
     IP=$(ipconfig getifaddr en${num})
     if [ ! -z "$IP" ]; then
@@ -78,13 +78,24 @@ fi
 # shellcheck source=/dev/null
 source "$REACT_NATIVE_DIR/scripts/node-binary.sh"
 
+# If hermes-engine is in the Podfile.lock, it means that Hermes is a dependency of the project
+# and it is enabled. If not, it means that hermes is disabled.
+HERMES_ENABLED=$(grep hermes-engine $PODS_PODFILE_DIR_PATH/Podfile.lock)
+
+# If hermes-engine is not in the Podfile.lock, it means that the app is not using Hermes.
+# Setting USE_HERMES is no the only way to set whether the app can use hermes or not: users
+# can also modify manually the Podfile.
+if [[ -z "$HERMES_ENABLED" ]]; then
+  USE_HERMES=false
+fi
+
 HERMES_ENGINE_PATH="$PODS_ROOT/hermes-engine"
 [ -z "$HERMES_CLI_PATH" ] && HERMES_CLI_PATH="$HERMES_ENGINE_PATH/destroot/bin/hermesc"
 
 # Hermes is enabled in new projects by default, so we cannot assume that USE_HERMES=1 is set as an envvar.
 # If hermes-engine is found in Pods, we can assume Hermes has not been disabled.
 # If hermesc is not available and USE_HERMES is either unset or true, show error.
-if [[  -f "$HERMES_ENGINE_PATH" && ! -f "$HERMES_CLI_PATH" ]]; then
+if [[  ! -z "$HERMES_ENABLED" && -f "$HERMES_ENGINE_PATH" && ! -f "$HERMES_CLI_PATH" ]]; then
   echo "error: Hermes is enabled but the hermesc binary could not be found at ${HERMES_CLI_PATH}." \
        "Perhaps you need to run 'bundle exec pod install' or otherwise " \
        "point the HERMES_CLI_PATH variable to your custom location." >&2
@@ -129,7 +140,7 @@ fi
 
 PACKAGER_SOURCEMAP_FILE=
 if [[ $EMIT_SOURCEMAP == true ]]; then
-  if [[ $USE_HERMES == true ]]; then
+  if [[ $USE_HERMES != false ]]; then
     PACKAGER_SOURCEMAP_FILE="$CONFIGURATION_BUILD_DIR/$(basename $SOURCEMAP_FILE)"
   else
     PACKAGER_SOURCEMAP_FILE="$SOURCEMAP_FILE"
@@ -138,7 +149,7 @@ if [[ $EMIT_SOURCEMAP == true ]]; then
 fi
 
 # Hermes doesn't require JS minification.
-if [[ $USE_HERMES == true && $DEV == false ]]; then
+if [[ $USE_HERMES != false && $DEV == false ]]; then
   EXTRA_ARGS="$EXTRA_ARGS --minify false"
 fi
 
@@ -153,7 +164,7 @@ fi
   $EXTRA_ARGS \
   $EXTRA_PACKAGER_ARGS
 
-if [[ $USE_HERMES != true ]]; then
+if [[ $USE_HERMES == false ]]; then
   cp "$BUNDLE_FILE" "$DEST/"
   BUNDLE_FILE="$DEST/main.jsbundle"
 else
@@ -168,8 +179,10 @@ else
   fi
   "$HERMES_CLI_PATH" -emit-binary $EXTRA_COMPILER_ARGS -out "$DEST/main.jsbundle" "$BUNDLE_FILE"
   if [[ $EMIT_SOURCEMAP == true ]]; then
-    HBC_SOURCEMAP_FILE="$BUNDLE_FILE.map"
+    HBC_SOURCEMAP_FILE="$DEST/main.jsbundle.map"
     "$NODE_BINARY" "$COMPOSE_SOURCEMAP_PATH" "$PACKAGER_SOURCEMAP_FILE" "$HBC_SOURCEMAP_FILE" -o "$SOURCEMAP_FILE"
+    rm "$HBC_SOURCEMAP_FILE"
+    rm "$PACKAGER_SOURCEMAP_FILE"
   fi
   BUNDLE_FILE="$DEST/main.jsbundle"
 fi
diff --git a/scripts/react_native_pods.rb b/scripts/react_native_pods.rb
index 3d86c4f3de4e..5198f8058431 100644
--- a/scripts/react_native_pods.rb
+++ b/scripts/react_native_pods.rb
@@ -7,10 +7,11 @@
 require 'open3'
 require 'pathname'
 require_relative './react_native_pods_utils/script_phases.rb'
-require_relative './cocoapods/hermes.rb'
+require_relative './cocoapods/jsengine.rb'
 require_relative './cocoapods/flipper.rb'
 require_relative './cocoapods/fabric.rb'
 require_relative './cocoapods/codegen.rb'
+require_relative './cocoapods/codegen_utils.rb'
 require_relative './cocoapods/utils.rb'
 require_relative './cocoapods/new_architecture.rb'
 require_relative './cocoapods/local_podspec_patch.rb'
@@ -18,28 +19,64 @@
 $CODEGEN_OUTPUT_DIR = 'build/generated/ios'
 $CODEGEN_COMPONENT_DIR = 'react/renderer/components'
 $CODEGEN_MODULE_DIR = '.'
-$REACT_CODEGEN_PODSPEC_GENERATED = false
-$REACT_CODEGEN_DISCOVERY_DONE = false
+$FOLLY_VERSION = '2021.07.22.00'
 
 $START_TIME = Time.now.to_i
 
-def use_react_native! (options={})
-  # The prefix to react-native
-  prefix = options[:path] ||= "../node_modules/react-native"
-
-  # Include Fabric dependencies
-  fabric_enabled = options[:fabric_enabled] ||= false
-
-  # New arch enabled
-  new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+# This function returns the min iOS version supported by React Native
+# By using this function, you won't have to manualy change your Podfile
+# when we change the minimum version supported by the framework.
+def min_ios_version_supported
+  return '12.4'
+end
 
-  # Include DevSupport dependency
-  production = options[:production] ||= false
+# This function prepares the project for React Native, before processing
+# all the target exposed by the framework.
+def prepare_react_native_project!
+  # Temporary solution to suppress duplicated GUID error.
+  # Can be removed once we move to generate files outside pod install.
+  install! 'cocoapods', :deterministic_uuids => false
 
-  # Include Hermes dependencies
-  hermes_enabled = options[:hermes_enabled] != nil ? options[:hermes_enabled] : true
+  ReactNativePodsUtils.create_xcode_env_if_missing
+end
 
-  flipper_configuration = options[:flipper_configuration] ||= FlipperConfiguration.disabled
+# Function that setup all the react native dependencies
+# 
+# Parameters
+# - path: path to react_native installation.
+# - fabric_enabled: whether fabric should be enabled or not.
+# - new_arch_enabled: whether the new architecture should be enabled or not.
+# - production: whether the dependencies must be installed to target a Debug or a Release build.
+# - hermes_enabled: whether Hermes should be enabled or not.
+# - flipper_configuration: The configuration to use for flipper.
+# - app_path: path to the React Native app. Required by the New Architecture.
+# - config_file_dir: directory of the `package.json` file, required by the New Architecture.
+# - ios_folder: the folder where the iOS code base lives. For a template app, it is `ios`, the default. For RNTester, it is `.`.
+def use_react_native! (
+  path: "../node_modules/react-native",
+  fabric_enabled: false,
+  new_arch_enabled: ENV['RCT_NEW_ARCH_ENABLED'] == '1',
+  production: ENV['PRODUCTION'] == '1',
+  hermes_enabled: ENV['USE_HERMES'] && ENV['USE_HERMES'] == '0' ? false : true,
+  flipper_configuration: FlipperConfiguration.disabled,
+  app_path: '..',
+  config_file_dir: '',
+  ios_folder: 'ios'
+)
+
+  # Current target definition is provided by Cocoapods and it refers to the target
+  # that has invoked the `use_react_native!` function.
+  ReactNativePodsUtils.detect_use_frameworks(current_target_definition)
+
+  CodegenUtils.clean_up_build_folder(app_path, ios_folder, $CODEGEN_OUTPUT_DIR)
+
+  # We are relying on this flag also in third parties libraries to proper install dependencies.
+  # Better to rely and enable this environment flag if the new architecture is turned on using flags.
+  ENV['RCT_NEW_ARCH_ENABLED'] = new_arch_enabled ? "1" : "0"
+  fabric_enabled = fabric_enabled || new_arch_enabled
+  ENV['USE_HERMES'] = hermes_enabled ? "1" : "0"
+
+  prefix = path
 
   ReactNativePodsUtils.warn_if_not_on_arm64()
 
@@ -51,6 +88,7 @@ def use_react_native! (options={})
   pod 'React', :path => "#{prefix}/"
   pod 'React-Core', :path => "#{prefix}/"
   pod 'React-CoreModules', :path => "#{prefix}/React/CoreModules"
+  pod 'React-RCTAppDelegate', :path => "#{prefix}/Libraries/AppDelegate"
   pod 'React-RCTActionSheet', :path => "#{prefix}/Libraries/ActionSheetIOS"
   pod 'React-RCTAnimation', :path => "#{prefix}/Libraries/NativeAnimation"
   pod 'React-RCTBlob', :path => "#{prefix}/Libraries/Blob"
@@ -62,11 +100,17 @@ def use_react_native! (options={})
   pod 'React-RCTVibration', :path => "#{prefix}/Libraries/Vibration"
   pod 'React-Core/RCTWebSocket', :path => "#{prefix}/"
 
-  pod 'React-bridging', :path => "#{prefix}/ReactCommon"
   pod 'React-cxxreact', :path => "#{prefix}/ReactCommon/cxxreact"
-  pod 'React-jsi', :path => "#{prefix}/ReactCommon/jsi"
+
+  if hermes_enabled
+    setup_hermes!(:react_native_path => prefix, :fabric_enabled => fabric_enabled)
+  else
+    setup_jsc!(:react_native_path => prefix, :fabric_enabled => fabric_enabled)
+  end
+
   pod 'React-jsiexecutor', :path => "#{prefix}/ReactCommon/jsiexecutor"
   pod 'React-jsinspector', :path => "#{prefix}/ReactCommon/jsinspector"
+
   pod 'React-callinvoker', :path => "#{prefix}/ReactCommon/callinvoker"
   pod 'React-runtimeexecutor', :path => "#{prefix}/ReactCommon/runtimeexecutor"
   pod 'React-perflogger', :path => "#{prefix}/ReactCommon/reactperflogger"
@@ -79,31 +123,26 @@ def use_react_native! (options={})
   pod 'boost', :podspec => "#{prefix}/third-party-podspecs/boost.podspec"
   pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec", :modular_headers => true
 
-  if new_arch_enabled
-    app_path = options[:app_path]
-    config_file_dir = options[:config_file_dir]
-    use_react_native_codegen_discovery!({
-      react_native_path: prefix,
-      app_path: app_path,
-      fabric_enabled: fabric_enabled,
-      config_file_dir: config_file_dir,
-    })
-  else
-    # Generate a podspec file for generated files.
-    # This gets generated in use_react_native_codegen_discovery when codegen discovery is enabled.
-    react_codegen_spec = get_react_codegen_spec(fabric_enabled: fabric_enabled)
-    generate_react_codegen_podspec!(react_codegen_spec)
-  end
+  run_codegen!(
+    app_path,
+    config_file_dir,
+    :new_arch_enabled => new_arch_enabled,
+    :disable_codegen => ENV['DISABLE_CODEGEN'] == '1',
+    :react_native_path => prefix,
+    :fabric_enabled => fabric_enabled,
+    :hermes_enabled => hermes_enabled,
+    :codegen_output_dir => $CODEGEN_OUTPUT_DIR,
+    :package_json_file => File.join(__dir__, "..", "package.json"),
+    :folly_version => $FOLLY_VERSION
+  )
 
   pod 'React-Codegen', :path => $CODEGEN_OUTPUT_DIR, :modular_headers => true
 
   if fabric_enabled
     checkAndGenerateEmptyThirdPartyProvider!(prefix, new_arch_enabled, $CODEGEN_OUTPUT_DIR)
-    setup_fabric!(prefix)
+    setup_fabric!(:react_native_path => prefix)
   end
 
-  install_hermes_if_enabled(hermes_enabled, prefix)
-
   # CocoaPods `configurations` option ensures that the target is copied only for the specified configurations,
   # but those dependencies are still built.
   # Flipper doesn't currently compile for release https://github.com/facebook/react-native/issues/33764
@@ -123,253 +162,79 @@ def use_react_native! (options={})
   end
 end
 
+# Getter to retrieve the folly flags in case contributors need to apply them manually.
+#
+# Returns: the folly compiler flags
+def folly_flags()
+  return NewArchitectureHelper.folly_compiler_flags
+end
+
+# This function can be used by library developer to prepare their modules for the New Architecture.
+# It passes the Folly Flags to the module, it configures the search path and installs some New Architecture specific dependencies.
+#
+# Parameters:
+# - spec: The spec that has to be configured with the New Architecture code
+# - new_arch_enabled: Whether the module should install dependencies for the new architecture
+def install_modules_dependencies(spec, new_arch_enabled: ENV['RCT_NEW_ARCH_ENABLED'] == "1")
+  NewArchitectureHelper.install_modules_dependencies(spec, new_arch_enabled, $FOLLY_VERSION)
+end
+
+# It returns the default flags.
 def get_default_flags()
   return ReactNativePodsUtils.get_default_flags()
 end
 
+# It installs the flipper dependencies into the project.
+#
+# Parameters
+# - versions: a dictionary of Flipper Library -> Versions that can be used to customize which version of Flipper to install.
+# - configurations: an array of configuration where to install the dependencies.
 def use_flipper!(versions = {}, configurations: ['Debug'])
   Pod::UI.warn "use_flipper is deprecated, use the flipper_configuration option in the use_react_native function"
   use_flipper_pods(versions, :configurations => configurations)
 end
 
+# Function that executes after React Native has been installed to configure some flags and build settings.
+#
+# Parameters
+# - installer: the Cocoapod object that allows to customize the project.
+# - react_native_path: path to React Native.
+# - mac_catalyst_enabled: whether we are running the Pod on a Mac Catalyst project or not.
 def react_native_post_install(installer, react_native_path = "../node_modules/react-native", mac_catalyst_enabled: false)
+  ReactNativePodsUtils.turn_off_resource_bundle_react_core(installer)
+
   ReactNativePodsUtils.apply_mac_catalyst_patches(installer) if mac_catalyst_enabled
 
   if ReactNativePodsUtils.has_pod(installer, 'Flipper')
     flipper_post_install(installer)
   end
 
+  package = JSON.parse(File.read(File.join(react_native_path, "package.json")))
+  version = package['version']
+
+  if ReactNativePodsUtils.has_pod(installer, 'hermes-engine') && is_building_hermes_from_source(version, react_native_path)
+    add_copy_hermes_framework_script_phase(installer, react_native_path)
+  else
+    remove_copy_hermes_framework_script_phase(installer, react_native_path)
+    remove_hermesc_build_dir(react_native_path)
+  end
+
   ReactNativePodsUtils.exclude_i386_architecture_while_using_hermes(installer)
   ReactNativePodsUtils.fix_library_search_paths(installer)
   ReactNativePodsUtils.set_node_modules_user_settings(installer, react_native_path)
 
   NewArchitectureHelper.set_clang_cxx_language_standard_if_needed(installer)
-  is_new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+  is_new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == "1"
   NewArchitectureHelper.modify_flags_for_new_architecture(installer, is_new_arch_enabled)
 
   Pod::UI.puts "Pod install took #{Time.now.to_i - $START_TIME} [s] to run".green
 end
 
-def get_react_codegen_spec(options={})
-  fabric_enabled = options[:fabric_enabled] ||= false
-  script_phases = options[:script_phases] ||= nil
-
-  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_version = '1.76.0'
-  boost_compiler_flags = '-Wno-documentation'
-
-  spec = {
-    'name' => "React-Codegen",
-    'version' => version,
-    'summary' => 'Temp pod for generated files for React Native',
-    'homepage' => 'https://facebook.com/',
-    'license' => 'Unlicense',
-    'authors' => 'Facebook',
-    'compiler_flags'  => "#{folly_compiler_flags} #{boost_compiler_flags} -Wno-nullability-completeness -std=c++17",
-    'source' => { :git => '' },
-    'header_mappings_dir' => './',
-    'platforms' => {
-      'ios' => '11.0',
-    },
-    'source_files' => "**/*.{h,mm,cpp}",
-    'pod_target_xcconfig' => { "HEADER_SEARCH_PATHS" =>
-      [
-        "\"$(PODS_ROOT)/boost\"",
-        "\"$(PODS_ROOT)/RCT-Folly\"",
-        "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
-        "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
-        "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
-      ].join(' ')
-    },
-    'dependencies': {
-      "FBReactNativeSpec":  [version],
-      "React-jsiexecutor":  [version],
-      "RCT-Folly": [folly_version],
-      "RCTRequired": [version],
-      "RCTTypeSafety": [version],
-      "React-Core": [version],
-      "React-jsi": [version],
-      "ReactCommon/turbomodule/core": [version]
-    }
-  }
-
-  if fabric_enabled
-    spec[:'dependencies'].merge!({
-      'React-graphics': [version],
-      'React-rncore':  [version],
-    });
-  end
-
-  if script_phases
-    Pod::UI.puts "[Codegen] Adding script_phases to React-Codegen."
-    spec[:'script_phases'] = script_phases
-  end
-
-  return spec
-end
-
-def get_codegen_config_from_file(config_path, config_key)
-  empty = {'libraries' => []}
-  if !File.exist?(config_path)
-    return empty
-  end
-
-  config = JSON.parse(File.read(config_path))
-  return config[config_key] ? config[config_key] : empty
-end
-
-def get_react_codegen_script_phases(options={})
-  app_path = options[:app_path] ||= ''
-  if !app_path
-    Pod::UI.warn '[Codegen] error: app_path is requried to use codegen discovery.'
-    exit 1
-  end
-
-  # We need to convert paths to relative path from installation_root for the script phase for CI.
-  relative_app_root = Pathname.new(app_path).realpath().relative_path_from(Pod::Config.instance.installation_root)
-
-  config_file_dir = options[:config_file_dir] ||= ''
-  relative_config_file_dir = ''
-  if config_file_dir != ''
-    relative_config_file_dir = Pathname.new(config_file_dir).relative_path_from(Pod::Config.instance.installation_root)
-  end
-
-  fabric_enabled = options[:fabric_enabled] ||= false
-
-  # react_native_path should be relative already.
-  react_native_path = options[:react_native_path] ||= "../node_modules/react-native"
-
-  # Generate input files for in-app libaraies which will be used to check if the script needs to be run.
-  # TODO: Ideally, we generate the input_files list from generate-artifacts.js and read the result here.
-  #       Or, generate this podspec in generate-artifacts.js as well.
-  config_key = options[:config_key] ||= 'codegenConfig'
-  app_package_path = File.join(app_path, 'package.json')
-  app_codegen_config = get_codegen_config_from_file(app_package_path, config_key)
-  file_list = []
-  if app_codegen_config['libraries'] then
-    Pod::UI.warn '[Deprecated] You are using the old `libraries` array to list all your codegen.\nThis method will be removed in the future.\nUpdate your `package.json` with a single object.'
-    app_codegen_config['libraries'].each do |library|
-      library_dir = File.join(app_path, library['jsSrcsDir'])
-      file_list.concat (`find #{library_dir} -type f \\( -name "Native*.js" -or -name "*NativeComponent.js" \\)`.split("\n").sort)
-    end
-  elsif app_codegen_config['jsSrcsDir'] then
-    codegen_dir = File.join(app_path, app_codegen_config['jsSrcsDir'])
-    file_list.concat (`find #{codegen_dir} -type f \\( -name "Native*.js" -or -name "*NativeComponent.js" \\)`.split("\n").sort)
-  else
-    Pod::UI.warn '[Error] Codegen not properly configured. Please add the `codegenConf` entry to your `package.json`'
-    exit 1
-  end
-
-  input_files = file_list.map { |filename| "${PODS_ROOT}/../#{Pathname.new(filename).realpath().relative_path_from(Pod::Config.instance.installation_root)}" }
-
-  # Add a script phase to trigger generate artifact.
-  # Some code is duplicated so that it's easier to delete the old way and switch over to this once it's stabilized.
-  return {
-    'name': 'Generate Specs',
-    'execution_position': :before_compile,
-    'input_files' => input_files,
-    'show_env_vars_in_log': true,
-    'output_files': ["${DERIVED_FILE_DIR}/react-codegen.log"],
-    'script': get_script_phases_with_codegen_discovery(
-      react_native_path: react_native_path,
-      relative_app_root: relative_app_root,
-      relative_config_file_dir: relative_config_file_dir,
-      fabric_enabled: fabric_enabled
-    ),
-  }
-
-end
-
-def set_react_codegen_podspec_generated(value)
-  $REACT_CODEGEN_PODSPEC_GENERATED = value
-end
-
-def has_react_codegen_podspec_generated()
-  return $REACT_CODEGEN_PODSPEC_GENERATED
-end
-
-def generate_react_codegen_podspec!(spec)
-  # This podspec file should only be create once in the session/pod install.
-  # This happens when multiple targets are calling use_react_native!.
-  if has_react_codegen_podspec_generated()
-    Pod::UI.puts "[Codegen] Skipping React-Codegen podspec generation."
-    return
-  end
-  relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
-  output_dir = "#{relative_installation_root}/#{$CODEGEN_OUTPUT_DIR}"
-  Pod::Executable.execute_command("mkdir", ["-p", output_dir]);
-
-  podspec_path = File.join(output_dir, 'React-Codegen.podspec.json')
-  Pod::UI.puts "[Codegen] Generating #{podspec_path}"
-
-  File.open(podspec_path, 'w') do |f|
-    f.write(spec.to_json)
-    f.fsync
-  end
-
-  set_react_codegen_podspec_generated(true)
-
-  return {
-    "spec" => spec,
-    "path" => $CODEGEN_OUTPUT_DIR,  # Path needs to be relative to `Podfile`
-  }
-end
-
-
-def use_react_native_codegen_discovery!(options={})
-  return if ENV['DISABLE_CODEGEN'] == '1'
-
-  if $REACT_CODEGEN_DISCOVERY_DONE
-    Pod::UI.puts "[Codegen] Skipping use_react_native_codegen_discovery."
-    return
-  end
-
-  Pod::UI.warn '[Codegen] warn: using experimental new codegen integration'
-  react_native_path = options[:react_native_path] ||= "../node_modules/react-native"
-  app_path = options[:app_path]
-  fabric_enabled = options[:fabric_enabled] ||= false
-  config_file_dir = options[:config_file_dir] ||= ''
-  relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
-
-  if !app_path
-    Pod::UI.warn '[Codegen] Error: app_path is required for use_react_native_codegen_discovery.'
-    Pod::UI.warn '[Codegen] If you are calling use_react_native_codegen_discovery! in your Podfile, please remove the call and pass `app_path` and/or `config_file_dir` to `use_react_native!`.'
-    exit 1
-  end
-
-  # Generate React-Codegen podspec here to add the script phases.
-  script_phases = get_react_codegen_script_phases(options)
-  react_codegen_spec = get_react_codegen_spec(fabric_enabled: fabric_enabled, script_phases: script_phases)
-  generate_react_codegen_podspec!(react_codegen_spec)
-
-  out = Pod::Executable.execute_command(
-    'node',
-    [
-      "#{relative_installation_root}/#{react_native_path}/scripts/generate-artifacts.js",
-      "-p", "#{app_path}",
-      "-o", Pod::Config.instance.installation_root,
-      "-e", "#{fabric_enabled}",
-      "-c", "#{config_file_dir}",
-    ])
-  Pod::UI.puts out;
-
-  $REACT_CODEGEN_DISCOVERY_DONE = true
-end
-
+# === LEGACY METHOD ===
+# We need to keep this while we continue to support the old architecture.
+# =====================
 def use_react_native_codegen!(spec, options={})
-  return if ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+  return if ENV['RCT_NEW_ARCH_ENABLED'] == "1"
   # TODO: Once the new codegen approach is ready for use, we should output a warning here to let folks know to migrate.
 
   # The prefix to react-native
@@ -402,6 +267,8 @@ def use_react_native_codegen!(spec, options={})
         "EventEmitters.h",
         "Props.cpp",
         "Props.h",
+        "States.cpp",
+        "States.h",
         "RCTComponentViewHelpers.h",
         "ShadowNodes.cpp",
         "ShadowNodes.h"
@@ -489,5 +356,5 @@ def __apply_Xcode_12_5_M1_post_install_workaround(installer)
   # We need to make a patch to RCT-Folly - remove the `__IPHONE_OS_VERSION_MIN_REQUIRED` check.
   # See https://github.com/facebook/flipper/issues/834 for more details.
   time_header = "#{Pod::Config.instance.installation_root.to_s}/Pods/RCT-Folly/folly/portability/Time.h"
-  `sed -i -e  $'s/ && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0)//' #{time_header}`
+  `sed -i -e  $'s/ && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0)//' '#{time_header}'`
 end
diff --git a/scripts/react_native_pods_utils/script_phases.sh b/scripts/react_native_pods_utils/script_phases.sh
index 6c41ce1cbaa2..08efd2afbde0 100755
--- a/scripts/react_native_pods_utils/script_phases.sh
+++ b/scripts/react_native_pods_utils/script_phases.sh
@@ -13,8 +13,6 @@ GENERATED_SCHEMA_FILE="$GENERATED_SRCS_DIR/schema.json"
 
 cd "$RCT_SCRIPT_RN_DIR"
 
-CODEGEN_REPO_PATH="$RCT_SCRIPT_RN_DIR/packages/react-native-codegen"
-CODEGEN_NPM_PATH="$RCT_SCRIPT_RN_DIR/../react-native-codegen"
 CODEGEN_CLI_PATH=""
 
 error () {
@@ -23,15 +21,6 @@ error () {
     exit 1
 }
 
-# Determine path to react-native-codegen
-if [ -d "$CODEGEN_REPO_PATH" ]; then
-    CODEGEN_CLI_PATH=$(cd "$CODEGEN_REPO_PATH" && pwd)
-elif [ -d "$CODEGEN_NPM_PATH" ]; then
-    CODEGEN_CLI_PATH=$(cd "$CODEGEN_NPM_PATH" && pwd)
-else
-    error "error: Could not determine react-native-codegen location in $CODEGEN_REPO_PATH or $CODEGEN_NPM_PATH. Try running 'yarn install' or 'npm install' in your project root."
-fi
-
 find_node () {
     NODE_BINARY="${NODE_BINARY:-$(command -v node || true)}"
     if [ -z "$NODE_BINARY" ]; then
@@ -41,6 +30,13 @@ find_node () {
     fi
 }
 
+find_codegen () {
+    CODEGEN_CLI_PATH=$("$NODE_BINARY" --print "require('path').dirname(require.resolve('react-native-codegen/package.json'))")
+    if ! [ -d "$CODEGEN_CLI_PATH" ]; then
+        error "error: Could not determine react-native-codegen location, using node module resolution. Try running 'yarn install' or 'npm install' in your project root."
+    fi
+}
+
 setup_dirs () {
     set +e
     rm -rf "$GENERATED_SRCS_DIR"
@@ -100,7 +96,7 @@ generateCodegenArtifactsFromSchema () {
 generateArtifacts () {
     describe "Generating codegen artifacts"
     pushd "$RCT_SCRIPT_RN_DIR" >/dev/null || exit 1
-        "$NODE_BINARY" "scripts/generate-artifacts.js" --path "$RCT_SCRIPT_APP_PATH" --outputPath "$TEMP_OUTPUT_DIR" --fabricEnabled "$RCT_SCRIPT_FABRIC_ENABLED" --configFileDir "$RCT_SCRIPT_CONFIG_FILE_DIR" --nodeBinary "$NODE_BINARY"
+        "$NODE_BINARY" "scripts/generate-codegen-artifacts.js" --path "$RCT_SCRIPT_APP_PATH" --outputPath "$TEMP_OUTPUT_DIR" --fabricEnabled "$RCT_SCRIPT_FABRIC_ENABLED" --configFileDir "$RCT_SCRIPT_CONFIG_FILE_DIR" --nodeBinary "$NODE_BINARY"
     popd >/dev/null || exit 1
 }
 
@@ -108,7 +104,7 @@ moveOutputs () {
     mkdir -p "$RCT_SCRIPT_OUTPUT_DIR"
 
     # Copy all output to output_dir
-    cp -R "$TEMP_OUTPUT_DIR/" "$RCT_SCRIPT_OUTPUT_DIR" || exit 1
+    cp -R "$TEMP_OUTPUT_DIR/." "$RCT_SCRIPT_OUTPUT_DIR" || exit 1
     echo "$LIBRARY_NAME output has been written to $RCT_SCRIPT_OUTPUT_DIR:" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
     ls -1 "$RCT_SCRIPT_OUTPUT_DIR" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
 }
@@ -116,6 +112,7 @@ moveOutputs () {
 withCodgenDiscovery () {
     setup_dirs
     find_node
+    find_codegen
     generateArtifacts
     moveOutputs
 }
@@ -123,6 +120,7 @@ withCodgenDiscovery () {
 noCodegenDiscovery () {
     setup_dirs
     find_node
+    find_codegen
     generateCodegenSchemaFromJavaScript
     generateCodegenArtifactsFromSchema
     moveOutputs
diff --git a/scripts/release-utils.js b/scripts/release-utils.js
new file mode 100644
index 000000000000..ae0ca5876d95
--- /dev/null
+++ b/scripts/release-utils.js
@@ -0,0 +1,170 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+const {exec, echo, exit, test, env, pushd, popd} = require('shelljs');
+const {saveFiles} = require('./scm-utils');
+const {createHermesPrebuiltArtifactsTarball} = require('./hermes/hermes-utils');
+
+// TODO: we should probably remove this because of this? https://github.com/facebook/react-native/pull/34846
+function saveFilesToRestore(tmpPublishingFolder) {
+  const filesToSaveAndRestore = [
+    'template/Gemfile',
+    'template/_ruby-version',
+    'template/package.json',
+    '.ruby-version',
+    'Gemfile.lock',
+    'Gemfile',
+    'package.json',
+    'ReactAndroid/gradle.properties',
+    'Libraries/Core/ReactNativeVersion.js',
+    'React/Base/RCTVersion.m',
+    'ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java',
+    'ReactCommon/cxxreact/ReactNativeVersion.h',
+  ];
+
+  saveFiles(filesToSaveAndRestore, tmpPublishingFolder);
+}
+
+function generateAndroidArtifacts(releaseVersion, tmpPublishingFolder) {
+  // -------- Generating Android Artifacts
+  echo('Generating Android artifacts inside /tmp/maven-local');
+  if (exec('./gradlew publishAllToMavenTempLocal').code) {
+    echo('Could not generate artifacts');
+    exit(1);
+  }
+
+  echo('Generated artifacts for Maven');
+
+  let artifacts = [
+    '.module',
+    '.pom',
+    '-debug.aar',
+    '-release.aar',
+    '-debug-sources.jar',
+    '-release-sources.jar',
+  ].map(suffix => {
+    return `react-android-${releaseVersion}${suffix}`;
+  });
+
+  artifacts.forEach(name => {
+    if (
+      !test(
+        '-e',
+        `/tmp/maven-local/com/facebook/react/react-android/${releaseVersion}/${name}`,
+      )
+    ) {
+      echo(
+        `Failing as expected file: \n\
+      /tmp/maven-local/com/facebook/react/react-android/${releaseVersion}/${name}\n\
+      was not correctly generated.`,
+      );
+      exit(1);
+    }
+  });
+}
+
+function publishAndroidArtifactsToMaven(releaseVersion, isNightly) {
+  // -------- Publish every artifact to Maven Central
+  // The GPG key is base64 encoded on CircleCI and then decoded here
+  let buff = Buffer.from(env.ORG_GRADLE_PROJECT_SIGNING_KEY_ENCODED, 'base64');
+  env.ORG_GRADLE_PROJECT_SIGNING_KEY = buff.toString('ascii');
+
+  // We want to gate ourselves against accidentally publishing a 1.x or a 1000.x on
+  // maven central which will break the semver for our artifacts.
+  if (!isNightly && releaseVersion.startsWith('0.')) {
+    // -------- For stable releases, we also need to close and release the staging repository.
+    if (
+      exec(
+        './gradlew publishAllToSonatype closeAndReleaseSonatypeStagingRepository -PisNightly=' +
+          isNightly,
+      ).code
+    ) {
+      echo(
+        'Failed to close and release the staging repository on Sonatype (Maven Central)',
+      );
+      exit(1);
+    }
+  } else {
+    // -------- For nightly releases, we only need to publish the snapshot to Sonatype snapshot repo.
+    if (exec('./gradlew publishAllToSonatype -PisNightly=' + isNightly).code) {
+      echo('Failed to publish artifacts to Sonatype (Maven Central)');
+      exit(1);
+    }
+  }
+
+  echo('Published artifacts to Maven Central');
+}
+
+function generateiOSArtifacts(
+  jsiFolder,
+  hermesCoreSourceFolder,
+  buildType,
+  targetFolder,
+) {
+  pushd(`${hermesCoreSourceFolder}`);
+
+  //Need to generate hermesc
+  exec(
+    `${hermesCoreSourceFolder}/utils/build-hermesc-xcode.sh ${hermesCoreSourceFolder}/build_host_hermesc`,
+  );
+
+  //Generating iOS Artifacts
+  exec(
+    `JSI_PATH=${jsiFolder} BUILD_TYPE=${buildType} ${hermesCoreSourceFolder}/utils/build-mac-framework.sh`,
+  );
+
+  exec(
+    `JSI_PATH=${jsiFolder} BUILD_TYPE=${buildType} ${hermesCoreSourceFolder}/utils/build-ios-framework.sh`,
+  );
+
+  popd();
+
+  const tarballOutputPath = createHermesPrebuiltArtifactsTarball(
+    hermesCoreSourceFolder,
+    buildType,
+    targetFolder,
+    true, // this is excludeDebugSymbols, we keep it as the default
+  );
+
+  return tarballOutputPath;
+}
+
+function failIfTagExists(version, buildType) {
+  // When dry-run in stable branch, the tag already exists.
+  // We are bypassing the tag-existence check when in a dry-run to have the CI pass
+  if (buildType === 'dry-run') {
+    return;
+  }
+
+  if (checkIfTagExists(version)) {
+    echo(`Tag v${version} already exists.`);
+    echo('You may want to rollback the last commit');
+    echo('git reset --hard HEAD~1');
+    exit(1);
+  }
+}
+
+function checkIfTagExists(version) {
+  const {code, stdout} = exec('git tag -l', {silent: true});
+  if (code !== 0) {
+    throw new Error('Failed to retrieve the list of tags');
+  }
+  const tags = new Set(stdout.split('\n'));
+  return tags.has(`v${version}`);
+}
+
+module.exports = {
+  generateAndroidArtifacts,
+  generateiOSArtifacts,
+  publishAndroidArtifactsToMaven,
+  saveFilesToRestore,
+  failIfTagExists,
+};
diff --git a/scripts/retry3 b/scripts/retry3
new file mode 100755
index 000000000000..2f96c6f997cc
--- /dev/null
+++ b/scripts/retry3
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+function retry3 {
+  local n=1
+  local max=3
+  local delay=1
+  while true; do
+    # shellcheck disable=SC2015
+    "$@" && break || {
+      if [[ $n -lt $max ]]; then
+        ((n++))
+        echo "Command failed. Attempt $n/$max:"
+        sleep $delay;
+      else
+        echo "The command has failed after $n attempts." >&2
+        return 1
+      fi
+    }
+  done
+}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+  retry3 "$@"
+fi
diff --git a/scripts/run-ci-e2e-tests.js b/scripts/run-ci-e2e-tests.js
index 177cb102339a..9a928be712e5 100644
--- a/scripts/run-ci-e2e-tests.js
+++ b/scripts/run-ci-e2e-tests.js
@@ -23,6 +23,7 @@ const {cd, cp, echo, exec, exit, mv, rm} = require('shelljs');
 const spawn = require('child_process').spawn;
 const argv = require('yargs').argv;
 const path = require('path');
+const {setupVerdaccio} = require('./setup-verdaccio');
 
 const SCRIPTS = __dirname;
 const ROOT = path.normalize(path.join(__dirname, '..'));
@@ -35,6 +36,7 @@ const REACT_NATIVE_APP_DIR = `${REACT_NATIVE_TEMP_DIR}/template`;
 const numberOfRetries = argv.retries || 1;
 let SERVER_PID;
 let APPIUM_PID;
+let VERDACCIO_PID;
 let exitCode;
 
 function describe(message) {
@@ -70,23 +72,27 @@ try {
 
   const REACT_NATIVE_PACKAGE = path.join(ROOT, 'react-native-*.tgz');
 
+  describe('Set up Verdaccio');
+  VERDACCIO_PID = setupVerdaccio();
+
+  describe('Publish packages');
+  const packages = JSON.parse(
+    JSON.parse(exec('yarn --json workspaces info').stdout).data,
+  );
+  Object.keys(packages).forEach(packageName => {
+    exec(
+      `cd ${packages[packageName].location} && npm publish --registry http://localhost:4873 --yes --access public`,
+    );
+  });
+
   describe('Scaffold a basic React Native app from template');
   exec(`rsync -a ${ROOT}/template ${REACT_NATIVE_TEMP_DIR}`);
   cd(REACT_NATIVE_APP_DIR);
 
-  const METRO_CONFIG = path.join(ROOT, 'metro.config.js');
-  const RN_GET_POLYFILLS = path.join(ROOT, 'rn-get-polyfills.js');
-  const RN_POLYFILLS_PATH = 'packages/polyfills/';
-  exec(`mkdir -p ${RN_POLYFILLS_PATH}`);
-
-  cp(METRO_CONFIG, '.');
-  cp(RN_GET_POLYFILLS, '.');
-  exec(
-    `rsync -a ${ROOT}/${RN_POLYFILLS_PATH} ${REACT_NATIVE_APP_DIR}/${RN_POLYFILLS_PATH}`,
-  );
-  mv('_flowconfig', '.flowconfig');
-  mv('_watchmanconfig', '.watchmanconfig');
   mv('_bundle', '.bundle');
+  mv('_eslintrc.js', '.eslintrc.js');
+  mv('_prettierrc.js', '.prettierrc.js');
+  mv('_watchmanconfig', '.watchmanconfig');
 
   describe('Install React Native package');
   exec(`npm install ${REACT_NATIVE_PACKAGE}`);
@@ -156,9 +162,7 @@ try {
 
     describe(`Start Metro, ${SERVER_PID}`);
     // shelljs exec('', {async: true}) does not emit stdout events, so we rely on good old spawn
-    const packagerProcess = spawn('yarn', ['start', '--max-workers 1'], {
-      env: process.env,
-    });
+    const packagerProcess = spawn('yarn', ['start', '--max-workers 1']);
     SERVER_PID = packagerProcess.pid;
     // wait a bit to allow packager to startup
     exec('sleep 15s');
@@ -254,6 +258,7 @@ try {
       exitCode = 1;
       throw Error(exitCode);
     }
+
     describe('Test: Verify packager can generate an iOS bundle');
     if (
       exec(
@@ -264,15 +269,30 @@ try {
       exitCode = 1;
       throw Error(exitCode);
     }
-    describe('Test: Flow check');
-    // The resolve package included a test for a malformed package.json (see https://github.com/browserify/resolve/issues/89)
-    // that is failing the flow check. We're removing it.
-    rm('-rf', './node_modules/resolve/test/resolver/malformed_package_json');
-    if (exec(`${ROOT}/node_modules/.bin/flow check`).code) {
-      echo('Flow check failed.');
+
+    describe('Test: TypeScript typechecking');
+    if (exec('yarn tsc').code) {
+      echo('Typechecking errors were found');
+      exitCode = 1;
+      throw Error(exitCode);
+    }
+
+    describe('Test: Jest tests');
+    if (exec('yarn test').code) {
+      echo('Jest tests failed');
       exitCode = 1;
       throw Error(exitCode);
     }
+
+    // TODO: ESLint infinitely hangs when running in the environment created by
+    // this script, but not projects generated by `react-native init`.
+    /*
+    describe('Test: ESLint/Prettier linting and formatting');
+    if (exec('yarn lint').code) {
+      echo('linting errors were found');
+      exitCode = 1;
+      throw Error(exitCode);
+    }*/
   }
   exitCode = 0;
 } finally {
@@ -288,5 +308,9 @@ try {
     echo(`Killing appium ${APPIUM_PID}`);
     exec(`kill -9 ${APPIUM_PID}`);
   }
+  if (VERDACCIO_PID) {
+    echo(`Killing verdaccio ${VERDACCIO_PID}`);
+    exec(`kill -9 ${VERDACCIO_PID}`);
+  }
 }
 exit(exitCode);
diff --git a/scripts/run-ci-javascript-tests.js b/scripts/run-ci-javascript-tests.js
index bdb9fedd7c7e..30fee2573f95 100644
--- a/scripts/run-ci-javascript-tests.js
+++ b/scripts/run-ci-javascript-tests.js
@@ -65,6 +65,13 @@ try {
     throw Error(exitCode);
   }
 
+  describe('Test: TypeScript tests');
+  if (exec(`${YARN_BINARY} run test-typescript-offline`).code) {
+    echo('Failed to run TypeScript tests.');
+    exitCode = 1;
+    throw Error(exitCode);
+  }
+
   exitCode = 0;
 } finally {
   // Do cleanup here
diff --git a/scripts/scm-utils.js b/scripts/scm-utils.js
new file mode 100644
index 000000000000..11810e6470c4
--- /dev/null
+++ b/scripts/scm-utils.js
@@ -0,0 +1,95 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+const {cp, echo, exec, exit} = require('shelljs');
+const fs = require('fs');
+const path = require('path');
+const mkdirp = require('mkdirp');
+
+function isGitRepo() {
+  try {
+    return (
+      exec('git rev-parse --is-inside-work-tree', {
+        silent: true,
+      }).stdout.trim() === 'true'
+    );
+  } catch (error) {
+    echo(
+      `It wasn't possible to check if we are in a git repository. Details: ${error}`,
+    );
+  }
+  return false;
+}
+
+function exitIfNotOnGit(command, errorMessage, gracefulExit = false) {
+  if (isGitRepo()) {
+    return command();
+  } else {
+    echo(errorMessage);
+    exit(gracefulExit ? 0 : 1);
+  }
+}
+
+function isTaggedLatest(commitSha) {
+  return (
+    exec(`git rev-list -1 latest | grep ${commitSha}`, {
+      silent: true,
+    }).stdout.trim() === commitSha
+  );
+}
+
+function getBranchName() {
+  return exec('git rev-parse --abbrev-ref HEAD', {
+    silent: true,
+  }).stdout.trim();
+}
+
+function getCurrentCommit() {
+  return isGitRepo()
+    ? exec('git rev-parse HEAD', {
+        silent: true,
+      }).stdout.trim()
+    : 'TEMP';
+}
+
+function saveFiles(filePaths, tmpFolder) {
+  for (const filePath of filePaths) {
+    const dirName = path.dirname(filePath);
+    if (dirName !== '.') {
+      const destFolder = `${tmpFolder}/${dirName}`;
+      mkdirp.sync(destFolder);
+    }
+    cp(filePath, `${tmpFolder}/${filePath}`);
+  }
+}
+
+function revertFiles(filePaths, tmpFolder) {
+  for (const filePath of filePaths) {
+    const absoluteTmpPath = `${tmpFolder}/${filePath}`;
+    if (fs.existsSync(absoluteTmpPath)) {
+      cp(absoluteTmpPath, filePath);
+    } else {
+      echo(
+        `It was not possible to revert ${filePath} since ${absoluteTmpPath} does not exist.`,
+      );
+      exit(1);
+    }
+  }
+}
+
+module.exports = {
+  exitIfNotOnGit,
+  getCurrentCommit,
+  getBranchName,
+  isTaggedLatest,
+  revertFiles,
+  saveFiles,
+};
diff --git a/scripts/set-rn-version.js b/scripts/set-rn-version.js
index 4fdd71dd0870..44f9ae4764a4 100755
--- a/scripts/set-rn-version.js
+++ b/scripts/set-rn-version.js
@@ -17,33 +17,47 @@
  *   * Creates a gemfile
  */
 const fs = require('fs');
+const os = require('os');
+const path = require('path');
 const {cat, echo, exec, exit, sed} = require('shelljs');
 const yargs = require('yargs');
-const {parseVersion} = require('./version-utils');
-
-let argv = yargs.option('v', {
-  alias: 'to-version',
-  type: 'string',
-}).argv;
-
+const {parseVersion, validateBuildType} = require('./version-utils');
+const {saveFiles} = require('./scm-utils');
+
+let argv = yargs
+  .option('v', {
+    alias: 'to-version',
+    type: 'string',
+    required: true,
+  })
+  .option('b', {
+    alias: 'build-type',
+    type: 'string',
+    required: true,
+  }).argv;
+
+const buildType = argv.buildType;
 const version = argv.toVersion;
-
-if (!version) {
-  echo('You must specify a version using -v');
-  exit(1);
-}
+validateBuildType(buildType);
 
 let major,
   minor,
   patch,
   prerelease = -1;
 try {
-  ({major, minor, patch, prerelease} = parseVersion(version));
+  ({major, minor, patch, prerelease} = parseVersion(version, buildType));
 } catch (e) {
   echo(e.message);
   exit(1);
 }
 
+const tmpVersioningFolder = fs.mkdtempSync(
+  path.join(os.tmpdir(), 'rn-set-version'),
+);
+echo(`The temp versioning folder is ${tmpVersioningFolder}`);
+
+saveFiles(['package.json', 'template/package.json'], tmpVersioningFolder);
+
 fs.writeFileSync(
   'ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java',
   cat('scripts/versiontemplates/ReactNativeVersion.java.template')
@@ -116,6 +130,7 @@ packageJson.dependencies = {
 fs.writeFileSync('package.json', JSON.stringify(packageJson, null, 2), 'utf-8');
 
 // Change ReactAndroid/gradle.properties
+saveFiles(['ReactAndroid/gradle.properties'], tmpVersioningFolder);
 if (
   sed(
     '-i',
@@ -143,21 +158,24 @@ const filesToValidate = [
   'ReactAndroid/gradle.properties',
   'template/package.json',
 ];
+
 const numberOfChangedLinesWithNewVersion = exec(
-  `git diff -U0 ${filesToValidate.join(
-    ' ',
-  )}| grep '^[+]' | grep -c ${version} `,
+  `diff -r ${tmpVersioningFolder} . | grep '^[>]' | grep -c ${version} `,
   {silent: true},
 ).stdout.trim();
 
 if (+numberOfChangedLinesWithNewVersion !== filesToValidate.length) {
+  // TODO: the logic that checks whether all the changes have been applied
+  // is missing several files. For example, it is not checking Ruby version nor that
+  // the Objecive-C files, the codegen and other files are properly updated.
+  // We are going to work on this in another PR.
+  echo('WARNING:');
   echo(
     `Failed to update all the files: [${filesToValidate.join(
       ', ',
     )}] must have versions in them`,
   );
-  echo('Fix the issue and try again');
-  exit(1);
+  echo(`These files already had version ${version} set.`);
 }
 
 exit(0);
diff --git a/scripts/setup-verdaccio.js b/scripts/setup-verdaccio.js
new file mode 100644
index 000000000000..e62e7918540d
--- /dev/null
+++ b/scripts/setup-verdaccio.js
@@ -0,0 +1,30 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+const {exec} = require('shelljs');
+const spawn = require('child_process').spawn;
+
+function setupVerdaccio() {
+  const verdaccioProcess = spawn('npx', [
+    'verdaccio@5.15.3',
+    '--config',
+    '.circleci/verdaccio.yml',
+  ]);
+  const VERDACCIO_PID = verdaccioProcess.pid;
+  exec('npx wait-on@6.0.1 http://localhost:4873');
+  exec('npm set registry http://localhost:4873');
+  exec('echo "//localhost:4873/:_authToken=secretToken" > .npmrc');
+  return VERDACCIO_PID;
+}
+
+module.exports = {
+  setupVerdaccio: setupVerdaccio,
+};
diff --git a/scripts/test-e2e-local-clean.js b/scripts/test-e2e-local-clean.js
new file mode 100644
index 000000000000..37ca37032732
--- /dev/null
+++ b/scripts/test-e2e-local-clean.js
@@ -0,0 +1,76 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+/*
+ * This script, paired with test-e2e-local.js, is the full suite of
+ * tooling needed for a successful local testing experience.
+ * This script is an helper to clean up the environment fully
+ * before running the test suite.
+ *
+ * You should use this when switching between branches.
+ *
+ * It will:
+ *  - clean up node modules
+ *  - clean up the build folder (derived data, gradlew cleanAll)
+ *  - clean up the pods folder for RNTester (pod install) (and Podfile.lock too)
+ *  - kill all packagers
+ *  - remove RNTestProject folder
+ *
+ * an improvements to consider:
+ *   - an option to uninstall the apps (RNTester, RNTestProject) from emulators
+ */
+
+const {exec, exit} = require('shelljs');
+
+const {isPackagerRunning} = require('./testing-utils');
+
+console.info('\n** Starting the clean up process **\n');
+
+// let's check if Metro is already running, if it is let's kill it and start fresh
+if (isPackagerRunning() === 'running') {
+  exec("lsof -i :8081 | grep LISTEN | /usr/bin/awk '{print $2}' | xargs kill");
+  console.info('\n** Killed Metro **\n');
+}
+
+// Android
+console.info('\n** Cleaning Gradle build artifacts **\n');
+exec('./gradlew cleanAll');
+exec('rm -rf /tmp/maven-local');
+
+// iOS
+console.info('\n** Nuking the derived data folder **\n');
+exec('rm -rf ~/Library/Developer/Xcode/DerivedData');
+
+console.info('\n** Removing the hermes-engine pod cache **\n');
+exec('rm -rf ~/Library/Caches/CocoaPods/Pods/External/hermes-engine');
+
+// RNTester Pods
+console.info('\n** Removing the RNTester Pods **\n');
+exec('rm -rf packages/rn-tester/Pods');
+
+// I'm not sure we want to also remove the lock file
+// exec('rm -rf packages/rn-tester/Podfile.lock');
+
+// RNTestProject
+console.info('\n** Removing the RNTestProject folder **\n');
+exec('rm -rf /tmp/RNTestProject');
+
+// final clean up
+console.info('\n** Final git level wipe **\n');
+// clean unstaged changes from git
+exec('git checkout -- .');
+// remove all the untracked files
+exec('git clean -fdx');
+
+console.info(
+  '\n** Clean up process completed\nPlease remember to run yarn install if you are planning to test again\n',
+);
+exit(0);
diff --git a/scripts/test-e2e-local.js b/scripts/test-e2e-local.js
new file mode 100644
index 000000000000..39ce8ca26f75
--- /dev/null
+++ b/scripts/test-e2e-local.js
@@ -0,0 +1,257 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+/*
+ * This script is a re-interpretation of the old test-manual.e2e.sh script.
+ * the idea is to provide a better DX for the manual testing.
+ * It's using Javascript over Bash for consistency with the rest of the recent scripts
+ * and to make it more accessible for other devs to play around with.
+ */
+
+const {exec, exit, pushd, popd, pwd, cd, cp} = require('shelljs');
+const yargs = require('yargs');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const {getBranchName} = require('./scm-utils');
+
+const {
+  launchAndroidEmulator,
+  isPackagerRunning,
+  launchPackagerInSeparateWindow,
+} = require('./testing-utils');
+
+const {
+  generateAndroidArtifacts,
+  saveFilesToRestore,
+  generateiOSArtifacts,
+} = require('./release-utils');
+
+const {
+  downloadHermesSourceTarball,
+  expandHermesSourceTarball,
+} = require('./hermes/hermes-utils');
+
+const argv = yargs
+  .option('t', {
+    alias: 'target',
+    default: 'RNTester',
+    choices: ['RNTester', 'RNTestProject'],
+  })
+  .option('p', {
+    alias: 'platform',
+    default: 'iOS',
+    choices: ['iOS', 'Android'],
+  })
+  .option('h', {
+    alias: 'hermes',
+    type: 'boolean',
+    default: true,
+  }).argv;
+
+/*
+ * see the test-local-e2e.js script for clean up process
+ */
+
+// command order: we ask the user to select if they want to test RN tester
+// or RNTestProject
+
+// if they select RN tester, we ask if iOS or Android, and then we run the tests
+// if they select RNTestProject, we run the RNTestProject test
+
+// let's check if Metro is already running, if it is let's kill it and start fresh
+if (isPackagerRunning() === 'running') {
+  exec("lsof -i :8081 | grep LISTEN | /usr/bin/awk '{print $2}' | xargs kill");
+}
+
+const onReleaseBranch = exec('git rev-parse --abbrev-ref HEAD', {
+  silent: true,
+})
+  .stdout.trim()
+  .endsWith('-stable');
+
+if (argv.target === 'RNTester') {
+  // FIXME: make sure that the commands retains colors
+  // (--ansi) doesn't always work
+  // see also https://github.com/shelljs/shelljs/issues/86
+
+  if (argv.platform === 'iOS') {
+    console.info(
+      `We're going to test the ${
+        argv.hermes ? 'Hermes' : 'JSC'
+      } version of RNTester iOS with the new Architecture enabled`,
+    );
+
+    // remember that for this to be successful
+    // you should have run bundle install once
+    // in your local setup - also: if I'm on release branch, I pick the
+    // hermes ref from the hermes ref file (see hermes-engine.podspec)
+    exec(
+      `cd packages/rn-tester && USE_HERMES=${
+        argv.hermes ? 1 : 0
+      } REACT_NATIVE_CI=${onReleaseBranch} RCT_NEW_ARCH_ENABLED=1 bundle exec pod install --ansi`,
+    );
+
+    // if everything succeeded so far, we can launch Metro and the app
+    // start the Metro server in a separate window
+    launchPackagerInSeparateWindow();
+
+    // launch the app on iOS simulator
+    pushd('packages/rn-tester');
+    exec('npx react-native run-ios --scheme RNTester');
+    popd();
+  } else {
+    // we do the android path here
+
+    launchAndroidEmulator();
+
+    console.info(
+      `We're going to test the ${
+        argv.hermes ? 'Hermes' : 'JSC'
+      } version of RNTester Android with the new Architecture enabled`,
+    );
+    exec(
+      `./gradlew :packages:rn-tester:android:app:${
+        argv.hermes ? 'installHermesDebug' : 'installJscDebug'
+      } --quiet`,
+    );
+
+    // launch the app on Android simulator
+    // TODO: we should find a way to make it work like for iOS, via npx react-native run-android
+    // currently, that fails with an error.
+
+    // if everything succeeded so far, we can launch Metro and the app
+    // start the Metro server in a separate window
+    launchPackagerInSeparateWindow();
+
+    // launch the app
+    exec(
+      'adb shell am start -n com.facebook.react.uiapp/com.facebook.react.uiapp.RNTesterActivity',
+    );
+
+    // just to make sure that the Android up won't have troubles finding the Metro server
+    exec('adb reverse tcp:8081 tcp:8081');
+  }
+} else {
+  console.info("We're going to test a fresh new RN project");
+
+  // create the local npm package to feed the CLI
+
+  // base setup required (specular to publish-npm.js)
+  const tmpPublishingFolder = fs.mkdtempSync(
+    path.join(os.tmpdir(), 'rn-publish-'),
+  );
+  console.info(`The temp publishing folder is ${tmpPublishingFolder}`);
+
+  saveFilesToRestore(tmpPublishingFolder);
+
+  // we need to add the unique timestamp to avoid npm/yarn to use some local caches
+  const baseVersion = require('../package.json').version;
+
+  const branchName = getBranchName();
+  const buildType =
+    branchName.endsWith('-stable') && baseVersion !== '1000.0.0'
+      ? 'release'
+      : 'dry-run';
+
+  const dateIdentifier = new Date()
+    .toISOString()
+    .slice(0, -8)
+    .replace(/[-:]/g, '')
+    .replace(/[T]/g, '-');
+
+  const releaseVersion = `${baseVersion}-${dateIdentifier}`;
+
+  // this is needed to generate the Android artifacts correctly
+  exec(
+    `node scripts/set-rn-version.js --to-version ${releaseVersion} --build-type ${buildType}`,
+  ).code;
+
+  // Generate native files for Android
+  generateAndroidArtifacts(releaseVersion, tmpPublishingFolder);
+
+  // Setting up generating native iOS (will be done later)
+  const repoRoot = pwd();
+  const jsiFolder = `${repoRoot}/ReactCommon/jsi`;
+  const hermesCoreSourceFolder = `${repoRoot}/sdks/hermes`;
+
+  if (!fs.existsSync(hermesCoreSourceFolder)) {
+    console.info('The Hermes source folder is missing. Downloading...');
+    downloadHermesSourceTarball();
+    expandHermesSourceTarball();
+  }
+
+  // need to move the scripts inside the local hermes cloned folder
+  // cp sdks/hermes-engine/utils/*.sh <your_hermes_checkout>/utils/.
+  cp(
+    `${repoRoot}/sdks/hermes-engine/utils/*.sh`,
+    `${repoRoot}/sdks/hermes/utils/.`,
+  );
+
+  // for this scenario, we only need to create the debug build
+  // (env variable PRODUCTION defines that podspec side)
+  const buildTypeiOSArtifacts = 'Debug';
+
+  // the android ones get set into /private/tmp/maven-local
+  const localMavenPath = '/private/tmp/maven-local';
+
+  // Generate native files for iOS
+  const tarballOutputPath = generateiOSArtifacts(
+    jsiFolder,
+    hermesCoreSourceFolder,
+    buildTypeiOSArtifacts,
+    localMavenPath,
+  );
+
+  // create locally the node module
+  exec('npm pack');
+
+  const localNodeTGZPath = `${repoRoot}/react-native-${releaseVersion}.tgz`;
+  exec(`node scripts/set-rn-template-version.js "file:${localNodeTGZPath}"`);
+
+  pushd('/tmp/');
+  // need to avoid the pod install step - we'll do it later
+  exec(
+    `node ${repoRoot}/cli.js init RNTestProject --template ${repoRoot} --skip-install`,
+  );
+
+  cd('RNTestProject');
+  exec('yarn install');
+
+  // need to do this here so that Android will be properly setup either way
+  exec(
+    'echo "REACT_NATIVE_MAVEN_LOCAL_REPO=/private/tmp/maven-local" >> android/gradle.properties',
+  );
+
+  // doing the pod install here so that it's easier to play around RNTestProject
+  cd('ios');
+  exec('bundle install');
+  exec(
+    `HERMES_ENGINE_TARBALL_PATH=${tarballOutputPath} USE_HERMES=${
+      argv.hermes ? 1 : 0
+    } bundle exec pod install --ansi`,
+  );
+
+  cd('..');
+
+  if (argv.platform === 'iOS') {
+    exec('yarn ios');
+  } else {
+    // android
+    exec('yarn android');
+  }
+  popd();
+
+  // just cleaning up the temp folder, the rest is done by the test clean script
+  exec(`rm -rf ${tmpPublishingFolder}`);
+}
+
+exit(0);
diff --git a/scripts/test-manual-e2e.sh b/scripts/test-manual-e2e.sh
index a98f74b662ac..7e08c8050f44 100755
--- a/scripts/test-manual-e2e.sh
+++ b/scripts/test-manual-e2e.sh
@@ -33,7 +33,6 @@ selected_vm=""
 PACKAGE_VERSION=""
 
 test_android(){
-    generate_maven_artifacts
     if [ "$1" == "1" ]; then
         test_android_hermes
     elif [ "$1" == "2" ]; then
@@ -43,7 +42,8 @@ test_android(){
 
 generate_maven_artifacts(){
     rm -rf android
-    ./gradlew :ReactAndroid:installArchives || error "Couldn't generate artifacts"
+    ./gradlew :ReactAndroid:installArchives || error "Couldn't generate React Native Maven artifacts"
+    ./gradlew :ReactAndroid:hermes-engine:installArchives || error "Couldn't generate Hermes Engine Maven artifacts"
 
     success "Generated artifacts for Maven"
 }
@@ -109,6 +109,10 @@ kill_packagers(){
 init_template_app(){
     kill_packagers
 
+    if [ "$selected_platform" == "1" ]; then
+        generate_maven_artifacts
+    fi
+
     PACKAGE_VERSION=$(cat package.json \
     | grep version \
     | head -1 \
@@ -137,7 +141,6 @@ init_template_app(){
 
     info "Double checking the versions in package.json are correct:"
     grep "\"react-native\": \".*react-native-$PACKAGE_VERSION-$TIMESTAMP.tgz\"" "/tmp/${project_name}/package.json" || error "Incorrect version number in /tmp/${project_name}/package.json"
-    grep -E "com.facebook.react:react-native:\\+" "${project_name}/android/app/build.gradle" || error "Dependency in /tmp/${project_name}/android/app/build.gradle must be com.facebook.react:react-native:+"
 
     success "New sample project generated at /tmp/${project_name}"
     popd >/dev/null || exit
diff --git a/scripts/testing-utils.js b/scripts/testing-utils.js
new file mode 100644
index 000000000000..a687a37cd562
--- /dev/null
+++ b/scripts/testing-utils.js
@@ -0,0 +1,111 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+const {exec} = require('shelljs');
+const os = require('os');
+const {spawn} = require('node:child_process');
+
+/*
+ * Android related utils - leverages android tooling
+ */
+
+// this code is taken from the CLI repo, slightly readapted to our needs
+// here's the reference folder:
+// https://github.com/react-native-community/cli/blob/main/packages/cli-platform-android/src/commands/runAndroid
+
+const emulatorCommand = process.env.ANDROID_HOME
+  ? `${process.env.ANDROID_HOME}/emulator/emulator`
+  : 'emulator';
+
+const getEmulators = () => {
+  const emulatorsOutput = exec(`${emulatorCommand} -list-avds`).stdout;
+  return emulatorsOutput.split(os.EOL).filter(name => name !== '');
+};
+
+const launchEmulator = emulatorName => {
+  // we need both options 'cause reasons:
+  // from docs: "When using the detached option to start a long-running process, the process will not stay running in the background after the parent exits unless it is provided with a stdio configuration that is not connected to the parent. If the parent's stdio is inherited, the child will remain attached to the controlling terminal."
+  // here: https://nodejs.org/api/child_process.html#optionsdetached
+
+  const cp = spawn(emulatorCommand, [`@${emulatorName}`], {
+    detached: true,
+    stdio: 'ignore',
+  });
+
+  cp.unref();
+};
+
+function tryLaunchEmulator() {
+  const emulators = getEmulators();
+  if (emulators.length > 0) {
+    try {
+      launchEmulator(emulators[0]);
+
+      return {success: true};
+    } catch (error) {
+      return {success: false, error};
+    }
+  }
+  return {
+    success: false,
+    error: 'No emulators found as an output of `emulator -list-avds`',
+  };
+}
+
+function launchAndroidEmulator() {
+  const result = tryLaunchEmulator();
+  if (result.success) {
+    console.info('Successfully launched emulator.');
+  } else {
+    console.error(`Failed to launch emulator. Reason: ${result.error || ''}.`);
+    console.warn(
+      'Please launch an emulator manually or connect a device. Otherwise app may fail to launch.',
+    );
+  }
+}
+
+/*
+ * iOS related utils - leverages xcodebuild
+ */
+
+/*
+ * Metro related utils
+ */
+
+// inspired by CLI again https://github.com/react-native-community/cli/blob/main/packages/cli-tools/src/isPackagerRunning.ts
+
+function isPackagerRunning(
+  packagerPort = process.env.RCT_METRO_PORT || '8081',
+) {
+  try {
+    const status = exec(`curl http://localhost:${packagerPort}/status`, {
+      silent: true,
+    }).stdout;
+
+    return status === 'packager-status:running' ? 'running' : 'unrecognized';
+  } catch (_error) {
+    return 'not_running';
+  }
+}
+
+// this is a very limited implementation of how this should work
+// literally, this is macos only
+// a more robust implementation can be found here:
+// https://github.com/react-native-community/cli/blob/7c003f2b1d9d80ec5c167614ba533a004272c685/packages/cli-platform-android/src/commands/runAndroid/index.ts#L195
+function launchPackagerInSeparateWindow() {
+  exec("open -a 'Terminal' ./scripts/packager.sh");
+}
+
+module.exports = {
+  launchAndroidEmulator,
+  isPackagerRunning,
+  launchPackagerInSeparateWindow,
+};
diff --git a/scripts/update-ruby.sh b/scripts/update-ruby.sh
index ffba2865c629..2e8f39bb74be 100755
--- a/scripts/update-ruby.sh
+++ b/scripts/update-ruby.sh
@@ -50,9 +50,6 @@ fi
 
 echo "$VERSION" > template/_ruby-version
 
-sed_i -e "s/^\(ruby '\)[^']*\('.*\)$/\1$VERSION\2/" Gemfile
-sed_i -e "s/^\(ruby '\)[^']*\('.*\)$/\1$VERSION\2/" template/Gemfile
-
 rm -f Gemfile.lock
 
 export BUNDLE_APP_CONFIG="$ROOT/.bundle"
@@ -60,9 +57,15 @@ cp "$BUNDLE_APP_CONFIG/"* template/_bundle # sync!
 
 bundle lock
 
-git add \
-    .ruby-version \
-    Gemfile \
-    Gemfile.lock \
-    template/_ruby-version \
-    template/Gemfile
+# Disabling getting a potential fatal exit with for crossing filesystem boundary
+export GIT_DISCOVERY_ACROSS_FILESYSTEM=1;
+IS_GIT_REPO=$(git rev-parse --is-inside-work-tree 2> /dev/null || true)
+export GIT_DISCOVERY_ACROSS_FILESYSTEM=0;
+if [ "$IS_GIT_REPO" = "true" ]; then
+    git add \
+        .ruby-version \
+        Gemfile.lock \
+        template/_ruby-version
+else
+    echo "Detected that you're not in Git. If on another SCM, don't forget to commit the edited files."
+fi
diff --git a/scripts/version-utils.js b/scripts/version-utils.js
index 25eddd5c9072..e73ea62ed442 100644
--- a/scripts/version-utils.js
+++ b/scripts/version-utils.js
@@ -7,48 +7,153 @@
  * @format
  */
 
-const {exec} = require('shelljs');
-
 const VERSION_REGEX = /^v?((\d+)\.(\d+)\.(\d+)(?:-(.+))?)$/;
 
-function parseVersion(versionStr) {
-  const match = versionStr.match(VERSION_REGEX);
-  if (!match) {
-    throw new Error(
-      `You must pass a correctly formatted version; couldn't parse ${versionStr}`,
-    );
-  }
+/**
+ * Parses a version string and performs some checks to verify its validity.
+ * A valid version is in the format vX.Y.Z[-KKK] where X, Y, Z are numbers and KKK can be something else.
+ * The `builtType` is used to enforce that the major version can assume only specific
+ * values.
+ *
+ * Some examples of valid versions are:
+ * - stable: 0.68.1
+ * - stable prerelease: 0.70.0-rc.0
+ * - nightly: 0.0.0-20221116-2018-0bc4547fc
+ * - dryrun: 1000.0.0
+ *
+ * Parameters:
+ * - @versionStr the string representing a version
+ * - @buildType the build type. It can be of values: `dry-run`, `release`, `nightly`
+ *
+ * Returns: an object with the shape:
+ * ```
+ * {
+ *   version: string,
+ *   major: number,
+ *   minor: number,
+ *   patch: number,
+ *   prerelease: string
+ * }
+ * ```
+ *
+ */
+function parseVersion(versionStr, buildType) {
+  validateBuildType(buildType);
+
+  const match = extractMatchIfValid(versionStr);
   const [, version, major, minor, patch, prerelease] = match;
-  return {
+
+  const versionObject = {
     version,
     major,
     minor,
     patch,
     prerelease,
   };
+
+  validateVersion(versionObject, buildType);
+
+  return versionObject;
 }
 
-function isReleaseBranch(branch) {
-  return branch.endsWith('-stable');
+function validateBuildType(buildType) {
+  const validBuildTypes = new Set(['release', 'dry-run', 'nightly']);
+  if (!validBuildTypes.has(buildType)) {
+    throw new Error(`Unsupported build type: ${buildType}`);
+  }
+}
+
+function extractMatchIfValid(versionStr) {
+  const match = versionStr.match(VERSION_REGEX);
+  if (!match) {
+    throw new Error(
+      `You must pass a correctly formatted version; couldn't parse ${versionStr}`,
+    );
+  }
+  return match;
+}
+
+function validateVersion(versionObject, buildType) {
+  const map = {
+    release: validateRelease,
+    'dry-run': validateDryRun,
+    nightly: validateNightly,
+  };
+
+  const validationFunction = map[buildType];
+  validationFunction(versionObject);
 }
 
-function getBranchName() {
-  return exec('git rev-parse --abbrev-ref HEAD', {
-    silent: true,
-  }).stdout.trim();
+/**
+ * Releases are in the form of 0.Y.Z[-RC.0]
+ */
+function validateRelease(version) {
+  const validRelease = isStableRelease(version) || isStablePrerelease(version);
+  if (!validRelease) {
+    throw new Error(`Version ${version.version} is not valid for Release`);
+  }
 }
 
-function isTaggedLatest(commitSha) {
+function validateDryRun(version) {
+  const isNightly = isNightlyBuild(version) && version.prerelease != null;
+
+  if (
+    !isMain(version) &&
+    !isNightly &&
+    !isStableRelease(version) &&
+    !isStablePrerelease(version)
+  ) {
+    throw new Error(`Version ${version.version} is not valid for dry-runs`);
+  }
+}
+
+function validateNightly(version) {
+  // a valid nightly is a prerelease
+  const isPrerelease = version.prerelease != null;
+  const isValidNightly = isNightlyBuild(version) && isPrerelease;
+  if (!isValidNightly) {
+    throw new Error(`Version ${version.version} is not valid for nightlies`);
+  }
+}
+
+function isStableRelease(version) {
   return (
-    exec(`git rev-list -1 latest | grep ${commitSha}`, {
-      silent: true,
-    }).stdout.trim() === commitSha
+    version.major === '0' && version.minor !== '0' && version.prerelease == null
   );
 }
 
+function isStablePrerelease(version) {
+  return (
+    version.major === '0' &&
+    version.minor !== '0' &&
+    version.patch === '0' &&
+    version.prerelease != null &&
+    (version.prerelease.startsWith('rc.') ||
+      version.prerelease.startsWith('rc-'))
+  );
+}
+
+function isNightlyBuild(version) {
+  return (
+    version.major === '0' && version.minor === '0' && version.patch === '0'
+  );
+}
+
+function isMain(version) {
+  return (
+    version.major === '1000' && version.minor === '0' && version.patch === '0'
+  );
+}
+
+function isReleaseBranch(branch) {
+  return branch.endsWith('-stable');
+}
+
 module.exports = {
-  getBranchName,
-  isTaggedLatest,
+  validateBuildType,
   parseVersion,
   isReleaseBranch,
+  isMain,
+  isStableRelease,
+  isStablePrerelease,
 };
diff --git a/sdks/.hermesversion b/sdks/.hermesversion
new file mode 100644
index 000000000000..42a65fb8878a
--- /dev/null
+++ b/sdks/.hermesversion
@@ -0,0 +1 @@
+hermes-2022-11-30-RNv0.71.0-1eb8f7ea3059a338205c302cea0f5a3057f93049
\ No newline at end of file
diff --git a/sdks/hermes-engine/hermes-engine.podspec b/sdks/hermes-engine/hermes-engine.podspec
index 672b7a048d03..247bc111f385 100644
--- a/sdks/hermes-engine/hermes-engine.podspec
+++ b/sdks/hermes-engine/hermes-engine.podspec
@@ -4,42 +4,54 @@
 # LICENSE file in the root directory of this source tree.
 
 require "json"
-require "open3"
+require_relative "./hermes-utils.rb"
 
-# sdks/hermesc/osx-bin/ImportHermesc.cmake
-import_hermesc_file=File.join(__dir__, "..", "hermesc", "osx-bin", "ImportHermesc.cmake")
+react_native_path = File.join(__dir__, "..", "..")
+
+# Whether Hermes is built for Release or Debug is determined by the PRODUCTION envvar.
+build_type = ENV['PRODUCTION'] == "1" ? :release : :debug
 
 # package.json
-package_file = File.join(__dir__, "..", "..", "package.json")
-package = JSON.parse(File.read(package_file))
+package = JSON.parse(File.read(File.join(react_native_path, "package.json")))
 version = package['version']
 
-# We need to check the current git branch/remote to verify if
-# we're on a React Native release branch to actually build Hermes.
-currentbranch, err = Open3.capture3("git rev-parse --abbrev-ref HEAD")
-currentremote, err = Open3.capture3("git config --get remote.origin.url")
+# sdks/.hermesversion
+hermestag_file = File.join(react_native_path, "sdks", ".hermesversion")
+isInCI = ENV['REACT_NATIVE_CI'] === 'true'
 
 source = {}
 git = "https://github.com/facebook/hermes.git"
 
+isInMain = version.include?('1000.0.0')
+isNightly = version.start_with?('0.0.0-')
+
 if ENV.has_key?('HERMES_ENGINE_TARBALL_PATH')
-  Pod::UI.puts '[Hermes] Using pre-built Hermes binaries from local path.' if Object.const_defined?("Pod::UI")
+  if !File.exist?(ENV['HERMES_ENGINE_TARBALL_PATH'])
+    abort "[Hermes] HERMES_ENGINE_TARBALL_PATH is set, but points to a non-existing file: \"#{ENV['HERMES_ENGINE_TARBALL_PATH']}\"\nIf you don't want to use tarball, run `unset HERMES_ENGINE_TARBALL_PATH`"
+  end
+end
+
+if ENV.has_key?('HERMES_ENGINE_TARBALL_PATH')
+  Pod::UI.puts "[Hermes] Using pre-built Hermes binaries from local path: #{ENV['HERMES_ENGINE_TARBALL_PATH']}".yellow if Object.const_defined?("Pod::UI")
   source[:http] = "file://#{ENV['HERMES_ENGINE_TARBALL_PATH']}"
-elsif version == '1000.0.0'
-  Pod::UI.puts '[Hermes] Hermes needs to be compiled, installing hermes-engine may take a while...'.yellow if Object.const_defined?("Pod::UI")
+elsif isInMain
+  Pod::UI.puts '[Hermes] Installing hermes-engine may take slightly longer, building Hermes compiler from source...'.yellow if Object.const_defined?("Pod::UI")
   source[:git] = git
   source[:commit] = `git ls-remote https://github.com/facebook/hermes main | cut -f 1`.strip
-elsif currentremote.strip.end_with?("facebook/react-native.git") and currentbranch.strip.end_with?("-stable")
-  Pod::UI.puts '[Hermes] Detected that you are on a React Native release branch, building Hermes from source...'.yellow if Object.const_defined?("Pod::UI")
+elsif isNightly
+  Pod::UI.puts '[Hermes] Nightly version, download pre-built for Hermes'.yellow if Object.const_defined?("Pod::UI")
+  destination_path = download_nightly_hermes(react_native_path, version)
+  # set tarball as hermes engine
+  source[:http] = "file://#{destination_path}"
+elsif File.exists?(hermestag_file) && isInCI
+  Pod::UI.puts '[Hermes] Detected that you are on a React Native release branch, building Hermes from source but fetched from tag...'.yellow if Object.const_defined?("Pod::UI")
+  hermestag = File.read(hermestag_file).strip
   source[:git] = git
-  source[:commit] = `git ls-remote https://github.com/facebook/hermes main | cut -f 1`.strip
+  source[:tag] = hermestag
 else
-  source[:http] = "https://github.com/facebook/react-native/releases/download/v#{version}/hermes-runtime-darwin-v#{version}.tar.gz"
-end
-
-module HermesHelper
-  # BUILD_TYPE = :debug
-  BUILD_TYPE = :release
+  # Sample url from Maven:
+  # https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.71.0/react-native-artifacts-0.71.0-hermes-ios-debug.tar.gz
+  source[:http] = "https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/#{version}/react-native-artifacts-#{version}-hermes-ios-#{build_type.to_s}.tar.gz"
 end
 
 Pod::Spec.new do |spec|
@@ -48,35 +60,84 @@ Pod::Spec.new do |spec|
   spec.summary     = "Hermes is a small and lightweight JavaScript engine optimized for running React Native."
   spec.description = "Hermes is a JavaScript engine optimized for fast start-up of React Native apps. It features ahead-of-time static optimization and compact bytecode."
   spec.homepage    = "https://hermesengine.dev"
-  spec.license     = package["license"]
+  spec.license     = package['license']
   spec.author      = "Facebook"
   spec.source      = source
   spec.platforms   = { :osx => "10.13", :ios => "12.4" }
 
-  spec.preserve_paths      = ["destroot/bin/*"].concat(HermesHelper::BUILD_TYPE == :debug ? ["**/*.{h,c,cpp}"] : [])
-  spec.source_files        = "destroot/include/**/*.h"
-  spec.header_mappings_dir = "destroot/include"
+  spec.preserve_paths      = '**/*.*'
+  spec.source_files        = ''
+
+  spec.xcconfig = {
+                    "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
+                    "CLANG_CXX_LIBRARY" => "compiler-default"
+                  }.merge!(build_type == :debug ? { "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1" } : {})
+
+  if source[:http] then
+
+    spec.subspec 'Pre-built' do |ss|
+      ss.preserve_paths = ["destroot/bin/*"].concat(build_type == :debug ? ["**/*.{h,c,cpp}"] : [])
+      ss.source_files = "destroot/include/**/*.h"
+      ss.exclude_files = ["destroot/include/jsi/jsi/JSIDynamic.{h,cpp}", "destroot/include/jsi/jsi/jsilib-*.{h,cpp}"]
+      ss.header_mappings_dir = "destroot/include"
+      ss.ios.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework"
+      ss.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermes.framework"
+    end
+
+  elsif source[:git] then
+
+    spec.subspec 'Hermes' do |ss|
+      ss.source_files = ''
+      ss.public_header_files = 'API/hermes/*.h'
+      ss.header_dir = 'hermes'
+    end
 
-  spec.ios.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework"
-  spec.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermes.framework"
+    spec.subspec 'JSI' do |ss|
+      ss.source_files = ''
+      ss.public_header_files = 'API/jsi/jsi/*.h'
+      ss.header_dir = 'jsi'
+    end
 
-  spec.xcconfig            = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", "CLANG_CXX_LIBRARY" => "compiler-default", "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1" }
+    spec.subspec 'Public' do |ss|
+      ss.source_files = ''
+      ss.public_header_files = 'public/hermes/Public/*.h'
+      ss.header_dir = 'hermes/Public'
+    end
 
-  if source[:git] then
-    spec.prepare_command = <<-EOS
-      # When true, debug build will be used.
-      # See `build-apple-framework.sh` for details
-      DEBUG=#{HermesHelper::BUILD_TYPE == :debug}
+    hermesc_path = ""
 
-      # Set HERMES_OVERRIDE_HERMESC_PATH if pre-built HermesC is available
-      #{File.exist?(import_hermesc_file) ? "export HERMES_OVERRIDE_HERMESC_PATH=#{import_hermesc_file}" : ""}
-      #{File.exist?(import_hermesc_file) ? "echo \"Overriding HermesC path...\"" : ""}
+    if ENV.has_key?('HERMES_OVERRIDE_HERMESC_PATH') && File.exist?(ENV['HERMES_OVERRIDE_HERMESC_PATH']) then
+      hermesc_path = ENV['HERMES_OVERRIDE_HERMESC_PATH']
+    else
+      # Keep hermesc_path synchronized with .gitignore entry.
+      ENV['REACT_NATIVE_PATH'] = react_native_path
+      hermesc_path = "${REACT_NATIVE_PATH}/sdks/hermes-engine/build_host_hermesc"
+      # NOTE: Prepare command is not run  if the pod is not downloaded.
+      spec.prepare_command = ". #{react_native_path}/sdks/hermes-engine/utils/build-hermesc-xcode.sh #{hermesc_path}"
+    end
 
-      # Build iOS framework
-      ./utils/build-ios-framework.sh
+    spec.user_target_xcconfig = {
+      'FRAMEWORK_SEARCH_PATHS' => '"$(PODS_ROOT)/hermes-engine/destroot/Library/Frameworks/iphoneos" ' +
+                                  '"$(PODS_ROOT)/hermes-engine/destroot/Library/Frameworks/iphonesimulator" ' +
+                                  '"$(PODS_ROOT)/hermes-engine/destroot/Library/Frameworks/macosx" ' +
+                                  '"$(PODS_ROOT)/hermes-engine/destroot/Library/Frameworks/catalyst"',
+      'OTHER_LDFLAGS' => '-framework "hermes"',
+      'HERMES_CLI_PATH' => "#{hermesc_path}/bin/hermesc"
+    }
 
-      # Build Mac framework
-      ./utils/build-mac-framework.sh
-    EOS
+    spec.script_phases = [
+      {
+        :name => 'Build Hermes',
+        :script => <<-EOS
+        . ${PODS_ROOT}/../.xcode.env
+        export CMAKE_BINARY=${CMAKE_BINARY:-#{%x(command -v cmake | tr -d '\n')}}
+        . ${REACT_NATIVE_PATH}/sdks/hermes-engine/utils/build-hermes-xcode.sh #{version} #{hermesc_path}/ImportHermesc.cmake
+        EOS
+      },
+      {
+        :name => 'Copy Hermes Framework',
+        :script => ". ${REACT_NATIVE_PATH}/sdks/hermes-engine/utils/copy-hermes-xcode.sh"
+      }
+    ]
   end
 end
diff --git a/sdks/hermes-engine/hermes-utils.rb b/sdks/hermes-engine/hermes-utils.rb
new file mode 100644
index 000000000000..084249601105
--- /dev/null
+++ b/sdks/hermes-engine/hermes-utils.rb
@@ -0,0 +1,26 @@
+# 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 'net/http'
+require 'rexml/document'
+
+# This function downloads the nightly prebuilt version of Hermes based on the passed version
+# and save it in the node_module/react_native/sdks/downloads folder
+# It then returns the path to the hermes tarball
+#
+# Parameters
+# - react_native_path: the path to the React Native folder in node modules. It is used as root path to store the Hermes tarball
+# - version: the version of React Native that requires the Hermes tarball
+# Returns: the path to the downloaded Hermes tarball
+def download_nightly_hermes(react_native_path, version)
+    params = "r=snapshots\&g=com.facebook.react\&a=react-native-artifacts\&c=hermes-ios-debug\&e=tar.gz\&v=#{version}-SNAPSHOT"
+    tarball_url = "http://oss.sonatype.org/service/local/artifact/maven/redirect\?#{params}"
+
+    destination_folder = "#{react_native_path}/sdks/downloads"
+    destination_path = "#{destination_folder}/hermes-ios.tar.gz"
+
+    `mkdir -p "#{destination_folder}" && curl "#{tarball_url}" -Lo "#{destination_path}"`
+    return destination_path
+end
diff --git a/sdks/hermes-engine/utils/build-apple-framework.sh b/sdks/hermes-engine/utils/build-apple-framework.sh
index f1f1e421023e..87faae6cb699 100755
--- a/sdks/hermes-engine/utils/build-apple-framework.sh
+++ b/sdks/hermes-engine/utils/build-apple-framework.sh
@@ -4,38 +4,55 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-if [ "$DEBUG" = true ]; then
-  BUILD_TYPE="Debug"
-else
-  BUILD_TYPE="Release"
-fi
+# Defines functions for building various Hermes frameworks.
+# See build-ios-framework.sh and build-mac-framework.sh for usage examples.
+
+CURR_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
 
-NUM_CORES=$(sysctl -n hw.ncpu)
 IMPORT_HERMESC_PATH=${HERMES_OVERRIDE_HERMESC_PATH:-$PWD/build_host_hermesc/ImportHermesc.cmake}
-REACT_NATIVE_PATH=${REACT_NATIVE_PATH:-$PWD/../..}
-JSI_PATH="$REACT_NATIVE_PATH/ReactCommon/jsi"
+BUILD_TYPE=${BUILD_TYPE:-Debug}
+
+HERMES_PATH="$CURR_SCRIPT_DIR/.."
+REACT_NATIVE_PATH=${REACT_NATIVE_PATH:-$CURR_SCRIPT_DIR/../../..}
+
+NUM_CORES=$(sysctl -n hw.ncpu)
+
+if [[ -z "$JSI_PATH" ]]; then
+  JSI_PATH="$REACT_NATIVE_PATH/ReactCommon/jsi"
+fi
+
+function use_env_var_or_ruby_prop {
+  if [[ -n "$1" ]]; then
+    echo "$1"
+  else
+    ruby -rcocoapods-core -rjson -e "puts Pod::Specification.from_file('hermes-engine.podspec').$2"
+  fi
+}
 
 function get_release_version {
-  ruby -rcocoapods-core -rjson -e "puts Pod::Specification.from_file('hermes-engine.podspec').version"
+  use_env_var_or_ruby_prop "${RELEASE_VERSION}" "version"
 }
 
 function get_ios_deployment_target {
-  ruby -rcocoapods-core -rjson -e "puts Pod::Specification.from_file('hermes-engine.podspec').deployment_target('ios')"
+  use_env_var_or_ruby_prop "${IOS_DEPLOYMENT_TARGET}" "deployment_target('ios')"
 }
 
 function get_mac_deployment_target {
-  ruby -rcocoapods-core -rjson -e "puts Pod::Specification.from_file('hermes-engine.podspec').deployment_target('osx')"
+  use_env_var_or_ruby_prop "${MAC_DEPLOYMENT_TARGET}" "deployment_target('osx')"
 }
 
 # Build host hermes compiler for internal bytecode
 function build_host_hermesc {
-  cmake -S . -B build_host_hermesc
-  cmake --build ./build_host_hermesc --target hermesc -j ${NUM_CORES}
+  echo "Building hermesc"
+  pushd "$HERMES_PATH" > /dev/null || exit 1
+    cmake -S . -B build_host_hermesc -DJSI_DIR="$JSI_PATH"
+    cmake --build ./build_host_hermesc --target hermesc -j "${NUM_CORES}"
+  popd > /dev/null || exit 1
 }
 
 # Utility function to configure an Apple framework
 function configure_apple_framework {
-  local build_cli_tools enable_bitcode
+  local build_cli_tools enable_bitcode enable_debugger cmake_build_type
 
   if [[ $1 == iphoneos || $1 == catalyst ]]; then
     enable_bitcode="true"
@@ -47,31 +64,43 @@ function configure_apple_framework {
   else
     build_cli_tools="false"
   fi
+  if [[ $BUILD_TYPE == "Debug" ]]; then
+    enable_debugger="true"
+  else
+    enable_debugger="false"
+  fi
+  if [[ $BUILD_TYPE == "Debug" ]]; then
+    # JS developers aren't VM developers.
+    # Therefore we're passing as build type Release, to provide a faster build.
+    cmake_build_type="Release"
+  else
+    cmake_build_type="MinSizeRel"
+  fi
 
-  cmake -S . -B "build_$1" \
-    -DHERMES_APPLE_TARGET_PLATFORM:STRING="$1" \
-    -DCMAKE_OSX_ARCHITECTURES:STRING="$2" \
-    -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="$3" \
-    -DHERMES_ENABLE_DEBUGGER:BOOLEAN=true \
-    -DHERMES_ENABLE_INTL:BOOLEAN=true \
-    -DHERMES_ENABLE_LIBFUZZER:BOOLEAN=false \
-    -DHERMES_ENABLE_FUZZILLI:BOOLEAN=false \
-    -DHERMES_ENABLE_TEST_SUITE:BOOLEAN=false \
-    -DHERMES_ENABLE_BITCODE:BOOLEAN="$enable_bitcode" \
-    -DHERMES_BUILD_APPLE_FRAMEWORK:BOOLEAN=true \
-    -DHERMES_BUILD_APPLE_DSYM:BOOLEAN=true \
-    -DHERMES_ENABLE_TOOLS:BOOLEAN="$build_cli_tools" \
-    -DIMPORT_HERMESC:PATH="$IMPORT_HERMESC_PATH" \
-    -DJSI_DIR="$JSI_PATH" \
-    -DHERMES_RELEASE_VERSION="for RN $(get_release_version)" \
-    -DCMAKE_INSTALL_PREFIX:PATH=../destroot \
-    -DCMAKE_BUILD_TYPE="$BUILD_TYPE"
+  pushd "$HERMES_PATH" > /dev/null || exit 1
+    cmake -S . -B "build_$1" \
+      -DHERMES_APPLE_TARGET_PLATFORM:STRING="$1" \
+      -DCMAKE_OSX_ARCHITECTURES:STRING="$2" \
+      -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="$3" \
+      -DHERMES_ENABLE_DEBUGGER:BOOLEAN="$enable_debugger" \
+      -DHERMES_ENABLE_INTL:BOOLEAN=true \
+      -DHERMES_ENABLE_LIBFUZZER:BOOLEAN=false \
+      -DHERMES_ENABLE_FUZZILLI:BOOLEAN=false \
+      -DHERMES_ENABLE_TEST_SUITE:BOOLEAN=false \
+      -DHERMES_ENABLE_BITCODE:BOOLEAN="$enable_bitcode" \
+      -DHERMES_BUILD_APPLE_FRAMEWORK:BOOLEAN=true \
+      -DHERMES_BUILD_APPLE_DSYM:BOOLEAN=true \
+      -DHERMES_ENABLE_TOOLS:BOOLEAN="$build_cli_tools" \
+      -DIMPORT_HERMESC:PATH="$IMPORT_HERMESC_PATH" \
+      -DJSI_DIR="$JSI_PATH" \
+      -DHERMES_RELEASE_VERSION="for RN $(get_release_version)" \
+      -DCMAKE_INSTALL_PREFIX:PATH=../destroot \
+      -DCMAKE_BUILD_TYPE="$cmake_build_type"
+    popd > /dev/null || exit 1
 }
 
 # Utility function to build an Apple framework
 function build_apple_framework {
-  echo "Building framework for $1 with architectures: $2"
-
   # Only build host HermesC if no file found at $IMPORT_HERMESC_PATH
   [ ! -f "$IMPORT_HERMESC_PATH" ] &&
   build_host_hermesc
@@ -80,15 +109,19 @@ function build_apple_framework {
   [ ! -f "$IMPORT_HERMESC_PATH" ] &&
   echo "Host hermesc is required to build apple frameworks!"
 
+  echo "Building $BUILD_TYPE framework for $1 with architectures: $2"
   configure_apple_framework "$1" "$2" "$3"
-  cmake --build "./build_$1" --target install/strip -j ${NUM_CORES}
+
+  pushd "$HERMES_PATH" > /dev/null || exit 1
+    cmake --build "./build_$1" --target install/strip -j "${NUM_CORES}"
+  popd > /dev/null || exit 1
 }
 
 # Accepts an array of frameworks and will place all of
 # the architectures into an universal folder and then remove
 # the merged frameworks from destroot
 function create_universal_framework {
-  cd ./destroot/Library/Frameworks || exit 1
+  pushd "$HERMES_PATH/destroot/Library/Frameworks" > /dev/null || exit 1
 
   local platforms=("$@")
   local args=""
@@ -96,16 +129,23 @@ function create_universal_framework {
   echo "Creating universal framework for platforms: ${platforms[*]}"
 
   for i in "${!platforms[@]}"; do
-    args+="-framework ${platforms[$i]}/hermes.framework "
+    local hermes_framework_path="${platforms[$i]}/hermes.framework"
+    args+="-framework $hermes_framework_path "
+
+    # Path to dSYM must be absolute
+    args+="-debug-symbols $HERMES_PATH/destroot/Library/Frameworks/$hermes_framework_path.dSYM "
   done
 
-  mkdir universal
+  mkdir -p universal
   # shellcheck disable=SC2086
-  xcodebuild -create-xcframework $args -output "universal/hermes.xcframework"
-
-  for platform in "$@"; do
-    rm -r "$platform"
-  done
+  if xcodebuild -create-xcframework $args -output "universal/hermes.xcframework"
+  then
+    # # Remove the thin iOS hermes.frameworks that are now part of the universal
+    # XCFramework
+    for platform in "${platforms[@]}"; do
+      rm -r "$platform"
+    done
+  fi
 
-  cd - || exit 1
+  popd > /dev/null || exit 1
 }
diff --git a/sdks/hermes-engine/utils/build-hermes-xcode.sh b/sdks/hermes-engine/utils/build-hermes-xcode.sh
new file mode 100755
index 000000000000..37faee325060
--- /dev/null
+++ b/sdks/hermes-engine/utils/build-hermes-xcode.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+# 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.
+
+set -x
+
+release_version="$1"; shift
+hermesc_path="$1"; shift
+
+build_cli_tools="false"
+if [[ "$PLATFORM_NAME" == macosx ]]; then
+  build_cli_tools="true"
+fi
+
+enable_debugger="false"
+if [[ "$CONFIGURATION" == "Debug" ]]; then
+  enable_debugger="true"
+fi
+
+cmake_build_type=""
+if [[ $CONFIGURATION == "Debug" ]]; then
+  # JS developers aren't VM developers.
+  # Therefore we're passing as build type Release, to provide a faster build.
+  cmake_build_type="Release"
+else
+  cmake_build_type="MinSizeRel"
+fi
+
+deployment_target=${IPHONEOS_DEPLOYMENT_TARGET}
+if [ -z "$deployment_target" ]; then
+  deployment_target=${MACOSX_DEPLOYMENT_TARGET}
+fi
+
+architectures=$( echo "$ARCHS" | tr  " " ";" )
+
+echo "Configure Apple framework"
+
+"$CMAKE_BINARY" \
+  -S "${PODS_ROOT}/hermes-engine" \
+  -B "${PODS_ROOT}/hermes-engine/build/${PLATFORM_NAME}" \
+  -DHERMES_APPLE_TARGET_PLATFORM:STRING="$PLATFORM_NAME" \
+  -DCMAKE_OSX_ARCHITECTURES:STRING="$architectures" \
+  -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="$deployment_target" \
+  -DHERMES_ENABLE_DEBUGGER:BOOLEAN="$enable_debugger" \
+  -DHERMES_ENABLE_INTL:BOOLEAN=true \
+  -DHERMES_ENABLE_LIBFUZZER:BOOLEAN=false \
+  -DHERMES_ENABLE_FUZZILLI:BOOLEAN=false \
+  -DHERMES_ENABLE_TEST_SUITE:BOOLEAN=false \
+  -DHERMES_ENABLE_BITCODE:BOOLEAN=false \
+  -DHERMES_BUILD_APPLE_FRAMEWORK:BOOLEAN=true \
+  -DHERMES_BUILD_APPLE_DSYM:BOOLEAN=true \
+  -DHERMES_ENABLE_TOOLS:BOOLEAN="$build_cli_tools" \
+  -DIMPORT_HERMESC:PATH="${hermesc_path}" \
+  -DHERMES_RELEASE_VERSION="for RN $release_version" \
+  -DCMAKE_INSTALL_PREFIX:PATH="${PODS_ROOT}/hermes-engine/destroot" \
+  -DCMAKE_BUILD_TYPE="$cmake_build_type"
+
+echo "Build Apple framework"
+
+"$CMAKE_BINARY" \
+  --build "${PODS_ROOT}/hermes-engine/build/${PLATFORM_NAME}" \
+  --target "install/strip" \
+  -j "$(sysctl -n hw.ncpu)"
diff --git a/sdks/hermes-engine/utils/build-hermesc-xcode.sh b/sdks/hermes-engine/utils/build-hermesc-xcode.sh
new file mode 100755
index 000000000000..6b1ea9184d76
--- /dev/null
+++ b/sdks/hermes-engine/utils/build-hermesc-xcode.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+# 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.
+
+set -x
+
+hermesc_dir_path="$1"
+
+CMAKE_BINARY=${CMAKE_BINARY:-$(command -v cmake | tr -d '\n')}
+
+if ! "$CMAKE_BINARY" -S . -B "$hermesc_dir_path"
+then
+    echo "Failed to configure Hermesc cmake project."
+    exit 1
+fi
+if ! "$CMAKE_BINARY" --build "$hermesc_dir_path" --target hermesc -j "$(sysctl -n hw.ncpu)"
+then
+    echo "Failed to build Hermesc cmake project."
+    exit 1
+fi
diff --git a/sdks/hermes-engine/utils/build-ios-framework.sh b/sdks/hermes-engine/utils/build-ios-framework.sh
index 771f39f79779..6b3b8fe2f8cd 100755
--- a/sdks/hermes-engine/utils/build-ios-framework.sh
+++ b/sdks/hermes-engine/utils/build-ios-framework.sh
@@ -5,7 +5,8 @@
 # LICENSE file in the root directory of this source tree.
 
 # shellcheck source=xplat/js/react-native-github/sdks/hermes-engine/utils/build-apple-framework.sh
-. ./utils/build-apple-framework.sh
+CURR_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
+. "${CURR_SCRIPT_DIR}/build-apple-framework.sh"
 
 if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
     ios_deployment_target=$(get_ios_deployment_target)
diff --git a/sdks/hermes-engine/utils/build-mac-framework.sh b/sdks/hermes-engine/utils/build-mac-framework.sh
index e1f9abf81a4a..0492ad28f22e 100755
--- a/sdks/hermes-engine/utils/build-mac-framework.sh
+++ b/sdks/hermes-engine/utils/build-mac-framework.sh
@@ -5,7 +5,8 @@
 # LICENSE file in the root directory of this source tree.
 
 # shellcheck source=xplat/js/react-native-github/sdks/hermes-engine/utils/build-apple-framework.sh
-. ./utils/build-apple-framework.sh
+CURR_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
+. "${CURR_SCRIPT_DIR}/build-apple-framework.sh"
 
 if [ ! -d destroot/Library/Frameworks/macosx/hermes.framework ]; then
     mac_deployment_target=$(get_mac_deployment_target)
diff --git a/sdks/hermes-engine/utils/copy-hermes-xcode.sh b/sdks/hermes-engine/utils/copy-hermes-xcode.sh
new file mode 100755
index 000000000000..1b14941e6a14
--- /dev/null
+++ b/sdks/hermes-engine/utils/copy-hermes-xcode.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+# 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.
+
+set -x
+
+src="${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/${PLATFORM_NAME}/hermes.framework"
+
+if [[ ! -e "$src" ]]; then
+  echo "$src does not exist."
+  exit 1
+fi
+
+dst1="${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes"
+[ ! -f "$dst1" ] && mkdir -p "$dst1"
+cp -R "$src" "$dst1"
+
+dst2="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+[ ! -f "$dst2" ] && mkdir -p "$dst2"
+cp -R "$src" "$dst2"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 018994f05a08..836c9a2946ea 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ pluginManagement {
 include(
     ":ReactAndroid",
     ":ReactAndroid:hermes-engine",
-    ":packages:react-native-codegen:android",
+    ":ReactAndroid:external-artifacts",
     ":packages:rn-tester:android:app")
 
 // Include this to enable codegen Gradle plugin.
diff --git a/template/App.js b/template/App.tsx
similarity index 87%
rename from template/App.js
rename to template/App.tsx
index 4c97733b30ca..bf24c33164b8 100644
--- a/template/App.js
+++ b/template/App.tsx
@@ -3,11 +3,10 @@
  * https://github.com/facebook/react-native
  *
  * @format
- * @flow strict-local
  */
 
 import React from 'react';
-import type {Node} from 'react';
+import type {PropsWithChildren} from 'react';
 import {
   SafeAreaView,
   ScrollView,
@@ -26,9 +25,11 @@ import {
   ReloadInstructions,
 } from 'react-native/Libraries/NewAppScreen';
 
-/* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
- * LTI update could not be added via codemod */
-const Section = ({children, title}): Node => {
+type SectionProps = PropsWithChildren<{
+  title: string;
+}>;
+
+function Section({children, title}: SectionProps): JSX.Element {
   const isDarkMode = useColorScheme() === 'dark';
   return (
     <View style={styles.sectionContainer}>
@@ -52,9 +53,9 @@ const Section = ({children, title}): Node => {
       </Text>
     </View>
   );
-};
+}
 
-const App: () => Node = () => {
+function App(): JSX.Element {
   const isDarkMode = useColorScheme() === 'dark';
 
   const backgroundStyle = {
@@ -76,7 +77,7 @@ const App: () => Node = () => {
             backgroundColor: isDarkMode ? Colors.black : Colors.white,
           }}>
           <Section title="Step One">
-            Edit <Text style={styles.highlight}>App.js</Text> to change this
+            Edit <Text style={styles.highlight}>App.tsx</Text> to change this
             screen and then come back to see your edits.
           </Section>
           <Section title="See Your Changes">
@@ -93,7 +94,7 @@ const App: () => Node = () => {
       </ScrollView>
     </SafeAreaView>
   );
-};
+}
 
 const styles = StyleSheet.create({
   sectionContainer: {
diff --git a/template/Gemfile b/template/Gemfile
index 5efda89f4525..567e59805c4a 100644
--- a/template/Gemfile
+++ b/template/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.5'
+ruby File.read(File.join(__dir__, '.ruby-version')).strip
 
-gem 'cocoapods', '~> 1.11', '>= 1.11.2'
+gem 'cocoapods', '~> 1.11', '>= 1.11.3'
diff --git a/template/__tests__/App-test.js b/template/__tests__/App-test.tsx
similarity index 100%
rename from template/__tests__/App-test.js
rename to template/__tests__/App-test.tsx
diff --git a/template/_buckconfig b/template/_buckconfig
deleted file mode 100644
index 934256cb29d4..000000000000
--- a/template/_buckconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-
-[android]
-  target = Google Inc.:Google APIs:23
-
-[maven_repositories]
-  central = https://repo1.maven.org/maven2
diff --git a/template/_flowconfig b/template/_flowconfig
deleted file mode 100644
index 3782e447cdef..000000000000
--- a/template/_flowconfig
+++ /dev/null
@@ -1,66 +0,0 @@
-[ignore]
-; We fork some components by platform
-.*/*[.]android.js
-
-; Ignore "BUCK" generated dirs
-<PROJECT_ROOT>/\.buckd/
-
-; Ignore polyfills
-node_modules/react-native/Libraries/polyfills/.*
-
-; Flow doesn't support platforms
-.*/Libraries/Utilities/LoadingView.js
-
-.*/node_modules/resolve/test/resolver/malformed_package_json/package\.json$
-
-[untyped]
-.*/node_modules/@react-native-community/cli/.*/.*
-
-[include]
-
-[libs]
-node_modules/react-native/interface.js
-node_modules/react-native/flow/
-
-[options]
-emoji=true
-
-exact_by_default=true
-
-format.bracket_spacing=false
-
-module.file_ext=.js
-module.file_ext=.json
-module.file_ext=.ios.js
-
-munge_underscores=true
-
-module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
-module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
-
-suppress_type=$FlowIssue
-suppress_type=$FlowFixMe
-suppress_type=$FlowFixMeProps
-suppress_type=$FlowFixMeState
-
-[lints]
-sketchy-null-number=warn
-sketchy-null-mixed=warn
-sketchy-number=warn
-untyped-type-import=warn
-nonstrict-import=warn
-deprecated-type=warn
-unsafe-getters-setters=warn
-unnecessary-invariant=warn
-
-[strict]
-deprecated-type
-nonstrict-import
-sketchy-null
-unclear-type
-unsafe-getters-setters
-untyped-import
-untyped-type-import
-
-[version]
-^0.182.0
diff --git a/template/_gitignore b/template/_gitignore
index 344481b211f2..16f8c30773d3 100644
--- a/template/_gitignore
+++ b/template/_gitignore
@@ -30,6 +30,9 @@ build/
 local.properties
 *.iml
 *.hprof
+.cxx/
+*.keystore
+!debug.keystore
 
 # node.js
 #
@@ -37,12 +40,6 @@ node_modules/
 npm-debug.log
 yarn-error.log
 
-# BUCK
-buck-out/
-\.buckd/
-*.keystore
-!debug.keystore
-
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
@@ -61,3 +58,6 @@ buck-out/
 # Ruby / CocoaPods
 /ios/Pods/
 /vendor/bundle/
+
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
diff --git a/template/_ruby-version b/template/_ruby-version
index a603bb50a29e..49cdd668e1c8 100644
--- a/template/_ruby-version
+++ b/template/_ruby-version
@@ -1 +1 @@
-2.7.5
+2.7.6
diff --git a/template/android/app/_BUCK b/template/android/app/_BUCK
deleted file mode 100644
index 0e779048347e..000000000000
--- a/template/android/app/_BUCK
+++ /dev/null
@@ -1,55 +0,0 @@
-# To learn about Buck see [Docs](https://buckbuild.com/).
-# To run your application with Buck:
-# - install Buck
-# - `npm start` - to start the packager
-# - `cd android`
-# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
-# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
-# - `buck install -r android/app` - compile, install and run application
-#
-
-load(":build_defs.bzl", "create_aar_targets", "create_jar_targets")
-
-lib_deps = []
-
-create_aar_targets(glob(["libs/*.aar"]))
-
-create_jar_targets(glob(["libs/*.jar"]))
-
-android_library(
-    name = "all-libs",
-    exported_deps = lib_deps,
-)
-
-android_library(
-    name = "app-code",
-    srcs = glob([
-        "src/main/java/**/*.java",
-    ]),
-    deps = [
-        ":all-libs",
-        ":build_config",
-        ":res",
-    ],
-)
-
-android_build_config(
-    name = "build_config",
-    package = "com.helloworld",
-)
-
-android_resource(
-    name = "res",
-    package = "com.helloworld",
-    res = "src/main/res",
-)
-
-android_binary(
-    name = "app",
-    keystore = "//android/keystores:debug",
-    manifest = "src/main/AndroidManifest.xml",
-    package_type = "debug",
-    deps = [
-        ":app-code",
-    ],
-)
diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle
index bb4470cd7336..e3b8c4c9cf4a 100644
--- a/template/android/app/build.gradle
+++ b/template/android/app/build.gradle
@@ -1,127 +1,87 @@
 apply plugin: "com.android.application"
+apply plugin: "com.facebook.react"
 
 import com.android.build.OutputFile
 
 /**
- * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
- * and bundleReleaseJsAndAssets).
- * These basically call `react-native bundle` with the correct arguments during the Android build
- * cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
- * bundle directly from the development server. Below you can see all the possible configurations
- * and their defaults. If you decide to add a configuration block, make sure to add it before the
- * `apply from: "../../node_modules/react-native/react.gradle"` line.
- *
- * project.ext.react = [
- *   // the name of the generated asset file containing your JS bundle
- *   bundleAssetName: "index.android.bundle",
- *
- *   // the entry file for bundle generation. If none specified and
- *   // "index.android.js" exists, it will be used. Otherwise "index.js" is
- *   // default. Can be overridden with ENTRY_FILE environment variable.
- *   entryFile: "index.android.js",
- *
- *   // https://reactnative.dev/docs/performance#enable-the-ram-format
- *   bundleCommand: "ram-bundle",
- *
- *   // whether to bundle JS and assets in debug mode
- *   bundleInDebug: false,
- *
- *   // whether to bundle JS and assets in release mode
- *   bundleInRelease: true,
- *
- *   // whether to bundle JS and assets in another build variant (if configured).
- *   // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
- *   // The configuration property can be in the following formats
- *   //         'bundleIn${productFlavor}${buildType}'
- *   //         'bundleIn${buildType}'
- *   // bundleInFreeDebug: true,
- *   // bundleInPaidRelease: true,
- *   // bundleInBeta: true,
- *
- *   // whether to disable dev mode in custom build variants (by default only disabled in release)
- *   // for example: to disable dev mode in the staging build type (if configured)
- *   devDisabledInStaging: true,
- *   // The configuration property can be in the following formats
- *   //         'devDisabledIn${productFlavor}${buildType}'
- *   //         'devDisabledIn${buildType}'
- *
- *   // the root of your project, i.e. where "package.json" lives
- *   root: "../../",
- *
- *   // where to put the JS bundle asset in debug mode
- *   jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
- *
- *   // where to put the JS bundle asset in release mode
- *   jsBundleDirRelease: "$buildDir/intermediates/assets/release",
- *
- *   // where to put drawable resources / React Native assets, e.g. the ones you use via
- *   // require('./image.png')), in debug mode
- *   resourcesDirDebug: "$buildDir/intermediates/res/merged/debug",
- *
- *   // where to put drawable resources / React Native assets, e.g. the ones you use via
- *   // require('./image.png')), in release mode
- *   resourcesDirRelease: "$buildDir/intermediates/res/merged/release",
- *
- *   // by default the gradle tasks are skipped if none of the JS files or assets change; this means
- *   // that we don't look at files in android/ or ios/ to determine whether the tasks are up to
- *   // date; if you have any other folders that you want to ignore for performance reasons (gradle
- *   // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
- *   // for example, you might want to remove it from here.
- *   inputExcludes: ["android/**", "ios/**"],
- *
- *   // override which node gets called and with what additional arguments
- *   nodeExecutableAndArgs: ["node"],
- *
- *   // supply additional arguments to the packager
- *   extraPackagerArgs: []
- * ]
+ * This is the configuration block to customize your React Native Android app.
+ * By default you don't need to apply any configuration, just uncomment the lines you need.
  */
-
-project.ext.react = [
-    enableHermes: true,  // clean and rebuild if changing
-]
-
-apply from: "../../node_modules/react-native/react.gradle"
+react {
+    /* Folders */
+    //   The root of your project, i.e. where "package.json" lives. Default is '..'
+    // root = file("../")
+    //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
+    // reactNativeDir = file("../node-modules/react-native")
+    //   The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen
+    // codegenDir = file("../node-modules/react-native-codegen")
+    //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
+    // cliFile = file("../node_modules/react-native/cli.js")
+
+    /* Variants */
+    //   The list of variants to that are debuggable. For those we're going to
+    //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
+    //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
+    // debuggableVariants = ["liteDebug", "prodDebug"]
+
+    /* Bundling */
+    //   A list containing the node command and its flags. Default is just 'node'.
+    // nodeExecutableAndArgs = ["node"]
+    //
+    //   The command to run when bundling. By default is 'bundle'
+    // bundleCommand = "ram-bundle"
+    //
+    //   The path to the CLI configuration file. Default is empty.
+    // bundleConfig = file(../rn-cli.config.js)
+    //
+    //   The name of the generated asset file containing your JS bundle
+    // bundleAssetName = "MyApplication.android.bundle"
+    //
+    //   The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
+    // entryFile = file("../js/MyApplication.android.js")
+    //
+    //   A list of extra flags to pass to the 'bundle' commands.
+    //   See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
+    // extraPackagerArgs = []
+
+    /* Hermes Commands */
+    //   The hermes compiler command to run. By default it is 'hermesc'
+    // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
+    //
+    //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
+    // hermesFlags = ["-O", "-output-source-map"]
+}
 
 /**
- * Set this to true to create two separate APKs instead of one:
- *   - An APK that only works on ARM devices
- *   - An APK that only works on x86 devices
- * The advantage is the size of the APK is reduced by about 4MB.
- * Upload all the APKs to the Play Store and people will download
- * the correct one based on the CPU architecture of their device.
+ * Set this to true to create four separate APKs instead of one,
+ * one for each native architecture. This is useful if you don't
+ * use App Bundles (https://developer.android.com/guide/app-bundle/)
+ * and want to have separate APKs to upload to the Play Store.
  */
 def enableSeparateBuildPerCPUArchitecture = false
 
 /**
- * Run Proguard to shrink the Java bytecode in release builds.
+ * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
  */
 def enableProguardInReleaseBuilds = false
 
 /**
- * The preferred build flavor of JavaScriptCore.
+ * The preferred build flavor of JavaScriptCore (JSC)
  *
  * For example, to use the international variant, you can use:
  * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
  *
  * The international variant includes ICU i18n library and necessary data
  * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
- * give correct results when using with locales other than en-US.  Note that
+ * give correct results when using with locales other than en-US. Note that
  * this variant is about 6MiB larger per architecture than default.
  */
 def jscFlavor = 'org.webkit:android-jsc:+'
 
 /**
- * Whether to enable the Hermes VM.
- *
- * This should be set on project.ext.react and that value will be read here. If it is not set
- * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
- * and the benefits of using Hermes will therefore be sharply reduced.
- */
-def enableHermes = project.ext.react.get("enableHermes", false);
-
-/**
- * Architectures to build native code for.
+ * Private function to get the list of Native Architectures you want to build.
+ * This reads the value from reactNativeArchitectures in your gradle.properties
+ * file and works together with the --active-arch-only flag of react-native run-android.
  */
 def reactNativeArchitectures() {
     def value = project.getProperties().get("reactNativeArchitectures")
@@ -133,84 +93,13 @@ android {
 
     compileSdkVersion rootProject.ext.compileSdkVersion
 
+    namespace "com.helloworld"
     defaultConfig {
         applicationId "com.helloworld"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-
-        if (isNewArchitectureEnabled()) {
-            // We configure the NDK build only if you decide to opt-in for the New Architecture.
-            externalNativeBuild {
-                ndkBuild {
-                    arguments "APP_PLATFORM=android-21",
-                        "APP_STL=c++_shared",
-                        "NDK_TOOLCHAIN_VERSION=clang",
-                        "GENERATED_SRC_DIR=$buildDir/generated/source",
-                        "PROJECT_BUILD_DIR=$buildDir",
-                        "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
-                        "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
-                        "NODE_MODULES_DIR=$rootDir/../node_modules"
-                    cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
-                    cppFlags "-std=c++17"
-                    // Make sure this target name is the same you specify inside the
-                    // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
-                    targets "helloworld_appmodules"
-                    // Fix for windows limit on number of character in file paths and in command lines
-                    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-                        arguments "NDK_APP_SHORT_COMMANDS=true"
-                    }
-                }
-            }
-            if (!enableSeparateBuildPerCPUArchitecture) {
-                ndk {
-                    abiFilters (*reactNativeArchitectures())
-                }
-            }
-        }
-    }
-
-    if (isNewArchitectureEnabled()) {
-        // We configure the NDK build only if you decide to opt-in for the New Architecture.
-        externalNativeBuild {
-            ndkBuild {
-                path "$projectDir/src/main/jni/Android.mk"
-            }
-        }
-        def reactAndroidProjectDir = project(':ReactAndroid').projectDir
-        def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
-            dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
-            from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-            into("$buildDir/react-ndk/exported")
-        }
-        def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
-            dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
-            from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-            into("$buildDir/react-ndk/exported")
-        }
-        afterEvaluate {
-            // If you wish to add a custom TurboModule or component locally,
-            // you should uncomment this line.
-            // preBuild.dependsOn("generateCodegenArtifactsFromSchema")
-            preDebugBuild.dependsOn(packageReactNdkDebugLibs)
-            preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
-
-            // Due to a bug inside AGP, we have to explicitly set a dependency
-            // between configureNdkBuild* tasks and the preBuild tasks.
-            // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
-            configureNdkBuildRelease.dependsOn(preReleaseBuild)
-            configureNdkBuildDebug.dependsOn(preDebugBuild)
-            reactNativeArchitectures().each { architecture ->
-                tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
-                    dependsOn("preDebugBuild")
-                }
-                tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
-                    dependsOn("preReleaseBuild")
-                }
-            }
-        }
     }
 
     splits {
@@ -260,65 +149,22 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: "libs", include: ["*.jar"])
-
-    //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    // The version of react-native is set by the React Native Gradle Plugin
+    implementation("com.facebook.react:react-android")
 
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.fbjni'
-    }
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
 
+    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
     debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
         exclude group:'com.squareup.okhttp3', module:'okhttp'
     }
 
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
-    }
-
-    if (enableHermes) {
-        //noinspection GradleDynamicVersion
-        implementation("com.facebook.react:hermes-engine:+") { // From node_modules
-            exclude group:'com.facebook.fbjni'
-        }
+    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
+    if (hermesEnabled.toBoolean()) {
+        implementation("com.facebook.react:hermes-android")
     } else {
         implementation jscFlavor
     }
 }
 
-if (isNewArchitectureEnabled()) {
-    // If new architecture is enabled, we let you build RN from source
-    // Otherwise we fallback to a prebuilt .aar bundled in the NPM package.
-    // This will be applied to all the imported transtitive dependency.
-    configurations.all {
-        resolutionStrategy.dependencySubstitution {
-            substitute(module("com.facebook.react:react-native"))
-                    .using(project(":ReactAndroid"))
-                    .because("On New Architecture we're building React Native from source")
-            substitute(module("com.facebook.react:hermes-engine"))
-                    .using(project(":ReactAndroid:hermes-engine"))
-                    .because("On New Architecture we're building Hermes from source")
-        }
-    }
-}
-
-// Run this once to be able to run the application with BUCK
-// puts all compile dependencies into folder libs for BUCK to use
-task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.implementation
-    into 'libs'
-}
-
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-
-def isNewArchitectureEnabled() {
-    // To opt-in for the New Architecture, you can either:
-    // - Set `newArchEnabled` to true inside the `gradle.properties` file
-    // - Invoke gradle with `-newArchEnabled=true`
-    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
-    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
-}
diff --git a/template/android/app/build_defs.bzl b/template/android/app/build_defs.bzl
deleted file mode 100644
index fff270f8d1d4..000000000000
--- a/template/android/app/build_defs.bzl
+++ /dev/null
@@ -1,19 +0,0 @@
-"""Helper definitions to glob .aar and .jar targets"""
-
-def create_aar_targets(aarfiles):
-    for aarfile in aarfiles:
-        name = "aars__" + aarfile[aarfile.rindex("/") + 1:aarfile.rindex(".aar")]
-        lib_deps.append(":" + name)
-        android_prebuilt_aar(
-            name = name,
-            aar = aarfile,
-        )
-
-def create_jar_targets(jarfiles):
-    for jarfile in jarfiles:
-        name = "jars__" + jarfile[jarfile.rindex("/") + 1:jarfile.rindex(".jar")]
-        lib_deps.append(":" + name)
-        prebuilt_jar(
-            name = name,
-            binary_jar = jarfile,
-        )
diff --git a/template/android/app/src/debug/java/com/helloworld/ReactNativeFlipper.java b/template/android/app/src/debug/java/com/helloworld/ReactNativeFlipper.java
index 8ed784fe5af7..595dd5831c38 100644
--- a/template/android/app/src/debug/java/com/helloworld/ReactNativeFlipper.java
+++ b/template/android/app/src/debug/java/com/helloworld/ReactNativeFlipper.java
@@ -17,7 +17,6 @@
 import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
 import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
 import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
-import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
 import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
 import com.facebook.react.ReactInstanceEventListener;
 import com.facebook.react.ReactInstanceManager;
@@ -25,13 +24,16 @@
 import com.facebook.react.modules.network.NetworkingModule;
 import okhttp3.OkHttpClient;
 
+/**
+ * Class responsible of loading Flipper inside your React Native application. This is the debug
+ * flavor of it. Here you can add your own plugins and customize the Flipper setup.
+ */
 public class ReactNativeFlipper {
   public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
     if (FlipperUtils.shouldEnableFlipper(context)) {
       final FlipperClient client = AndroidFlipperClient.getInstance(context);
 
       client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
-      client.addPlugin(new ReactFlipperPlugin());
       client.addPlugin(new DatabasesFlipperPlugin(context));
       client.addPlugin(new SharedPreferencesFlipperPlugin(context));
       client.addPlugin(CrashReporterPlugin.getInstance());
diff --git a/template/android/app/src/main/AndroidManifest.xml b/template/android/app/src/main/AndroidManifest.xml
index 7ba57ca1dc05..4122f36a590a 100644
--- a/template/android/app/src/main/AndroidManifest.xml
+++ b/template/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.helloworld">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/template/android/app/src/main/java/com/helloworld/MainActivity.java b/template/android/app/src/main/java/com/helloworld/MainActivity.java
index 405d80a8d972..96fcdf2d7caf 100644
--- a/template/android/app/src/main/java/com/helloworld/MainActivity.java
+++ b/template/android/app/src/main/java/com/helloworld/MainActivity.java
@@ -2,7 +2,8 @@
 
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.ReactRootView;
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
+import com.facebook.react.defaults.DefaultReactActivityDelegate;
 
 public class MainActivity extends ReactActivity {
 
@@ -16,33 +17,19 @@ protected String getMainComponentName() {
   }
 
   /**
-   * Returns the instance of the {@link ReactActivityDelegate}. There the RootView is created and
-   * you can specify the renderer you wish to use - the new renderer (Fabric) or the old renderer
-   * (Paper).
+   * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util class {@link
+   * DefaultReactActivityDelegate} which allows you to easily enable Fabric and Concurrent React
+   * (aka React 18) with two boolean flags.
    */
   @Override
   protected ReactActivityDelegate createReactActivityDelegate() {
-    return new MainActivityDelegate(this, getMainComponentName());
-  }
-
-  public static class MainActivityDelegate extends ReactActivityDelegate {
-    public MainActivityDelegate(ReactActivity activity, String mainComponentName) {
-      super(activity, mainComponentName);
-    }
-
-    @Override
-    protected ReactRootView createRootView() {
-      ReactRootView reactRootView = new ReactRootView(getContext());
-      // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-      reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED);
-      return reactRootView;
-    }
-
-    @Override
-    protected boolean isConcurrentRootEnabled() {
-      // If you opted-in for the New Architecture, we enable Concurrent Root (i.e. React 18).
-      // More on this on https://reactjs.org/blog/2022/03/29/react-v18.html
-      return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-    }
+    return new DefaultReactActivityDelegate(
+        this,
+        getMainComponentName(),
+        // If you opted-in for the New Architecture, we enable the Fabric Renderer.
+        DefaultNewArchitectureEntryPoint.getFabricEnabled(), // fabricEnabled
+        // If you opted-in for the New Architecture, we enable Concurrent React (i.e. React 18).
+        DefaultNewArchitectureEntryPoint.getConcurrentReactEnabled() // concurrentRootEnabled
+        );
   }
 }
diff --git a/template/android/app/src/main/java/com/helloworld/MainApplication.java b/template/android/app/src/main/java/com/helloworld/MainApplication.java
index eedd192958b9..3227c9e96996 100644
--- a/template/android/app/src/main/java/com/helloworld/MainApplication.java
+++ b/template/android/app/src/main/java/com/helloworld/MainApplication.java
@@ -1,22 +1,19 @@
 package com.helloworld;
 
 import android.app.Application;
-import android.content.Context;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.config.ReactFeatureFlags;
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
+import com.facebook.react.defaults.DefaultReactNativeHost;
 import com.facebook.soloader.SoLoader;
-import com.helloworld.newarchitecture.MainApplicationReactNativeHost;
-import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 public class MainApplication extends Application implements ReactApplication {
 
   private final ReactNativeHost mReactNativeHost =
-      new ReactNativeHost(this) {
+      new DefaultReactNativeHost(this) {
         @Override
         public boolean getUseDeveloperSupport() {
           return BuildConfig.DEBUG;
@@ -35,57 +32,31 @@ protected List<ReactPackage> getPackages() {
         protected String getJSMainModuleName() {
           return "index";
         }
-      };
 
-  private final ReactNativeHost mNewArchitectureNativeHost =
-      new MainApplicationReactNativeHost(this);
+        @Override
+        protected boolean isNewArchEnabled() {
+          return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+        }
+
+        @Override
+        protected Boolean isHermesEnabled() {
+          return BuildConfig.IS_HERMES_ENABLED;
+        }
+      };
 
   @Override
   public ReactNativeHost getReactNativeHost() {
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      return mNewArchitectureNativeHost;
-    } else {
-      return mReactNativeHost;
-    }
+    return mReactNativeHost;
   }
 
   @Override
   public void onCreate() {
     super.onCreate();
-    // If you opted-in for the New Architecture, we enable the TurboModule system
-    ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
     SoLoader.init(this, /* native exopackage */ false);
-    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
-  }
-
-  /**
-   * Loads Flipper in React Native templates. Call this in the onCreate method with something like
-   * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
-   *
-   * @param context
-   * @param reactInstanceManager
-   */
-  private static void initializeFlipper(
-      Context context, ReactInstanceManager reactInstanceManager) {
-    if (BuildConfig.DEBUG) {
-      try {
-        /*
-         We use reflection here to pick up the class that initializes Flipper,
-        since Flipper library is not available in release mode
-        */
-        Class<?> aClass = Class.forName("com.helloworld.ReactNativeFlipper");
-        aClass
-            .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
-            .invoke(null, context, reactInstanceManager);
-      } catch (ClassNotFoundException e) {
-        e.printStackTrace();
-      } catch (NoSuchMethodException e) {
-        e.printStackTrace();
-      } catch (IllegalAccessException e) {
-        e.printStackTrace();
-      } catch (InvocationTargetException e) {
-        e.printStackTrace();
-      }
+    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+      // If you opted-in for the New Architecture, we load the native entry point for this app.
+      DefaultNewArchitectureEntryPoint.load();
     }
+    ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
   }
 }
diff --git a/template/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java b/template/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java
deleted file mode 100644
index 55473c3f4393..000000000000
--- a/template/android/app/src/main/java/com/helloworld/newarchitecture/MainApplicationReactNativeHost.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.helloworld.newarchitecture;
-
-import android.app.Application;
-import androidx.annotation.NonNull;
-import com.facebook.react.PackageList;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
-import com.facebook.react.bridge.JSIModulePackage;
-import com.facebook.react.bridge.JSIModuleProvider;
-import com.facebook.react.bridge.JSIModuleSpec;
-import com.facebook.react.bridge.JSIModuleType;
-import com.facebook.react.bridge.JavaScriptContextHolder;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.UIManager;
-import com.facebook.react.fabric.ComponentFactory;
-import com.facebook.react.fabric.CoreComponentsRegistry;
-import com.facebook.react.fabric.FabricJSIModuleProvider;
-import com.facebook.react.fabric.ReactNativeConfig;
-import com.facebook.react.uimanager.ViewManagerRegistry;
-import com.helloworld.BuildConfig;
-import com.helloworld.newarchitecture.components.MainComponentsRegistry;
-import com.helloworld.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A {@link ReactNativeHost} that helps you load everything needed for the New Architecture, both
- * TurboModule delegates and the Fabric Renderer.
- *
- * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
- * `newArchEnabled` property). Is ignored otherwise.
- */
-public class MainApplicationReactNativeHost extends ReactNativeHost {
-  public MainApplicationReactNativeHost(Application application) {
-    super(application);
-  }
-
-  @Override
-  public boolean getUseDeveloperSupport() {
-    return BuildConfig.DEBUG;
-  }
-
-  @Override
-  protected List<ReactPackage> getPackages() {
-    List<ReactPackage> packages = new PackageList(this).getPackages();
-    // Packages that cannot be autolinked yet can be added manually here, for example:
-    //     packages.add(new MyReactNativePackage());
-    // TurboModules must also be loaded here providing a valid TurboReactPackage implementation:
-    //     packages.add(new TurboReactPackage() { ... });
-    // If you have custom Fabric Components, their ViewManagers should also be loaded here
-    // inside a ReactPackage.
-    return packages;
-  }
-
-  @Override
-  protected String getJSMainModuleName() {
-    return "index";
-  }
-
-  @NonNull
-  @Override
-  protected ReactPackageTurboModuleManagerDelegate.Builder
-      getReactPackageTurboModuleManagerDelegateBuilder() {
-    // Here we provide the ReactPackageTurboModuleManagerDelegate Builder. This is necessary
-    // for the new architecture and to use TurboModules correctly.
-    return new MainApplicationTurboModuleManagerDelegate.Builder();
-  }
-
-  @Override
-  protected JSIModulePackage getJSIModulePackage() {
-    return new JSIModulePackage() {
-      @Override
-      public List<JSIModuleSpec> getJSIModules(
-          final ReactApplicationContext reactApplicationContext,
-          final JavaScriptContextHolder jsContext) {
-        final List<JSIModuleSpec> specs = new ArrayList<>();
-
-        // Here we provide a new JSIModuleSpec that will be responsible of providing the
-        // custom Fabric Components.
-        specs.add(
-            new JSIModuleSpec() {
-              @Override
-              public JSIModuleType getJSIModuleType() {
-                return JSIModuleType.UIManager;
-              }
-
-              @Override
-              public JSIModuleProvider<UIManager> getJSIModuleProvider() {
-                final ComponentFactory componentFactory = new ComponentFactory();
-                CoreComponentsRegistry.register(componentFactory);
-
-                // Here we register a Components Registry.
-                // The one that is generated with the template contains no components
-                // and just provides you the one from React Native core.
-                MainComponentsRegistry.register(componentFactory);
-
-                final ReactInstanceManager reactInstanceManager = getReactInstanceManager();
-
-                ViewManagerRegistry viewManagerRegistry =
-                    new ViewManagerRegistry(
-                        reactInstanceManager.getOrCreateViewManagers(reactApplicationContext));
-
-                return new FabricJSIModuleProvider(
-                    reactApplicationContext,
-                    componentFactory,
-                    ReactNativeConfig.DEFAULT_CONFIG,
-                    viewManagerRegistry);
-              }
-            });
-        return specs;
-      }
-    };
-  }
-}
diff --git a/template/android/app/src/main/java/com/helloworld/newarchitecture/components/MainComponentsRegistry.java b/template/android/app/src/main/java/com/helloworld/newarchitecture/components/MainComponentsRegistry.java
deleted file mode 100644
index c74d0ccadb6b..000000000000
--- a/template/android/app/src/main/java/com/helloworld/newarchitecture/components/MainComponentsRegistry.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.helloworld.newarchitecture.components;
-
-import com.facebook.jni.HybridData;
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.fabric.ComponentFactory;
-import com.facebook.soloader.SoLoader;
-
-/**
- * Class responsible to load the custom Fabric Components. This class has native methods and needs a
- * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
- * folder for you).
- *
- * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
- * `newArchEnabled` property). Is ignored otherwise.
- */
-@DoNotStrip
-public class MainComponentsRegistry {
-  static {
-    SoLoader.loadLibrary("fabricjni");
-  }
-
-  @DoNotStrip private final HybridData mHybridData;
-
-  @DoNotStrip
-  private native HybridData initHybrid(ComponentFactory componentFactory);
-
-  @DoNotStrip
-  private MainComponentsRegistry(ComponentFactory componentFactory) {
-    mHybridData = initHybrid(componentFactory);
-  }
-
-  @DoNotStrip
-  public static MainComponentsRegistry register(ComponentFactory componentFactory) {
-    return new MainComponentsRegistry(componentFactory);
-  }
-}
diff --git a/template/android/app/src/main/java/com/helloworld/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java b/template/android/app/src/main/java/com/helloworld/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java
deleted file mode 100644
index 8593b3bb850c..000000000000
--- a/template/android/app/src/main/java/com/helloworld/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.helloworld.newarchitecture.modules;
-
-import com.facebook.jni.HybridData;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.soloader.SoLoader;
-import java.util.List;
-
-/**
- * Class responsible to load the TurboModules. This class has native methods and needs a
- * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
- * folder for you).
- *
- * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
- * `newArchEnabled` property). Is ignored otherwise.
- */
-public class MainApplicationTurboModuleManagerDelegate
-    extends ReactPackageTurboModuleManagerDelegate {
-
-  private static volatile boolean sIsSoLibraryLoaded;
-
-  protected MainApplicationTurboModuleManagerDelegate(
-      ReactApplicationContext reactApplicationContext, List<ReactPackage> packages) {
-    super(reactApplicationContext, packages);
-  }
-
-  protected native HybridData initHybrid();
-
-  native boolean canCreateTurboModule(String moduleName);
-
-  public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder {
-    protected MainApplicationTurboModuleManagerDelegate build(
-        ReactApplicationContext context, List<ReactPackage> packages) {
-      return new MainApplicationTurboModuleManagerDelegate(context, packages);
-    }
-  }
-
-  @Override
-  protected synchronized void maybeLoadOtherSoLibraries() {
-    if (!sIsSoLibraryLoaded) {
-      // If you change the name of your application .so file in the Android.mk file,
-      // make sure you update the name here as well.
-      SoLoader.loadLibrary("helloworld_appmodules");
-      sIsSoLibraryLoaded = true;
-    }
-  }
-}
diff --git a/template/android/app/src/main/jni/Android.mk b/template/android/app/src/main/jni/Android.mk
deleted file mode 100644
index 55732a705bcf..000000000000
--- a/template/android/app/src/main/jni/Android.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-THIS_DIR := $(call my-dir)
-
-include $(REACT_ANDROID_DIR)/Android-prebuilt.mk
-
-# If you wish to add a custom TurboModule or Fabric component in your app you
-# will have to include the following autogenerated makefile.
-# include $(GENERATED_SRC_DIR)/codegen/jni/Android.mk
-
-# Includes the MK file for autolinked libraries
-include $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni/Android-rncli.mk  
-
-include $(CLEAR_VARS)
-
-LOCAL_PATH := $(THIS_DIR)
-
-# You can customize the name of your application .so file here.
-LOCAL_MODULE := helloworld_appmodules
-
-# The generated/rncli/src/main/jni folder contains Autolinking support files.
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni/*.cpp)
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni
-
-# Here you should add any native library you wish to depend on.
-LOCAL_SHARED_LIBRARIES := \
-  libfabricjni \
-  libfbjni \
-  libfolly_runtime \
-  libglog \
-  libjsi \
-  libreact_codegen_rncore \
-  libreact_debug \
-  libreact_nativemodule_core \
-  libreact_render_componentregistry \
-  libreact_render_core \
-  libreact_render_debug \
-  libreact_render_graphics \
-  librrc_view \
-  libruntimeexecutor \
-  libturbomodulejsijni \
-  libyoga
-
-# Autolinked libraries
-LOCAL_SHARED_LIBRARIES += $(call import-codegen-modules) 
-
-# If you wish to add a custom TurboModule or Fabric component in your app you
-# will have to link against it here:
-# LOCAL_SHARED_LIBRARIES += \
-#   libreact_codegen_<your library name>
-
-LOCAL_CFLAGS := -DLOG_TAG=\"ReactNative\" -fexceptions -frtti -std=c++17 -Wall
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/template/android/app/src/main/jni/MainApplicationModuleProvider.cpp b/template/android/app/src/main/jni/MainApplicationModuleProvider.cpp
deleted file mode 100644
index 26162dd87233..000000000000
--- a/template/android/app/src/main/jni/MainApplicationModuleProvider.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "MainApplicationModuleProvider.h"
-
-#include <rncli.h>
-#include <rncore.h>
-
-namespace facebook {
-namespace react {
-
-std::shared_ptr<TurboModule> MainApplicationModuleProvider(
-    const std::string &moduleName,
-    const JavaTurboModule::InitParams &params) {
-  // Here you can provide your own module provider for TurboModules coming from
-  // either your application or from external libraries. The approach to follow
-  // is similar to the following (for a library called `samplelibrary`:
-  //
-  // auto module = samplelibrary_ModuleProvider(moduleName, params);
-  // if (module != nullptr) {
-  //    return module;
-  // }
-  // return rncore_ModuleProvider(moduleName, params);
-
-  // Module providers autolinked by RN CLI
-  auto rncli_module = rncli_ModuleProvider(moduleName, params);
-  if (rncli_module != nullptr) {
-    return rncli_module;
-  }
-
-  return rncore_ModuleProvider(moduleName, params);
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/template/android/app/src/main/jni/MainApplicationModuleProvider.h b/template/android/app/src/main/jni/MainApplicationModuleProvider.h
deleted file mode 100644
index b38ccf53fd49..000000000000
--- a/template/android/app/src/main/jni/MainApplicationModuleProvider.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include <ReactCommon/JavaTurboModule.h>
-
-namespace facebook {
-namespace react {
-
-std::shared_ptr<TurboModule> MainApplicationModuleProvider(
-    const std::string &moduleName,
-    const JavaTurboModule::InitParams &params);
-
-} // namespace react
-} // namespace facebook
diff --git a/template/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp b/template/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
deleted file mode 100644
index 5fd688c509d1..000000000000
--- a/template/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "MainApplicationTurboModuleManagerDelegate.h"
-#include "MainApplicationModuleProvider.h"
-
-namespace facebook {
-namespace react {
-
-jni::local_ref<MainApplicationTurboModuleManagerDelegate::jhybriddata>
-MainApplicationTurboModuleManagerDelegate::initHybrid(
-    jni::alias_ref<jhybridobject>) {
-  return makeCxxInstance();
-}
-
-void MainApplicationTurboModuleManagerDelegate::registerNatives() {
-  registerHybrid({
-      makeNativeMethod(
-          "initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid),
-      makeNativeMethod(
-          "canCreateTurboModule",
-          MainApplicationTurboModuleManagerDelegate::canCreateTurboModule),
-  });
-}
-
-std::shared_ptr<TurboModule>
-MainApplicationTurboModuleManagerDelegate::getTurboModule(
-    const std::string &name,
-    const std::shared_ptr<CallInvoker> &jsInvoker) {
-  // Not implemented yet: provide pure-C++ NativeModules here.
-  return nullptr;
-}
-
-std::shared_ptr<TurboModule>
-MainApplicationTurboModuleManagerDelegate::getTurboModule(
-    const std::string &name,
-    const JavaTurboModule::InitParams &params) {
-  return MainApplicationModuleProvider(name, params);
-}
-
-bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
-    const std::string &name) {
-  return getTurboModule(name, nullptr) != nullptr ||
-      getTurboModule(name, {.moduleName = name}) != nullptr;
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/template/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h b/template/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
deleted file mode 100644
index 9ee38a81f6d8..000000000000
--- a/template/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <memory>
-#include <string>
-
-#include <ReactCommon/TurboModuleManagerDelegate.h>
-#include <fbjni/fbjni.h>
-
-namespace facebook {
-namespace react {
-
-class MainApplicationTurboModuleManagerDelegate
-    : public jni::HybridClass<
-          MainApplicationTurboModuleManagerDelegate,
-          TurboModuleManagerDelegate> {
- public:
-  // Adapt it to the package you used for your Java class.
-  static constexpr auto kJavaDescriptor =
-      "Lcom/helloworld/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;";
-
-  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>);
-
-  static void registerNatives();
-
-  std::shared_ptr<TurboModule> getTurboModule(
-      const std::string &name,
-      const std::shared_ptr<CallInvoker> &jsInvoker) override;
-  std::shared_ptr<TurboModule> getTurboModule(
-      const std::string &name,
-      const JavaTurboModule::InitParams &params) override;
-
-  /**
-   * Test-only method. Allows user to verify whether a TurboModule can be
-   * created by instances of this class.
-   */
-  bool canCreateTurboModule(const std::string &name);
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/template/android/app/src/main/jni/MainComponentsRegistry.cpp b/template/android/app/src/main/jni/MainComponentsRegistry.cpp
deleted file mode 100644
index 54f598a486ad..000000000000
--- a/template/android/app/src/main/jni/MainComponentsRegistry.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "MainComponentsRegistry.h"
-
-#include <CoreComponentsRegistry.h>
-#include <fbjni/fbjni.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/renderer/components/rncore/ComponentDescriptors.h>
-#include <rncli.h>
-
-namespace facebook {
-namespace react {
-
-MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {}
-
-std::shared_ptr<ComponentDescriptorProviderRegistry const>
-MainComponentsRegistry::sharedProviderRegistry() {
-  auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
-
-  // Autolinked providers registered by RN CLI
-  rncli_registerProviders(providerRegistry);
-
-  // Custom Fabric Components go here. You can register custom
-  // components coming from your App or from 3rd party libraries here.
-  //
-  // providerRegistry->add(concreteComponentDescriptorProvider<
-  //        AocViewerComponentDescriptor>());
-  return providerRegistry;
-}
-
-jni::local_ref<MainComponentsRegistry::jhybriddata>
-MainComponentsRegistry::initHybrid(
-    jni::alias_ref<jclass>,
-    ComponentFactory *delegate) {
-  auto instance = makeCxxInstance(delegate);
-
-  auto buildRegistryFunction =
-      [](EventDispatcher::Weak const &eventDispatcher,
-         ContextContainer::Shared const &contextContainer)
-      -> ComponentDescriptorRegistry::Shared {
-    auto registry = MainComponentsRegistry::sharedProviderRegistry()
-                        ->createComponentDescriptorRegistry(
-                            {eventDispatcher, contextContainer});
-
-    auto mutableRegistry =
-        std::const_pointer_cast<ComponentDescriptorRegistry>(registry);
-
-    mutableRegistry->setFallbackComponentDescriptor(
-        std::make_shared<UnimplementedNativeViewComponentDescriptor>(
-            ComponentDescriptorParameters{
-                eventDispatcher, contextContainer, nullptr}));
-
-    return registry;
-  };
-
-  delegate->buildRegistryFunction = buildRegistryFunction;
-  return instance;
-}
-
-void MainComponentsRegistry::registerNatives() {
-  registerHybrid({
-      makeNativeMethod("initHybrid", MainComponentsRegistry::initHybrid),
-  });
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/template/android/app/src/main/jni/MainComponentsRegistry.h b/template/android/app/src/main/jni/MainComponentsRegistry.h
deleted file mode 100644
index d61cbffaae4a..000000000000
--- a/template/android/app/src/main/jni/MainComponentsRegistry.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <ComponentFactory.h>
-#include <fbjni/fbjni.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
-
-namespace facebook {
-namespace react {
-
-class MainComponentsRegistry
-    : public facebook::jni::HybridClass<MainComponentsRegistry> {
- public:
-  // Adapt it to the package you used for your Java class.
-  constexpr static auto kJavaDescriptor =
-      "Lcom/helloworld/newarchitecture/components/MainComponentsRegistry;";
-
-  static void registerNatives();
-
-  MainComponentsRegistry(ComponentFactory *delegate);
-
- private:
-  static std::shared_ptr<ComponentDescriptorProviderRegistry const>
-  sharedProviderRegistry();
-
-  static jni::local_ref<jhybriddata> initHybrid(
-      jni::alias_ref<jclass>,
-      ComponentFactory *delegate);
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/template/android/app/src/main/jni/OnLoad.cpp b/template/android/app/src/main/jni/OnLoad.cpp
deleted file mode 100644
index c569b6e865da..000000000000
--- a/template/android/app/src/main/jni/OnLoad.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <fbjni/fbjni.h>
-#include "MainApplicationTurboModuleManagerDelegate.h"
-#include "MainComponentsRegistry.h"
-
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
-  return facebook::jni::initialize(vm, [] {
-    facebook::react::MainApplicationTurboModuleManagerDelegate::
-        registerNatives();
-    facebook::react::MainComponentsRegistry::registerNatives();
-  });
-}
diff --git a/template/android/app/src/release/java/com/helloworld/ReactNativeFlipper.java b/template/android/app/src/release/java/com/helloworld/ReactNativeFlipper.java
new file mode 100644
index 000000000000..b51036440474
--- /dev/null
+++ b/template/android/app/src/release/java/com/helloworld/ReactNativeFlipper.java
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ */
+package com.helloworld;
+
+import android.content.Context;
+import com.facebook.react.ReactInstanceManager;
+
+/**
+ * Class responsible of loading Flipper inside your React Native application. This is the release
+ * flavor of it so it's empty as we don't want to load Flipper.
+ */
+public class ReactNativeFlipper {
+  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
+    // Do nothing as we don't want to initialize Flipper on Release.
+  }
+}
diff --git a/template/android/build.gradle b/template/android/build.gradle
index 338dc272f39d..67d887b03078 100644
--- a/template/android/build.gradle
+++ b/template/android/build.gradle
@@ -1,53 +1,21 @@
-import org.apache.tools.ant.taskdefs.condition.Os
-
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
     ext {
-        buildToolsVersion = "31.0.0"
+        buildToolsVersion = "33.0.0"
         minSdkVersion = 21
-        compileSdkVersion = 31
-        targetSdkVersion = 31
+        compileSdkVersion = 33
+        targetSdkVersion = 33
 
-        if (System.properties['os.arch'] == "aarch64") {
-            // For M1 Users we need to use the NDK 24 which added support for aarch64
-            ndkVersion = "24.0.8215888"
-        } else {
-            // Otherwise we default to the side-by-side NDK version from AGP.
-            ndkVersion = "21.4.7075529"
-        }
+        // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
+        ndkVersion = "23.1.7779620"
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.2.1")
+        classpath("com.android.tools.build:gradle:7.3.1")
         classpath("com.facebook.react:react-native-gradle-plugin")
-        classpath("de.undercouch:gradle-download-task:5.0.1")
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        maven {
-            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url("$rootDir/../node_modules/react-native/android")
-        }
-        maven {
-            // Android JSC is installed from npm
-            url("$rootDir/../node_modules/jsc-android/dist")
-        }
-        mavenCentral {
-            // We don't want to fetch react-native from Maven Central as there are
-            // older versions over there.
-            content {
-                excludeGroup "com.facebook.react"
-            }
-        }
-        google()
-        maven { url 'https://www.jitpack.io' }
     }
 }
diff --git a/template/android/gradle.properties b/template/android/gradle.properties
index fa4feae5f190..e4af465e8a18 100644
--- a/template/android/gradle.properties
+++ b/template/android/gradle.properties
@@ -38,3 +38,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
 newArchEnabled=false
+
+# Use this property to enable or disable the Hermes JS engine.
+# If set to false, you will be using JSC instead.
+hermesEnabled=true
diff --git a/template/android/gradle/wrapper/gradle-wrapper.properties b/template/android/gradle/wrapper/gradle-wrapper.properties
index 92f06b50fd65..8fad3f5a98bf 100644
--- a/template/android/gradle/wrapper/gradle-wrapper.properties
+++ b/template/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/template/android/settings.gradle b/template/android/settings.gradle
index bd838b9c306d..ab284c3a6bd2 100644
--- a/template/android/settings.gradle
+++ b/template/android/settings.gradle
@@ -2,10 +2,3 @@ rootProject.name = 'HelloWorld'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/react-native-gradle-plugin')
-
-if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
-    include(":ReactAndroid")
-    project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
-    include(":ReactAndroid:hermes-engine")
-    project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine')
-}
diff --git a/template/ios/HelloWorld.xcodeproj/project.pbxproj b/template/ios/HelloWorld.xcodeproj/project.pbxproj
index 70234ff08ade..2ad587963337 100644
--- a/template/ios/HelloWorld.xcodeproj/project.pbxproj
+++ b/template/ios/HelloWorld.xcodeproj/project.pbxproj
@@ -492,6 +492,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -517,6 +518,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/template/ios/HelloWorld/AppDelegate.h b/template/ios/HelloWorld/AppDelegate.h
index ef1de86a2a80..5d2808256ca0 100644
--- a/template/ios/HelloWorld/AppDelegate.h
+++ b/template/ios/HelloWorld/AppDelegate.h
@@ -1,8 +1,6 @@
-#import <React/RCTBridgeDelegate.h>
+#import <RCTAppDelegate.h>
 #import <UIKit/UIKit.h>
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate, RCTBridgeDelegate>
-
-@property (nonatomic, strong) UIWindow *window;
+@interface AppDelegate : RCTAppDelegate
 
 @end
diff --git a/template/ios/HelloWorld/AppDelegate.mm b/template/ios/HelloWorld/AppDelegate.mm
index 28475b9c49dd..6edcfa51889a 100644
--- a/template/ios/HelloWorld/AppDelegate.mm
+++ b/template/ios/HelloWorld/AppDelegate.mm
@@ -1,85 +1,13 @@
 #import "AppDelegate.h"
 
-#import <React/RCTBridge.h>
 #import <React/RCTBundleURLProvider.h>
-#import <React/RCTRootView.h>
-
-#import <React/RCTAppSetupUtils.h>
-
-#if RCT_NEW_ARCH_ENABLED
-#import <React/CoreModulesPlugins.h>
-#import <React/RCTCxxBridgeDelegate.h>
-#import <React/RCTFabricSurfaceHostingProxyRootView.h>
-#import <React/RCTSurfacePresenter.h>
-#import <React/RCTSurfacePresenterBridgeAdapter.h>
-#import <ReactCommon/RCTTurboModuleManager.h>
-
-#import <react/config/ReactNativeConfig.h>
-
-static NSString *const kRNConcurrentRoot = @"concurrentRoot";
-
-@interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate> {
-  RCTTurboModuleManager *_turboModuleManager;
-  RCTSurfacePresenterBridgeAdapter *_bridgeAdapter;
-  std::shared_ptr<const facebook::react::ReactNativeConfig> _reactNativeConfig;
-  facebook::react::ContextContainer::Shared _contextContainer;
-}
-@end
-#endif
 
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-  RCTAppSetupPrepareApp(application);
-
-  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
-
-#if RCT_NEW_ARCH_ENABLED
-  _contextContainer = std::make_shared<facebook::react::ContextContainer const>();
-  _reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
-  _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
-  _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer];
-  bridge.surfacePresenter = _bridgeAdapter.surfacePresenter;
-#endif
-
-  NSDictionary *initProps = [self prepareInitialProps];
-  UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"HelloWorld", initProps);
-
-  if (@available(iOS 13.0, *)) {
-    rootView.backgroundColor = [UIColor systemBackgroundColor];
-  } else {
-    rootView.backgroundColor = [UIColor whiteColor];
-  }
-
-  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-  UIViewController *rootViewController = [UIViewController new];
-  rootViewController.view = rootView;
-  self.window.rootViewController = rootViewController;
-  [self.window makeKeyAndVisible];
-  return YES;
-}
-
-/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off.
-///
-/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
-/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
-/// @return: `true` if the `concurrentRoot` feture is enabled. Otherwise, it returns `false`.
-- (BOOL)concurrentRootEnabled
-{
-  // Switch this bool to turn on and off the concurrent root
-  return true;
-}
-
-- (NSDictionary *)prepareInitialProps
-{
-  NSMutableDictionary *initProps = [NSMutableDictionary new];
-
-#ifdef RCT_NEW_ARCH_ENABLED
-  initProps[kRNConcurrentRoot] = @([self concurrentRootEnabled]);
-#endif
-
-  return initProps;
+  self.moduleName = @"HelloWorld";
+  return [super application:application didFinishLaunchingWithOptions:launchOptions];
 }
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
@@ -91,43 +19,14 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 #endif
 }
 
-#if RCT_NEW_ARCH_ENABLED
-
-#pragma mark - RCTCxxBridgeDelegate
-
-- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
-{
-  _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
-                                                             delegate:self
-                                                            jsInvoker:bridge.jsCallInvoker];
-  return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager);
-}
-
-#pragma mark RCTTurboModuleManagerDelegate
-
-- (Class)getModuleClassFromName:(const char *)name
-{
-  return RCTCoreModulesClassProvider(name);
-}
-
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
-                                                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
-{
-  return nullptr;
-}
-
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
-                                                     initParams:
-                                                         (const facebook::react::ObjCTurboModule::InitParams &)params
-{
-  return nullptr;
-}
-
-- (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
+/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off.
+///
+/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
+/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
+/// @return: `true` if the `concurrentRoot` feature is enabled. Otherwise, it returns `false`.
+- (BOOL)concurrentRootEnabled
 {
-  return RCTAppSetupDefaultModuleFromClass(moduleClass);
+  return true;
 }
 
-#endif
-
 @end
diff --git a/template/ios/HelloWorld/Info.plist b/template/ios/HelloWorld/Info.plist
index 948d58224f94..b9fd912f0d58 100644
--- a/template/ios/HelloWorld/Info.plist
+++ b/template/ios/HelloWorld/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
diff --git a/template/ios/Podfile b/template/ios/Podfile
index 92e7ee1919e6..15021a3e4510 100644
--- a/template/ios/Podfile
+++ b/template/ios/Podfile
@@ -1,8 +1,16 @@
 require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
-platform :ios, '12.4'
-install! 'cocoapods', :deterministic_uuids => false
+platform :ios, min_ios_version_supported
+prepare_react_native_project!
+
+flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
+
+linkage = ENV['USE_FRAMEWORKS']
+if linkage != nil
+  Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
+  use_frameworks! :linkage => linkage.to_sym
+end
 
 target 'HelloWorld' do
   config = use_native_modules!
@@ -15,13 +23,13 @@ target 'HelloWorld' do
     # Hermes is now enabled by default. Disable by setting this flag to false.
     # Upcoming versions of React Native may rely on get_default_flags(), but
     # we make it explicit here to aid in the React Native upgrade process.
-    :hermes_enabled => true,
+    :hermes_enabled => flags[:hermes_enabled],
     :fabric_enabled => flags[:fabric_enabled],
     # Enables Flipper.
     #
     # Note that if you have use_frameworks! enabled, Flipper will not work and
     # you should disable the next line.
-    :flipper_configuration => FlipperConfiguration.enabled,
+    :flipper_configuration => flipper_config,
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
diff --git a/template/package.json b/template/package.json
index 32c8110e38ab..73618f8f9a18 100644
--- a/template/package.json
+++ b/template/package.json
@@ -5,23 +5,30 @@
   "scripts": {
     "android": "react-native run-android",
     "ios": "react-native run-ios",
+    "lint": "eslint .",
     "start": "react-native start",
-    "test": "jest",
-    "lint": "eslint ."
+    "test": "jest"
   },
   "dependencies": {
-    "react": "18.1.0",
-    "react-native": "1000.0.0"
+    "react": "18.2.0",
+    "react-native": "0.71.0-rc.5"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",
+    "@babel/preset-env": "^7.14.0",
     "@babel/runtime": "^7.12.5",
-    "@react-native-community/eslint-config": "^2.0.0",
-    "babel-jest": "^26.6.3",
-    "eslint": "^7.32.0",
-    "jest": "^26.6.3",
-    "metro-react-native-babel-preset": "^0.71.3",
-    "react-test-renderer": "18.1.0"
+    "@react-native-community/eslint-config": "^3.0.0",
+    "@tsconfig/react-native": "^2.0.2",
+    "@types/jest": "^29.2.1",
+    "@types/react": "^18.0.24",
+    "@types/react-test-renderer": "^18.0.0",
+    "babel-jest": "^29.2.1",
+    "eslint": "^8.19.0",
+    "jest": "^29.2.1",
+    "metro-react-native-babel-preset": "0.73.5",
+    "prettier": "^2.4.1",
+    "react-test-renderer": "18.2.0",
+    "typescript": "4.8.4"
   },
   "jest": {
     "preset": "react-native"
diff --git a/template/tsconfig.json b/template/tsconfig.json
new file mode 100644
index 000000000000..45a6c7072238
--- /dev/null
+++ b/template/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "@tsconfig/react-native/tsconfig.json"
+}
diff --git a/third-party-podspecs/RCT-Folly.podspec b/third-party-podspecs/RCT-Folly.podspec
index 02e47ea25856..ec097f63d102 100644
--- a/third-party-podspecs/RCT-Folly.podspec
+++ b/third-party-podspecs/RCT-Folly.podspec
@@ -152,5 +152,5 @@ Pod::Spec.new do |spec|
 
   # Folly has issues when compiled with iOS 10 set as deployment target
   # See https://github.com/facebook/folly/issues/1470 for details
-  spec.platforms = { :ios => "9.0", :tvos => "9.0" }
+  spec.platforms = { :ios => "9.0" }
 end
diff --git a/third-party-podspecs/boost.podspec b/third-party-podspecs/boost.podspec
index 2f1fcc4b5ef0..3d9331c95d12 100644
--- a/third-party-podspecs/boost.podspec
+++ b/third-party-podspecs/boost.podspec
@@ -14,7 +14,7 @@ Pod::Spec.new do |spec|
                   :sha256 => 'f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41' }
 
   # Pinning to the same version as React.podspec.
-  spec.platforms = { :ios => '11.0', :tvos => '11.0' }
+  spec.platforms = { :ios => '11.0' }
   spec.requires_arc = false
 
   spec.module_name = 'boost'
diff --git a/tools/build_defs/oss/rn_defs.bzl b/tools/build_defs/oss/rn_defs.bzl
index b28ee634c0c9..bcc154f4a9b8 100644
--- a/tools/build_defs/oss/rn_defs.bzl
+++ b/tools/build_defs/oss/rn_defs.bzl
@@ -52,6 +52,8 @@ ANDROID = "Android"
 
 APPLE = "Apple"
 
+WINDOWS = "Windows"
+
 # Apple SDK Definitions
 IOS = "ios"
 
@@ -89,7 +91,12 @@ def get_react_native_ios_target_sdk_version():
     return REACT_NATIVE_TARGET_IOS_SDK
 
 # Building is not supported in OSS right now
-def rn_xplat_cxx_library(name, compiler_flags_enable_exceptions = False, compiler_flags_enable_rtti = False, **kwargs):
+def rn_xplat_cxx_library(
+        name,
+        compiler_flags_enable_exceptions = False,
+        compiler_flags_enable_rtti = False,
+        compiler_flags_pedantic = False,
+        **kwargs):
     visibility = kwargs.get("visibility", [])
     kwargs = {
         k: v
@@ -108,10 +115,18 @@ def rn_xplat_cxx_library(name, compiler_flags_enable_exceptions = False, compile
     # OSS builds cannot have platform-specific flags here, so these are the same
     # for all platforms.
     kwargs["compiler_flags"] = kwargs.get("compiler_flags", [])
+
     kwargs["compiler_flags"] = ["-std=c++17"] + kwargs["compiler_flags"]
     kwargs["compiler_flags"] = ["-Wall"] + kwargs["compiler_flags"]
     kwargs["compiler_flags"] = ["-Werror"] + kwargs["compiler_flags"]
 
+    # -Wpedantic catches usage of nonstandard language extensions that may not
+    # be supported by other compilers (e.g. MSVC)
+    if compiler_flags_pedantic:
+        kwargs["compiler_flags"] = ["-Wpedantic"] + kwargs["compiler_flags"]
+    else:
+        kwargs["compiler_flags"] = ["-Wno-pedantic"] + kwargs["compiler_flags"]
+
     # For now, we allow turning off RTTI and exceptions for android builds only
     if compiler_flags_enable_exceptions:
         kwargs["compiler_flags"] = ["-fexceptions"] + kwargs["compiler_flags"]
@@ -150,6 +165,9 @@ def react_native_root_target(path):
 def react_native_xplat_shared_library_target(path):
     return react_native_xplat_target(path)
 
+def react_native_desktop_root_target(path):
+    return "//" + path
+
 # Example: react_native_tests_target('java/com/facebook/react/modules:modules')
 def react_native_tests_target(path):
     return "//ReactAndroid/src/test/" + path
@@ -179,7 +197,6 @@ def _unique(li):
 # React property preprocessor
 def rn_android_library(name, deps = [], plugins = [], *args, **kwargs):
     _ = kwargs.pop("autoglob", False)
-    _ = kwargs.pop("is_androidx", False)
     _ = kwargs.pop("pure_kotlin", False)
     if react_native_target(
         "java/com/facebook/react/uimanager/annotations:annotations",
@@ -225,7 +242,6 @@ def rn_apple_library(*args, **kwargs):
     fb_apple_library(*args, **kwargs)
 
 def rn_java_library(*args, **kwargs):
-    _ = kwargs.pop("is_androidx", False)
     native.java_library(*args, **kwargs)
 
 def rn_java_annotation_processor(*args, **kwargs):
@@ -244,7 +260,6 @@ def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs):
     vm_args = vm_args or []
 
     _ = kwargs.pop("autoglob", False)
-    _ = kwargs.pop("is_androidx", False)
 
     kwargs["deps"] = kwargs.pop("deps", []) + [
         react_native_android_toplevel_dep("third-party/java/mockito2:mockito2"),
diff --git a/tools/eslint/README.md b/tools/eslint/README.md
new file mode 100644
index 000000000000..116e749329df
--- /dev/null
+++ b/tools/eslint/README.md
@@ -0,0 +1,7 @@
+# react-native/tools/eslint
+
+This directory contains ESLint rules for the `react-native` repository itself.
+They are configured in `.eslintrc.js` using the `eslint-plugin-lint` package.
+
+For ESLint rules intended for projects that consume React Native, add them to
+the `@react-native-community/eslint-plugin` package instead.
diff --git a/tools/eslint/rules/__tests__/no-haste-imports-test.js b/tools/eslint/rules/__tests__/no-haste-imports-test.js
new file mode 100644
index 000000000000..ac14485c9051
--- /dev/null
+++ b/tools/eslint/rules/__tests__/no-haste-imports-test.js
@@ -0,0 +1,99 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+const rule = require('../no-haste-imports.js');
+const {RuleTester} = require('eslint');
+
+const ruleTester = new RuleTester({
+  parser: require.resolve('hermes-eslint'),
+  parserOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module',
+  },
+});
+
+ruleTester.run('require(...)', rule, {
+  valid: [
+    {
+      code: `const X = require('x');`,
+    },
+    {
+      code: `const X = require('./X');`,
+    },
+    {
+      code: `const Y = require('X/Y');`,
+    },
+  ],
+  invalid: [
+    {
+      code: `const X = require('X');`,
+      errors: [{messageId: 'hasteImport', data: {importPath: 'X'}}],
+      output: null, // Expect no autofix to be suggested.
+    },
+    {
+      code: `const useX = require('useX');`,
+      errors: [{messageId: 'hasteImport', data: {importPath: 'useX'}}],
+      output: null, // Expect no autofix to be suggested.
+    },
+  ],
+});
+
+ruleTester.run('import(...)', rule, {
+  valid: [
+    {
+      code: `import('x');`,
+    },
+    {
+      code: `import('./X');`,
+    },
+    {
+      code: `import('X/Y');`,
+    },
+  ],
+  invalid: [
+    {
+      code: `import('X');`,
+      errors: [{messageId: 'hasteImport', data: {importPath: 'X'}}],
+      output: null, // Expect no autofix to be suggested.
+    },
+    {
+      code: `import('useX');`,
+      errors: [{messageId: 'hasteImport', data: {importPath: 'useX'}}],
+      output: null, // Expect no autofix to be suggested.
+    },
+  ],
+});
+
+ruleTester.run("import ... from '...'", rule, {
+  valid: [
+    {
+      code: `import X from 'x';`,
+    },
+    {
+      code: `import X from './X';`,
+    },
+    {
+      code: `import Y from 'X/Y';`,
+    },
+  ],
+  invalid: [
+    {
+      code: `import X from 'X';`,
+      errors: [{messageId: 'hasteImport', data: {importPath: 'X'}}],
+      output: null, // Expect no autofix to be suggested.
+    },
+    {
+      code: `import useX from 'useX';`,
+      errors: [{messageId: 'hasteImport', data: {importPath: 'useX'}}],
+      output: null, // Expect no autofix to be suggested.
+    },
+  ],
+});
diff --git a/tools/eslint/rules/__tests__/no-react-native-imports-test.js b/tools/eslint/rules/__tests__/no-react-native-imports-test.js
new file mode 100644
index 000000000000..117bc76e0d10
--- /dev/null
+++ b/tools/eslint/rules/__tests__/no-react-native-imports-test.js
@@ -0,0 +1,160 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+const rule = require('../no-react-native-imports.js');
+const {RuleTester} = require('eslint');
+const path = require('node:path');
+
+const RN_ROOT_DIRECTORY = path.resolve(__dirname, '..', '..', '..', '..');
+
+const ruleTester = new RuleTester({
+  parser: require.resolve('hermes-eslint'),
+  parserOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module',
+  },
+});
+
+// Use a filename inside `react-native`. This lint rule is only applicable to
+// JavaScript files inside of the `react-native` repository.
+const filename = `${RN_ROOT_DIRECTORY}/Libraries/Components/View/View.js`;
+
+ruleTester.run('require(...)', rule, {
+  valid: [
+    {
+      code: `const X = require('X');`,
+      filename,
+    },
+    {
+      code: `const X = require('react-native-X');`,
+      filename,
+    },
+    {
+      code: `const Y =require('react-native-X/Y');`,
+      filename,
+    },
+  ],
+  invalid: [
+    {
+      code: `const {Platform} = require('react-native');`,
+      errors: [{messageId: 'rnImport'}],
+      filename,
+      output: null, // Expect no autofix to be suggested.
+    },
+    {
+      code: `const Mystery = require('react-native/Mystery');`,
+      errors: [{messageId: 'rnImport'}],
+      filename,
+      output: null, // Expect no autofix to be suggested.
+    },
+    {
+      code: `const Platform = require('react-native/Libraries/Utilities/Platform');`,
+      errors: [{messageId: 'rnImport'}],
+      filename,
+      output: `const Platform = require('../../Utilities/Platform');`,
+    },
+    {
+      code: `const ViewNativeComponent = require('react-native/Libraries/Components/View/ViewNativeComponent');`,
+      errors: [{messageId: 'rnImport'}],
+      filename,
+      output: `const ViewNativeComponent = require('./ViewNativeComponent');`,
+    },
+  ],
+});
+
+ruleTester.run('import(...)', rule, {
+  valid: [
+    {
+      code: `import('X');`,
+      filename,
+    },
+    {
+      code: `import('react-native-X');`,
+      filename,
+    },
+    {
+      code: `import('react-native-X/Y');`,
+      filename,
+    },
+  ],
+  invalid: [
+    /**
+     * import expressions
+     */
+    {
+      code: `import('react-native');`,
+      errors: [{messageId: 'rnImport'}],
+      filename,
+      output: null, // Expect no autofix to be suggested.
+    },
+    {
+      code: `import('react-native/Mystery');`,
+      errors: [{messageId: 'rnImport'}],
+      filename,
+      output: null, // Expect no autofix to be suggested.
+    },
+    {
+      code: `import('react-native/Libraries/Utilities/Platform');`,
+      errors: [{messageId: 'rnImport'}],
+      filename,
+      output: `import('../../Utilities/Platform');`,
+    },
+    {
+      code: `import('react-native/Libraries/Components/View/ViewNativeComponent');`,
+      errors: [{messageId: 'rnImport'}],
+      filename,
+      output: `import('./ViewNativeComponent');`,
+    },
+  ],
+});
+
+ruleTester.run("import ... from '...'", rule, {
+  valid: [
+    {
+      code: `import X from 'X';`,
+      filename,
+    },
+    {
+      code: `import X from 'react-native-X';`,
+      filename,
+    },
+    {
+      code: `import Y from 'react-native-X/Y';`,
+      filename,
+    },
+  ],
+  invalid: [
+    {
+      code: `import {Platform} from 'react-native';`,
+      errors: [{messageId: 'rnImport'}],
+      filename,
+      output: null, // Expect no autofix to be suggested.
+    },
+    {
+      code: `import Mystery from 'react-native/Mystery';`,
+      errors: [{messageId: 'rnImport'}],
+      filename,
+      output: null, // Expect no autofix to be suggested.
+    },
+    {
+      code: `import Platform from 'react-native/Libraries/Utilities/Platform';`,
+      errors: [{messageId: 'rnImport'}],
+      filename,
+      output: `import Platform from '../../Utilities/Platform';`,
+    },
+    {
+      code: `import ViewNativeComponent from 'react-native/Libraries/Components/View/ViewNativeComponent';`,
+      errors: [{messageId: 'rnImport'}],
+      filename,
+      output: `import ViewNativeComponent from './ViewNativeComponent';`,
+    },
+  ],
+});
diff --git a/tools/eslint/rules/__tests__/require-extends-error-test.js b/tools/eslint/rules/__tests__/require-extends-error-test.js
new file mode 100644
index 000000000000..198c8603c8eb
--- /dev/null
+++ b/tools/eslint/rules/__tests__/require-extends-error-test.js
@@ -0,0 +1,151 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+const rule = require('../require-extends-error.js');
+const {RuleTester} = require('eslint');
+
+const ruleTester = new RuleTester({
+  parser: require.resolve('hermes-eslint'),
+  parserOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module',
+  },
+});
+
+ruleTester.run('functions', rule, {
+  valid: [
+    {
+      code: `(function () {});`,
+    },
+    {
+      code: `function xError() {}`,
+    },
+  ],
+  invalid: [
+    {
+      code: 'function XError() {}',
+      errors: [{messageId: 'errorFunction', data: {name: 'XError'}}],
+    },
+    {
+      code: '(function XError() {});',
+      errors: [{messageId: 'errorFunction', data: {name: 'XError'}}],
+    },
+  ],
+});
+
+ruleTester.run('classes', rule, {
+  valid: [
+    {
+      code: `(class {});`,
+    },
+    {
+      code: `(class extends Y {});`,
+    },
+    {
+      code: `class X extends Y {}`,
+    },
+    {
+      code: `(class X extends Y {});`,
+    },
+    {
+      code: `class XError extends Error {}`,
+    },
+    {
+      code: `(class XError extends Error {});`,
+    },
+    {
+      code: `class XError extends YError {}`,
+    },
+    {
+      code: `(class XError extends YError {});`,
+    },
+    {
+      code: `class XError extends Y.Error {}`,
+    },
+    {
+      code: `(class XError extends Y.Error {});`,
+    },
+    {
+      code: `class XError extends Y.Z.Error {}`,
+    },
+    {
+      code: `(class XError extends Y.Z.Error {});`,
+    },
+  ],
+  invalid: [
+    {
+      code: `class XError {}`,
+      errors: [{messageId: 'errorClass', data: {name: 'XError'}}],
+    },
+    {
+      code: `(class XError {});`,
+      errors: [{messageId: 'errorClass', data: {name: 'XError'}}],
+    },
+    {
+      code: `class XError extends Y {}`,
+      errors: [{messageId: 'errorClass', data: {name: 'XError'}}],
+    },
+    {
+      code: `(class XError extends Y {});`,
+      errors: [{messageId: 'errorClass', data: {name: 'XError'}}],
+    },
+    {
+      code: `class XError extends Y.Z {}`,
+      errors: [{messageId: 'errorClass', data: {name: 'XError'}}],
+    },
+    {
+      code: `(class XError extends Y.Z {});`,
+      errors: [{messageId: 'errorClass', data: {name: 'XError'}}],
+    },
+  ],
+});
+
+ruleTester.run('superclasses', rule, {
+  valid: [],
+  invalid: [
+    {
+      code: `(class extends Error {});`,
+      errors: [{messageId: 'errorSuperClassMissingName'}],
+    },
+    {
+      code: `class X extends Error {}`,
+      errors: [{messageId: 'errorSuperClass', data: {name: 'X'}}],
+    },
+    {
+      code: `(class X extends Error {});`,
+      errors: [{messageId: 'errorSuperClass', data: {name: 'X'}}],
+    },
+    {
+      code: `class X extends YError {}`,
+      errors: [{messageId: 'errorSuperClass', data: {name: 'X'}}],
+    },
+    {
+      code: `(class X extends YError {});`,
+      errors: [{messageId: 'errorSuperClass', data: {name: 'X'}}],
+    },
+    {
+      code: `class X extends Y.Error {}`,
+      errors: [{messageId: 'errorSuperClass', data: {name: 'X'}}],
+    },
+    {
+      code: `(class X extends Y.Error {});`,
+      errors: [{messageId: 'errorSuperClass', data: {name: 'X'}}],
+    },
+    {
+      code: `class X extends Y.Z.Error {}`,
+      errors: [{messageId: 'errorSuperClass', data: {name: 'X'}}],
+    },
+    {
+      code: `(class X extends Y.Z.Error {});`,
+      errors: [{messageId: 'errorSuperClass', data: {name: 'X'}}],
+    },
+  ],
+});
diff --git a/tools/eslint/rules/__tests__/valid-flow-typed-signature-test.js b/tools/eslint/rules/__tests__/valid-flow-typed-signature-test.js
new file mode 100644
index 000000000000..8181511bc100
--- /dev/null
+++ b/tools/eslint/rules/__tests__/valid-flow-typed-signature-test.js
@@ -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.
+ *
+ * @format
+ */
+
+'use strict';
+
+const rule = require('../valid-flow-typed-signature.js');
+const {RuleTester} = require('eslint');
+
+const ruleTester = new RuleTester({
+  parser: require.resolve('hermes-eslint'),
+  parserOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module',
+  },
+});
+
+ruleTester.run('valid-flow-typed-signature', rule, {
+  valid: [
+    {
+      code: `// ...`,
+    },
+    {
+      code: [
+        `// flow-typed signature: 9333721862f426d869c32ea6f7cecfda`,
+        `// flow-typed version: 123456/xyz_v1.x.x/flow_>=v0.83.x`,
+        ``,
+        `declare module "xyz" {}`,
+      ].join('\n'),
+    },
+  ],
+  invalid: [
+    {
+      code: [
+        `// flow-typed signature: 90affbd9a1954ec9ff029b7ad7183a16`,
+        `// flow-typed version: 123456/xyz_v1.x.x/flow_>=v0.83.x`,
+        ``,
+        `declare module "xyz" {}`,
+      ].join('\n'),
+      errors: [{messageId: 'invalidSignature'}],
+    },
+  ],
+});
diff --git a/packages/eslint-plugin-react-native-community/no-haste-imports.js b/tools/eslint/rules/no-haste-imports.js
similarity index 56%
rename from packages/eslint-plugin-react-native-community/no-haste-imports.js
rename to tools/eslint/rules/no-haste-imports.js
index 6c5c855a2ab4..834ab53e4a28 100644
--- a/packages/eslint-plugin-react-native-community/no-haste-imports.js
+++ b/tools/eslint/rules/no-haste-imports.js
@@ -7,40 +7,60 @@
  * @format
  */
 
+'use strict';
+
 module.exports = {
   meta: {
     type: 'problem',
     docs: {
-      description:
-        'disallow Haste module names in import statements and require calls',
+      description: 'Disallow importing Haste module names',
+      recommended: true,
+    },
+    messages: {
+      hasteImport:
+        "'{{importPath}}' seems to be a Haste module name; use path-based imports intead",
     },
     schema: [],
   },
 
   create(context) {
     return {
-      ImportDeclaration(node) {
-        checkImportForHaste(context, node.source.value, node.source);
-      },
       CallExpression(node) {
-        if (isStaticRequireCall(node)) {
-          const [firstArgument] = node.arguments;
-          checkImportForHaste(context, firstArgument.value, firstArgument);
+        if (
+          node.callee.type === 'Identifier' &&
+          node.callee.name === 'require' &&
+          node.arguments.length === 1
+        ) {
+          processSource(node.arguments[0]);
         }
       },
+      ImportExpression(node) {
+        processSource(node.source);
+      },
+      ImportDeclaration(node) {
+        processSource(node.source);
+      },
     };
+
+    function processSource(source) {
+      if (source.type !== 'Literal' || typeof source.value !== 'string') {
+        return;
+      }
+      const importPath = source.value;
+      if (!isLikelyHasteModuleName(importPath)) {
+        return;
+      }
+      context.report({
+        node: source,
+        messageId: 'hasteImport',
+        data: {
+          importPath,
+        },
+      });
+    }
   },
 };
 
-function checkImportForHaste(context, importPath, node) {
-  if (isLikelyHasteModuleName(importPath)) {
-    context.report({
-      node,
-      message: `"${importPath}" appears to be a Haste module name. Use path-based imports instead.`,
-    });
-  }
-}
-
 function isLikelyHasteModuleName(importPath) {
   // Our heuristic assumes an import path is a Haste module name if it is not a
   // path and doesn't appear to be an npm package. For several years, npm has
@@ -59,15 +79,3 @@ function isLikelyHasteModuleName(importPath) {
     /[A-Z]/.test(importPath)
   );
 }
-
-function isStaticRequireCall(node) {
-  return (
-    node &&
-    node.callee &&
-    node.callee.type === 'Identifier' &&
-    node.callee.name === 'require' &&
-    node.arguments.length === 1 &&
-    node.arguments[0].type === 'Literal' &&
-    typeof node.arguments[0].value === 'string'
-  );
-}
diff --git a/tools/eslint/rules/no-react-native-imports.js b/tools/eslint/rules/no-react-native-imports.js
new file mode 100644
index 000000000000..7ddbc7d25844
--- /dev/null
+++ b/tools/eslint/rules/no-react-native-imports.js
@@ -0,0 +1,108 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+const fs = require('node:fs');
+const path = require('node:path');
+
+const RN_ROOT_DIRECTORY = path.resolve(__dirname, '..', '..', '..');
+const RN_IMPORT_PATTERN = /^react-native(?:\/(?<relativeImport>.+))?$/;
+const RN_IMPORT_EXTS = ['.android.js', '.ios.js', '.js'];
+
+module.exports = {
+  meta: {
+    type: 'problem',
+    docs: {
+      description: "Disallow importing from 'react-native'",
+      recommended: true,
+    },
+    fixable: 'code',
+    messages: {
+      rnImport: "Use relative paths when importing within 'react-native'",
+    },
+    schema: [],
+  },
+
+  create(context) {
+    return {
+      CallExpression(node) {
+        if (
+          node.callee.type === 'Identifier' &&
+          node.callee.name === 'require' &&
+          node.arguments.length === 1
+        ) {
+          processSource(node.arguments[0]);
+        }
+      },
+      ImportExpression(node) {
+        processSource(node.source);
+      },
+      ImportDeclaration(node) {
+        processSource(node.source);
+      },
+    };
+
+    function processSource(source) {
+      if (source.type !== 'Literal' || typeof source.value !== 'string') {
+        return;
+      }
+      const match = source.value.match(RN_IMPORT_PATTERN);
+      if (match == null) {
+        return;
+      }
+      let fix;
+      // NOTE: We only attempt to resolve `react-native/<relativeImport>`. We
+      // cannot safely fix named imports from `react-native` because the index
+      // does arbitrary things like access the `default` property, etc.
+      if (match.groups.relativeImport != null) {
+        const suggestion = resolveRelativeImport(match.groups.relativeImport);
+        if (suggestion != null) {
+          fix = fixer => {
+            const delimiter = source.raw[0];
+            const replacement = [delimiter, suggestion, delimiter].join('');
+            return fixer.replaceText(source, replacement);
+          };
+        }
+      }
+      context.report({
+        node: source,
+        messageId: 'rnImport',
+        fix,
+      });
+    }
+
+    function resolveRelativeImport(relativeImport) {
+      const importPath = path.resolve(RN_ROOT_DIRECTORY, relativeImport);
+      if (!isValidImportPath(importPath)) {
+        return null;
+      }
+      const sourcePath = path.dirname(context.getPhysicalFilename());
+      const relativePath = path.relative(sourcePath, importPath);
+      // If importing from the same directory, prepend `./` to source path.
+      const relativePathWithLeadingSlash = relativePath.includes(path.sep)
+        ? relativePath
+        : ['.', path.sep, relativePath].join('');
+      // Normalize backslash (on Windows) to forward slash.
+      return relativePathWithLeadingSlash.replace(/\\/g, '/');
+    }
+
+    function isValidImportPath(importPath) {
+      const candidatePaths = [];
+      if (importPath.endsWith('.js')) {
+        candidatePaths.push(importPath);
+      } else {
+        for (const extension of RN_IMPORT_EXTS) {
+          candidatePaths.push(importPath + extension);
+        }
+      }
+      return candidatePaths.some(candidatePath => fs.existsSync(candidatePath));
+    }
+  },
+};
diff --git a/tools/eslint/rules/require-extends-error.js b/tools/eslint/rules/require-extends-error.js
new file mode 100644
index 000000000000..10acee541e9a
--- /dev/null
+++ b/tools/eslint/rules/require-extends-error.js
@@ -0,0 +1,109 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+module.exports = {
+  meta: {
+    type: 'problem',
+    docs: {
+      description: "Require error classes to extend 'Error'",
+      recommended: true,
+    },
+    messages: {
+      errorClass:
+        "'{{name}}' must extend an error class (like 'Error') because its name is in PascalCase and ends with 'Error'.",
+      errorSuperClass:
+        "'{{name}}' may not be the name of an error class. It should be in PascalCase and end with 'Error'.",
+      errorSuperClassMissingName:
+        "An error class should have a PascalCase name ending with 'Error'.",
+      errorFunction:
+        "'{{name}}' is a reserved name. PascalCase names ending with 'Error' are reserved for error classes and may not be used for regular functions. Either rename this function or convert it to a class that extends 'Error'.",
+    },
+    schema: [],
+  },
+
+  create(context) {
+    return {
+      ClassDeclaration(node) {
+        processClass(node);
+      },
+      ClassExpression(node) {
+        processClass(node);
+      },
+      FunctionExpression(node) {
+        processFunction(node);
+      },
+      FunctionDeclaration(node) {
+        processFunction(node);
+      },
+    };
+
+    function processClass(node) {
+      const {id, superClass} = node;
+
+      // First, handle all cases in which superclass is not error-like.
+      if (superClass == null || !isSuperClassErrorLike(superClass)) {
+        if (id == null || !isIdentifierErrorLike(id)) {
+          return;
+        }
+        context.report({
+          node: id,
+          messageId: 'errorClass',
+          data: {name: id.name},
+        });
+        return;
+      }
+
+      // Then, handle all cases in which superclass is error-like.
+      if (id == null) {
+        context.report({
+          node,
+          messageId: 'errorSuperClassMissingName',
+        });
+      } else if (!isIdentifierErrorLike(id)) {
+        context.report({
+          node: id,
+          messageId: 'errorSuperClass',
+          data: {name: id.name},
+        });
+      }
+    }
+
+    function processFunction(node) {
+      const {id} = node;
+      if (id == null || !isIdentifierErrorLike(id)) {
+        return;
+      }
+      context.report({
+        node: id,
+        messageId: 'errorFunction',
+        data: {name: id.name},
+      });
+    }
+  },
+};
+
+function isSuperClassErrorLike(node) {
+  if (node.type === 'Identifier') {
+    return isNameErrorLike(node.name);
+  }
+  if (node.type === 'MemberExpression') {
+    return isSuperClassErrorLike(node.property);
+  }
+  return false;
+}
+
+function isIdentifierErrorLike(node) {
+  return node.type === 'Identifier' && isNameErrorLike(node.name);
+}
+
+function isNameErrorLike(name) {
+  return typeof name === 'string' && /^([A-Z].*)?Error$/.test(name);
+}
diff --git a/tools/eslint/rules/sort-imports.js b/tools/eslint/rules/sort-imports.js
new file mode 100644
index 000000000000..42312a93c1e4
--- /dev/null
+++ b/tools/eslint/rules/sort-imports.js
@@ -0,0 +1,12 @@
+/**
+ * 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.
+ *
+ * To regenerate this file, please run this command on Meta's monorepo:
+ * @codegen-command : xplat/js/tools/sort-imports/scripts/build.sh
+ * @generated SignedSource<<ee1e17a6301a02a3f4f0fe018531c4b4>>
+ * @nolint
+ */
+"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function t(e){var t=e.default;if("function"==typeof t){var n=function(){return t.apply(this,arguments)};n.prototype=t.prototype}else n={};return Object.defineProperty(n,"__esModule",{value:!0}),Object.keys(e).forEach((function(t){var r=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(n,t,r.get?r:{enumerable:!0,get:function(){return e[t]}})})),n}const n=e(require("path")).default,r=__dirname.split(n.sep).includes("xplat");function i(e){if(("Literal"===e.type||"JSXText"===e.type)&&"string"==typeof e.value)return e.value;if("BinaryExpression"===e.type&&"+"===e.operator){const t=i(e.left),n=i(e.right);if(null!=t&&null!=n)return t+n}return null}function o(e){if("Identifier"===e.type)return e.name;if("ThisExpression"===e.type)return"this";if("MemberExpression"===e.type){const t=o(e.object),n=e.computed?i(e.property):o(e.property);if(null!=t&&null!=n)return t+"."+n}else if("TypeCastExpression"===e.type)return o(e.expression);return null}function a(e){return e.callee?o(e.callee):null}function l(e,t,n){const r=e.getSourceCode().getText(),i=function(e,t){if(t.line<1)throw new RangeError("Line number "+t.line+" is before the start of file");const n=/\r\n|\r|\n|\u2028|\u2029/g;let r={index:0};for(let i=1;i<t.line;++i)if(r=n.exec(e),null==r)throw new RangeError("Line number "+t.line+" is past the end of file");if(null==r)throw new RangeError("Line number "+t.line+" is past the end of file");return r.index+(r[0]||"").length}(r,t)+t.column+n;return function(e,t){if(t<0)throw new RangeError("computed offset "+t+" is a negative index");if(t>=e.length)throw new RangeError("computed offset "+t+" is past the end of file");const n=/\r\n|\r|\n|\u2028|\u2029/g;let r,i={index:0},o=0;do{r=i,i=n.exec(e),++o}while(i&&i.index<t);return{line:o,column:t-r.index-(r[0]||"").length}}(r,i)}function s(e,t){let n;return e.variables.some((function(e){return!(!e.defs.length||e.name!==t)&&(n=e,!0)})),n||(null==e.upper?null:s(e.upper,t))}const u=e=>"string"==typeof e&&e.charCodeAt(0)>=97,c=e=>"string"==typeof e&&e.charCodeAt(0)<=90;function p(e){return null!=e&&"VariableDeclaration"===e.type&&"Program"===e.parent.type&&1===e.declarations.length&&null!=e.declarations[0].init&&m(e.declarations[0].init)}function f(e){return null!=e&&"VariableDeclarator"===e.type&&"VariableDeclaration"===e.parent.type&&"Program"===e.parent.parent.type&&1===e.parent.declarations.length&&m(e.init)}function m(e){return null!=e&&(d(e)||y(e)||h(e))}function g(e){return null!=e&&"CallExpression"===e.type&&e.callee&&"Identifier"===e.callee.type&&"requireNUX"===e.callee.name&&2===e.arguments.length&&"Literal"===e.arguments[0].type}function d(e){return"CallExpression"===e.type&&e.callee&&"Identifier"===e.callee.type&&"require"===e.callee.name&&1===e.arguments.length&&"Literal"===e.arguments[0].type}function y(e){return"CallExpression"===e.type&&"Identifier"===e.callee.type&&"requireDeferred"===e.callee.name&&1===e.arguments.length&&"Literal"===e.arguments[0].type&&"string"==typeof e.arguments[0].value}function h(e){return"CallExpression"===e.type&&"Identifier"===e.callee.type&&"requireDeferredForDisplay"===e.callee.name&&1===e.arguments.length&&"Literal"===e.arguments[0].type&&"string"==typeof e.arguments[0].value}function x(e){return"ImportDeclaration"===e.type&&(null==e.importKind||"value"===e.importKind)}function b(e){return"ImportDeclaration"===e.type&&("type"===e.importKind||"typeof"===e.importKind)}function C(e){return x(e)||b(e)}function S(e){return null!=e&&"CallExpression"===e.type&&e.callee&&"Identifier"===e.callee.type&&"JSResource"===e.callee.name&&1===e.arguments.length&&"Literal"===e.arguments[0].type}function v(e){return null!=e&&"CallExpression"===e.type&&e.callee&&"Identifier"===e.callee.type&&"JSResourceForInteraction"===e.callee.name&&2===e.arguments.length&&"Literal"===e.arguments[0].type}function E(e){return null!=e&&"CallExpression"===e.type&&"Identifier"===e.callee.type&&"ClientJSResource"===e.callee.name&&1===e.arguments.length&&"Literal"===e.arguments[0].type&&"string"==typeof e.arguments[0].value}function I(e){if(null==e||"CallExpression"!==e.type||null==e.callee)return!1;let t;return"Identifier"===e.callee.type&&(t=e.callee),"MemberExpression"===e.callee.type&&"Identifier"===e.callee.object.type&&(t=e.callee.object),null!=t&&"requireCond"===t.name&&e.arguments.length>0}function T(e){return 0===e.indexOf("m#")?e.substring(2):e}function R(e,t,n=1){return"CallExpression"!==e.type||e.arguments.length!==n||null!=t&&"string"==typeof t&&a(e)!==t||"Literal"!==e.arguments[0].type||"string"!=typeof e.arguments[0].value?null:T(e.arguments[0].value)}function D(e,t,n){const r=e.arguments;return I(e)?3!==r.length?null:(null==t||r[0]&&"Literal"===r[0].type&&r[0].value===t)&&(null==n||r[1]&&"Literal"===r[1].type&&r[1].value===n)?r[2]&&"ObjectExpression"===r[2].type?r[2].properties.reduce(((e,t)=>{if("Property"===t.type&&"Literal"===t.value.type){let n;if("Identifier"===t.key.type)n=t.key.name;else{if("Literal"!==t.key.type)return e;n=String(t.key.value)}e[n]="string"==typeof t.value.value?T(t.value.value):null}return e}),{}):r[2]&&"Literal"===r[2].type&&"string"==typeof r[2].value?T(r[2].value):null:null:null}function w(e){return R(e,"JSResource")}function N(e){return null==e?null:m(e)?"string"!=typeof e.arguments[0].value?null:T(e.arguments[0].value):null}function q(e,t){const n=e.getSourceCode().ast.body.find((e=>"VariableDeclaration"===e.type&&1===e.declarations.length&&"VariableDeclarator"===e.declarations[0].type&&null!=e.declarations[0].init&&N(e.declarations[0].init)===t));return n||null}function k(e){let t=e;for(;"TypeCastExpression"===t.type;)t=t.expression;return t}function L(e){if("value"!==e.importKind)return!0;return e.specifiers.every((e=>"ImportSpecifier"===e.type&&("type"===e.importKind||"typeof"===e.importKind)))}function O(e,t){const n=e.getSourceCode().ast.body.find((e=>"ImportDeclaration"===e.type&&e.source.value===t&&!L(e)));return n||null}var P={asAnyKindOfRequireCall:function(e){return m(e)?e:null},asAnyKindOfRequireVariableDeclaration:function(e){return p(e)?e:null},asAnyKindOfRequireVariableDeclarator:function(e){return f(e)?e:null},getAnyRequiredModuleName:function(e,t=Object.freeze({})){const n=N(e)||w(e)||function(e){return R(e,"JSResourceForInteraction",2)}(e)||function(e){if(!g(e))return null;if(2!==e.arguments.length)return null;if("string"!=typeof e.arguments[1].value)return null;return T(e.arguments[1].value)}(e);return null!=n?n:D(e,t.condType,t.condition)},getBaseNode:function(e){let t=e;for(;"MemberExpression"===t.type;)t=t.object;return t},getBinding:s,getBootloadedModuleNames:function(e){return"ExpressionStatement"===e.type&&e.expression&&"CallExpression"===e.expression.type&&e.expression.callee&&"MemberExpression"===e.expression.callee.type&&e.expression.callee.object&&"Bootloader"===e.expression.callee.object.name&&e.expression.callee.property&&"loadModules"===e.expression.callee.property.name&&e.expression.arguments.length>0&&"ArrayExpression"===e.expression.arguments[0].type&&e.expression.arguments[0].elements.length>0?e.expression.arguments[0].elements.map((e=>"Literal"===e.type&&"string"==typeof e.value?e.value:null)).filter(Boolean):null},getCalleeName:a,getConstantStringExpression:i,getCurrentClassName:function(e){const t=e.getAncestors().find((e=>"ClassDeclaration"===e.type));return t&&"ClassDeclaration"===t.type&&null!=t.id?t.id.name:null},getEnglishForNth:function(e){return["first","second","third","fourth","fifth","sixth"][e]},getFullyQualifiedIdentifier:o,getJSResourceModuleName:w,getJSXMemberOrNamespaceRoot:function(e){let t=e;for(;"JSXIdentifier"!==t.type;)if("JSXMemberExpression"===t.type)t=t.object;else{if("JSXNamespacedName"!==t.type)throw new Error("unexpected "+t.type);t=t.namespace}return t},getLocOffset:function(e,t,n){return l(e,t.loc.start,n)},getLocOffsetOfLoc:l,getName:function(e){const t=k(e);return"Identifier"===t.type?t.name:"Literal"===t.type?String(t.value):null},getObjectPropertyName:function(e){if("Property"!==e.type&&"PropertyDefinition"!==e.type&&"MethodDefinition"!==e.type)return null;const t=e.key;return"Identifier"!==t.type||e.computed?function(e){switch(e.type){case"Literal":switch(e.literalType){case"bigint":return e.bigint;case"null":return"null";case"regexp":return`/${e.regex.pattern}/${e.regex.flags}`;default:return String(e.value)}case"TemplateLiteral":if(0===e.expressions.length&&1===e.quasis.length)return e.quasis[0].value.cooked}return null}(t):t.name},getParamComments:function(e,t){return t.params.map((function(t){const n=e.getSourceCode().getCommentsBefore(t);return n[n.length-1]}))},getPropertyName:function(e){return"MemberExpression"!==e.type?null:e.computed?i(e.property):"Identifier"!==e.property.type?null:e.property.name},getPropTokens:function(e,t){const n=e.getSourceCode().getTokens(t),r=[];return n.forEach(((e,t,n)=>{"JSXIdentifier"===e.type&&"Punctuator"===n[t+1].type&&"="===n[t+1].value&&r.push(e)})),r},getRequireCondModules:D,getRequireModuleName:N,getRequireModuleNode:q,getReturnComment:function(e,t){return e.getSourceCode().getCommentsBefore(t.body)[0]},getValueImportNode:O,hasValueImport:function(e){return e.getSourceCode().ast.body.some((e=>"ImportDeclaration"===e.type&&!L(e)))},getVariable:function(e,t){let n=t;for(;n;){const t=n.set.get(e);if(t)return t;n=n.upper}return null},insertRequireStatement:function(e,t,n,r=""){if(""===n)throw new Error("Name must be a string with length larger than 0");const i=`const ${n} = require('${n}${r}');`,o=[];e.getSourceCode().ast.body.forEach((e=>{if("VariableDeclaration"===e.type&&1===e.declarations.length&&"VariableDeclarator"===e.declarations[0].type&&e.declarations[0].init){const t=N(e.declarations[0].init);null!=t&&o.push({name:t,node:e})}}));const a=o.find((e=>e.name>=n));if(a){if(a.name.replace(r,"")===n)return[];const e=o[0];if(u(a.name)&&c(n)){if(e!==a){const e=a.node.range[0];return[t.removeRange([e-1,e-1]),t.insertTextBefore(a.node,i+"\n\n")]}return[t.insertTextBefore(a.node,i+"\n\n")]}return[t.insertTextBefore(a.node,i+"\n")]}if(o.length>0){const e=o[o.length-1],r=c(e.name)&&u(n)?"\n":"";return[t.insertTextAfter(e.node,"\n"+i+r)]}{const n=e.getSourceCode().ast.body,r=n[0];return"ExpressionStatement"===r.type&&"Literal"===r.expression.type&&"use strict"===r.expression.value?[t.insertTextBefore(n[1],i+"\n")]:[t.insertTextBefore(n[0],i+"\n")]}},insertValueImportStatement:function(e,t,n,r=""){if(""===n)throw new Error("Name must be a string with length larger than 0");const i=`import ${n} from '${n}${r}';`,o=[];e.getSourceCode().ast.body.forEach((e=>{if(x(e)){const t=function(e){if(m(e))return"string"!=typeof e.arguments[0].value?null:T(e.arguments[0].value);if(C(e))return e.source.value;return null}(e);null!=t&&o.push({name:t,node:e})}}));const a=o.find((e=>e.name>=n));if(a){if(a.name.replace(r,"")===n)return[];const e=o[0];if(u(a.name)&&c(n)){if(e!==a){const e=a.node.range[0];return[t.removeRange([e-1,e-1]),t.insertTextBefore(a.node,i+"\n\n")]}return[t.insertTextBefore(a.node,i+"\n\n")]}return[t.insertTextBefore(a.node,i+"\n")]}if(o.length>0){const e=o[o.length-1],r=c(e.name)&&u(n)?"\n":"";return[t.insertTextAfter(e.node,"\n"+i+r)]}{const n=e.getSourceCode().ast.body,r=n[0];return"ExpressionStatement"===r.type&&"Literal"===r.expression.type&&"use strict"===r.expression.value?[t.insertTextBefore(n[1],i+"\n")]:[t.insertTextBefore(n[0],i+"\n")]}},isAnyKindOfImport:C,isAnyKindOfModuleCall:function(e){return m(e)||I(e)||S(e)||v(e)||E(e)||g(e)},isAnyKindOfRequireCall:m,isAnyKindOfRequireVariableDeclaration:p,isAnyKindOfRequireVariableDeclarator:f,isClientJSResource:E,isFbSourceRepo:r,isGraphQLTemplate:function(e){return"Identifier"===e.tag.type&&"graphql"===e.tag.name&&1===e.quasi.quasis.length},isInsideMethod:function(e,t){return e.getAncestors().some((e=>"MethodDefinition"===e.type&&"Identifier"===e.key.type&&e.key.name===t))},isJSResource:S,isJSResourceForInteraction:v,isModuleRef:function(e){return"Literal"===e.type&&"string"==typeof e.value&&e.value.startsWith("m#")},isOnlyTypeImport:L,isOnlyTypeExport:function(e){return"type"===e.exportKind},isReferenced:function(e){const t=e.parent;switch(t.type){case"MemberExpression":case"JSXMemberExpression":return t.property===e&&!0===t.computed||t.object===e;case"MetaProperty":case"ImportDefaultSpecifier":case"ImportNamespaceSpecifier":case"ImportSpecifier":case"LabeledStatement":case"RestElement":case"ObjectPattern":case"ArrayPattern":return!1;case"Property":case"MethodDefinition":return t.key===e&&t.computed;case"VariableDeclarator":case"ClassDeclaration":case"ClassExpression":return t.id!==e;case"ArrowFunctionExpression":case"FunctionDeclaration":case"FunctionExpression":for(let n=0;n<t.params.length;n++)if(t.params[n]===e)return!1;return"ArrowFunctionExpression"!==t.type&&t.id!==e;case"ExportSpecifier":return("ExportNamedDeclaration"!==t.parent.type||!t.parent.source)&&t.local===e;case"JSXAttribute":return t.name!==e;case"PropertyDefinition":return t.value===e;case"CatchClause":return t.param!==e;case"AssignmentExpression":case"AssignmentPattern":return t.right===e}return!0},isRequire:d,isRequireCond:I,isRequireDeferred:y,isRequireDeferredForDisplay:h,isTestOrExample:function(e){const t=e.getFilename();return null!=t.match(/\/__tests__\//)||null!=t.match(/\.react\.example\.js/)},isFlowTypeFile:function(e){return null!=e.getFilename().match(/\.js\.flow$/)},isThisExpression:function(e){return"ThisExpression"===k(e).type},isTypeImportDeclaration:b,isValueImportDeclaration:x,removeRequireStatement:function(e,t,n,r=""){const i=q(e,`${n}${r}`);if(i){const[e,n]=i.range;return[t.removeRange([e,n]),t.removeRange([n,n+1])]}return[]},removeValueImportStatement:function(e,t,n,r=""){const i=O(e,`${n}${r}`);if(i){const[e,n]=i.range;return[t.removeRange([e,n]),t.removeRange([n,n+1])]}return[]},replaceValueImportStatement:function(e,t,n,r="",i,o=""){const a=O(e,`${n}${r}`);return a?[t.replaceText(a,`import ${i} from '${i}${o}';`)]:[]},resolveVariable:function(e,t){const n=s(e.getScope(),t.name);if(null==n)return null;const r=n.defs[0];if(null!=r&&"FunctionName"===r.type)return r.node;const i=n.references.find((e=>e.writeExpr));return null!=i?i.writeExpr:null},stripModuleRef:T,uncast:k};var j=t(Object.freeze({__proto__:null,isCommaOrSemiToken:function(e){return"Punctuator"===e.type&&(","===e.value||";"===e.value)}}));const{isCommaOrSemiToken:B}=j;var F={getInlineComments:function(e,t,n=B){const r=e.ast.comments.filter((e=>e.loc.start.line===t.loc.end.line&&e.range[0]>t.range[1])).sort(((e,t)=>e.range[0]-t.range[0])),i=[];let o=t;for(const t of r){const r=e.getTokensBetween(o,t);if(r.length>0){if(!n)break;if(!r.every(n))break}i.push(t),o=t}return i},getLeadingComments:function(e,t,n){const r=e.getCommentsBefore(t),i=[];let o=t;for(let t=r.length-1;t>=0;t-=1){const a=r[t];if(a===n)break;if(a.loc.end.line===o.loc.start.line){i.unshift(a),o=a;continue}if(a.loc.end.line!==o.loc.start.line-1)break;const l=e.getTokenBefore(a);if(l&&l.loc.end.line===a.loc.start.line)break;i.unshift(a),o=a}return i}};var M=function(e){return e.getSourceCode().ast.docblock?.comment};const{getInlineComments:A,getLeadingComments:V}=F,{isCommaOrSemiToken:$}=j;function K(e){return"@"===e[0]||":"===e[0]}const J=/\d{1,3}(\.\d+)?%/;function _(e){switch(typeof e){case"number":return{isSafeNumericString:!0,isPercentage:!1};case"boolean":return{isSafeNumericString:!1,isPercentage:!1}}return isNaN(e)||isNaN(parseFloat(e))?J.test(e)?{isSafeNumericString:!0,isPercentage:!0}:{isSafeNumericString:!1,isPercentage:!1}:{isSafeNumericString:!0,isPercentage:!1}}function X(e){return e.reduce((([e,t],[n,r])=>[Math.min(e,n),Math.max(t,r)]),[Number.MAX_SAFE_INTEGER,0])}var U={compareNames:function(e,t,n=!1){if("number"==typeof e&&"number"==typeof t)return e-t;const r=String(e),i=String(t);if(""===r&&""!==i)return-1;if(""!==r&&""===i)return 1;if(""===r&&""===i)return 0;const{isSafeNumericString:o,isPercentage:a}=_(r),{isSafeNumericString:l,isPercentage:s}=_(i);if(o&&l){const e=Number.parseFloat(r),t=Number.parseFloat(i);if(e===t){if(!a&&s)return-1;if(a&&!s)return 1}return e-t}if(n){const e=K(r),t=K(i);if(!e&&t)return-1;if(e&&!t)return 1}const u=o||r[0].toLowerCase()===r[0].toUpperCase(),c=l||i[0].toLowerCase()===i[0].toUpperCase();if(!u&&c)return 1;if(u&&!c)return-1;if(!u&&!c){const e=r[0].toLowerCase()===r[0],t=i[0].toLowerCase()===i[0];if(!e&&t)return-1;if(e&&!t)return 1}return r.localeCompare(i,"en",{caseFirst:"upper",sensitivity:"base"})},getEncompassingRange:X,getNodeTextWithComments:function(e,t,n,{shouldIncludeNextTokenInRange:r=$,ensureTextFollowsNode:i,inlineCommentIgnoreToken:o}={}){const a=A(e,t,o),l=[...V(e,t,n).map((({range:e})=>e)),t.range,...a.map((({range:e})=>e))],s=e.getTokenAfter(t);s&&!0===r?.(s)&&l.push(s.range);const u=X(l);let c=e.text.slice(u[0],u[1]);const p=t.range[1]-u[0];if(null!=i){e.getTokenAfter(t)?.value!==i&&(c=c.slice(0,p)+i+c.slice(p))}return{range:u,text:c}},isComma:function(e){return"Punctuator"===e.type&&","===e.value}};const z=P,{getInlineComments:G,getLeadingComments:Q}=F,W=M,{compareNames:H}=U,Y=0,Z={default:1,namespace:2,named:3},ee={default:4,namespace:5,named:6},te={default:7,namespace:8,named:9},ne=0,re=1,ie=2,oe=3,ae=99;var le={meta:{fixable:"code",messages:{incorrectOrder:"Requires should be sorted alphabetically"}},create(e){const t=e.getSourceCode(),n=function(e){const t=W(e);if(null!=t)return t;const n=e.getSourceCode().ast,r=n.body.length>0?n.body[0]:n,i=e.getSourceCode().getCommentsBefore(r)[0];return i&&"Block"===i.type?i:null}(e);if(n&&(n.value.includes("* @generated")||n.value.includes("* @partially-generated")))return{};const r=Object.freeze({typeImport:{priority:10,uppercase:[],lowercase:[],tiebreakFunction:s},valueImport:{priority:20,uppercase:[],lowercase:[],tiebreakFunction:s},requiresUsedByOtherRequires:{priority:30,uppercase:[],lowercase:[],tiebreakFunction:u},require:{priority:40,uppercase:[],lowercase:[],tiebreakFunction:u}}),i=[];let o=null,a=null;const l=new Set;return{Program(n){for(const e of n.body)switch(e.type){case"ImportDeclaration":if("type"===e.importKind||"typeof"===e.importKind)g(r.typeImport,e,e.source.value,!0);else{const n=t.getLastToken(e.source,(e=>"from"===e.value));0===e.specifiers.length&&null==n?d(e):g(r.valueImport,e,e.source.value)}break;case"VariableDeclaration":{const t=e.declarations[0]?.init;if(1!==e.declarations.length||null==t){d(e);break}f(t,e);break}default:d(e)}const s=[];for(const e of Object.keys(r)){const t=r[e];s.push({priority:t.priority,nodes:t.uppercase.sort(((e,n)=>c(e,n,t.tiebreakFunction)))}),s.push({priority:t.priority+5,nodes:t.lowercase.sort(((e,n)=>c(e,n,t.tiebreakFunction)))})}function u(e){return[e.leadingComments.length?e.leadingComments.map((e=>t.getText(e))).join("\n")+"\n":"",e.inlineComments.length?" "+e.inlineComments.map((e=>t.getText(e))).join(" "):""]}const p=s.filter((e=>0!==e.nodes.length)).sort(((e,t)=>e.priority-t.priority)).map((e=>e.nodes.map((e=>{const[n,r]=u(e),i=function(e,t){const n=t.node,r=e.getText(n),i=(()=>{if("ImportDeclaration"===n.type&&null!=n.specifiers.find((e=>"ImportSpecifier"===e.type))){const t=e.getFirstToken(n,(e=>"Punctuator"===e.type&&"{"===e.value)),r=e.getFirstToken(n,(e=>"Punctuator"===e.type&&"}"===e.value));return null==t||null==r?null:e.getText().substring(t.range[0],r.range[1])}if("VariableDeclaration"===n.type&&"ObjectPattern"===n.declarations[0].id.type){const t=n.declarations[0].id.typeAnnotation,r=e.getText(n.declarations[0].id);return t?r.substr(0,t.range[0]-n.declarations[0].id.range[0]):r}return null})();if(null==i)return r;let o=[],a=null;"ImportDeclaration"===n.type?o=n.specifiers.map((t=>"ImportDefaultSpecifier"===t.type||"ImportNamespaceSpecifier"===t.type?null:{leadingComments:e.getCommentsBefore(t),name:t.imported.name,node:t})).filter(Boolean):"VariableDeclaration"===n.type&&"ObjectPattern"===n.declarations[0].id.type&&(o=n.declarations[0].id.properties.map((t=>{if("ExperimentalRestProperty"===t.type||"RestElement"===t.type)return a=t,null;const n=t.key,r="Literal"===n.type?String(n.value):"Identifier"===n.type?t.computed?null:n.name:null;return null==r?null:{leadingComments:e.getCommentsBefore(t),name:r,node:t}})).filter(Boolean));if(o.length<=1)return r;const l=i.indexOf("\n")>=0,s=o.sort(((e,t)=>H(e.name,t.name))).map((e=>e.node));null!=a&&s.push(a);const u=s.map((t=>{const n=e.getCommentsBefore(t).map((t=>e.getText(t))),r=n.length?n.join(""):"";return l?(r?"  "+r+"\n":"")+"  "+e.getText(t):(r?r+" ":"")+e.getText(t)})),c=(()=>{const t=[];if("ImportDeclaration"===n.type){if(t.push(...e.getCommentsBefore(n.source)),l&&null!=n.specifiers.find((e=>"ImportSpecifier"===e.type))){const r=e.getTokenBefore(n.source,(e=>"Punctuator"===e.type&&"}"===e.value));null!=r&&t.push(...e.getCommentsBefore(r))}}else if("VariableDeclaration"===n.type&&"ObjectPattern"===n.declarations[0].id.type){const r=e.getLastToken(n.declarations[0].id);null!=r&&t.push(...e.getCommentsBefore(r))}return t})(),p=l&&c.length?c.map((t=>"  "+e.getText(t))).join("\n")+"\n":"",f=l?"\n"+u.map((e=>e.includes("...")?`${e}\n`:`${e},\n`)).join("")+p:u.join(", ");return r.replace(i,`{${f}}`)}(t,e);return n+i+r})).join("\n"))).join("\n\n"),m=o;if(null==m||null==a)return;const y=m.leadingComments.length?m.leadingComments[0].range[0]:m.node.range[0],h=a.inlineComments.length>0?a.inlineComments[a.inlineComments.length-1].range[1]:a.node.range[1];t.getText(m.node,m.node.range[0]-y,h-m.node.range[1])!==p&&e.report({node:m.node,messageId:"incorrectOrder",fix(e){const n=i.filter((({node:e})=>e.range[0]>=y&&e.range[1]<=h)).map((e=>{const[n,r]=u(e),i=t.getText(e.node);return{range:e.node.range,text:n+i+r}})).flat().concat(t.getAllComments().filter((e=>e.range[0]>=y&&e.range[1]<=h&&!l.has(e))).map((e=>({range:e.range,text:t.getText(e)})))).sort(((e,t)=>e.range[0]-t.range[0]||e.range[1]-t.range[1])).map((({text:e})=>e)).join("\n");return e.replaceTextRange([y,h],[p,n].filter(Boolean).join("\n\n"))}})}};function s(e){if(0===e.specifiers.length)return Y;const t=(()=>{switch(e.importKind){default:case"value":return Z;case"type":return ee;case"typeof":return te}})();return e.specifiers.find((e=>"ImportDefaultSpecifier"===e.type))?t.default:e.specifiers.find((e=>"ImportNamespaceSpecifier"===e.type))?t.namespace:t.named}function u(e){if("ExpressionStatement"===e.type)return ne;switch(e.declarations[0].id.type){case"Identifier":return re;case"ObjectPattern":return ie;case"ArrayPattern":return oe}return ae}function c(e,t,n){const r=H(e.moduleName,t.moduleName);if(0!==r)return r;const i=n(e.node)-n(t.node);return 0!==i?i:e.node.loc.start.line-t.node.loc.start.line}function p(e,t){if(null==e)throw new Error("Missing required module name");return null!=t?`${e}_${t}`:e}function f(e,n,i){const o=z.getRequireModuleName(e);if(z.isRequire(e)){const e=p(o,i);g("requireCond"===e||"requireDeferred"===e||"requireDeferredForDisplay"===e?r.requiresUsedByOtherRequires:r.require,n,p(o,i))}else if(z.isRequireDeferred(e)||z.isRequireDeferredForDisplay(e))g(r.require,n,p(o,i));else{if(z.isRequireCond(e)){if("VariableDeclaration"===n.type){const e=t.getText(n.declarations[0].id);return void g(r.require,n,p(e,i))}}else{if("MemberExpression"===e.type)return void f(e.object,n,p(t.getText(e.property),i));if("CallExpression"===e.type)return void f(e.callee,n,i)}d(n)}}function m(e){e.leadingComments.forEach((e=>l.add(e))),e.inlineComments.forEach((e=>l.add(e)));t.getCommentsInside(e.node).forEach((e=>l.add(e)))}function g(e,r,i,l=!1){const s={inlineComments:G(t,r),leadingComments:Q(t,r,n),moduleName:i,node:r};if(l)e.uppercase.push(s);else{const t=i[0]||"";t.toLowerCase()===t?e.lowercase.push(s):e.uppercase.push(s)}null==o&&(o=s),a=s,m(s)}function d(e){const r={inlineComments:G(t,e),leadingComments:Q(t,e,n),node:e};i.push(r),m(r)}}};const se=le;var ue={...se,create:e=>e.getSourceCode().getText().includes("@generated SignedSource<<")?{}:se.create(e)};module.exports=ue;
diff --git a/tools/eslint/rules/valid-flow-typed-signature.js b/tools/eslint/rules/valid-flow-typed-signature.js
new file mode 100644
index 000000000000..c90ed5bbef66
--- /dev/null
+++ b/tools/eslint/rules/valid-flow-typed-signature.js
@@ -0,0 +1,71 @@
+/**
+ * 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
+ */
+
+'use strict';
+
+const crypto = require('node:crypto');
+
+// @see https://github.com/flow-typed/flow-typed
+const HASH_COMMENT_RE = /\/\/ flow-typed signature: (.*)$/;
+
+module.exports = {
+  meta: {
+    type: 'problem',
+    docs: {
+      description: 'Require valid flow-typed signatures',
+      recommended: true,
+    },
+    messages: {
+      invalidSignature:
+        'Invalid flow-typed signature; avoid local modifications',
+    },
+    schema: [],
+  },
+
+  create(context) {
+    return {
+      Program() {
+        const sourceText = context.getSourceCode().getText();
+
+        const firstLineEndIndex = sourceText.indexOf('\n');
+        const firstLine = sourceText.substr(0, firstLineEndIndex);
+
+        const match = firstLine.match(HASH_COMMENT_RE);
+        if (match == null) {
+          // Not a signed flow-typed definition file.
+          return;
+        }
+
+        const hash = match[1];
+        const versionedCode = sourceText.substr(firstLineEndIndex + 1);
+        if (md5(versionedCode) === hash) {
+          return;
+        }
+
+        context.report({
+          loc: {
+            start: {
+              line: 1,
+              column: firstLine.length - hash.length,
+            },
+            end: {
+              line: 1,
+              column: firstLine.length,
+            },
+          },
+          messageId: 'invalidSignature',
+        });
+      },
+    };
+  },
+};
+
+function md5(string) {
+  return crypto.createHash('md5').update(string).digest('hex');
+}
diff --git a/types/.npmignore b/types/.npmignore
new file mode 100644
index 000000000000..0480d436df53
--- /dev/null
+++ b/types/.npmignore
@@ -0,0 +1 @@
+__typetests__
diff --git a/types/__typetests__/animated.tsx b/types/__typetests__/animated.tsx
new file mode 100644
index 000000000000..bee061fb72d2
--- /dev/null
+++ b/types/__typetests__/animated.tsx
@@ -0,0 +1,242 @@
+/**
+ * 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
+ */
+
+import * as React from 'react';
+
+import {
+  Animated,
+  View,
+  NativeSyntheticEvent,
+  NativeScrollEvent,
+  StyleProp,
+  SectionListData,
+} from 'react-native';
+
+interface CompProps {
+  width: number;
+}
+
+class Comp extends React.Component<CompProps> {
+  f1: () => boolean = () => true;
+
+  render() {
+    const {width} = this.props;
+    return <View style={{width}} />;
+  }
+}
+
+const ForwardComp = React.forwardRef<View, CompProps>(({width}, ref) => {
+  function f1(): boolean {
+    return true;
+  }
+
+  return <View ref={ref} style={{width}} />;
+});
+
+type X = React.PropsWithoutRef<React.ComponentProps<typeof ForwardComp>>;
+
+type Props = React.ComponentPropsWithRef<typeof Animated.Text>;
+const AnimatedWrapperComponent: React.FunctionComponent<Props> = ({
+  key, // $ExpectType string | number | null | undefined || Key | null | undefined
+  ...props
+}) => <Animated.Text {...props} />;
+
+function TestAnimatedAPI() {
+  // Value
+  const v1 = new Animated.Value(0);
+  const v2 = new Animated.Value(0);
+
+  // Ref
+  const AnimatedViewRef = React.useRef<View>(null);
+
+  AnimatedViewRef.current &&
+    AnimatedViewRef.current.measure(() => {
+      return;
+    });
+
+  const AnimatedComp = Animated.createAnimatedComponent(Comp);
+
+  const AnimatedCompRef = React.useRef<Comp>(null);
+
+  AnimatedCompRef.current && AnimatedCompRef.current.f1();
+
+  const AnimatedForwardComp = Animated.createAnimatedComponent(ForwardComp);
+
+  const AnimatedForwardCompRef =
+    React.useRef<React.ElementRef<typeof ForwardComp>>(null);
+  const ForwardCompRef = React.useRef<View>(null);
+
+  AnimatedForwardCompRef.current &&
+    AnimatedForwardCompRef.current.measure(() => {
+      return;
+    });
+
+  v1.setValue(0.1);
+
+  v1.addListener(e => {
+    const n: number = e.value;
+  });
+
+  const v200 = v1.interpolate({
+    inputRange: [0, 1],
+    outputRange: [0, 200],
+  });
+
+  const id = v200.addListener(() => {});
+  v200.removeListener(id);
+  v200.removeAllListeners();
+  v200.hasListeners();
+
+  Animated.timing(v2, {
+    toValue: v1.interpolate({inputRange: [0, 1], outputRange: [0, 200]}),
+    useNativeDriver: false,
+  });
+
+  // ValueXY
+  const position = new Animated.ValueXY({x: 0, y: 0});
+
+  // Animation functions
+  const spring1 = Animated.spring(v1, {
+    toValue: 0.5,
+    tension: 10,
+    delay: 100,
+    useNativeDriver: false,
+  });
+
+  const springXY = Animated.spring(position, {
+    toValue: {
+      x: 1,
+      y: 2,
+    },
+    useNativeDriver: false,
+  });
+
+  spring1.start();
+  spring1.stop();
+  spring1.reset();
+
+  Animated.parallel(
+    [
+      Animated.spring(v1, {toValue: 1, useNativeDriver: false}),
+      Animated.spring(v2, {toValue: 1, useNativeDriver: false}),
+    ],
+    {
+      stopTogether: true,
+    },
+  );
+
+  Animated.decay(v1, {
+    velocity: 2,
+    useNativeDriver: false,
+  });
+
+  Animated.timing(v1, {
+    toValue: 1,
+    duration: 100,
+    delay: 100,
+    easing: v => v,
+    useNativeDriver: false,
+  });
+
+  Animated.add(v1, v2);
+  Animated.subtract(v1, v2);
+  Animated.divide(v1, v2);
+  Animated.multiply(v1, v2);
+  Animated.modulo(v1, 2);
+
+  Animated.delay(100);
+
+  Animated.sequence([spring1, springXY]);
+
+  Animated.stagger(100, [spring1, springXY]);
+
+  const listener = (e?: NativeSyntheticEvent<NativeScrollEvent>) => {
+    if (e) {
+      console.warn(e.nativeEvent.contentOffset.y);
+    }
+  };
+
+  Animated.event([{nativeEvent: {contentOffset: {y: v1}}}], {
+    useNativeDriver: true,
+    listener,
+  });
+
+  const AnimatedView = Animated.createAnimatedComponent(View);
+  const ref = React.useRef<View>(null);
+  const legacyRef = React.useRef<Animated.LegacyRef<View>>(null);
+
+  return (
+    <View ref={ref}>
+      <Animated.View
+        ref={ref}
+        style={[
+          position.getLayout(),
+          {
+            opacity: v1,
+          },
+        ]}
+      />
+      <AnimatedView ref={ref} style={{top: 3}}>
+        i has children
+      </AnimatedView>
+      <Animated.View ref={legacyRef} />
+      <AnimatedView ref={legacyRef} />
+      <AnimatedComp ref={AnimatedCompRef} width={v1} />
+      <ForwardComp ref={ForwardCompRef} width={1} />
+      <AnimatedForwardComp ref={AnimatedForwardCompRef} width={10} />
+      <Animated.Image
+        style={{transform: position.getTranslateTransform()}}
+        source={{uri: 'https://picsum.photos/200'}}
+      />
+      <Animated.View
+        testID="expect-type-animated-view"
+        style={{opacity: v1}}
+        onLayout={event => {
+          const x = event.nativeEvent.layout.x; // $ExpectType number
+          const y = event.nativeEvent.layout.y; // $ExpectType number
+          const width = event.nativeEvent.layout.width; // $ExpectType number
+          const height = event.nativeEvent.layout.height; // $ExpectType number
+        }}
+      />
+      ;
+      <Animated.FlatList
+        testID="expect-type-animated-flatlist"
+        style={{opacity: v1}}
+        data={[1] as ReadonlyArray<number>}
+        renderItem={info => {
+          info; // $ExpectType ListRenderItemInfo<number>
+          return <View testID={info.item.toFixed(1)} />;
+        }}
+      />
+      ;
+      <Animated.SectionList
+        testID="expect-type-animated-sectionlist"
+        style={{opacity: v1}}
+        sections={
+          [{title: 'test', data: [1]}] as SectionListData<
+            number,
+            {title: string}
+          >[]
+        }
+        renderItem={info => {
+          /*
+           * Original <SectionList> expects:
+           * SectionListRenderItemInfo<any>    on TS@3.5,
+           * SectionListRenderItemInfo<number> on TS@4.0.
+           * Skip until original is adjusted and type can be asserted
+           */
+          info; // Should expect SectionListRenderItemInfo<number>
+          info.section.title; // $ExpectType string
+          return <View testID={info.item.toFixed(1)} />;
+        }}
+      />
+      ;
+    </View>
+  );
+}
diff --git a/types/__typetests__/fabric-component-sample.ts b/types/__typetests__/fabric-component-sample.ts
new file mode 100644
index 000000000000..73d91a6bcee8
--- /dev/null
+++ b/types/__typetests__/fabric-component-sample.ts
@@ -0,0 +1,55 @@
+/**
+ * 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
+ */
+
+import codegenNativeComponent, {
+  NativeComponentType,
+} from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
+import {
+  WithDefault,
+  Double,
+  Float,
+  Int32,
+  UnsafeObject,
+  BubblingEventHandler,
+  DirectEventHandler,
+} from 'react-native/Libraries/Types/CodegenTypes';
+import type {ViewProps} from 'react-native';
+
+type Event = Readonly<{
+  value: Double;
+}>;
+
+interface NativeProps extends ViewProps {
+  string?: string;
+  number?: number;
+  boolean?: boolean;
+  default?: WithDefault<'option1' | 'option2', 'option1'>;
+  double?: Double;
+  float?: Float;
+  int32?: Int32;
+  unsafeObject?: UnsafeObject;
+  onBubblingEventHandler?: BubblingEventHandler<Event>;
+  onDirectEventHandler?: DirectEventHandler<Event>;
+}
+
+export type SampleViewType = NativeComponentType<NativeProps>;
+
+interface NativeCommands {
+  changeBackgroundColor: (
+    viewRef: React.ElementRef<SampleViewType>,
+    color: string,
+  ) => void;
+}
+
+export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
+  supportedCommands: ['changeBackgroundColor'],
+});
+
+export default codegenNativeComponent<NativeProps>('SampleView');
diff --git a/types/__typetests__/globals.tsx b/types/__typetests__/globals.tsx
new file mode 100644
index 000000000000..e14a8029d6da
--- /dev/null
+++ b/types/__typetests__/globals.tsx
@@ -0,0 +1,178 @@
+/**
+ * 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.
+ */
+
+const noop = () => { };
+
+function testInterval() {
+    let handle = setInterval(noop, 0);
+    clearInterval(handle);
+
+    handle = setInterval((arg1: number, arg2: string) => {
+        console.log('arg1', arg1);
+        console.log('arg2', arg2);
+    }, 0, 100, '200');
+    clearInterval(handle);
+
+    handle = setInterval((arg1: number, arg2: string) => {
+        console.log('arg1', arg1);
+        console.log('arg2', arg2);
+    // @ts-expect-error
+    }, 0, 'wrong-type', '200');
+    clearInterval(handle);
+
+    // @ts-expect-error
+    handle = setInterval((missingArg: any) => {
+        console.log('missingArg', missingArg);
+    }, 0);
+    clearInterval(handle);
+
+    handle = setInterval((arg1: number) => {
+        console.log('arg1', arg1);
+    // @ts-expect-error
+    }, 0, 100, 'missing-arg');
+    clearInterval(handle);
+}
+
+function testTimeout() {
+    let handle = setTimeout(noop, 0);
+    clearTimeout(handle);
+
+    handle = setTimeout((arg1: number, arg2: string) => {
+        console.log('arg1', arg1);
+        console.log('arg2', arg2);
+    }, 0, 100, '200');
+    clearTimeout(handle);
+
+    handle = setTimeout((arg1: number, arg2: string) => {
+        console.log('arg1', arg1);
+        console.log('arg2', arg2);
+    // @ts-expect-error
+    }, 0, 'wrong-type', '200');
+    clearTimeout(handle);
+
+    // @ts-expect-error
+    handle = setTimeout((missingArg: any) => {
+        console.log('missingArg', missingArg);
+    }, 0);
+    clearTimeout(handle);
+
+    handle = setTimeout((arg1: number) => {
+        console.log('arg1', arg1);
+    // @ts-expect-error
+    }, 0, 100, 'missing-arg');
+    clearTimeout(handle);
+}
+
+function testImmediate() {
+    let handle = setImmediate(noop);
+    clearImmediate(handle);
+
+    handle = setImmediate((arg1: number, arg2: string) => {
+        console.log('arg1', arg1);
+        console.log('arg2', arg2);
+    }, 100, '200');
+    clearImmediate(handle);
+
+    handle = setImmediate((arg1: number, arg2: string) => {
+        console.log('arg1', arg1);
+        console.log('arg2', arg2);
+    // @ts-expect-error
+    }, 'wrong-type', '200');
+    clearImmediate(handle);
+
+    // @ts-expect-error
+    handle = setImmediate((missingArg: any) => {
+        console.log('missingArg', missingArg);
+    });
+    clearImmediate(handle);
+
+    handle = setImmediate((arg1: number) => {
+        console.log('arg1', arg1);
+    // @ts-expect-error
+    }, 100, 'missing-arg');
+    clearImmediate(handle);
+}
+
+const fetchCopy: WindowOrWorkerGlobalScope['fetch'] = fetch;
+
+const myHeaders = new Headers();
+myHeaders.append('Content-Type', 'image/jpeg');
+
+const myInit: RequestInit = {
+    method: 'GET',
+    headers: myHeaders,
+    mode: 'cors',
+    signal: new AbortSignal(),
+};
+
+const myRequest = new Request('flowers.jpg');
+
+fetch(myRequest, myInit)
+    .then(response => {
+        console.log(response.type);
+        console.log(response.url);
+        console.log(response.status);
+        console.log(response.ok);
+        console.log(response.statusText);
+        console.log(response.headers);
+
+        return response.blob();
+    })
+    .then(blob => {
+        const init = { status: 200, statusText: 'SuperSmashingGreat!' };
+        const myResponse = new Response(blob, init);
+    });
+
+const xmlRequest = new XMLHttpRequest();
+
+xmlRequest.addEventListener('load', ev => {
+    console.log(ev.lengthComputable);
+    console.log(ev.loaded);
+    console.log(ev.total);
+});
+
+const test = new URLSearchParams();
+
+const url = new URL('path', 'http://localhost/');
+
+const blobA = new Blob();
+const textA = 'i \u2665 dogs';
+
+const blob = new Blob([blobA, textA]);
+
+const reader = new FileReader();
+
+reader.onloadend = ev => {
+    console.log(ev.target);
+    console.log(ev.loaded);
+};
+
+reader.readAsText(new Blob());
+
+fetch('https://example.org/post-image', {
+    body: { uri: 'file:///data/tmp/qwerad3.jpg' },
+    headers: {
+        'Content-Type': 'type',
+    },
+    method: 'POST',
+});
+
+const socket = new WebSocket('wss://echo.websocket.org');
+socket.send('hello world');
+socket.addEventListener('open', () => console.log('open'));
+socket.onopen = () => console.log('open');
+socket.addEventListener('close', e => console.log(e.code));
+socket.onclose = e => console.log(e.code);
+socket.addEventListener('message', e => console.log(e.data));
+socket.onmessage = e => console.log(e.data);
+socket.addEventListener('error', e => console.log(e.message));
+socket.onerror = e => console.log(e.message);
+
+const formData = new FormData();
+formData.append('file', { fileName: 'example' });
+console.log(formData.getParts());
+console.log(formData.getAll());
diff --git a/types/__typetests__/index.tsx b/types/__typetests__/index.tsx
new file mode 100644
index 000000000000..768b798bafd8
--- /dev/null
+++ b/types/__typetests__/index.tsx
@@ -0,0 +1,2072 @@
+/**
+ * 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
+ */
+
+/*
+The content of index.io.js could be something like
+
+    'use strict';
+
+    import { AppRegistry } from 'react-native'
+    import Welcome from './gen/Welcome'
+
+    AppRegistry.registerComponent('MopNative', () => Welcome);
+
+For a list of complete Typescript examples: check https://github.com/bgrieder/RNTSExplorer
+*/
+
+import * as PropTypes from 'prop-types';
+import * as React from 'react';
+import {
+  AccessibilityInfo,
+  ActionSheetIOS,
+  Alert,
+  AppState,
+  AppStateStatus,
+  Appearance,
+  BackHandler,
+  Button,
+  ColorValue,
+  DevSettings,
+  DeviceEventEmitter,
+  DeviceEventEmitterStatic,
+  Dimensions,
+  DrawerLayoutAndroid,
+  DrawerSlideEvent,
+  DynamicColorIOS,
+  FlatList,
+  FlatListProps,
+  GestureResponderEvent,
+  HostComponent,
+  I18nManager,
+  Image,
+  ImageBackground,
+  ImageErrorEventData,
+  ImageLoadEventData,
+  ImageResizeMode,
+  ImageResolvedAssetSource,
+  ImageStyle,
+  InputAccessoryView,
+  InteractionManager,
+  Keyboard,
+  KeyboardAvoidingView,
+  LayoutChangeEvent,
+  Linking,
+  ListRenderItemInfo,
+  LogBox,
+  Modal,
+  MouseEvent,
+  NativeEventEmitter,
+  NativeModule, // Not actually exported, not sure why
+  NativeModules,
+  NativeScrollEvent,
+  NativeSyntheticEvent,
+  PermissionsAndroid,
+  Platform,
+  PlatformColor,
+  Pressable,
+  ProgressBarAndroid,
+  ProgressViewIOS,
+  PushNotificationIOS,
+  RefreshControl,
+  RegisteredStyle,
+  ScaledSize,
+  ScrollView,
+  ScrollViewProps,
+  SectionList,
+  SectionListProps,
+  SectionListRenderItemInfo,
+  Share,
+  ShareDismissedAction,
+  ShareSharedAction,
+  StatusBar,
+  StyleProp,
+  StyleSheet,
+  Switch,
+  SwitchChangeEvent,
+  Systrace,
+  Text,
+  TextInput,
+  TextInputChangeEventData,
+  TextInputContentSizeChangeEventData,
+  TextInputEndEditingEventData,
+  TextInputFocusEventData,
+  TextInputKeyPressEventData,
+  TextInputScrollEventData,
+  TextInputSelectionChangeEventData,
+  TextInputSubmitEditingEventData,
+  TextLayoutEventData,
+  TextProps,
+  TextStyle,
+  TouchableNativeFeedback,
+  TouchableOpacity,
+  TouchableWithoutFeedback,
+  UIManager,
+  View,
+  ViewStyle,
+  VirtualizedList,
+  YellowBox,
+  findNodeHandle,
+  requireNativeComponent,
+  useColorScheme,
+  useWindowDimensions,
+  SectionListData,
+  ToastAndroid,
+  Touchable,
+  LayoutAnimation,
+} from 'react-native';
+
+declare module 'react-native' {
+  interface NativeTypedModule {
+    someFunction(): void;
+    someProperty: string;
+  }
+  interface NativeModulesStatic {
+    NativeTypedModule: NativeTypedModule;
+  }
+}
+
+NativeModules.NativeUntypedModule;
+
+NativeModules.NativeTypedModule.someFunction();
+NativeModules.NativeTypedModule.someProperty = '';
+
+function dimensionsListener(dimensions: {
+  window: ScaledSize;
+  screen: ScaledSize;
+}) {
+  console.log('window dimensions: ', dimensions.window);
+  console.log('screen dimensions: ', dimensions.screen);
+}
+
+function testDimensions() {
+  const {width, height, scale, fontScale} = Dimensions.get(
+    1 === 1 ? 'window' : 'screen',
+  );
+
+  const subscription = Dimensions.addEventListener(
+    'change',
+    dimensionsListener,
+  );
+  subscription.remove();
+}
+
+function TextUseWindowDimensions() {
+  const {width, height, scale, fontScale} = useWindowDimensions();
+}
+
+BackHandler.addEventListener('hardwareBackPress', () => true).remove();
+BackHandler.addEventListener('hardwareBackPress', () => false).remove();
+BackHandler.addEventListener('hardwareBackPress', () => undefined).remove();
+BackHandler.addEventListener('hardwareBackPress', () => null).remove();
+
+interface LocalStyles {
+  container: ViewStyle;
+  welcome: TextStyle;
+  instructions: TextStyle;
+}
+
+const styles = StyleSheet.create<LocalStyles>({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: '#F5FCFF',
+  },
+  welcome: {
+    fontSize: 20,
+    textAlign: 'center',
+    margin: 10,
+  },
+  instructions: {
+    textAlign: 'center',
+    color: '#333333',
+    marginBottom: 5,
+  },
+});
+
+//alternative declaration of styles (inline typings)
+const stylesAlt = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: '#F5FCFF',
+  },
+  welcome: {
+    fontSize: 20,
+    textAlign: 'center',
+    margin: 10,
+  },
+  instructions: {
+    textAlign: 'center',
+    color: '#333333',
+    marginBottom: 5,
+  },
+});
+
+StyleSheet.setStyleAttributePreprocessor(
+  'fontFamily',
+  (family: string) => family,
+);
+
+const welcomeFontSize = StyleSheet.flatten(styles.welcome).fontSize;
+
+const viewStyle: StyleProp<ViewStyle> = {
+  backgroundColor: '#F5FCFF',
+};
+const textStyle: StyleProp<TextStyle> = {
+  fontSize: 20,
+};
+const imageStyle: StyleProp<ImageStyle> = {
+  resizeMode: 'contain',
+};
+const fontVariantStyle: StyleProp<TextStyle> = {
+  fontVariant: ['tabular-nums'],
+};
+
+const viewProperty = StyleSheet.flatten(viewStyle).backgroundColor;
+const textProperty = StyleSheet.flatten(textStyle).fontSize;
+const imageProperty = StyleSheet.flatten(imageStyle).resizeMode;
+const fontVariantProperty = StyleSheet.flatten(fontVariantStyle).fontVariant;
+
+// correct use of the StyleSheet.flatten
+const styleArray: StyleProp<ViewStyle>[] = [];
+const flattenStyle = StyleSheet.flatten(styleArray);
+const {top} = flattenStyle;
+
+const s = StyleSheet.create({
+  shouldWork: {
+    fontWeight: '900', // if we comment this line, errors gone
+    marginTop: 5, // if this line commented, errors also gone
+  },
+});
+const f1: TextStyle = s.shouldWork;
+
+// StyleSheet.compose
+// It creates a new style object by composing two existing styles
+const composeTextStyle: StyleProp<TextStyle> = {
+  color: '#000000',
+  fontSize: 20,
+};
+
+const composeImageStyle: StyleProp<ImageStyle> = {
+  resizeMode: 'contain',
+};
+
+// The following use of the compose method is valid
+const combinedStyle: StyleProp<TextStyle> = StyleSheet.compose(
+  composeTextStyle,
+  composeTextStyle,
+);
+
+const combinedStyle1: StyleProp<ImageStyle> = StyleSheet.compose(
+  composeImageStyle,
+  composeImageStyle,
+);
+
+const combinedStyle2: StyleProp<TextStyle | ConcatArray<TextStyle>> =
+  StyleSheet.compose([composeTextStyle], [composeTextStyle]);
+
+const combinedStyle3: StyleProp<TextStyle | null> = StyleSheet.compose(
+  composeTextStyle,
+  null,
+);
+
+const combinedStyle4: StyleProp<TextStyle | ConcatArray<TextStyle> | null> =
+  StyleSheet.compose([composeTextStyle], null);
+
+const combinedStyle5: StyleProp<TextStyle> = StyleSheet.compose(
+  composeTextStyle,
+  Math.random() < 0.5 ? composeTextStyle : null,
+);
+
+const combinedStyle6: StyleProp<TextStyle | null> = StyleSheet.compose(
+  null,
+  null,
+);
+
+const page = StyleSheet.create({
+  container: {
+    flex: 1,
+    padding: 24,
+    backgroundColor: '#fff',
+  },
+  text: {
+    fontSize: 30,
+    color: '#000',
+  },
+});
+
+const lists = StyleSheet.create({
+  listContainer: {
+    flex: 1,
+    backgroundColor: '#61dafb',
+  },
+  listItem: {
+    fontStyle: 'italic',
+    fontWeight: 'bold',
+  },
+});
+
+const container = StyleSheet.compose(page.container, lists.listContainer);
+<View style={container} />;
+const text = StyleSheet.compose(page.text, lists.listItem);
+<Text style={text} />;
+
+// The following use of the compose method is invalid:
+const combinedStyle8: StyleProp<ImageStyle> = StyleSheet.compose(
+  // @ts-expect-error
+  composeTextStyle,
+  composeTextStyle,
+);
+
+const combinedStyle9: StyleProp<ImageStyle> = StyleSheet.compose(
+  // @ts-expect-error
+  [composeTextStyle],
+  null,
+);
+
+const combinedStyle10: StyleProp<ImageStyle> = StyleSheet.compose(
+  // @ts-expect-error
+  Math.random() < 0.5 ? composeTextStyle : null,
+  null,
+);
+
+const testNativeSyntheticEvent = <T extends {}>(
+  e: NativeSyntheticEvent<T>,
+): void => {
+  e.isDefaultPrevented();
+  e.preventDefault();
+  e.isPropagationStopped();
+  e.stopPropagation();
+  e.persist();
+  e.cancelable;
+  e.bubbles;
+  e.currentTarget;
+  e.defaultPrevented;
+  e.eventPhase;
+  e.isTrusted;
+  e.nativeEvent;
+  e.target;
+  e.timeStamp;
+  e.type;
+  e.nativeEvent;
+};
+
+function eventHandler<T extends React.BaseSyntheticEvent>(e: T) {}
+
+function handler(e: GestureResponderEvent) {
+  eventHandler(e);
+}
+
+type ElementProps<C> = C extends React.Component<infer P, any> ? P : never;
+
+class CustomView extends React.Component {
+  render() {
+    return (
+      <Text
+        style={[StyleSheet.absoluteFill, {...StyleSheet.absoluteFillObject}]}>
+        Custom View
+      </Text>
+    );
+  }
+}
+
+class Welcome extends React.Component<ElementProps<View> & {color: string}> {
+  rootViewRef = React.useRef<View>(null);
+  customViewRef = React.useRef<CustomView>(null);
+
+  testNativeMethods() {
+    if (this.rootViewRef.current != null) {
+      this.rootViewRef.current.setNativeProps({});
+      this.rootViewRef.current.measure(
+        (x: number, y: number, width: number, height: number) => {},
+      );
+    }
+  }
+
+  testFindNodeHandle() {
+    if (this.rootViewRef.current != null) {
+      const nativeComponentHandle = findNodeHandle(this.rootViewRef.current);
+    }
+
+    if (this.customViewRef.current != null) {
+      const customComponentHandle = findNodeHandle(this.customViewRef.current);
+      const fromHandle = findNodeHandle(customComponentHandle);
+    }
+  }
+
+  render() {
+    const {color, ...props} = this.props;
+    return (
+      <View
+        {...props}
+        ref={this.rootViewRef}
+        style={[[styles.container], undefined, null, false]}>
+        <Text style={styles.welcome}>Welcome to React Native</Text>
+        <Text style={styles.instructions}>
+          To get started, edit index.ios.js
+        </Text>
+        <Text style={styles.instructions}>
+          Press Cmd+R to reload,{'\n'}
+          Cmd+D or shake for dev menu
+        </Text>
+        <CustomView ref={this.customViewRef} />
+      </View>
+    );
+  }
+}
+
+export default Welcome;
+
+// TouchableTest
+function TouchableTest() {
+  function basicUsage() {
+    if (Touchable.TOUCH_TARGET_DEBUG) {
+      return Touchable.renderDebugView({
+        color: 'mediumspringgreen',
+        hitSlop: {bottom: 5, top: 5},
+      });
+    }
+  }
+
+  function defaultHitSlop() {
+    return Touchable.renderDebugView({
+      color: 'red',
+    });
+  }
+}
+
+// TouchableNativeFeedbackTest
+export class TouchableNativeFeedbackTest extends React.Component {
+  onPressButton = (e: GestureResponderEvent) => {
+    e.persist();
+    e.isPropagationStopped();
+    e.isDefaultPrevented();
+  };
+
+  render() {
+    return (
+      <>
+        <TouchableNativeFeedback onPress={this.onPressButton}>
+          <View style={{width: 150, height: 100, backgroundColor: 'red'}}>
+            <Text style={{margin: 30}}>Button</Text>
+          </View>
+        </TouchableNativeFeedback>
+        <TouchableNativeFeedback
+          background={TouchableNativeFeedback.Ripple('red', true)}>
+          <View style={{width: 150, height: 100, backgroundColor: 'red'}}>
+            <Text style={{margin: 30}}>Button</Text>
+          </View>
+        </TouchableNativeFeedback>
+        <TouchableNativeFeedback
+          background={TouchableNativeFeedback.Ripple('red', true, 30)}>
+          <View style={{width: 150, height: 100, backgroundColor: 'red'}}>
+            <Text style={{margin: 30}}>Button</Text>
+          </View>
+        </TouchableNativeFeedback>
+        <TouchableNativeFeedback
+          background={TouchableNativeFeedback.SelectableBackground()}>
+          <View style={{width: 150, height: 100, backgroundColor: 'red'}}>
+            <Text style={{margin: 30}}>Button</Text>
+          </View>
+        </TouchableNativeFeedback>
+        <TouchableNativeFeedback
+          background={TouchableNativeFeedback.SelectableBackground(30)}>
+          <View style={{width: 150, height: 100, backgroundColor: 'red'}}>
+            <Text style={{margin: 30}}>Button</Text>
+          </View>
+        </TouchableNativeFeedback>
+        <TouchableNativeFeedback
+          background={TouchableNativeFeedback.SelectableBackgroundBorderless()}>
+          <View style={{width: 150, height: 100, backgroundColor: 'red'}}>
+            <Text style={{margin: 30}}>Button</Text>
+          </View>
+        </TouchableNativeFeedback>
+        <TouchableNativeFeedback
+          background={TouchableNativeFeedback.SelectableBackgroundBorderless(
+            30,
+          )}>
+          <View style={{width: 150, height: 100, backgroundColor: 'red'}}>
+            <Text style={{margin: 30}}>Button</Text>
+          </View>
+        </TouchableNativeFeedback>
+      </>
+    );
+  }
+}
+
+// PressableTest
+export class PressableTest extends React.Component<{}> {
+  private readonly myRef: React.RefObject<View> = React.createRef();
+
+  onPressButton = (e: GestureResponderEvent) => {
+    e.persist();
+    e.isPropagationStopped();
+    e.isDefaultPrevented();
+  };
+
+  onHoverButton = (e: MouseEvent) => {
+    e.persist();
+    e.isPropagationStopped();
+    e.isDefaultPrevented();
+  };
+
+  render() {
+    return (
+      <>
+        <Pressable
+          ref={this.myRef}
+          onPress={this.onPressButton}
+          style={{backgroundColor: 'blue'}}
+          unstable_pressDelay={100}>
+          <View style={{width: 150, height: 100, backgroundColor: 'red'}}>
+            <Text style={{margin: 30}}>Button</Text>
+          </View>
+        </Pressable>
+        {/* Style function */}
+        <Pressable
+          onPress={this.onPressButton}
+          style={state => ({
+            backgroundColor: state.pressed ? 'red' : 'blue',
+          })}>
+          <View style={{width: 150, height: 100, backgroundColor: 'red'}}>
+            <Text style={{margin: 30}}>Button</Text>
+          </View>
+        </Pressable>
+        {/* Children function */}
+        <Pressable
+          onPress={this.onPressButton}
+          style={state => ({
+            backgroundColor: state.pressed ? 'red' : 'blue',
+          })}>
+          {state =>
+            state.pressed ? (
+              <View>
+                <Text>Pressed</Text>
+              </View>
+            ) : (
+              <View>
+                <Text>Not Pressed</Text>
+              </View>
+            )
+          }
+        </Pressable>
+        {/* Android Ripple */}
+        <Pressable
+          android_ripple={{
+            borderless: true,
+            color: 'green',
+            radius: 20,
+            foreground: true,
+          }}
+          onPress={this.onPressButton}
+          style={{backgroundColor: 'blue'}}>
+          <View style={{width: 150, height: 100, backgroundColor: 'red'}}>
+            <Text style={{margin: 30}}>Button</Text>
+          </View>
+        </Pressable>
+        {/* onHoverIn */}
+        <Pressable
+          ref={this.myRef}
+          onHoverIn={this.onHoverButton}
+          style={{backgroundColor: 'blue'}}>
+          <View style={{width: 150, height: 100, backgroundColor: 'red'}}>
+            <Text style={{margin: 30}}>Button</Text>
+          </View>
+        </Pressable>
+      </>
+    );
+  }
+}
+
+// App State
+function appStateListener(state: string) {
+  console.log('New state: ' + state);
+}
+
+function appStateTest() {
+  console.log('Current state: ' + AppState.currentState);
+  AppState.addEventListener('change', appStateListener);
+  AppState.addEventListener('blur', appStateListener);
+  AppState.addEventListener('focus', appStateListener);
+}
+
+let appState: AppStateStatus = 'active';
+appState = 'background';
+appState = 'inactive';
+appState = 'unknown';
+appState = 'extension';
+
+const AppStateExample = () => {
+  const appState = React.useRef(AppState.currentState);
+  const [appStateVisible, setAppStateVisible] = React.useState(
+    appState.current,
+  );
+  const appStateIsAvailable = AppState.isAvailable;
+
+  React.useEffect(() => {
+    const subscription = AppState.addEventListener('change', nextAppState => {
+      if (
+        appState.current.match(/inactive|background/) &&
+        nextAppState === 'active'
+      ) {
+        console.log('App has come to the foreground!');
+      }
+
+      appState.current = nextAppState;
+      setAppStateVisible(appState.current);
+      console.log('AppState', appState.current);
+    });
+
+    return () => {
+      subscription.remove();
+    };
+  }, []);
+
+  return (
+    <View style={styles.container}>
+      <Text>Current state is: {appStateVisible}</Text>
+      <Text>Available: {appStateIsAvailable}</Text>
+    </View>
+  );
+};
+
+if (Systrace.isEnabled()) {
+  const cookie = Systrace.beginAsyncEvent('async-event');
+  Systrace.endAsyncEvent('async-event', cookie);
+
+  const cookie2 = Systrace.beginAsyncEvent('async-event-2', {foo: '123'});
+  Systrace.endAsyncEvent('async-event-2', cookie2, {bar: '456'});
+
+  Systrace.beginEvent('sync-event');
+  Systrace.endEvent();
+
+  Systrace.beginEvent('sync-event-2', {key: 'value'});
+  Systrace.endEvent({key: 'other-value'});
+
+  Systrace.counterEvent('counter', 123);
+}
+
+InteractionManager.runAfterInteractions(() => {
+  // ...
+}).then(() => 'done');
+
+export class FlatListTest extends React.Component<FlatListProps<number>, {}> {
+  list: FlatList<any> | null = null;
+
+  componentDidMount(): void {
+    if (this.list) {
+      this.list.flashScrollIndicators();
+    }
+  }
+
+  _renderItem = (rowData: any) => {
+    return (
+      <View>
+        <Text> {rowData.item} </Text>
+      </View>
+    );
+  };
+  _cellRenderer = ({children}: any) => {
+    return <View>{children}</View>;
+  };
+
+  _renderSeparator = () => (
+    <View style={{height: 1, width: '100%', backgroundColor: 'gray'}} />
+  );
+
+  render() {
+    return (
+      <FlatList
+        ref={list => (this.list = list)}
+        data={[1, 2, 3, 4, 5]}
+        renderItem={this._renderItem}
+        ItemSeparatorComponent={this._renderSeparator}
+        ListFooterComponent={null}
+        ListFooterComponentStyle={[
+          {padding: 8},
+          [{backgroundColor: 'transparent'}],
+        ]}
+        ListHeaderComponent={null}
+        ListHeaderComponentStyle={[
+          {padding: 8},
+          [{backgroundColor: 'transparent'}],
+        ]}
+        CellRendererComponent={this._cellRenderer}
+        fadingEdgeLength={200}
+      />
+    );
+  }
+}
+
+export class SectionListTest extends React.Component<
+  SectionListProps<string>,
+  {}
+> {
+  myList: React.RefObject<SectionList<string>>;
+
+  constructor(props: SectionListProps<string>) {
+    super(props);
+    this.myList = React.createRef();
+  }
+
+  scrollMe = () => {
+    this.myList.current &&
+      this.myList.current.scrollToLocation({itemIndex: 0, sectionIndex: 1});
+  };
+
+  render() {
+    const sections = [
+      {
+        title: 'Section 1',
+        data: ['A', 'B', 'C', 'D', 'E'],
+      },
+      {
+        title: 'Section 2',
+        data: ['A2', 'B2', 'C2', 'D2', 'E2'],
+        renderItem: (info: {item: string}) => (
+          <View>
+            <Text>{info.item}</Text>
+          </View>
+        ),
+      },
+    ];
+
+    const cellRenderer = ({children}: any) => {
+      return <View>{children}</View>;
+    };
+
+    return (
+      <React.Fragment>
+        <Button title="Press" onPress={this.scrollMe} />
+
+        <SectionList
+          ref={this.myList}
+          sections={sections}
+          renderSectionHeader={({section}) => (
+            <View>
+              <Text>{section.title}</Text>
+            </View>
+          )}
+          renderItem={(info: SectionListRenderItemInfo<string>) => (
+            <View>
+              <Text>{`${info.section.title} - ${info.item}`}</Text>
+            </View>
+          )}
+          CellRendererComponent={cellRenderer}
+          maxToRenderPerBatch={5}
+          ListFooterComponent={null}
+          ListFooterComponentStyle={[
+            {padding: 8},
+            [{backgroundColor: 'transparent'}],
+          ]}
+          ListHeaderComponent={null}
+          ListHeaderComponentStyle={[
+            {padding: 8},
+            [{backgroundColor: 'transparent'}],
+          ]}
+        />
+      </React.Fragment>
+    );
+  }
+}
+
+type SectionT = {displayTitle: false} | {displayTitle: true; title: string};
+
+export class SectionListTypedSectionTest extends React.Component<
+  SectionListProps<string, SectionT>,
+  {}
+> {
+  myList: React.RefObject<SectionList<string, SectionT>>;
+
+  constructor(props: SectionListProps<string, SectionT>) {
+    super(props);
+    this.myList = React.createRef();
+  }
+
+  scrollMe = () => {
+    this.myList.current &&
+      this.myList.current.scrollToLocation({itemIndex: 0, sectionIndex: 1});
+  };
+
+  render() {
+    const sections: SectionListData<string, SectionT>[] = [
+      {
+        displayTitle: false,
+        data: ['A', 'B', 'C', 'D', 'E'],
+      },
+      {
+        displayTitle: true,
+        title: 'Section 2',
+        data: ['A2', 'B2', 'C2', 'D2', 'E2'],
+        renderItem: (info: {item: string}) => (
+          <View>
+            <Text>{info.item}</Text>
+          </View>
+        ),
+      },
+    ];
+
+    const cellRenderer = ({children}: any) => {
+      return <View>{children}</View>;
+    };
+
+    return (
+      <React.Fragment>
+        <Button title="Press" onPress={this.scrollMe} />
+
+        <SectionList
+          ref={this.myList}
+          sections={sections}
+          renderSectionHeader={({section}) => {
+            section; // $ExpectType SectionListData<string, SectionT>
+
+            return section.displayTitle ? (
+              <View>
+                <Text>{section.title}</Text>
+              </View>
+            ) : null;
+          }}
+          renderItem={info => {
+            info; // $ExpectType SectionListRenderItemInfo<string, SectionT>
+
+            return (
+              <View>
+                <Text>
+                  {info.section.displayTitle ? (
+                    <Text>{`${info.section.title} - `}</Text>
+                  ) : null}
+                  <Text>{info.item}</Text>
+                </Text>
+              </View>
+            );
+          }}
+          CellRendererComponent={cellRenderer}
+          maxToRenderPerBatch={5}
+        />
+
+        <SectionList
+          ref={this.myList}
+          sections={sections}
+          renderSectionHeader={({section}) => {
+            section; // $ExpectType SectionListData<string, SectionT>
+
+            return section.displayTitle ? (
+              <View>
+                <Text>{section.title}</Text>
+              </View>
+            ) : null;
+          }}
+          renderItem={info => {
+            info; // $ExpectType SectionListRenderItemInfo<string, SectionT>
+
+            return (
+              <View>
+                <Text>
+                  {info.section.displayTitle ? (
+                    <Text>{`${info.section.title} - `}</Text>
+                  ) : null}
+                  <Text>{info.item}</Text>
+                </Text>
+              </View>
+            );
+          }}
+          CellRendererComponent={cellRenderer}
+          maxToRenderPerBatch={5}
+          ListFooterComponent={null}
+          ListFooterComponentStyle={null}
+          ListHeaderComponent={null}
+          ListHeaderComponentStyle={null}
+        />
+
+        <SectionList
+          ref={this.myList}
+          sections={sections}
+          renderSectionHeader={({section}) => {
+            section; // $ExpectType SectionListData<string, SectionT>
+
+            return section.displayTitle ? (
+              <View>
+                <Text>{section.title}</Text>
+              </View>
+            ) : null;
+          }}
+          renderItem={info => {
+            info; // $ExpectType SectionListRenderItemInfo<string, SectionT>
+
+            return (
+              <View>
+                <Text>
+                  {info.section.displayTitle ? (
+                    <Text>{`${info.section.title} - `}</Text>
+                  ) : null}
+                  <Text>{info.item}</Text>
+                </Text>
+              </View>
+            );
+          }}
+          CellRendererComponent={cellRenderer}
+          maxToRenderPerBatch={5}
+          ListFooterComponent={null}
+          ListFooterComponentStyle={undefined}
+          ListHeaderComponent={null}
+          ListHeaderComponentStyle={undefined}
+        />
+      </React.Fragment>
+    );
+  }
+}
+
+export class CapsLockComponent extends React.Component<TextProps> {
+  render() {
+    const content = (this.props.children || '') as string;
+    return <Text {...this.props}>{content.toUpperCase()}</Text>;
+  }
+}
+
+const getInitialUrlTest = () =>
+  Linking.getInitialURL().then(val => {
+    if (val !== null) {
+      val.indexOf('val is now a string');
+    }
+  });
+
+LogBox.ignoreAllLogs();
+LogBox.ignoreAllLogs(true);
+LogBox.ignoreLogs(['someString', /^aRegex/]);
+LogBox.install();
+LogBox.uninstall();
+
+class AlertTest extends React.Component {
+  showAlert() {
+    Alert.alert(
+      'Title',
+      'Message',
+      [
+        {text: 'First button', onPress: () => {}},
+        {text: 'Second button', onPress: () => {}},
+        {text: 'Third button', onPress: () => {}},
+      ],
+      {
+        cancelable: false,
+        onDismiss: () => {},
+      },
+    );
+  }
+
+  render() {
+    return <Button title="Press me" onPress={this.showAlert} />;
+  }
+}
+
+Alert.prompt(
+  'Enter password',
+  'Enter your password to claim your $1.5B in lottery winnings',
+  text => {
+    console.log(text);
+  },
+  'secure-text',
+);
+
+Alert.prompt(
+  'Enter password',
+  'Enter your password to claim your $1.5B in lottery winnings',
+  [
+    {
+      text: 'Cancel',
+      onPress: () => console.log('Cancel Pressed'),
+      style: 'cancel',
+    },
+    {
+      text: 'OK',
+      isPreferred: true,
+      onPress: password => console.log('OK Pressed, password: ' + password),
+    },
+  ],
+  'secure-text',
+);
+
+class InputAccessoryViewTest extends React.Component {
+  render() {
+    const uniqueID = 'foobar';
+    return (
+      <InputAccessoryView nativeID={uniqueID}>
+        <TextInput inputAccessoryViewID={uniqueID} />
+      </InputAccessoryView>
+    );
+  }
+}
+
+// DeviceEventEmitterStatic
+const deviceEventEmitterStatic: DeviceEventEmitterStatic = DeviceEventEmitter;
+deviceEventEmitterStatic.addListener('keyboardWillShow', data => true);
+deviceEventEmitterStatic.addListener('keyboardWillShow', data => true, {});
+
+// NativeEventEmitter - Android
+const androidEventEmitter = new NativeEventEmitter();
+const sub1 = androidEventEmitter.addListener('event', (event: object) => event);
+const sub2 = androidEventEmitter.addListener(
+  'event',
+  (event: object) => event,
+  {},
+);
+androidEventEmitter.listenerCount('event'); // $ExpectType number
+sub2.remove();
+androidEventEmitter.removeAllListeners('event');
+androidEventEmitter.removeSubscription(sub1);
+
+// NativeEventEmitter - IOS
+const nativeModule: NativeModule = {
+  addListener(eventType: string) {},
+  removeListeners(count: number) {},
+};
+const iosEventEmitter = new NativeEventEmitter(nativeModule);
+const sub3 = iosEventEmitter.addListener('event', (event: object) => event);
+const sub4 = iosEventEmitter.addListener('event', (event: object) => event, {});
+iosEventEmitter.listenerCount('event');
+sub4.remove();
+iosEventEmitter.removeAllListeners('event');
+iosEventEmitter.removeSubscription(sub3);
+
+class CustomEventEmitter extends NativeEventEmitter {}
+
+const customEventEmitter = new CustomEventEmitter();
+customEventEmitter.addListener('event', () => {});
+
+class TextInputTest extends React.Component<{}, {username: string}> {
+  username: TextInput | null = null;
+
+  handleUsernameChange = (text: string) => {
+    console.log(`text: ${text}`);
+  };
+
+  onScroll = (e: NativeSyntheticEvent<TextInputScrollEventData>) => {
+    testNativeSyntheticEvent(e);
+    console.log(`x: ${e.nativeEvent.contentOffset.x}`);
+    console.log(`y: ${e.nativeEvent.contentOffset.y}`);
+  };
+
+  handleOnBlur = (e: NativeSyntheticEvent<TextInputFocusEventData>) => {
+    testNativeSyntheticEvent(e);
+  };
+
+  handleOnFocus = (e: NativeSyntheticEvent<TextInputFocusEventData>) => {
+    testNativeSyntheticEvent(e);
+  };
+
+  handleOnSelectionChange = (
+    e: NativeSyntheticEvent<TextInputSelectionChangeEventData>,
+  ) => {
+    testNativeSyntheticEvent(e);
+
+    console.log(`target: ${e.nativeEvent.target}`);
+    console.log(`start: ${e.nativeEvent.selection.start}`);
+    console.log(`end: ${e.nativeEvent.selection.end}`);
+  };
+
+  handleOnKeyPress = (e: NativeSyntheticEvent<TextInputKeyPressEventData>) => {
+    testNativeSyntheticEvent(e);
+    console.log(`key: ${e.nativeEvent.key}`);
+  };
+
+  handleOnChange = (e: NativeSyntheticEvent<TextInputChangeEventData>) => {
+    testNativeSyntheticEvent(e);
+
+    console.log(`eventCount: ${e.nativeEvent.eventCount}`);
+    console.log(`target: ${e.nativeEvent.target}`);
+    console.log(`text: ${e.nativeEvent.text}`);
+  };
+
+  handleOnContentSizeChange = (
+    e: NativeSyntheticEvent<TextInputContentSizeChangeEventData>,
+  ) => {
+    testNativeSyntheticEvent(e);
+    console.log(`contentSize.width: ${e.nativeEvent.contentSize.width}`);
+    console.log(`contentSize.height: ${e.nativeEvent.contentSize.height}`);
+  };
+
+  handleOnEndEditing = (
+    e: NativeSyntheticEvent<TextInputEndEditingEventData>,
+  ) => {
+    testNativeSyntheticEvent(e);
+    console.log(`text: ${e.nativeEvent.text}`);
+  };
+
+  handleOnSubmitEditing = (
+    e: NativeSyntheticEvent<TextInputSubmitEditingEventData>,
+  ) => {
+    testNativeSyntheticEvent(e);
+    console.log(`text: ${e.nativeEvent.text}`);
+  };
+
+  render() {
+    return (
+      <View>
+        <Text onPress={() => this.username && this.username.focus()}>
+          Username
+        </Text>
+
+        <TextInput
+          ref={input => (this.username = input)}
+          textContentType="username"
+          autoComplete="username"
+          value={this.state.username}
+          onChangeText={this.handleUsernameChange}
+        />
+
+        <TextInput multiline onScroll={this.onScroll} />
+
+        <TextInput onBlur={this.handleOnBlur} onFocus={this.handleOnFocus} />
+
+        <TextInput onSelectionChange={this.handleOnSelectionChange} />
+
+        <TextInput onKeyPress={this.handleOnKeyPress} />
+
+        <TextInput onChange={this.handleOnChange} />
+
+        <TextInput onChange={this.handleOnChange} />
+
+        <TextInput onEndEditing={this.handleOnEndEditing} />
+
+        <TextInput onSubmitEditing={this.handleOnSubmitEditing} />
+
+        <TextInput
+          multiline
+          onContentSizeChange={this.handleOnContentSizeChange}
+        />
+
+        <TextInput contextMenuHidden={true} textAlignVertical="top" />
+
+        <TextInput textAlign="center" />
+      </View>
+    );
+  }
+}
+
+class TextTest extends React.Component {
+  handleOnLayout = (e: LayoutChangeEvent) => {
+    testNativeSyntheticEvent(e);
+
+    const x = e.nativeEvent.layout.x; // $ExpectType number
+    const y = e.nativeEvent.layout.y; // $ExpectType number
+    const width = e.nativeEvent.layout.width; // $ExpectType number
+    const height = e.nativeEvent.layout.height; // $ExpectType number
+  };
+
+  handleOnTextLayout = (e: NativeSyntheticEvent<TextLayoutEventData>) => {
+    testNativeSyntheticEvent(e);
+
+    e.nativeEvent.lines.forEach(line => {
+      const ascender = line.ascender; // $ExpectType number
+      const capHeight = line.capHeight; // $ExpectType number
+      const descender = line.descender; // $ExpectType number
+      const height = line.height; // $ExpectType number
+      const text = line.text; // $ExpectType string
+      const width = line.width; // $ExpectType number
+      const x = line.x; // $ExpectType number
+      const xHeight = line.xHeight; // $ExpectType number
+      const y = line.y; // $ExpectType number
+    });
+  };
+
+  render() {
+    return (
+      <Text
+        allowFontScaling={false}
+        ellipsizeMode="head"
+        lineBreakMode="clip"
+        numberOfLines={2}
+        onLayout={this.handleOnLayout}
+        onTextLayout={this.handleOnTextLayout}
+        disabled>
+        Test text
+      </Text>
+    );
+  }
+}
+
+class StatusBarTest extends React.Component {
+  render() {
+    StatusBar.setBarStyle('dark-content', true);
+
+    console.log('height:', StatusBar.currentHeight);
+
+    return (
+      <StatusBar backgroundColor="blue" barStyle="light-content" translucent />
+    );
+  }
+}
+
+export class ImageTest extends React.Component {
+  componentDidMount(): void {
+    const uri =
+      'https://seeklogo.com/images/T/typescript-logo-B29A3F462D-seeklogo.com.png';
+    const headers = {Authorization: 'Bearer test'};
+    const image: ImageResolvedAssetSource = Image.resolveAssetSource({uri});
+    console.log(image.width, image.height, image.scale, image.uri);
+
+    Image.queryCache &&
+      Image.queryCache([uri]).then(({[uri]: status}) => {
+        if (status === undefined) {
+          console.log('Image is not in cache');
+        } else {
+          console.log(`Image is in ${status} cache`);
+        }
+      });
+
+    Image.getSize(uri, (width, height) => console.log(width, height));
+    Image.getSize(
+      uri,
+      (width, height) => console.log(width, height),
+      error => console.error(error),
+    );
+    Image.getSizeWithHeaders(uri, headers, (width, height) =>
+      console.log(width, height),
+    );
+    Image.getSizeWithHeaders(
+      uri,
+      headers,
+      (width, height) => console.log(width, height),
+      error => console.error(error),
+    );
+    Image.prefetch(uri); // $ExpectType Promise<boolean>
+  }
+
+  handleOnLoad = (e: NativeSyntheticEvent<ImageLoadEventData>) => {
+    testNativeSyntheticEvent(e);
+    console.log('height:', e.nativeEvent.source.height);
+    console.log('width:', e.nativeEvent.source.width);
+    console.log('uri:', e.nativeEvent.source.uri);
+  };
+
+  handleOnError = (e: NativeSyntheticEvent<ImageErrorEventData>) => {
+    testNativeSyntheticEvent(e);
+    console.log('error:', e.nativeEvent.error);
+  };
+
+  render() {
+    const resizeMode: ImageResizeMode = 'contain';
+
+    return (
+      <View>
+        <Image
+          source={{
+            uri: 'https://seeklogo.com/images/T/typescript-logo-B29A3F462D-seeklogo.com.png',
+          }}
+          onLoad={this.handleOnLoad}
+          onError={this.handleOnError}
+        />
+
+        <Image
+          source={{
+            uri: 'https://seeklogo.com/images/T/typescript-logo-B29A3F462D-seeklogo.com.png',
+          }}
+          resizeMode={resizeMode}
+        />
+      </View>
+    );
+  }
+}
+
+export class ImageBackgroundProps extends React.Component {
+  private _imageRef: Image | null = null;
+
+  setImageRef = (image: Image) => {
+    this._imageRef = image;
+  };
+
+  render() {
+    return (
+      <View>
+        <ImageBackground
+          source={{
+            uri: 'https://seeklogo.com/images/T/typescript-logo-B29A3F462D-seeklogo.com.png',
+          }}
+          imageRef={this.setImageRef}>
+          <Text>Some text</Text>
+        </ImageBackground>
+      </View>
+    );
+  }
+}
+
+class AccessibilityTest extends React.Component {
+  render() {
+    return (
+      <>
+        <View
+          accessibilityElementsHidden={true}
+          importantForAccessibility={'no-hide-descendants'}
+          onAccessibilityTap={() => {}}
+          accessibilityRole="header"
+          accessibilityState={{checked: true}}
+          accessibilityHint="Very important header"
+          accessibilityValue={{min: 60, max: 120, now: 80}}
+          aria-label="Aria Label"
+          onMagicTap={() => {}}
+          onAccessibilityEscape={() => {}}>
+          <Text accessibilityIgnoresInvertColors>Text</Text>
+          <View />
+        </View>
+        <Pressable aria-hidden={false} aria-label="Aria Label" />
+        <TouchableOpacity
+          aria-hidden={true}
+          aria-label="Aria Label"
+          aria-busy
+          aria-valuemax={1}
+        />
+        <TouchableNativeFeedback
+          aria-expanded={false}
+          aria-label="Aria Label"
+        />
+      </>
+    );
+  }
+}
+
+AccessibilityInfo.isBoldTextEnabled().then(isEnabled =>
+  console.log(`AccessibilityInfo.isBoldTextEnabled => ${isEnabled}`),
+);
+AccessibilityInfo.isGrayscaleEnabled().then(isEnabled =>
+  console.log(`AccessibilityInfo.isGrayscaleEnabled => ${isEnabled}`),
+);
+AccessibilityInfo.isInvertColorsEnabled().then(isEnabled =>
+  console.log(`AccessibilityInfo.isInvertColorsEnabled => ${isEnabled}`),
+);
+AccessibilityInfo.isReduceMotionEnabled().then(isEnabled =>
+  console.log(`AccessibilityInfo.isReduceMotionEnabled => ${isEnabled}`),
+);
+AccessibilityInfo.isReduceTransparencyEnabled().then(isEnabled =>
+  console.log(`AccessibilityInfo.isReduceTransparencyEnabled => ${isEnabled}`),
+);
+AccessibilityInfo.isScreenReaderEnabled().then(isEnabled =>
+  console.log(`AccessibilityInfo.isScreenReaderEnabled => ${isEnabled}`),
+);
+AccessibilityInfo.getRecommendedTimeoutMillis(5000).then(timeoutMiles =>
+  console.log(
+    `AccessibilityInfo.getRecommendedTimeoutMillis => ${timeoutMiles}`,
+  ),
+);
+
+AccessibilityInfo.addEventListener(
+  'announcementFinished',
+  ({announcement, success}) =>
+    console.log(
+      `A11y Event: announcementFinished: ${announcement}, ${success}`,
+    ),
+);
+AccessibilityInfo.addEventListener('boldTextChanged', isEnabled =>
+  console.log(`AccessibilityInfo.isBoldTextEnabled => ${isEnabled}`),
+);
+AccessibilityInfo.addEventListener('grayscaleChanged', isEnabled =>
+  console.log(`AccessibilityInfo.isGrayscaleEnabled => ${isEnabled}`),
+);
+AccessibilityInfo.addEventListener('invertColorsChanged', isEnabled =>
+  console.log(`AccessibilityInfo.isInvertColorsEnabled => ${isEnabled}`),
+);
+AccessibilityInfo.addEventListener('reduceMotionChanged', isEnabled =>
+  console.log(`AccessibilityInfo.isReduceMotionEnabled => ${isEnabled}`),
+);
+AccessibilityInfo.addEventListener('reduceTransparencyChanged', isEnabled =>
+  console.log(`AccessibilityInfo.isReduceTransparencyEnabled => ${isEnabled}`),
+);
+const screenReaderChangedListener = (isEnabled: boolean): void =>
+  console.log(`AccessibilityInfo.isScreenReaderEnabled => ${isEnabled}`);
+AccessibilityInfo.addEventListener(
+  'screenReaderChanged',
+  screenReaderChangedListener,
+).remove();
+
+const KeyboardAvoidingViewTest = () => <KeyboardAvoidingView enabled />;
+
+const ModalTest = () => <Modal hardwareAccelerated />;
+const ModalTest2 = () => <Modal hardwareAccelerated testID="modal-test-2" />;
+
+// $ExpectType HostComponent<{ nativeProp: string; }>
+const NativeBridgedComponent = requireNativeComponent<{nativeProp: string}>(
+  'NativeBridgedComponent',
+);
+
+class BridgedComponentTest extends React.Component {
+  static propTypes = {
+    jsProp: PropTypes.string.isRequired,
+  };
+
+  nativeComponentRef: React.ElementRef<typeof NativeBridgedComponent> | null;
+
+  callNativeMethod = () => {
+    UIManager.dispatchViewManagerCommand(
+      findNodeHandle(this.nativeComponentRef),
+      'someNativeMethod',
+      [],
+    );
+  };
+
+  measureNativeComponent() {
+    if (this.nativeComponentRef) {
+      this.nativeComponentRef.measure(
+        (x, y, width, height, pageX, pageY) =>
+          x + y + width + height + pageX + pageY,
+      );
+    }
+  }
+
+  render() {
+    return (
+      <NativeBridgedComponent
+        {...this.props}
+        nativeProp="test"
+        ref={ref => (this.nativeComponentRef = ref)}
+      />
+    );
+  }
+}
+
+const SwitchColorTest = () => (
+  <Switch trackColor={{true: 'pink', false: 'red'}} />
+);
+const SwitchColorOptionalTrueTest = () => (
+  <Switch trackColor={{false: 'red'}} />
+);
+const SwitchColorOptionalFalseTest = () => (
+  <Switch trackColor={{true: 'pink'}} />
+);
+const SwitchColorNullTest = () => (
+  <Switch trackColor={{true: 'pink', false: null}} />
+);
+
+const SwitchThumbColorTest = () => <Switch thumbColor={'red'} />;
+
+const SwitchOnChangeWithoutParamsTest = () => (
+  <Switch onChange={() => console.log('test')} />
+);
+const SwitchOnChangeUndefinedTest = () => <Switch onChange={undefined} />;
+const SwitchOnChangeNullTest = () => <Switch onChange={null} />;
+const SwitchOnChangePromiseTest = () => (
+  <Switch
+    onChange={event => {
+      const e: SwitchChangeEvent = event;
+      return new Promise(() => e.nativeEvent.value);
+    }}
+  />
+);
+
+const SwitchOnValueChangeWithoutParamsTest = () => (
+  <Switch onValueChange={() => console.log('test')} />
+);
+const SwitchOnValueChangeUndefinedTest = () => (
+  <Switch onValueChange={undefined} />
+);
+const SwitchOnValueChangeNullTest = () => <Switch onValueChange={null} />;
+const SwitchOnValueChangePromiseTest = () => (
+  <Switch
+    onValueChange={value => {
+      const v: boolean = value;
+      return new Promise(() => v);
+    }}
+  />
+);
+
+const NativeIDTest = () => (
+  <ScrollView nativeID={'nativeID'}>
+    <View nativeID={'nativeID'} />
+    <Text nativeID={'nativeID'}>Text</Text>
+    <Image
+      source={{
+        uri: 'https://seeklogo.com/images/T/typescript-logo-B29A3F462D-seeklogo.com.png',
+      }}
+      nativeID={'nativeID'}
+    />
+  </ScrollView>
+);
+
+const IdTest = () => (
+  <View id={'id'}>
+    <TouchableWithoutFeedback id={'id'} onPress={() => {}} />
+    <Text id={'id'}>Text</Text>
+    <TextInput id={'id'} value="text" />
+    <Image
+      source={{
+        uri: 'https://seeklogo.com/images/T/typescript-logo-B29A3F462D-seeklogo.com.png',
+      }}
+      id={'id'}
+    />
+  </View>
+);
+
+const ScrollViewMaintainVisibleContentPositionTest = () => (
+  <ScrollView
+    maintainVisibleContentPosition={{
+      autoscrollToTopThreshold: 1,
+      minIndexForVisible: 10,
+    }}></ScrollView>
+);
+
+const ScrollViewInsetsTest = () => (
+  <>
+    <ScrollView automaticallyAdjustKeyboardInsets />
+    <ScrollView automaticallyAdjustKeyboardInsets={false} />
+  </>
+);
+
+const MaxFontSizeMultiplierTest = () => (
+  <Text maxFontSizeMultiplier={0}>Text</Text>
+);
+
+const ShareTest = () => {
+  Share.share(
+    {title: 'title', message: 'message'},
+    {
+      dialogTitle: 'dialogTitle',
+      excludedActivityTypes: ['activity'],
+      tintColor: 'red',
+      subject: 'Email subject',
+    },
+  );
+  Share.share({title: 'title', url: 'url'});
+  Share.share({message: 'message'}).then(result => {
+    if (result.action === Share.sharedAction) {
+      const activity = result.activityType;
+    } else if (result.action === Share.dismissedAction) {
+    }
+  });
+};
+
+const KeyboardTest = () => {
+  const subscriber = Keyboard.addListener('keyboardDidHide', event => {
+    event;
+  });
+  subscriber.remove();
+
+  Keyboard.dismiss();
+
+  // Android Keyboard Event
+  Keyboard.scheduleLayoutAnimation({
+    duration: 0,
+    easing: 'keyboard',
+    endCoordinates: {screenX: 0, screenY: 0, width: 0, height: 0},
+  });
+
+  // IOS Keyboard Event
+  Keyboard.scheduleLayoutAnimation({
+    duration: 0,
+    easing: 'easeInEaseOut',
+    endCoordinates: {screenX: 0, screenY: 0, width: 0, height: 0},
+    startCoordinates: {screenX: 0, screenY: 0, width: 0, height: 0},
+    isEventFromThisApp: true,
+  });
+  if (Keyboard.isVisible()) {
+    Keyboard.metrics();
+  }
+};
+
+const PermissionsAndroidTest = () => {
+  PermissionsAndroid.request('android.permission.CAMERA').then(result => {
+    switch (result) {
+      case 'granted':
+        break;
+      case 'denied':
+        break;
+      case 'never_ask_again':
+        break;
+    }
+  });
+
+  PermissionsAndroid.requestMultiple([
+    'android.permission.CAMERA',
+    'android.permission.ACCESS_FINE_LOCATION',
+    'android.permission.ACCESS_BACKGROUND_LOCATION',
+  ]).then(results => {
+    switch (results['android.permission.CAMERA']) {
+      case 'granted':
+        break;
+      case 'denied':
+        break;
+      case 'never_ask_again':
+        break;
+    }
+    switch (results['android.permission.ACCESS_FINE_LOCATION']) {
+      case 'granted':
+        break;
+      case 'denied':
+        break;
+      case 'never_ask_again':
+        break;
+    }
+    switch (results['android.permission.ACCESS_BACKGROUND_LOCATION']) {
+      case 'granted':
+        break;
+      case 'denied':
+        break;
+      case 'never_ask_again':
+        break;
+    }
+  });
+
+  PermissionsAndroid.requestMultiple([
+    'android.permission.BLUETOOTH_SCAN',
+    'android.permission.BLUETOOTH_CONNECT',
+    'android.permission.BLUETOOTH_ADVERTISE',
+  ]).then(results => {
+    switch (results['android.permission.BLUETOOTH_SCAN']) {
+      case 'granted':
+        break;
+      case 'denied':
+        break;
+      case 'never_ask_again':
+        break;
+    }
+    switch (results['android.permission.BLUETOOTH_CONNECT']) {
+      case 'granted':
+        break;
+      case 'denied':
+        break;
+      case 'never_ask_again':
+        break;
+    }
+    switch (results['android.permission.BLUETOOTH_ADVERTISE']) {
+      case 'granted':
+        break;
+      case 'denied':
+        break;
+      case 'never_ask_again':
+        break;
+    }
+  });
+};
+
+// Platform
+const PlatformTest = () => {
+  switch (Platform.OS) {
+    case 'ios':
+      if (!Platform.isPad) {
+        return 32;
+      } else {
+        return 44;
+      }
+    case 'android':
+    case 'macos':
+    case 'windows':
+      return Platform.isTV ? 64 : 56;
+    default:
+      return Platform.isTV ? 40 : 44;
+  }
+};
+
+const PlatformConstantsTest = () => {
+  const testing: boolean = Platform.constants.isTesting;
+  if (Platform.OS === 'ios') {
+    const hasForceTouch: boolean = Platform.constants.forceTouchAvailable;
+  } else if (Platform.OS === 'android') {
+    const {major, prerelease} = Platform.constants.reactNativeVersion;
+    const v = Platform.constants.Version;
+    const host: string | undefined = Platform.constants.ServerHost;
+  }
+};
+Platform.select({native: 1}); // $ExpectType number | undefined
+Platform.select({native: 1, web: 2, default: 0}); // $ExpectType number
+Platform.select({android: 1}); // $ExpectType number | undefined
+Platform.select({android: 1, ios: 2, default: 0}); // $ExpectType number
+Platform.select({android: 1, ios: 2, macos: 3, web: 4, windows: 5}); // $ExpectType number | undefined
+Platform.select({android: 1, ios: 2, macos: 3, web: 4, windows: 5, default: 0}); // $ExpectType number
+
+PlatformColor('?attr/colorControlNormal');
+PlatformColor('?attr/colorControlNormal', '?attr/colorAccent', 'another');
+
+DynamicColorIOS({
+  dark: 'lightskyblue',
+  light: 'midnightblue',
+});
+
+DynamicColorIOS({
+  dark: 'lightskyblue',
+  light: PlatformColor('labelColor'),
+});
+
+// Test you cannot set internals of ColorValue directly
+const OpaqueTest1 = () => (
+  <View
+    // @ts-expect-error
+    style={{
+      backgroundColor: {
+        resource_paths: ['?attr/colorControlNormal'],
+      },
+    }}
+  />
+);
+
+const OpaqueTest2 = () => (
+  <View
+    // @ts-expect-error
+    style={{
+      backgroundColor: {
+        semantic: 'string',
+        dynamic: {
+          light: 'light',
+          dark: 'dark',
+        },
+      },
+    }}
+  />
+);
+
+// Test you cannot amend opaque type
+// @ts-expect-error
+PlatformColor('?attr/colorControlNormal').resource_paths.push('foo');
+
+const someColorProp: ColorValue = PlatformColor('test');
+
+// Test PlatformColor inside Platform select with stylesheet
+StyleSheet.create({
+  labelCell: {
+    flex: 1,
+    alignItems: 'stretch',
+    ...Platform.select({
+      ios: {
+        color: DynamicColorIOS({
+          dark: 'lightskyblue',
+          light: PlatformColor('labelColor'),
+        }),
+      },
+      android: {
+        color: PlatformColor('?attr/colorControlNormal'),
+      },
+      default: {color: PlatformColor('?attr/colorControlNormal')},
+    }),
+  },
+});
+
+// PlatformColor in style colors
+StyleSheet.create({
+  labelCell: {
+    flex: 1,
+    alignItems: 'stretch',
+    color: PlatformColor('test'),
+    backgroundColor: PlatformColor('test'),
+    borderBottomColor: PlatformColor('test'),
+    borderColor: PlatformColor('test'),
+    borderEndColor: PlatformColor('test'),
+    borderLeftColor: PlatformColor('test'),
+    borderRightColor: PlatformColor('test'),
+    borderStartColor: PlatformColor('test'),
+    borderTopColor: PlatformColor('test'),
+    overlayColor: PlatformColor('test'),
+    shadowColor: PlatformColor('test'),
+    textDecorationColor: PlatformColor('test'),
+    textShadowColor: PlatformColor('test'),
+    tintColor: PlatformColor('test'),
+  },
+});
+
+function someColorString(): ColorValue {
+  return '#000000';
+}
+
+function somePlatformColor(): ColorValue {
+  return PlatformColor('test');
+}
+
+const colors = {
+  color: someColorString(),
+  backgroundColor: somePlatformColor(),
+};
+
+StyleSheet.create({
+  labelCell: {
+    color: colors.color,
+    backgroundColor: colors.backgroundColor,
+  },
+});
+
+const OpaqueTest3 = () => (
+  <View
+    style={{
+      backgroundColor: colors.backgroundColor,
+    }}
+  />
+);
+
+// ProgressBarAndroid
+const ProgressBarAndroidTest = () => {
+  <ProgressBarAndroid
+    animating
+    color="white"
+    styleAttr="Horizontal"
+    progress={0.42}
+  />;
+};
+
+// Push notification
+const PushNotificationTest = () => {
+  PushNotificationIOS.presentLocalNotification({
+    alertBody: 'notificatus',
+    userInfo: 'informius',
+    alertTitle: 'Titulus',
+    alertAction: 'view',
+  });
+
+  PushNotificationIOS.scheduleLocalNotification({
+    alertAction: 'view',
+    alertBody: 'Look at me!',
+    alertTitle: 'Hello!',
+    applicationIconBadgeNumber: 999,
+    category: 'engagement',
+    fireDate: new Date().toISOString(),
+    isSilent: false,
+    repeatInterval: 'minute',
+    userInfo: {
+      abc: 123,
+    },
+  });
+};
+
+// YellowBox
+const YellowBoxTest = () => <YellowBox />;
+
+// Appearance
+const DarkMode = () => {
+  const color = useColorScheme();
+  const isDarkMode = Appearance.getColorScheme() === 'dark';
+
+  const subscription = Appearance.addChangeListener(({colorScheme}) => {
+    console.log(colorScheme);
+  });
+
+  React.useEffect(() => {
+    console.log('-color', color);
+
+    return () => {
+      subscription.remove();
+    };
+  }, [color, subscription]);
+
+  return <Text>Is dark mode enabled? {isDarkMode}</Text>;
+};
+
+// VirtualizedList
+// Test inspired by: https://reactnative.dev/docs/virtualizedlist
+const VirtualizedListTest = () => {
+  const DATA = [1, 2, 3];
+
+  const getItem = (data: number[], index: number) => {
+    return {
+      title: `Item ${data[index]}`,
+    };
+  };
+
+  const getItemCount = (data: number[]) => data.length;
+
+  return (
+    <VirtualizedList
+      data={DATA}
+      initialNumToRender={4}
+      renderItem={({item}: ListRenderItemInfo<ReturnType<typeof getItem>>) => (
+        <Text>{item.title}</Text>
+      )}
+      getItemCount={getItemCount}
+      getItem={getItem}
+    />
+  );
+};
+
+// DevSettings
+DevSettings.addMenuItem('alert', () => {
+  Alert.alert('alert');
+});
+DevSettings.reload();
+DevSettings.reload('reload with reason');
+
+// Accessibility custom actions
+const AccessibilityCustomActionsTest = () => {
+  return (
+    <View
+      accessible={true}
+      accessibilityActions={[
+        // should support custom defined actions
+        {name: 'cut', label: 'cut'},
+        {name: 'copy', label: 'copy'},
+        {name: 'paste', label: 'paste'},
+      ]}
+      onAccessibilityAction={event => {
+        switch (event.nativeEvent.actionName) {
+          case 'cut':
+            Alert.alert('Alert', 'cut action success');
+            break;
+          case 'copy':
+            Alert.alert('Alert', 'copy action success');
+            break;
+          case 'paste':
+            Alert.alert('Alert', 'paste action success');
+            break;
+        }
+      }}
+    />
+  );
+};
+
+// DrawerLayoutAndroidTest
+export class DrawerLayoutAndroidTest extends React.Component {
+  drawerRef = React.createRef<DrawerLayoutAndroid>();
+
+  readonly styles = StyleSheet.create({
+    container: {
+      flex: 1,
+      alignItems: 'center',
+      justifyContent: 'center',
+      paddingTop: 50,
+      backgroundColor: '#ecf0f1',
+      padding: 8,
+    },
+    navigationContainer: {
+      flex: 1,
+      paddingTop: 50,
+      backgroundColor: '#fff',
+      padding: 8,
+    },
+  });
+
+  readonly navigationView = (
+    <View style={this.styles.navigationContainer}>
+      <Text style={{margin: 10, fontSize: 15}}>I'm in the Drawer!</Text>
+    </View>
+  );
+
+  handleDrawerClose = () => {
+    console.log('handleDrawerClose');
+  };
+
+  handleDrawerOpen = () => {
+    console.log('handleDrawerOpen');
+  };
+
+  handleDrawerSlide = (event: DrawerSlideEvent) => {
+    console.log('handleDrawerSlide', event);
+  };
+
+  handleDrawerStateChanged = (event: 'Idle' | 'Dragging' | 'Settling') => {
+    console.log('handleDrawerStateChanged', event);
+  };
+
+  render() {
+    return (
+      <DrawerLayoutAndroid
+        ref={this.drawerRef}
+        drawerBackgroundColor="rgba(0,0,0,0.5)"
+        drawerLockMode="locked-closed"
+        drawerPosition="right"
+        drawerWidth={300}
+        keyboardDismissMode="on-drag"
+        onDrawerClose={this.handleDrawerClose}
+        onDrawerOpen={this.handleDrawerOpen}
+        onDrawerSlide={this.handleDrawerSlide}
+        onDrawerStateChanged={this.handleDrawerStateChanged}
+        renderNavigationView={() => this.navigationView}
+        statusBarBackgroundColor="yellow">
+        <View style={this.styles.container}>
+          <Text style={{margin: 10, fontSize: 15}}>
+            DrawerLayoutAndroid example
+          </Text>
+        </View>
+      </DrawerLayoutAndroid>
+    );
+  }
+}
+
+// DataDetectorType for Text component
+const DataDetectorTypeTest = () => {
+  return (
+    <>
+      <Text dataDetectorType={'all'}>
+        http://test.com test@test.com +33123456789
+      </Text>
+      <Text dataDetectorType={'email'}>test@test.com</Text>
+      <Text dataDetectorType={'link'}>http://test.com</Text>
+      <Text dataDetectorType={'none'}>Hi there !</Text>
+      <Text dataDetectorType={'phoneNumber'}>+33123456789</Text>
+      <Text dataDetectorType={null}>Must allow null value</Text>
+    </>
+  );
+};
+
+const ToastAndroidTest = () => {
+  ToastAndroid.showWithGravityAndOffset(
+    'My Toast',
+    ToastAndroid.SHORT,
+    ToastAndroid.BOTTOM,
+    0,
+    50,
+  );
+};
+
+const I18nManagerTest = () => {
+  I18nManager.allowRTL(true);
+  I18nManager.forceRTL(true);
+  I18nManager.swapLeftAndRightInRTL(true);
+  const {isRTL, doLeftAndRightSwapInRTL} = I18nManager.getConstants();
+  const isRtlFlag = I18nManager.isRTL;
+  const doLeftAndRightSwapInRtlFlag = I18nManager.doLeftAndRightSwapInRTL;
+
+  console.log(
+    isRTL,
+    isRtlFlag,
+    doLeftAndRightSwapInRTL,
+    doLeftAndRightSwapInRtlFlag,
+  );
+};
+
+// LayoutAnimations
+LayoutAnimation.configureNext(
+  LayoutAnimation.create(
+    123,
+    LayoutAnimation.Types.easeIn,
+    LayoutAnimation.Properties.opacity,
+  ),
+);
+
+LayoutAnimation.configureNext(LayoutAnimation.create(123, 'easeIn', 'opacity'));
+
+// ActionSheetIOS
+const ActionSheetIOSTest = () => {
+  // test destructiveButtonIndex undefined
+  ActionSheetIOS.showActionSheetWithOptions(
+    {
+      options: ['foo'],
+      destructiveButtonIndex: undefined,
+    },
+    () => undefined,
+  );
+
+  // test destructiveButtonIndex null
+  ActionSheetIOS.showActionSheetWithOptions(
+    {
+      options: ['foo'],
+      destructiveButtonIndex: null,
+    },
+    () => undefined,
+  );
+
+  // test destructiveButtonIndex single number
+  ActionSheetIOS.showActionSheetWithOptions(
+    {
+      options: ['foo'],
+      destructiveButtonIndex: 0,
+    },
+    () => undefined,
+  );
+
+  // test destructiveButtonIndex number array
+  ActionSheetIOS.showActionSheetWithOptions(
+    {
+      options: ['foo', 'bar'],
+      destructiveButtonIndex: [0, 1],
+    },
+    () => undefined,
+  );
+};
diff --git a/types/__typetests__/init-example.tsx b/types/__typetests__/init-example.tsx
new file mode 100644
index 000000000000..f9e7baa19de5
--- /dev/null
+++ b/types/__typetests__/init-example.tsx
@@ -0,0 +1,117 @@
+/**
+ * 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
+ */
+
+import * as React from 'react';
+import {
+  SafeAreaView,
+  StyleSheet,
+  ScrollView,
+  View,
+  Text,
+  StatusBar,
+} from 'react-native';
+
+import {
+  Header,
+  LearnMoreLinks,
+  Colors,
+  DebugInstructions,
+  ReloadInstructions,
+} from 'react-native/Libraries/NewAppScreen';
+
+const App = () => {
+  const hasHermes =
+    typeof HermesInternal === 'object' && HermesInternal !== null;
+  return (
+    <>
+      <StatusBar barStyle="dark-content" />
+      <SafeAreaView>
+        <ScrollView
+          contentInsetAdjustmentBehavior="automatic"
+          style={styles.scrollView}>
+          <Header />
+          {!hasHermes ? null : (
+            <View style={styles.engine}>
+              <Text style={styles.footer}>Engine: Hermes</Text>
+            </View>
+          )}
+          <View style={styles.body}>
+            <View style={styles.sectionContainer}>
+              <Text style={styles.sectionTitle}>Step One</Text>
+              <Text style={styles.sectionDescription}>
+                Edit <Text style={styles.highlight}>App.js</Text> to change this
+                screen and then come back to see your edits.
+              </Text>
+            </View>
+            <View style={styles.sectionContainer}>
+              <Text style={styles.sectionTitle}>See Your Changes</Text>
+              <Text style={styles.sectionDescription}>
+                <ReloadInstructions />
+              </Text>
+            </View>
+            <View style={styles.sectionContainer}>
+              <Text style={styles.sectionTitle}>Debug</Text>
+              <Text style={styles.sectionDescription}>
+                <DebugInstructions />
+              </Text>
+            </View>
+            <View style={styles.sectionContainer}>
+              <Text style={styles.sectionTitle}>Learn More</Text>
+              <Text style={styles.sectionDescription}>
+                Read the docs to discover what to do next:
+              </Text>
+            </View>
+            <LearnMoreLinks />
+          </View>
+        </ScrollView>
+      </SafeAreaView>
+    </>
+  );
+};
+
+const styles = StyleSheet.create({
+  scrollView: {
+    backgroundColor: Colors.lighter,
+  },
+  engine: {
+    position: 'absolute',
+    right: 0,
+  },
+  body: {
+    backgroundColor: Colors.white,
+  },
+  sectionContainer: {
+    marginTop: 32,
+    paddingHorizontal: 24,
+  },
+  sectionTitle: {
+    fontSize: 24,
+    fontWeight: '600',
+    color: Colors.black,
+  },
+  sectionDescription: {
+    marginTop: 8,
+    fontSize: 18,
+    fontWeight: '400',
+    color: Colors.dark,
+  },
+  highlight: {
+    fontWeight: '700',
+  },
+  footer: {
+    color: Colors.dark,
+    fontSize: 12,
+    fontWeight: '600',
+    padding: 4,
+    paddingRight: 12,
+    textAlign: 'right',
+  },
+});
+
+export default App;
diff --git a/types/__typetests__/legacy-properties.tsx b/types/__typetests__/legacy-properties.tsx
new file mode 100644
index 000000000000..f0898243d588
--- /dev/null
+++ b/types/__typetests__/legacy-properties.tsx
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+import * as React from 'react';
+import {TextInputProperties} from 'react-native';
+
+class Test extends React.Component<TextInputProperties> {}
diff --git a/types/__typetests__/stylesheet-create.tsx b/types/__typetests__/stylesheet-create.tsx
new file mode 100644
index 000000000000..20ce13c8fa21
--- /dev/null
+++ b/types/__typetests__/stylesheet-create.tsx
@@ -0,0 +1,33 @@
+/**
+ * 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
+ */
+
+import * as React from 'react';
+import {View, StyleSheet} from 'react-native';
+
+export function App() {
+  return <View style={styles.container} />;
+}
+
+const styles = StyleSheet.create({
+  container: {
+    position: 'absolute',
+    backgroundColor: 'red',
+    width: '100%',
+    height: '100%',
+  },
+  transforms: {
+    transform: [
+      {matrix: [0, 1, -1, 0, 0, 0]},
+      {skewX: '40deg'},
+      {translateX: 40},
+      {translateY: 40},
+      {rotate: '30deg'},
+    ],
+  },
+});
diff --git a/types/__typetests__/stylesheet-flatten.tsx b/types/__typetests__/stylesheet-flatten.tsx
new file mode 100644
index 000000000000..412a9c13922c
--- /dev/null
+++ b/types/__typetests__/stylesheet-flatten.tsx
@@ -0,0 +1,33 @@
+/**
+ * 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
+ */
+
+import * as React from 'react';
+import {View, Text, ViewStyle, StyleSheet} from 'react-native';
+
+interface Props {
+  style: ViewStyle;
+}
+
+export function App(props: Props) {
+  const backgroundColor = (
+    StyleSheet.flatten([styles.container, props.style]) as ViewStyle
+  ).backgroundColor;
+
+  return (
+    <View style={[styles.container, props.style]}>
+      <Text>{String(backgroundColor)}</Text>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    backgroundColor: 'red',
+  },
+});
diff --git a/types/__typetests__/turbo-module-sample.ts b/types/__typetests__/turbo-module-sample.ts
new file mode 100644
index 000000000000..b178fdcc51b6
--- /dev/null
+++ b/types/__typetests__/turbo-module-sample.ts
@@ -0,0 +1,22 @@
+/**
+ * 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 { TurboModule, TurboModuleRegistry } from 'react-native';
+'use strict';
+
+export interface SomeConstants {
+    x: string;
+    y: number;
+    z: boolean;
+}
+
+export interface SampleSpec extends TurboModule {
+    getConstants(): SomeConstants
+    doSomething(): void;
+}
+
+export default TurboModuleRegistry.getEnforcing<SampleSpec>('Sample');
diff --git a/types/index.d.ts b/types/index.d.ts
new file mode 100644
index 000000000000..cb20aa033ef6
--- /dev/null
+++ b/types/index.d.ts
@@ -0,0 +1,213 @@
+/**
+ * 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
+ */
+
+// Definitions by: Eloy Durán <https://github.com/alloy>
+//                 HuHuanming <https://github.com/huhuanming>
+//                 Kyle Roach <https://github.com/iRoachie>
+//                 Tim Wang <https://github.com/timwangdev>
+//                 Kamal Mahyuddin <https://github.com/kamal>
+//                 Alex Dunne <https://github.com/alexdunne>
+//                 Manuel Alabor <https://github.com/swissmanu>
+//                 Michele Bombardi <https://github.com/bm-software>
+//                 Martin van Dam <https://github.com/mvdam>
+//                 Kacper Wiszczuk <https://github.com/esemesek>
+//                 Ryan Nickel <https://github.com/mrnickel>
+//                 Souvik Ghosh <https://github.com/souvik-ghosh>
+//                 Cheng Gibson <https://github.com/nossbigg>
+//                 Saransh Kataria <https://github.com/saranshkataria>
+//                 Wojciech Tyczynski <https://github.com/tykus160>
+//                 Jake Bloom <https://github.com/jakebloom>
+//                 Ceyhun Ozugur <https://github.com/ceyhun>
+//                 Mike Martin <https://github.com/mcmar>
+//                 Theo Henry de Villeneuve <https://github.com/theohdv>
+//                 Romain Faust <https://github.com/romain-faust>
+//                 Be Birchall <https://github.com/bebebebebe>
+//                 Jesse Katsumata <https://github.com/Naturalclar>
+//                 Xianming Zhong <https://github.com/chinesedfan>
+//                 Valentyn Tolochko <https://github.com/vtolochk>
+//                 Sergey Sychev <https://github.com/SychevSP>
+//                 Kelvin Chu <https://github.com/RageBill>
+//                 Daiki Ihara <https://github.com/sasurau4>
+//                 Abe Dolinger <https://github.com/256hz>
+//                 Dominique Richard <https://github.com/doumart>
+//                 Mohamed Shaban <https://github.com/drmas>
+//                 Jérémy Barbet <https://github.com/jeremybarbet>
+//                 David Sheldrick <https://github.com/ds300>
+//                 Natsathorn Yuthakovit <https://github.com/natsathorn>
+//                 ConnectDotz <https://github.com/connectdotz>
+//                 Alexey Molchan <https://github.com/alexeymolchan>
+//                 Alex Brazier <https://github.com/alexbrazier>
+//                 Arafat Zahan <https://github.com/kuasha420>
+//                 Pedro Hernández <https://github.com/phvillegas>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
+//                 Zihan Chen <https://github.com/ZihanChen-MSFT>
+//                 Lorenzo Sciandra <https://github.com/kelset>
+//                 Mateusz Wit <https://github.com/MateWW>
+//                 Saad Najmi <https://github.com/saadnajmi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+// USING: these definitions are meant to be used with the TSC compiler target set to at least ES2015.
+//
+// USAGE EXAMPLES: check the RNTSExplorer project at https://github.com/bgrieder/RNTSExplorer
+//
+// CONTRIBUTING: please open pull requests
+//
+// CREDITS: This work is based on an original work made by Bernd Paradies: https://github.com/bparadie
+//
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/// <reference path="modules/BatchedBridge.d.ts" />
+/// <reference path="modules/Codegen.d.ts" />
+/// <reference path="modules/Devtools.d.ts" />
+/// <reference path="modules/globals.d.ts" />
+/// <reference path="modules/LaunchScreen.d.ts" />
+
+export * from '../Libraries/ActionSheetIOS/ActionSheetIOS';
+export * from '../Libraries/Alert/Alert';
+export * from '../Libraries/Animated/Animated';
+export * from '../Libraries/Animated/Easing';
+export * from '../Libraries/Animated/useAnimatedValue';
+export * from '../Libraries/AppState/AppState';
+export * from '../Libraries/BatchedBridge/NativeModules';
+export * from '../Libraries/Components/AccessibilityInfo/AccessibilityInfo';
+export * from '../Libraries/Components/ActivityIndicator/ActivityIndicator';
+export * from '../Libraries/Components/Clipboard/Clipboard';
+export * from '../Libraries/Components/DatePicker/DatePickerIOS';
+export * from '../Libraries/Components/DrawerAndroid/DrawerLayoutAndroid';
+export * from '../Libraries/Components/Keyboard/Keyboard';
+export * from '../Libraries/Components/Keyboard/KeyboardAvoidingView';
+export * from '../Libraries/Components/Pressable/Pressable';
+export * from '../Libraries/Components/ProgressBarAndroid/ProgressBarAndroid';
+export * from '../Libraries/Components/ProgressViewIOS/ProgressViewIOS';
+export * from '../Libraries/Components/RefreshControl/RefreshControl';
+export * from '../Libraries/Components/SafeAreaView/SafeAreaView';
+export * from '../Libraries/Components/ScrollView/ScrollView';
+export * from '../Libraries/Components/Slider/Slider';
+export * from '../Libraries/Components/StatusBar/StatusBar';
+export * from '../Libraries/Components/Switch/Switch';
+export * from '../Libraries/Components/TextInput/InputAccessoryView';
+export * from '../Libraries/Components/TextInput/TextInput';
+export * from '../Libraries/Components/ToastAndroid/ToastAndroid';
+export * from '../Libraries/Components/Touchable/Touchable';
+export * from '../Libraries/Components/Touchable/TouchableHighlight';
+export * from '../Libraries/Components/Touchable/TouchableNativeFeedback';
+export * from '../Libraries/Components/Touchable/TouchableOpacity';
+export * from '../Libraries/Components/Touchable/TouchableWithoutFeedback';
+export * from '../Libraries/Components/View/View';
+export * from '../Libraries/Components/View/ViewAccessibility';
+export * from '../Libraries/Components/View/ViewPropTypes';
+export * from '../Libraries/Components/Button';
+export * from '../Libraries/EventEmitter/NativeEventEmitter';
+export * from '../Libraries/EventEmitter/RCTDeviceEventEmitter';
+export * from '../Libraries/EventEmitter/RCTNativeAppEventEmitter';
+export * from '../Libraries/Image/Image';
+export * from '../Libraries/Image/ImageResizeMode';
+export * from '../Libraries/Image/ImageSource';
+export * from '../Libraries/Interaction/InteractionManager';
+export * from '../Libraries/Interaction/PanResponder';
+export * from '../Libraries/LayoutAnimation/LayoutAnimation';
+export * from '../Libraries/Linking/Linking';
+export * from '../Libraries/Lists/FlatList';
+export * from '../Libraries/Lists/SectionList';
+export * from '../Libraries/Lists/VirtualizedList';
+export * from '../Libraries/LogBox/LogBox';
+export * from '../Libraries/Modal/Modal';
+export * as Systrace from '../Libraries/Performance/Systrace';
+export * from '../Libraries/PermissionsAndroid/PermissionsAndroid';
+export * from '../Libraries/PushNotificationIOS/PushNotificationIOS';
+export * from '../Libraries/ReactNative/AppRegistry';
+export * from '../Libraries/ReactNative/I18nManager';
+export * from '../Libraries/ReactNative/RendererProxy';
+export * from '../Libraries/ReactNative/RootTag';
+export * from '../Libraries/ReactNative/UIManager';
+export * from '../Libraries/ReactNative/requireNativeComponent';
+export * from '../Libraries/Settings/Settings';
+export * from '../Libraries/Share/Share';
+export * from '../Libraries/StyleSheet/PlatformColorValueTypesIOS';
+export * from '../Libraries/StyleSheet/PlatformColorValueTypes';
+export * from '../Libraries/StyleSheet/StyleSheet';
+export * from '../Libraries/StyleSheet/StyleSheetTypes';
+export * from '../Libraries/StyleSheet/processColor';
+export * from '../Libraries/Text/Text';
+export * from '../Libraries/TurboModule/RCTExport';
+export * from '../Libraries/TurboModule/TurboModuleRegistry';
+export * from '../Libraries/Types/CoreEventTypes';
+export * from '../Libraries/Utilities/Appearance';
+export * from '../Libraries/Utilities/BackHandler';
+export * from '../Libraries/Utilities/DevSettings';
+export * from '../Libraries/Utilities/Dimensions';
+export * from '../Libraries/Utilities/PixelRatio';
+export * from '../Libraries/Utilities/Platform';
+export * from '../Libraries/Vibration/Vibration';
+export * from '../Libraries/YellowBox/YellowBoxDeprecated';
+export * from '../Libraries/vendor/core/ErrorUtils';
+export * from '../Libraries/vendor/emitter/EventEmitter';
+
+export * from './public/DeprecatedPropertiesAlias';
+export * from './public/Insets';
+export * from './public/ReactNativeRenderer';
+export * from './public/ReactNativeTypes';
+
+import type {ErrorUtils} from '../Libraries/vendor/core/ErrorUtils';
+
+declare global {
+  interface NodeRequire {
+    (id: string): any;
+  }
+
+  var require: NodeRequire;
+
+  /**
+   * Console polyfill
+   * @see https://reactnative.dev/docs/javascript-environment#polyfills
+   */
+  interface Console {
+    error(message?: any, ...optionalParams: any[]): void;
+    info(message?: any, ...optionalParams: any[]): void;
+    log(message?: any, ...optionalParams: any[]): void;
+    warn(message?: any, ...optionalParams: any[]): void;
+    trace(message?: any, ...optionalParams: any[]): void;
+    debug(message?: any, ...optionalParams: any[]): void;
+    table(...data: any[]): void;
+    groupCollapsed(label?: string): void;
+    groupEnd(): void;
+    group(label?: string): void;
+    /**
+     * @deprecated Use LogBox.ignoreLogs(patterns) instead
+     */
+    ignoredYellowBox: string[];
+  }
+
+  var console: Console;
+
+  /**
+   * This contains the non-native `XMLHttpRequest` object, which you can use if you want to route network requests
+   * through DevTools (to trace them):
+   *
+   *   global.XMLHttpRequest = global.originalXMLHttpRequest;
+   *
+   * @see https://github.com/facebook/react-native/issues/934
+   */
+  const originalXMLHttpRequest: any;
+
+  const __BUNDLE_START_TIME__: number;
+  const ErrorUtils: ErrorUtils;
+
+  /**
+   * This variable is set to true when react-native is running in Dev mode
+   * @example
+   * if (__DEV__) console.log('Running in dev mode')
+   */
+  const __DEV__: boolean;
+
+  const HermesInternal: null | {};
+}
diff --git a/types/modules/BatchedBridge.d.ts b/types/modules/BatchedBridge.d.ts
new file mode 100644
index 000000000000..c6b2e145a2f3
--- /dev/null
+++ b/types/modules/BatchedBridge.d.ts
@@ -0,0 +1,32 @@
+/**
+ * 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
+ */
+
+interface SpyData {
+  type: number;
+  module?: string | undefined;
+  method: string | number;
+  args: any[];
+}
+
+declare class MessageQueue {
+  static spy(spyOrToggle: boolean | ((data: SpyData) => void)): void;
+
+  getCallableModule(name: string): Object;
+  registerCallableModule(name: string, module: Object): void;
+  registerLazyCallableModule(name: string, factory: () => Object): void;
+}
+
+declare module 'react-native/Libraries/BatchedBridge/BatchedBridge' {
+  const BatchedBridge: MessageQueue;
+  export default BatchedBridge;
+}
+
+declare module 'react-native/Libraries/BatchedBridge/MessageQueue' {
+  export default MessageQueue;
+}
diff --git a/types/modules/Codegen.d.ts b/types/modules/Codegen.d.ts
new file mode 100644
index 000000000000..24de3b099159
--- /dev/null
+++ b/types/modules/Codegen.d.ts
@@ -0,0 +1,74 @@
+/**
+ * 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
+ */
+
+declare module 'react-native/Libraries/Utilities/codegenNativeCommands' {
+  export interface Options<T extends string> {
+    readonly supportedCommands: ReadonlyArray<T>;
+  }
+
+  function codegenNativeCommands<T extends object>(
+    options: Options<keyof T extends string ? keyof T : never>,
+  ): T;
+
+  export default codegenNativeCommands;
+}
+
+declare module 'react-native/Libraries/Utilities/codegenNativeComponent' {
+  import type {HostComponent} from 'react-native';
+
+  export interface Options {
+    readonly interfaceOnly?: boolean;
+    readonly paperComponentName?: string;
+    readonly paperComponentNameDeprecated?: string;
+    readonly excludedPlatforms?: ReadonlyArray<'iOS' | 'android'>;
+  }
+
+  export type NativeComponentType<T> = HostComponent<T>;
+
+  function codegenNativeComponent<Props extends object>(
+    componentName: string,
+    options?: Options,
+  ): NativeComponentType<Props>;
+
+  export default codegenNativeComponent;
+}
+
+declare module 'react-native/Libraries/Types/CodegenTypes' {
+  import type {NativeSyntheticEvent} from 'react-native';
+
+  // Event types
+  // We're not using the PaperName, it is only used to codegen view config settings
+
+  export type BubblingEventHandler<
+    T,
+    PaperName extends string | never = never,
+  > = (event: NativeSyntheticEvent<T>) => void | Promise<void>;
+  export type DirectEventHandler<
+    T,
+    PaperName extends string | never = never,
+  > = (event: NativeSyntheticEvent<T>) => void | Promise<void>;
+
+  // Prop types
+  export type Double = number;
+  export type Float = number;
+  export type Int32 = number;
+  export type UnsafeObject = object;
+
+  type DefaultTypes = number | boolean | string | ReadonlyArray<string>;
+  // Default handling, ignore the unused value
+  // we're only using it for type checking
+  //
+  // TODO: (rickhanlonii) T44881457 If a default is provided, it should always be optional
+  //  but that is currently not supported in the codegen since we require a default
+
+  export type WithDefault<
+    Type extends DefaultTypes,
+    Value extends Type | string | undefined | null,
+  > = Type | undefined | null;
+}
diff --git a/types/modules/Devtools.d.ts b/types/modules/Devtools.d.ts
new file mode 100644
index 000000000000..3a993cf7ab7b
--- /dev/null
+++ b/types/modules/Devtools.d.ts
@@ -0,0 +1,31 @@
+/**
+ * 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
+ */
+
+declare module 'react-native/Libraries/Core/Devtools/parseErrorStack' {
+  export type StackFrame = {
+    file: string;
+    methodName: string;
+    lineNumber: number;
+    column: number | null;
+  };
+
+  export interface ExtendedError extends Error {
+    framesToPop?: number | undefined;
+  }
+
+  export default function parseErrorStack(error: ExtendedError): StackFrame[];
+}
+
+declare module 'react-native/Libraries/Core/Devtools/symbolicateStackTrace' {
+  import {StackFrame} from 'react-native/Libraries/Core/Devtools/parseErrorStack';
+
+  export default function symbolicateStackTrace(
+    stack: ReadonlyArray<StackFrame>,
+  ): Promise<StackFrame[]>;
+}
diff --git a/types/modules/LaunchScreen.d.ts b/types/modules/LaunchScreen.d.ts
new file mode 100644
index 000000000000..3e816dd06527
--- /dev/null
+++ b/types/modules/LaunchScreen.d.ts
@@ -0,0 +1,18 @@
+/**
+ * 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
+ */
+
+// Adds the JSX elements used in the launch screen.
+
+declare module 'react-native/Libraries/NewAppScreen' {
+  export const Header: any;
+  export const LearnMoreLinks: any;
+  export const Colors: any;
+  export const DebugInstructions: any;
+  export const ReloadInstructions: any;
+}
diff --git a/types/modules/globals.d.ts b/types/modules/globals.d.ts
new file mode 100644
index 000000000000..042fd06cb1f0
--- /dev/null
+++ b/types/modules/globals.d.ts
@@ -0,0 +1,577 @@
+/**
+ * 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
+ */
+
+/*
+ * This file is necessary to declare global functions that might also be included by `--lib dom`.
+ * Due to a TypeScript bug, these cannot be placed inside a `declare global` block in index.d.ts.
+ * https://github.com/Microsoft/TypeScript/issues/16430
+ */
+
+//
+// Timer Functions
+//
+declare function clearInterval(handle: number): void;
+declare function clearTimeout(handle: number): void;
+declare function setInterval(handler: () => void, timeout: number): number;
+declare function setInterval<Args extends any[]>(
+  handler: (...args: Args) => void,
+  timeout?: number,
+  ...args: Args
+): number;
+declare function setTimeout(handler: () => void, timeout: number): number;
+declare function setTimeout<Args extends any[]>(
+  handler: (...args: Args) => void,
+  timeout?: number,
+  ...args: Args
+): number;
+declare function clearImmediate(handle: number): void;
+declare function setImmediate(handler: () => void): number;
+declare function setImmediate<Args extends any[]>(
+  handler: (...args: Args) => void,
+  ...args: Args
+): number;
+
+declare function cancelAnimationFrame(handle: number): void;
+declare function requestAnimationFrame(
+  callback: (time: number) => void,
+): number;
+
+declare function fetchBundle(
+  bundleId: number,
+  callback: (error?: Error | null) => void,
+): void;
+
+//
+// Fetch API
+//
+
+declare interface GlobalFetch {
+  fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
+}
+
+declare function fetch(
+  input: RequestInfo,
+  init?: RequestInit,
+): Promise<Response>;
+
+declare interface WindowOrWorkerGlobalScope {
+  fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
+}
+
+interface Blob {
+  readonly size: number;
+  readonly type: string;
+  slice(start?: number, end?: number): Blob;
+}
+
+interface BlobOptions {
+  type: string;
+  lastModified: number;
+}
+
+declare var Blob: {
+  prototype: Blob;
+  new (blobParts?: Array<Blob | string>, options?: BlobOptions): Blob;
+};
+
+type FormDataValue = string | {name?: string; type?: string; uri: string};
+
+type FormDataPart =
+  | {
+      string: string;
+      headers: {[name: string]: string};
+    }
+  | {
+      uri: string;
+      headers: {[name: string]: string};
+      name?: string;
+      type?: string;
+    };
+
+declare class FormData {
+  append(name: string, value: any): void;
+  getAll(): Array<FormDataValue>;
+  getParts(): Array<FormDataPart>;
+}
+
+declare interface Body {
+  readonly bodyUsed: boolean;
+  arrayBuffer(): Promise<ArrayBuffer>;
+  blob(): Promise<Blob>;
+  json(): Promise<any>;
+  text(): Promise<string>;
+  formData(): Promise<FormData>;
+}
+
+declare interface Headers {
+  append(name: string, value: string): void;
+  delete(name: string): void;
+  forEach(callback: Function, thisArg?: any): void;
+  get(name: string): string | null;
+  has(name: string): boolean;
+  set(name: string, value: string): void;
+}
+
+declare var Headers: {
+  prototype: Headers;
+  new (init?: HeadersInit_): Headers;
+};
+
+/**
+ * React Native's implementation of fetch allows this syntax for uploading files from
+ * local filesystem.
+ * See https://github.com/facebook/react-native/blob/master/Libraries/Network/convertRequestBody.js#L22
+ */
+interface _SourceUri {
+  uri: string;
+  [key: string]: any;
+}
+
+type BodyInit_ =
+  | _SourceUri
+  | Blob
+  | Int8Array
+  | Int16Array
+  | Int32Array
+  | Uint8Array
+  | Uint16Array
+  | Uint32Array
+  | Uint8ClampedArray
+  | Float32Array
+  | Float64Array
+  | DataView
+  | ArrayBuffer
+  | FormData
+  | string
+  | null;
+
+declare interface RequestInit {
+  body?: BodyInit_ | undefined;
+  credentials?: RequestCredentials_ | undefined;
+  headers?: HeadersInit_ | undefined;
+  integrity?: string | undefined;
+  keepalive?: boolean | undefined;
+  method?: string | undefined;
+  mode?: RequestMode_ | undefined;
+  referrer?: string | undefined;
+  window?: any;
+  signal?: AbortSignal | undefined;
+}
+
+declare interface Request extends Object, Body {
+  readonly credentials: RequestCredentials_;
+  readonly headers: Headers;
+  readonly method: string;
+  readonly mode: RequestMode_;
+  readonly referrer: string;
+  readonly url: string;
+  clone(): Request;
+}
+
+declare var Request: {
+  prototype: Request;
+  new (input: Request | string, init?: RequestInit): Request;
+};
+
+declare type RequestInfo = Request | string;
+
+declare interface ResponseInit {
+  headers?: HeadersInit_ | undefined;
+  status?: number | undefined;
+  statusText?: string | undefined;
+}
+
+declare interface Response extends Object, Body {
+  readonly headers: Headers;
+  readonly ok: boolean;
+  readonly status: number;
+  readonly statusText: string;
+  readonly type: ResponseType_;
+  readonly url: string;
+  readonly redirected: boolean;
+  clone(): Response;
+}
+
+declare var Response: {
+  prototype: Response;
+  new (body?: BodyInit_, init?: ResponseInit): Response;
+  error: () => Response;
+  redirect: (url: string, status?: number) => Response;
+};
+
+type HeadersInit_ = Headers | string[][] | {[key: string]: string};
+type RequestCredentials_ = 'omit' | 'same-origin' | 'include';
+type RequestMode_ = 'navigate' | 'same-origin' | 'no-cors' | 'cors';
+type ResponseType_ =
+  | 'basic'
+  | 'cors'
+  | 'default'
+  | 'error'
+  | 'opaque'
+  | 'opaqueredirect';
+
+//
+// XMLHttpRequest
+//
+
+declare interface ProgressEvent<T extends EventTarget = EventTarget>
+  extends Event {
+  readonly lengthComputable: boolean;
+  readonly loaded: number;
+  readonly total: number;
+  readonly target: T | null;
+}
+
+interface XMLHttpRequestEventMap extends XMLHttpRequestEventTargetEventMap {
+  readystatechange: Event;
+}
+
+interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
+  //  msCaching: string;
+  onreadystatechange: ((this: XMLHttpRequest, ev: Event) => any) | null;
+  readonly readyState: number;
+  readonly response: any;
+  readonly responseText: string;
+  responseType: XMLHttpRequestResponseType;
+  readonly responseURL: string;
+  readonly responseXML: Document | null;
+  readonly status: number;
+  readonly statusText: string;
+  timeout: number;
+  readonly upload: XMLHttpRequestUpload;
+  withCredentials: boolean;
+  abort(): void;
+  getAllResponseHeaders(): string;
+  getResponseHeader(header: string): string | null;
+  //  msCachingEnabled(): boolean;
+  open(
+    method: string,
+    url: string,
+    async?: boolean,
+    user?: string | null,
+    password?: string | null,
+  ): void;
+  overrideMimeType(mime: string): void;
+  send(data?: any): void;
+  setRequestHeader(header: string, value: string): void;
+  readonly DONE: number;
+  readonly HEADERS_RECEIVED: number;
+  readonly LOADING: number;
+  readonly OPENED: number;
+  readonly UNSENT: number;
+  addEventListener<K extends keyof XMLHttpRequestEventMap>(
+    type: K,
+    listener: (this: XMLHttpRequest, ev: XMLHttpRequestEventMap[K]) => any,
+  ): void;
+  //  addEventListener(type: string, listener: EventListenerOrEventListenerObject): void;
+  removeEventListener<K extends keyof XMLHttpRequestEventMap>(
+    type: K,
+    listener: (this: XMLHttpRequest, ev: XMLHttpRequestEventMap[K]) => any,
+  ): void;
+  //  removeEventListener(type: string, listener: EventListenerOrEventListenerObject): void;
+}
+
+declare var XMLHttpRequest: {
+  prototype: XMLHttpRequest;
+  new (): XMLHttpRequest;
+  readonly DONE: number;
+  readonly HEADERS_RECEIVED: number;
+  readonly LOADING: number;
+  readonly OPENED: number;
+  readonly UNSENT: number;
+};
+
+interface XMLHttpRequestEventTargetEventMap {
+  abort: ProgressEvent;
+  error: ProgressEvent;
+  load: ProgressEvent;
+  loadend: ProgressEvent;
+  loadstart: ProgressEvent;
+  progress: ProgressEvent;
+  timeout: ProgressEvent;
+}
+
+interface XMLHttpRequestEventTarget {
+  onabort: ((this: XMLHttpRequest, ev: ProgressEvent) => any) | null;
+  onerror: ((this: XMLHttpRequest, ev: ProgressEvent) => any) | null;
+  onload: ((this: XMLHttpRequest, ev: ProgressEvent) => any) | null;
+  onloadend: ((this: XMLHttpRequest, ev: ProgressEvent) => any) | null;
+  onloadstart: ((this: XMLHttpRequest, ev: ProgressEvent) => any) | null;
+  onprogress: ((this: XMLHttpRequest, ev: ProgressEvent) => any) | null;
+  ontimeout: ((this: XMLHttpRequest, ev: ProgressEvent) => any) | null;
+  addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(
+    type: K,
+    listener: (
+      this: XMLHttpRequestEventTarget,
+      ev: XMLHttpRequestEventTargetEventMap[K],
+    ) => any,
+  ): void;
+  //  addEventListener(type: string, listener: EventListenerOrEventListenerObject): void;
+  removeEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(
+    type: K,
+    listener: (
+      this: XMLHttpRequestEventTarget,
+      ev: XMLHttpRequestEventTargetEventMap[K],
+    ) => any,
+  ): void;
+  //  removeEventListener(type: string, listener: EventListenerOrEventListenerObject): void;
+}
+
+interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget {
+  addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(
+    type: K,
+    listener: (
+      this: XMLHttpRequestUpload,
+      ev: XMLHttpRequestEventTargetEventMap[K],
+    ) => any,
+  ): void;
+  //  addEventListener(type: string, listener: EventListenerOrEventListenerObject): void;
+  removeEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(
+    type: K,
+    listener: (
+      this: XMLHttpRequestUpload,
+      ev: XMLHttpRequestEventTargetEventMap[K],
+    ) => any,
+  ): void;
+  //  removeEventListener(type: string, listener: EventListenerOrEventListenerObject): void;
+}
+
+declare var XMLHttpRequestUpload: {
+  prototype: XMLHttpRequestUpload;
+  new (): XMLHttpRequestUpload;
+};
+
+declare type XMLHttpRequestResponseType =
+  | ''
+  | 'arraybuffer'
+  | 'blob'
+  | 'document'
+  | 'json'
+  | 'text';
+
+/**
+ * Based on definition from lib.dom but using class syntax.
+ * The properties are mutable to support users that use a `URL` polyfill, but the implementation
+ * built into React Native (as of 0.63) does not implement all the properties.
+ */
+declare class URL {
+  static createObjectURL(blob: Blob): string;
+  static revokeObjectURL(url: string): void;
+
+  constructor(url: string, base?: string);
+
+  href: string;
+  readonly origin: string;
+  protocol: string;
+  username: string;
+  password: string;
+  host: string;
+  hostname: string;
+  port: string;
+  pathname: string;
+  search: string;
+  readonly searchParams: URLSearchParams;
+  hash: string;
+
+  toJSON(): string;
+}
+
+/**
+ * Based on definitions of lib.dom and lib.dom.iterable
+ */
+declare class URLSearchParams {
+  constructor(
+    init?: string[][] | Record<string, string> | string | URLSearchParams,
+  );
+
+  append(name: string, value: string): void;
+  delete(name: string): void;
+  get(name: string): string | null;
+  getAll(name: string): string[];
+  has(name: string): boolean;
+  set(name: string, value: string): void;
+  sort(): void;
+  forEach(
+    callbackfn: (value: string, key: string, parent: URLSearchParams) => void,
+    thisArg?: any,
+  ): void;
+  [Symbol.iterator](): IterableIterator<[string, string]>;
+
+  entries(): IterableIterator<[string, string]>;
+  keys(): IterableIterator<string>;
+  values(): IterableIterator<string>;
+}
+
+interface WebSocketMessageEvent extends Event {
+  data?: any;
+}
+interface WebSocketErrorEvent extends Event {
+  message: string;
+}
+interface WebSocketCloseEvent extends Event {
+  code?: number | undefined;
+  reason?: string | undefined;
+  message?: string | undefined;
+}
+
+type WebsocketMessageEventListener = (
+  event: 'message',
+  handler: (e: WebSocketMessageEvent) => void,
+) => void;
+type WebsocketErrorEventListener = (
+  event: 'error',
+  handler: (e: WebSocketErrorEvent) => void,
+) => void;
+type WebsocketOpenEventListener = (event: 'open', handler: () => void) => void;
+type WebsocketCloseEventListener = (
+  event: 'close',
+  handler: (e: WebSocketCloseEvent) => void,
+) => void;
+
+type WebsocketEventListener = WebsocketMessageEventListener &
+  WebsocketErrorEventListener &
+  WebsocketOpenEventListener &
+  WebsocketCloseEventListener;
+
+interface WebSocket extends EventTarget {
+  readonly readyState: number;
+  send(data: string | ArrayBuffer | ArrayBufferView | Blob): void;
+  close(code?: number, reason?: string): void;
+  onopen: (() => void) | null;
+  onmessage: ((event: WebSocketMessageEvent) => void) | null;
+  onerror: ((event: WebSocketErrorEvent) => void) | null;
+  onclose: ((event: WebSocketCloseEvent) => void) | null;
+  addEventListener: WebsocketEventListener;
+  removeEventListener: WebsocketEventListener;
+}
+
+declare var WebSocket: {
+  prototype: WebSocket;
+  new (
+    uri: string,
+    protocols?: string | string[] | null,
+    options?: {
+      headers: {[headerName: string]: string};
+      [optionName: string]: any;
+    } | null,
+  ): WebSocket;
+  readonly CLOSED: number;
+  readonly CLOSING: number;
+  readonly CONNECTING: number;
+  readonly OPEN: number;
+};
+
+//
+// Abort Controller
+//
+
+interface AbortEvent extends Event {
+  type: 'abort';
+}
+
+declare class AbortSignal implements EventTarget {
+  /**
+   * AbortSignal cannot be constructed directly.
+   */
+  constructor();
+  /**
+   * Returns `true` if this `AbortSignal`'s `AbortController` has signaled to abort, and `false` otherwise.
+   */
+  readonly aborted: boolean;
+
+  onabort: (event: AbortEvent) => void;
+
+  addEventListener: (
+    type: 'abort',
+    listener: (this: AbortSignal, event: any) => any,
+    options?:
+      | boolean
+      | {
+          capture?: boolean;
+          once?: boolean;
+          passive?: boolean;
+        },
+  ) => void;
+
+  removeEventListener: (
+    type: 'abort',
+    listener: (this: AbortSignal, event: any) => any,
+    options?:
+      | boolean
+      | {
+          capture?: boolean;
+        },
+  ) => void;
+}
+
+declare class AbortController {
+  /**
+   * Initialize this controller.
+   */
+  constructor();
+  /**
+   * Returns the `AbortSignal` object associated with this object.
+   */
+  readonly signal: AbortSignal;
+  /**
+   * Abort and signal to any observers that the associated activity is to be aborted.
+   */
+  abort(): void;
+}
+
+interface FileReaderEventMap {
+  abort: ProgressEvent<FileReader>;
+  error: ProgressEvent<FileReader>;
+  load: ProgressEvent<FileReader>;
+  loadend: ProgressEvent<FileReader>;
+  loadstart: ProgressEvent<FileReader>;
+  progress: ProgressEvent<FileReader>;
+}
+
+interface FileReader extends EventTarget {
+  readonly error: Error | null;
+  onabort: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+  onerror: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+  onload: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+  onloadend: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+  onloadstart:
+    | ((this: FileReader, ev: ProgressEvent<FileReader>) => any)
+    | null;
+  onprogress: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+  readonly readyState: number;
+  readonly result: string | ArrayBuffer;
+  abort(): void;
+  readAsArrayBuffer(blob: Blob): void;
+  // readAsBinaryString(blob: Blob): void;
+  readAsDataURL(blob: Blob): void;
+  readAsText(blob: Blob, encoding?: string): void;
+  readonly DONE: number;
+  readonly EMPTY: number;
+  readonly LOADING: number;
+  addEventListener<K extends keyof FileReaderEventMap>(
+    type: K,
+    listener: (this: FileReader, ev: FileReaderEventMap[K]) => any,
+    options?: boolean,
+  ): void;
+  // addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
+  removeEventListener<K extends keyof FileReaderEventMap>(
+    type: K,
+    listener: (this: FileReader, ev: FileReaderEventMap[K]) => any,
+    options?: boolean,
+  ): void;
+  // removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
+}
+
+declare var FileReader: {
+  prototype: FileReader;
+  new (): FileReader;
+  readonly DONE: number;
+  readonly EMPTY: number;
+  readonly LOADING: number;
+};
diff --git a/types/private/TimerMixin.d.ts b/types/private/TimerMixin.d.ts
new file mode 100644
index 000000000000..616183c79c4b
--- /dev/null
+++ b/types/private/TimerMixin.d.ts
@@ -0,0 +1,19 @@
+/**
+ * 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 TimerMixin {
+  setTimeout: typeof setTimeout;
+  clearTimeout: typeof clearTimeout;
+  setInterval: typeof setInterval;
+  clearInterval: typeof clearInterval;
+  setImmediate: typeof setImmediate;
+  clearImmediate: typeof clearImmediate;
+  requestAnimationFrame: typeof requestAnimationFrame;
+  cancelAnimationFrame: typeof cancelAnimationFrame;
+}
diff --git a/React/Views/RCTMaskedView.h b/types/private/Utilities.d.ts
similarity index 66%
rename from React/Views/RCTMaskedView.h
rename to types/private/Utilities.d.ts
index cab90b6cdca3..563cac81a023 100644
--- a/React/Views/RCTMaskedView.h
+++ b/types/private/Utilities.d.ts
@@ -1,14 +1,10 @@
-/*
+/**
  * 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
  */
 
-#import <UIKit/UIKit.h>
-
-#import <React/RCTView.h>
-
-@interface RCTMaskedView : RCTView
-
-@end
+export type Constructor<T> = new (...args: any[]) => T;
diff --git a/types/public/DeprecatedPropertiesAlias.d.ts b/types/public/DeprecatedPropertiesAlias.d.ts
new file mode 100644
index 000000000000..b7b1aa68254b
--- /dev/null
+++ b/types/public/DeprecatedPropertiesAlias.d.ts
@@ -0,0 +1,205 @@
+/**
+ * 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
+ */
+
+import {
+  TextProps,
+  TextPropsIOS,
+  TextPropsAndroid,
+  AccessibilityProps,
+  AccessibilityPropsIOS,
+  AccessibilityPropsAndroid,
+  TextInputProps,
+  TextInputIOSProps,
+  TextInputAndroidProps,
+  ViewProps,
+  ViewPropsIOS,
+  ViewPropsAndroid,
+  ScrollViewProps,
+  ScrollViewPropsIOS,
+  ScrollViewPropsAndroid,
+  InputAccessoryViewProps,
+  ActivityIndicatorProps,
+  ActivityIndicatorIOSProps,
+  DatePickerIOSProps,
+  DrawerLayoutAndroidProps,
+  ProgressBarAndroidProps,
+  ProgressViewIOSProps,
+  RefreshControlProps,
+  RefreshControlPropsIOS,
+  RefreshControlPropsAndroid,
+  SliderProps,
+  SliderPropsIOS,
+  SliderPropsAndroid,
+  ImageSourcePropType,
+  ImageProps,
+  ImagePropsIOS,
+  ImagePropsAndroid,
+  ImageBackgroundProps,
+  FlatListProps,
+  VirtualizedListProps,
+  SectionListProps,
+  ModalProps,
+  TouchableWithoutFeedbackProps,
+  TouchableHighlightProps,
+  TouchableOpacityProps,
+  TouchableNativeFeedbackProps,
+  ButtonProps,
+  StatusBarProps,
+  StatusBarPropsIOS,
+  StatusBarPropsAndroid,
+  SwitchProps,
+  SwitchPropsIOS,
+} from 'react-native';
+
+/*
+ * Previously, props interfaces where named *Properties
+ * They have been renamed to *Props to match React Native documentation
+ * The following lines ensure compatibility with *Properties and should be removed in the future
+ */
+
+/** @deprecated Use TextProps */
+export type TextProperties = TextProps;
+
+/** @deprecated Use TextPropsIOS */
+export type TextPropertiesIOS = TextPropsIOS;
+
+/** @deprecated Use TextPropsAndroid */
+export type TextPropertiesAndroid = TextPropsAndroid;
+
+/** @deprecated Use AccessibilityProps */
+export type AccessibilityProperties = AccessibilityProps;
+
+/** @deprecated Use AccessibilityPropsIOS */
+export type AccessibilityPropertiesIOS = AccessibilityPropsIOS;
+
+/** @deprecated Use AccessibilityPropsAndroid */
+export type AccessibilityPropertiesAndroid = AccessibilityPropsAndroid;
+
+/** @deprecated Use TextInputProps */
+export type TextInputProperties = TextInputProps;
+
+/** @deprecated Use TextInputIOSProps */
+export type TextInputIOSProperties = TextInputIOSProps;
+
+/** @deprecated Use TextInputAndroidProps */
+export type TextInputAndroidProperties = TextInputAndroidProps;
+
+/** @deprecated Use ViewProps */
+export type ViewProperties = ViewProps;
+
+/** @deprecated Use ViewPropsIOS */
+export type ViewPropertiesIOS = ViewPropsIOS;
+
+/** @deprecated Use ViewPropsAndroid */
+export type ViewPropertiesAndroid = ViewPropsAndroid;
+
+/** @deprecated Use ScrollViewProps */
+export type ScrollViewProperties = ScrollViewProps;
+
+/** @deprecated Use ScrollViewPropsIOS */
+export type ScrollViewPropertiesIOS = ScrollViewPropsIOS;
+
+/** @deprecated Use ScrollViewPropsAndroid */
+export type ScrollViewPropertiesAndroid = ScrollViewPropsAndroid;
+
+/** @deprecated Use InputAccessoryViewProps */
+export type InputAccessoryViewProperties = InputAccessoryViewProps;
+
+/** @deprecated Use ActivityIndicatorProps */
+export type ActivityIndicatorProperties = ActivityIndicatorProps;
+
+/** @deprecated Use ActivityIndicatorIOSProps */
+export type ActivityIndicatorIOSProperties = ActivityIndicatorIOSProps;
+
+/** @deprecated Use DatePickerIOSProps */
+export type DatePickerIOSProperties = DatePickerIOSProps;
+
+/** @deprecated Use DrawerLayoutAndroidProps */
+export type DrawerLayoutAndroidProperties = DrawerLayoutAndroidProps;
+
+/** @deprecated Use ProgressBarAndroidProps */
+export type ProgressBarAndroidProperties = ProgressBarAndroidProps;
+
+/** @deprecated Use ProgressViewIOSProps */
+export type ProgressViewIOSProperties = ProgressViewIOSProps;
+
+/** @deprecated Use RefreshControlProps */
+export type RefreshControlProperties = RefreshControlProps;
+
+/** @deprecated Use RefreshControlPropsIOS */
+export type RefreshControlPropertiesIOS = RefreshControlPropsIOS;
+
+/** @deprecated Use RefreshControlPropsAndroid */
+export type RefreshControlPropertiesAndroid = RefreshControlPropsAndroid;
+
+/** @deprecated Use SliderProps */
+export type SliderProperties = SliderProps;
+
+/** @deprecated Use SliderPropsIOS */
+export type SliderPropertiesIOS = SliderPropsIOS;
+
+/** @deprecated Use SliderPropsAndroid */
+export type SliderPropertiesAndroid = SliderPropsAndroid;
+
+/** @deprecated Use ImageSourcePropType */
+export type ImagePropertiesSourceOptions = ImageSourcePropType;
+
+/** @deprecated Use ImageProps */
+export type ImageProperties = ImageProps;
+
+/** @deprecated Use ImagePropsIOS */
+export type ImagePropertiesIOS = ImagePropsIOS;
+
+/** @deprecated Use ImagePropsAndroid */
+export type ImagePropertiesAndroid = ImagePropsAndroid;
+
+/** @deprecated Use ImageBackgroundProps */
+export type ImageBackgroundProperties = ImageBackgroundProps;
+
+/** @deprecated Use FlatListProps */
+export type FlatListProperties<ItemT> = FlatListProps<ItemT>;
+
+/** @deprecated Use VirtualizedListProps */
+export type VirtualizedListProperties<ItemT> = VirtualizedListProps<ItemT>;
+
+/** @deprecated Use SectionListProps */
+export type SectionListProperties<ItemT> = SectionListProps<ItemT>;
+
+/** @deprecated Use ModalProps */
+export type ModalProperties = ModalProps;
+
+/** @deprecated Use TouchableWithoutFeedbackProps */
+export type TouchableWithoutFeedbackProperties = TouchableWithoutFeedbackProps;
+
+/** @deprecated Use TouchableHighlightProps */
+export type TouchableHighlightProperties = TouchableHighlightProps;
+
+/** @deprecated Use TouchableOpacityProps */
+export type TouchableOpacityProperties = TouchableOpacityProps;
+
+/** @deprecated Use TouchableNativeFeedbackProps */
+export type TouchableNativeFeedbackProperties = TouchableNativeFeedbackProps;
+
+/** @deprecated Use ButtonProps */
+export type ButtonProperties = ButtonProps;
+
+/** @deprecated Use StatusBarProps */
+export type StatusBarProperties = StatusBarProps;
+
+/** @deprecated Use StatusBarPropsIOS */
+export type StatusBarPropertiesIOS = StatusBarPropsIOS;
+
+/** @deprecated Use StatusBarPropsAndroid */
+export type StatusBarPropertiesAndroid = StatusBarPropsAndroid;
+
+/** @deprecated Use SwitchProps */
+export type SwitchProperties = SwitchProps;
+
+/** @deprecated Use SwitchPropsIOS */
+export type SwitchPropertiesIOS = SwitchPropsIOS;
diff --git a/types/public/Insets.d.ts b/types/public/Insets.d.ts
new file mode 100644
index 000000000000..9f77753ecc16
--- /dev/null
+++ b/types/public/Insets.d.ts
@@ -0,0 +1,15 @@
+/**
+ * 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 Insets {
+  top?: number | undefined;
+  left?: number | undefined;
+  bottom?: number | undefined;
+  right?: number | undefined;
+}
diff --git a/types/public/ReactNativeRenderer.d.ts b/types/public/ReactNativeRenderer.d.ts
new file mode 100644
index 000000000000..542788c77b5b
--- /dev/null
+++ b/types/public/ReactNativeRenderer.d.ts
@@ -0,0 +1,149 @@
+/**
+ * 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
+ */
+
+import {GestureResponderEvent} from '../../Libraries/Types/CoreEventTypes';
+
+/**
+ * Gesture recognition on mobile devices is much more complicated than web.
+ * A touch can go through several phases as the app determines what the user's intention is.
+ * For example, the app needs to determine if the touch is scrolling, sliding on a widget, or tapping.
+ * This can even change during the duration of a touch. There can also be multiple simultaneous touches.
+ *
+ * The touch responder system is needed to allow components to negotiate these touch interactions
+ * without any additional knowledge about their parent or child components.
+ * This system is implemented in ResponderEventPlugin.js, which contains further details and documentation.
+ *
+ * Best Practices
+ * Users can feel huge differences in the usability of web apps vs. native, and this is one of the big causes.
+ * Every action should have the following attributes:
+ *      Feedback/highlighting- show the user what is handling their touch, and what will happen when they release the gesture
+ *      Cancel-ability- when making an action, the user should be able to abort it mid-touch by dragging their finger away
+ *
+ * These features make users more comfortable while using an app,
+ * because it allows people to experiment and interact without fear of making mistakes.
+ *
+ * TouchableHighlight and Touchable*
+ * The responder system can be complicated to use.
+ * So we have provided an abstract Touchable implementation for things that should be "tappable".
+ * This uses the responder system and allows you to easily configure tap interactions declaratively.
+ * Use TouchableHighlight anywhere where you would use a button or link on web.
+ */
+export interface GestureResponderHandlers {
+  /**
+   * A view can become the touch responder by implementing the correct negotiation methods.
+   * There are two methods to ask the view if it wants to become responder:
+   */
+
+  /**
+   * Does this view want to become responder on the start of a touch?
+   */
+  onStartShouldSetResponder?:
+    | ((event: GestureResponderEvent) => boolean)
+    | undefined;
+
+  /**
+   * Called for every touch move on the View when it is not the responder: does this view want to "claim" touch responsiveness?
+   */
+  onMoveShouldSetResponder?:
+    | ((event: GestureResponderEvent) => boolean)
+    | undefined;
+
+  /**
+   * If the View returns true and attempts to become the responder, one of the following will happen:
+   */
+
+  onResponderEnd?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * The View is now responding for touch events.
+   * This is the time to highlight and show the user what is happening
+   */
+  onResponderGrant?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * Something else is the responder right now and will not release it
+   */
+  onResponderReject?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * If the view is responding, the following handlers can be called:
+   */
+
+  /**
+   * The user is moving their finger
+   */
+  onResponderMove?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * Fired at the end of the touch, ie "touchUp"
+   */
+  onResponderRelease?: ((event: GestureResponderEvent) => void) | undefined;
+
+  onResponderStart?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   *  Something else wants to become responder.
+   *  Should this view release the responder? Returning true allows release
+   */
+  onResponderTerminationRequest?:
+    | ((event: GestureResponderEvent) => boolean)
+    | undefined;
+
+  /**
+   * The responder has been taken from the View.
+   * Might be taken by other views after a call to onResponderTerminationRequest,
+   * or might be taken by the OS without asking (happens with control center/ notification center on iOS)
+   */
+  onResponderTerminate?: ((event: GestureResponderEvent) => void) | undefined;
+
+  /**
+   * onStartShouldSetResponder and onMoveShouldSetResponder are called with a bubbling pattern,
+   * where the deepest node is called first.
+   * That means that the deepest component will become responder when multiple Views return true for *ShouldSetResponder handlers.
+   * This is desirable in most cases, because it makes sure all controls and buttons are usable.
+   *
+   * However, sometimes a parent will want to make sure that it becomes responder.
+   * This can be handled by using the capture phase.
+   * Before the responder system bubbles up from the deepest component,
+   * it will do a capture phase, firing on*ShouldSetResponderCapture.
+   * So if a parent View wants to prevent the child from becoming responder on a touch start,
+   * it should have a onStartShouldSetResponderCapture handler which returns true.
+   */
+  onStartShouldSetResponderCapture?:
+    | ((event: GestureResponderEvent) => boolean)
+    | undefined;
+
+  /**
+   * onStartShouldSetResponder and onMoveShouldSetResponder are called with a bubbling pattern,
+   * where the deepest node is called first.
+   * That means that the deepest component will become responder when multiple Views return true for *ShouldSetResponder handlers.
+   * This is desirable in most cases, because it makes sure all controls and buttons are usable.
+   *
+   * However, sometimes a parent will want to make sure that it becomes responder.
+   * This can be handled by using the capture phase.
+   * Before the responder system bubbles up from the deepest component,
+   * it will do a capture phase, firing on*ShouldSetResponderCapture.
+   * So if a parent View wants to prevent the child from becoming responder on a touch start,
+   * it should have a onStartShouldSetResponderCapture handler which returns true.
+   */
+  onMoveShouldSetResponderCapture?:
+    | ((event: GestureResponderEvent) => boolean)
+    | undefined;
+}
+
+/**
+ * React Native also implements unstable_batchedUpdates
+ */
+export function unstable_batchedUpdates<A, B>(
+  callback: (a: A, b: B) => any,
+  a: A,
+  b: B,
+): void;
+export function unstable_batchedUpdates<A>(callback: (a: A) => any, a: A): void;
+export function unstable_batchedUpdates(callback: () => any): void;
diff --git a/types/public/ReactNativeTypes.d.ts b/types/public/ReactNativeTypes.d.ts
new file mode 100644
index 000000000000..3acd235ac579
--- /dev/null
+++ b/types/public/ReactNativeTypes.d.ts
@@ -0,0 +1,143 @@
+/**
+ * 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
+ */
+
+import type * as React from 'react';
+
+export type MeasureOnSuccessCallback = (
+  x: number,
+  y: number,
+  width: number,
+  height: number,
+  pageX: number,
+  pageY: number,
+) => void;
+
+export type MeasureInWindowOnSuccessCallback = (
+  x: number,
+  y: number,
+  width: number,
+  height: number,
+) => void;
+
+export type MeasureLayoutOnSuccessCallback = (
+  left: number,
+  top: number,
+  width: number,
+  height: number,
+) => void;
+
+/**
+ * NativeMethods provides methods to access the underlying native component directly.
+ * This can be useful in cases when you want to focus a view or measure its on-screen dimensions,
+ * for example.
+ * The methods described here are available on most of the default components provided by React Native.
+ * Note, however, that they are not available on composite components that aren't directly backed by a
+ * native view. This will generally include most components that you define in your own app.
+ * For more information, see [Direct Manipulation](https://reactnative.dev/docs/direct-manipulation).
+ * @see https://github.com/facebook/react-native/blob/master/Libraries/Renderer/shims/ReactNativeTypes.js#L87
+ */
+export interface NativeMethods {
+  /**
+   * Determines the location on screen, width, and height of the given view and
+   * returns the values via an async callback. If successful, the callback will
+   * be called with the following arguments:
+   *
+   *  - x
+   *  - y
+   *  - width
+   *  - height
+   *  - pageX
+   *  - pageY
+   *
+   * Note that these measurements are not available until after the rendering
+   * has been completed in native. If you need the measurements as soon as
+   * possible, consider using the [`onLayout`
+   * prop](docs/view.html#onlayout) instead.
+   */
+  measure(callback: MeasureOnSuccessCallback): void;
+
+  /**
+   * Determines the location of the given view in the window and returns the
+   * values via an async callback. If the React root view is embedded in
+   * another native view, this will give you the absolute coordinates. If
+   * successful, the callback will be called with the following
+   * arguments:
+   *
+   *  - x
+   *  - y
+   *  - width
+   *  - height
+   *
+   * Note that these measurements are not available until after the rendering
+   * has been completed in native.
+   */
+  measureInWindow(callback: MeasureInWindowOnSuccessCallback): void;
+
+  /**
+   * Like [`measure()`](#measure), but measures the view relative an ancestor,
+   * specified as `relativeToNativeComponentRef`. This means that the returned x, y
+   * are relative to the origin x, y of the ancestor view.
+   * _Can also be called with a relativeNativeNodeHandle but is deprecated._
+   */
+  measureLayout(
+    relativeToNativeComponentRef:
+      | React.ElementRef<HostComponent<unknown>>
+      | number,
+    onSuccess: MeasureLayoutOnSuccessCallback,
+    onFail?: () => void,
+  ): void;
+
+  /**
+   * This function sends props straight to native. They will not participate in
+   * future diff process - this means that if you do not include them in the
+   * next render, they will remain active (see [Direct
+   * Manipulation](https://reactnative.dev/docs/direct-manipulation)).
+   */
+  setNativeProps(nativeProps: object): void;
+
+  /**
+   * Requests focus for the given input or view. The exact behavior triggered
+   * will depend on the platform and type of view.
+   */
+  focus(): void;
+
+  /**
+   * Removes focus from an input or view. This is the opposite of `focus()`.
+   */
+  blur(): void;
+
+  refs: {
+    [key: string]: React.Component<any, any>;
+  };
+}
+
+/**
+ * @deprecated Use NativeMethods instead.
+ */
+export type NativeMethodsMixin = NativeMethods;
+/**
+ * @deprecated Use NativeMethods instead.
+ */
+export type NativeMethodsMixinType = NativeMethods;
+
+/**
+ * Represents a native component, such as those returned from `requireNativeComponent`.
+ *
+ * @see https://github.com/facebook/react-native/blob/v0.62.0-rc.5/Libraries/Renderer/shims/ReactNativeTypes.js
+ *
+ * @todo This should eventually be defined as an AbstractComponent, but that
+ *       should first be introduced in the React typings.
+ */
+export interface HostComponent<P>
+  extends Pick<
+    React.ComponentClass<P>,
+    Exclude<keyof React.ComponentClass<P>, 'new'>
+  > {
+  new (props: P, context?: any): React.Component<P> & Readonly<NativeMethods>;
+}
diff --git a/types/tsconfig.json b/types/tsconfig.json
new file mode 100644
index 000000000000..7cabbef31792
--- /dev/null
+++ b/types/tsconfig.json
@@ -0,0 +1,15 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": ["es6"],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictFunctionTypes": true,
+      "strictNullChecks": true,
+      "types": [],
+      "jsx": "react",
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true,
+      "paths": {"react-native": ["."]}
+    }
+  }
diff --git a/types/tslint.json b/types/tslint.json
new file mode 100644
index 000000000000..18bca2db93ec
--- /dev/null
+++ b/types/tslint.json
@@ -0,0 +1,23 @@
+{
+  "extends": "@definitelytyped/dtslint/dtslint.json",
+  "rules": {
+    "array-type": false,
+    "ban-types": false,
+    "comment-format": false,
+    "interface-over-type-literal": false,
+    "jsdoc-format": false,
+    "max-line-length": false,
+    "no-declare-current-package": false,
+    "no-empty-interface": false,
+    "no-misused-new": false,
+    "no-self-import": false,
+    "no-single-declare-module": false,
+    "no-unnecessary-generics": false,
+    "prefer-declare-function": false,
+    "semicolon": false,
+    "strict-export-declare-modifiers": false,
+    "whitespace": false,
+    "use-default-type-parameter": false,
+    "no-redundant-jsdoc": false
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index 0adb083d6c98..79041538b23c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,53 +2,45 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.0.1.tgz#9a04a4aba7b8323b65498d9554a1bdd15d960296"
-  integrity sha512-EldHF4Ufj3NL9yCAmYrPzY+3/Yqrzxu24F4Mu4nRjK3w70AKYRmhuLwGZdA9JeoDsbIwkgGkbqUK2INuF582Og==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/trace-mapping" "^0.2.2"
-    sourcemap-codec "1.4.8"
-
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
-  dependencies:
-    "@babel/highlight" "^7.16.7"
-
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.8", "@babel/compat-data@^7.16.4":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
-  integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
-
-"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.14.0", "@babel/core@^7.7.5":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.0.tgz#16b8772b0a567f215839f689c5ded6bb20e864d5"
-  integrity sha512-x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA==
-  dependencies:
-    "@ampproject/remapping" "^2.0.0"
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.0"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helpers" "^7.17.0"
-    "@babel/parser" "^7.17.0"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.0"
-    "@babel/types" "^7.17.0"
+"@ampproject/remapping@^2.1.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
+  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
+  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+  dependencies:
+    "@babel/highlight" "^7.18.6"
+
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.18.8", "@babel/compat-data@^7.19.3":
+  version "7.19.3"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.3.tgz#707b939793f867f5a73b2666e6d9a3396eb03151"
+  integrity sha512-prBHMK4JYYK+wDjJF1q99KK4JLL+egWS4nmNqdlMUgCExMZ+iZW0hGhyC3VEbsPjvaN0TBhW//VIFwBrk8sEiw==
+
+"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.14.0":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.1.tgz#c8fa615c5e88e272564ace3d42fbc8b17bfeb22b"
+  integrity sha512-1H8VgqXme4UXCRv7/Wa1bq7RVymKOzC7znjyFM8KiEzwFqcKUKYNoQef4GhdklgNvoBXyW4gYhuBNCM5o1zImw==
+  dependencies:
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.19.0"
+    "@babel/helper-compilation-targets" "^7.19.1"
+    "@babel/helper-module-transforms" "^7.19.0"
+    "@babel/helpers" "^7.19.0"
+    "@babel/parser" "^7.19.1"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.19.1"
+    "@babel/types" "^7.19.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
+    json5 "^2.2.1"
     semver "^6.3.0"
 
 "@babel/eslint-parser@^7.18.2":
@@ -60,60 +52,61 @@
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.0"
 
-"@babel/generator@^7.14.0", "@babel/generator@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz#7bd890ba706cd86d3e2f727322346ffdbf98f65e"
-  integrity sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw==
+"@babel/generator@^7.14.0", "@babel/generator@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.0.tgz#785596c06425e59334df2ccee63ab166b738419a"
+  integrity sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==
   dependencies:
-    "@babel/types" "^7.17.0"
+    "@babel/types" "^7.19.0"
+    "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
-    source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.12.13", "@babel/helper-annotate-as-pure@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
-  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
+"@babel/generator@^7.20.0", "@babel/generator@^7.7.2":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95"
+  integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.20.5"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    jsesc "^2.5.1"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
-  integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==
+"@babel/helper-annotate-as-pure@^7.12.13", "@babel/helper-annotate-as-pure@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
+  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.12.13"
-    "@babel/types" "^7.12.13"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.8", "@babel/helper-compilation-targets@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b"
-  integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.19.0", "@babel/helper-compilation-targets@^7.19.1":
+  version "7.19.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz#a10a04588125675d7c7ae299af86fa1b2ee038ca"
+  integrity sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==
   dependencies:
-    "@babel/compat-data" "^7.16.4"
-    "@babel/helper-validator-option" "^7.16.7"
-    browserslist "^4.17.5"
+    "@babel/compat-data" "^7.19.3"
+    "@babel/helper-validator-option" "^7.18.6"
+    browserslist "^4.21.3"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.16.7":
-  version "7.16.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz#8a6959b9cc818a88815ba3c5474619e9c0f2c21c"
-  integrity sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==
+"@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.18.6":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b"
+  integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.9"
+    "@babel/helper-split-export-declaration" "^7.18.6"
 
-"@babel/helper-create-regexp-features-plugin@^7.12.13", "@babel/helper-create-regexp-features-plugin@^7.16.7":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1"
-  integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz#7976aca61c0984202baca73d84e2337a5424a41b"
+  integrity sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    regexpu-core "^5.0.1"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    regexpu-core "^5.1.0"
 
 "@babel/helper-define-polyfill-provider@^0.2.0":
   version "0.2.0"
@@ -129,183 +122,178 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
-  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-explode-assignable-expression@^7.12.13":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f"
-  integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==
-  dependencies:
-    "@babel/types" "^7.13.0"
-
-"@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
-  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-get-function-arity@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
-  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-hoist-variables@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
-  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-member-expression-to-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0"
-  integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
-  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-module-transforms@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41"
-  integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-simple-access" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-optimise-call-expression@^7.12.13", "@babel/helper-optimise-call-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
-  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.17.12", "@babel/helper-plugin-utils@^7.8.0":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz#86c2347da5acbf5583ba0a10aed4c9bf9da9cf96"
-  integrity sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==
-
-"@babel/helper-remap-async-to-generator@^7.13.0", "@babel/helper-remap-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
-  integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-wrap-function" "^7.16.8"
-    "@babel/types" "^7.16.8"
-
-"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0", "@babel/helper-replace-supers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
-  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-simple-access@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7"
-  integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.12.1", "@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
-  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
-  dependencies:
-    "@babel/types" "^7.16.0"
-
-"@babel/helper-split-export-declaration@^7.12.13", "@babel/helper-split-export-declaration@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
-  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-validator-identifier@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
-  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
-
-"@babel/helper-validator-option@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
-  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
-
-"@babel/helper-wrap-function@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
-  integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
-  dependencies:
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.8"
-    "@babel/types" "^7.16.8"
-
-"@babel/helpers@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.0.tgz#79cdf6c66a579f3a7b5e739371bc63ca0306886b"
-  integrity sha512-Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ==
-  dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.0"
-    "@babel/types" "^7.17.0"
-
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7":
-  version "7.16.10"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88"
-  integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
+"@babel/helper-environment-visitor@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
+  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
+
+"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
+  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
+  dependencies:
+    "@babel/template" "^7.18.10"
+    "@babel/types" "^7.19.0"
+
+"@babel/helper-hoist-variables@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
+  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-member-expression-to-functions@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815"
+  integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==
+  dependencies:
+    "@babel/types" "^7.18.9"
+
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
+  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz#309b230f04e22c58c6a2c0c0c7e50b216d350c30"
+  integrity sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.19.0"
+    "@babel/types" "^7.19.0"
+
+"@babel/helper-optimise-call-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
+  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf"
+  integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==
+
+"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
+  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-wrap-function" "^7.18.9"
+    "@babel/types" "^7.18.9"
+
+"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.18.9":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz#e1592a9b4b368aa6bdb8784a711e0bcbf0612b78"
+  integrity sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/traverse" "^7.19.1"
+    "@babel/types" "^7.19.0"
+
+"@babel/helper-simple-access@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea"
+  integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818"
+  integrity sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==
+  dependencies:
+    "@babel/types" "^7.18.9"
+
+"@babel/helper-split-export-declaration@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
+  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-string-parser@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
+  integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
+
+"@babel/helper-string-parser@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
+  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
+
+"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
+  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
+
+"@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
+  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
+
+"@babel/helper-wrap-function@^7.18.9":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz#89f18335cff1152373222f76a4b37799636ae8b1"
+  integrity sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==
+  dependencies:
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.19.0"
+    "@babel/types" "^7.19.0"
+
+"@babel/helpers@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.0.tgz#f30534657faf246ae96551d88dd31e9d1fa1fc18"
+  integrity sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==
+  dependencies:
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.19.0"
+    "@babel/types" "^7.19.0"
+
+"@babel/highlight@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
+  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.18.6"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c"
-  integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==
+"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.1.tgz#6f6d6c2e621aad19a92544cc217ed13f1aac5b4c"
+  integrity sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==
 
 "@babel/plugin-proposal-async-generator-functions@^7.0.0":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
-  integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz#34f6f5174b688529342288cd264f80c9ea9fb4a7"
+  integrity sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-remap-async-to-generator" "^7.18.9"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
 "@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.13.0":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
-  integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-proposal-export-default-from@^7.0.0":
   version "7.12.13"
@@ -316,39 +304,39 @@
     "@babel/plugin-syntax-export-default-from" "^7.12.13"
 
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
-  integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
+  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
 "@babel/plugin-proposal-object-rest-spread@^7.0.0":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz#5d210a4d727d6ce3b18f9de82cc99a3964eed60a"
-  integrity sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz#f9434f6beb2c8cae9dfcf97d2a5941bbbf9ad4e7"
+  integrity sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==
   dependencies:
-    "@babel/compat-data" "^7.13.8"
-    "@babel/helper-compilation-targets" "^7.13.8"
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/compat-data" "^7.18.8"
+    "@babel/helper-compilation-targets" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.13.0"
+    "@babel/plugin-transform-parameters" "^7.18.8"
 
 "@babel/plugin-proposal-optional-catch-binding@^7.0.0":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107"
-  integrity sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
+  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
 "@babel/plugin-proposal-optional-chaining@^7.0.0", "@babel/plugin-proposal-optional-chaining@^7.13.12":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
-  integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993"
+  integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
@@ -386,12 +374,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.17.12", "@babel/plugin-syntax-flow@^7.2.0":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.17.12.tgz#23d852902acd19f42923fca9d0f196984d124e73"
-  integrity sha512-B8QIgBvkIG6G2jgsOHQUist7Sm0EBLDCx8sen072IwqNuzMegZNXrYnSv77cYzA8mLDZAfQYqsLIhimiP1s2HQ==
+"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.18.6", "@babel/plugin-syntax-flow@^7.2.0":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz#774d825256f2379d06139be0c723c4dd444f3ca1"
+  integrity sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
@@ -407,12 +395,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz#044fb81ebad6698fe62c478875575bcbb9b70f15"
-  integrity sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g==
+"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.12.13", "@babel/plugin-syntax-jsx@^7.7.2":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0"
+  integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
@@ -463,153 +451,149 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8"
-  integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==
+"@babel/plugin-syntax-typescript@^7.16.7", "@babel/plugin-syntax-typescript@^7.7.2":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz#1c09cd25795c7c2b8a4ba9ae49394576d4133285"
+  integrity sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-arrow-functions@^7.0.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
-  integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe"
+  integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-async-to-generator@^7.0.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f"
-  integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615"
+  integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==
   dependencies:
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-remap-async-to-generator" "^7.13.0"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-remap-async-to-generator" "^7.18.6"
 
 "@babel/plugin-transform-block-scoped-functions@^7.0.0":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
-  integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
+  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-block-scoping@^7.0.0":
-  version "7.14.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz#ac1b3a8e3d8cbb31efc6b9be2f74eb9823b74ab2"
-  integrity sha512-2mQXd0zBrwfp0O1moWIhPpEeTKDvxyHcnma3JATVP1l+CctWBuot6OJG8LQ4DnBj4ZZPSmlb/fm4mu47EOAnVA==
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz#f9b7e018ac3f373c81452d6ada8bd5a18928926d"
+  integrity sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-classes@^7.0.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b"
-  integrity sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.12.13"
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-replace-supers" "^7.13.0"
-    "@babel/helper-split-export-declaration" "^7.12.13"
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz#0e61ec257fba409c41372175e7c1e606dc79bb20"
+  integrity sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.19.0"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-replace-supers" "^7.18.9"
+    "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.0.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"
-  integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e"
+  integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-destructuring@^7.0.0":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz#678d96576638c19d5b36b332504d3fd6e06dea27"
-  integrity sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA==
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz#9e03bc4a94475d62b7f4114938e6c5c33372cbf5"
+  integrity sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-exponentiation-operator@^7.0.0":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
-  integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-flow-strip-types@^7.0.0", "@babel/plugin-transform-flow-strip-types@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.17.12.tgz#5e070f99a4152194bd9275de140e83a92966cab3"
-  integrity sha512-g8cSNt+cHCpG/uunPQELdq/TeV3eg1OLJYwxypwHtAWo9+nErH3lQx9CSO2uI9lF74A0mR0t4KoMjs1snSgnTw==
+"@babel/plugin-transform-flow-strip-types@^7.0.0", "@babel/plugin-transform-flow-strip-types@^7.18.6":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.19.0.tgz#e9e8606633287488216028719638cbbb2f2dde8f"
+  integrity sha512-sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/plugin-syntax-flow" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/plugin-syntax-flow" "^7.18.6"
 
 "@babel/plugin-transform-for-of@^7.0.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062"
-  integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==
+  version "7.18.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1"
+  integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-function-name@^7.0.0":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
-  integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
+  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
   dependencies:
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-compilation-targets" "^7.18.9"
+    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-literals@^7.0.0":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
-  integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
+  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-member-expression-literals@^7.0.0":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
-  integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
+  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.13.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe"
-  integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz#afd243afba166cca69892e24a8fd8c9f2ca87883"
+  integrity sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-simple-access" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-simple-access" "^7.18.6"
     babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.0.0":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
-  integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz#ec7455bab6cd8fb05c525a94876f435a48128888"
+  integrity sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
 "@babel/plugin-transform-object-super@^7.0.0":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
-  integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
+  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/helper-replace-supers" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.6"
 
-"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz#8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007"
-  integrity sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==
+"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.18.8":
+  version "7.18.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz#ee9f1a0ce6d78af58d0956a9378ea3427cccb48a"
+  integrity sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-property-literals@^7.0.0":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
-  integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
+  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-react-display-name@^7.0.0":
   version "7.12.13"
@@ -644,11 +628,12 @@
     "@babel/types" "^7.13.12"
 
 "@babel/plugin-transform-regenerator@^7.0.0":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39"
-  integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73"
+  integrity sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==
   dependencies:
-    regenerator-transform "^0.14.2"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    regenerator-transform "^0.15.0"
 
 "@babel/plugin-transform-runtime@^7.0.0":
   version "7.13.15"
@@ -663,33 +648,33 @@
     semver "^6.3.0"
 
 "@babel/plugin-transform-shorthand-properties@^7.0.0":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
-  integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
+  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-spread@^7.0.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd"
-  integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6"
+  integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
 
 "@babel/plugin-transform-sticky-regex@^7.0.0":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
-  integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
+  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-template-literals@^7.0.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d"
-  integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
+  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-typescript@^7.16.7", "@babel/plugin-transform-typescript@^7.5.0":
   version "7.16.8"
@@ -701,21 +686,21 @@
     "@babel/plugin-syntax-typescript" "^7.16.7"
 
 "@babel/plugin-transform-unicode-regex@^7.0.0":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
-  integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
+  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/preset-flow@^7.13.13", "@babel/preset-flow@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.17.12.tgz#664a5df59190260939eee862800a255bef3bd66f"
-  integrity sha512-7QDz7k4uiaBdu7N89VKjUn807pJRXmdirQu0KyR9LXnQrr5Jt41eIMKTS7ljej+H29erwmMrwq9Io9mJHLI3Lw==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.18.6.tgz#83f7602ba566e72a9918beefafef8ef16d2810cb"
+  integrity sha512-E7BDhL64W6OUqpuyHnSroLnqyRTcG6ZdOBl1OKI/QK/HJfplqK/S3sq1Cckx7oTodJ5yOXyfw7rEADJ6UjoQDQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-validator-option" "^7.16.7"
-    "@babel/plugin-transform-flow-strip-types" "^7.17.12"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-validator-option" "^7.18.6"
+    "@babel/plugin-transform-flow-strip-types" "^7.18.6"
 
 "@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.15.0":
   version "7.16.7"
@@ -745,44 +730,54 @@
     core-js-pure "^3.19.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.8.4":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72"
-  integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.18.3", "@babel/runtime@^7.8.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.6.tgz#6a1ef59f838debd670421f8c7f2cbb8da9751580"
+  integrity sha512-t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.0.0", "@babel/template@^7.16.7", "@babel/template@^7.3.3":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
-  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.7.4":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz#3143e5066796408ccc880a33ecd3184f3e75cd30"
-  integrity sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.0"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.17.0"
-    "@babel/types" "^7.17.0"
+"@babel/template@^7.0.0", "@babel/template@^7.18.10", "@babel/template@^7.3.3":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
+  integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/parser" "^7.18.10"
+    "@babel/types" "^7.18.10"
+
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.7.2", "@babel/traverse@^7.7.4":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.1.tgz#0fafe100a8c2a603b4718b1d9bf2568d1d193347"
+  integrity sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.19.0"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.19.1"
+    "@babel/types" "^7.19.0"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
-  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
+"@babel/types@^7.0.0", "@babel/types@^7.13.12", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
+  version "7.19.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.3.tgz#fc420e6bbe54880bce6779ffaf315f5e43ec9624"
+  integrity sha512-hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw==
+  dependencies:
+    "@babel/helper-string-parser" "^7.18.10"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.20.0", "@babel/types@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84"
+  integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
@@ -790,27 +785,78 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@cnakazawa/watch@^1.0.3":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
-  integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
+"@definitelytyped/dts-critic@^0.0.127":
+  version "0.0.127"
+  resolved "https://registry.yarnpkg.com/@definitelytyped/dts-critic/-/dts-critic-0.0.127.tgz#eacdd8fd32bee501d597854e68088e202e01166f"
+  integrity sha512-9atIPvUzleMTnT6mdqSIk4lMYyTCCPW9omKwQx5yDz2BSbCvz2UGzwrYADCkAB+OynOfjefVvzcUIC0M6asVEw==
   dependencies:
-    exec-sh "^0.3.2"
-    minimist "^1.2.0"
+    "@definitelytyped/header-parser" "^0.0.127"
+    command-exists "^1.2.8"
+    rimraf "^3.0.2"
+    semver "^6.2.0"
+    tmp "^0.2.1"
+    yargs "^15.3.1"
 
-"@eslint/eslintrc@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
-  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
+"@definitelytyped/dtslint@^0.0.127":
+  version "0.0.127"
+  resolved "https://registry.yarnpkg.com/@definitelytyped/dtslint/-/dtslint-0.0.127.tgz#38f8322a0e90d5c01e4a98fcaa05377e9b42100a"
+  integrity sha512-3UAVWRz6G+rbfV/elxMpdpqrDSYPugj4jQjs+SgsJLVLoQOsCXhIv1k2ibgNc5YKWxuw70Z/kRig8jYN49STww==
+  dependencies:
+    "@definitelytyped/dts-critic" "^0.0.127"
+    "@definitelytyped/header-parser" "^0.0.127"
+    "@definitelytyped/typescript-versions" "^0.0.127"
+    "@definitelytyped/utils" "^0.0.127"
+    "@typescript-eslint/eslint-plugin" "^5.30.0"
+    "@typescript-eslint/parser" "^5.30.0"
+    "@typescript-eslint/utils" "^5.30.0"
+    eslint "^8.17.0"
+    fs-extra "^6.0.1"
+    json-stable-stringify "^1.0.1"
+    strip-json-comments "^2.0.1"
+    tslint "5.14.0"
+    yargs "^15.1.0"
+
+"@definitelytyped/header-parser@^0.0.127":
+  version "0.0.127"
+  resolved "https://registry.yarnpkg.com/@definitelytyped/header-parser/-/header-parser-0.0.127.tgz#2283c5f9acb29a7adaacf09100f851fbb5af127e"
+  integrity sha512-4BvTT/EXZPqkmpw/mhg7inbaLI16Sq1E7K6QeWoTGU60mf8sfB7me7Kta+/EYZptZzyyt/xR6I7MnptWuDCoPw==
+  dependencies:
+    "@definitelytyped/typescript-versions" "^0.0.127"
+    "@types/parsimmon" "^1.10.1"
+    parsimmon "^1.13.0"
+
+"@definitelytyped/typescript-versions@^0.0.127":
+  version "0.0.127"
+  resolved "https://registry.yarnpkg.com/@definitelytyped/typescript-versions/-/typescript-versions-0.0.127.tgz#40bde1d1e78fea772bef7ff9aacaec94a1113991"
+  integrity sha512-q/vGlB0sVOKeEj4L661MmYPmBBzfZltG/unjsFGBaglu1zz9BIuhSW3NYPeiPrtq8OyrwtR6slet22b2SH/xyw==
+
+"@definitelytyped/utils@^0.0.127":
+  version "0.0.127"
+  resolved "https://registry.yarnpkg.com/@definitelytyped/utils/-/utils-0.0.127.tgz#d2d485bfbef947af15cfadb7fe9fd55a0db45f70"
+  integrity sha512-EBpYDuYt8T9i63k/jBjWgF7Gr6YebKUiKaNH5kWkIfvGAC1NfyruhxBT40pFTcKICt02/w4Bws/AcjEEekWyww==
+  dependencies:
+    "@definitelytyped/typescript-versions" "^0.0.127"
+    "@qiwi/npm-registry-client" "^8.9.1"
+    "@types/node" "^14.14.35"
+    charm "^1.0.2"
+    fs-extra "^8.1.0"
+    fstream "^1.0.12"
+    tar "^6.1.11"
+    tar-stream "^2.1.4"
+
+"@eslint/eslintrc@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.2.tgz#58b69582f3b7271d8fa67fe5251767a5b38ea356"
+  integrity sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==
   dependencies:
     ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
-    globals "^13.9.0"
-    ignore "^4.0.6"
+    debug "^4.3.2"
+    espree "^9.4.0"
+    globals "^13.15.0"
+    ignore "^5.2.0"
     import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
 "@hapi/hoek@^9.0.0":
@@ -825,16 +871,26 @@
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
-"@humanwhocodes/config-array@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
-  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+"@humanwhocodes/config-array@^0.10.4":
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.4.tgz#01e7366e57d2ad104feea63e72248f22015c520c"
+  integrity sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.0"
+    "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
     minimatch "^3.0.4"
 
-"@humanwhocodes/object-schema@^1.2.0":
+"@humanwhocodes/gitignore-to-minimatch@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
+  integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
@@ -855,172 +911,192 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/console@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2"
-  integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==
+"@jest/console@^29.2.1":
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.2.1.tgz#5f2c62dcdd5ce66e94b6d6729e021758bceea090"
+  integrity sha512-MF8Adcw+WPLZGBiNxn76DOuczG3BhODTcMlDCA4+cFi41OkaY/lyI0XUUhi73F88Y+7IHoGmD80pN5CtxQUdSw==
   dependencies:
-    "@jest/types" "^26.6.2"
+    "@jest/types" "^29.2.1"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^26.6.2"
-    jest-util "^26.6.2"
+    jest-message-util "^29.2.1"
+    jest-util "^29.2.1"
     slash "^3.0.0"
 
-"@jest/core@^26.6.3":
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad"
-  integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==
+"@jest/core@^29.2.1":
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.2.1.tgz#30af794ebd73bfb87cd8ba36718738dfe38b772e"
+  integrity sha512-kuLKYqnqgerXkBUwlHVxeSuhSnd+JMnMCLfU98bpacBSfWEJPegytDh3P2m15/JHzet32hGGld4KR4OzMb6/Tg==
   dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/reporters" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/console" "^29.2.1"
+    "@jest/reporters" "^29.2.1"
+    "@jest/test-result" "^29.2.1"
+    "@jest/transform" "^29.2.1"
+    "@jest/types" "^29.2.1"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
+    ci-info "^3.2.0"
     exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-changed-files "^26.6.2"
-    jest-config "^26.6.3"
-    jest-haste-map "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.2"
-    jest-resolve-dependencies "^26.6.3"
-    jest-runner "^26.6.3"
-    jest-runtime "^26.6.3"
-    jest-snapshot "^26.6.2"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
-    jest-watcher "^26.6.2"
-    micromatch "^4.0.2"
-    p-each-series "^2.1.0"
-    rimraf "^3.0.0"
+    graceful-fs "^4.2.9"
+    jest-changed-files "^29.2.0"
+    jest-config "^29.2.1"
+    jest-haste-map "^29.2.1"
+    jest-message-util "^29.2.1"
+    jest-regex-util "^29.2.0"
+    jest-resolve "^29.2.1"
+    jest-resolve-dependencies "^29.2.1"
+    jest-runner "^29.2.1"
+    jest-runtime "^29.2.1"
+    jest-snapshot "^29.2.1"
+    jest-util "^29.2.1"
+    jest-validate "^29.2.1"
+    jest-watcher "^29.2.1"
+    micromatch "^4.0.4"
+    pretty-format "^29.2.1"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/create-cache-key-function@^27.0.1":
-  version "27.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/create-cache-key-function/-/create-cache-key-function-27.0.1.tgz#93f36e543e67a84ef1430e456b750d2271738e90"
-  integrity sha512-cnJPO3//4BXpydHjo7nuI+L7YUktxwWeRCYlRhk6faNuiZpqLbhGZhNOMo8fOcuf3+80UP5vLqDvwM4XcDLpcA==
+"@jest/create-cache-key-function@^29.2.1":
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/@jest/create-cache-key-function/-/create-cache-key-function-29.2.1.tgz#5f168051001ffea318b720cd6062daaf0b074913"
+  integrity sha512-///wxGQUyP0GCr3L1OcqIzhsKvN2gOyqWsRxs56XGCdD8EEuoKg857G9nC+zcWIpIsG+3J5UnEbhe3LJw8CNmQ==
   dependencies:
-    "@jest/types" "^27.0.1"
+    "@jest/types" "^29.2.1"
 
-"@jest/environment@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c"
-  integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==
+"@jest/environment@^29.2.1":
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.2.1.tgz#acb1994fbd5ad02819a1a34a923c531e6923b665"
+  integrity sha512-EutqA7T/X6zFjw6mAWRHND+ZkTPklmIEWCNbmwX6uCmOrFrWaLbDZjA+gePHJx6fFMMRvNfjXcvzXEtz54KPlg==
   dependencies:
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/fake-timers" "^29.2.1"
+    "@jest/types" "^29.2.1"
     "@types/node" "*"
-    jest-mock "^26.6.2"
+    jest-mock "^29.2.1"
 
-"@jest/fake-timers@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad"
-  integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==
+"@jest/expect-utils@^29.2.1":
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.2.1.tgz#eae61c90f2066540f60d23b8f254f03b7869b22f"
+  integrity sha512-yr4aHNg5Z1CjKby5ozm7sKjgBlCOorlAoFcvrOQ/4rbZRfgZQdnmh7cth192PYIgiPZo2bBXvqdOApnAMWFJZg==
   dependencies:
-    "@jest/types" "^26.6.2"
-    "@sinonjs/fake-timers" "^6.0.1"
+    jest-get-type "^29.2.0"
+
+"@jest/expect@^29.2.1":
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.2.1.tgz#8d99be3886ebfcffd6cabb2b46602a301b976ffe"
+  integrity sha512-o14R2t2tHHHudwji43UKkzmmH49xfF5T++FQBK2tl88qwuBWQOcx7fNUYl+mA/9TPNAN0FkQ3usnpyS8FUwsvQ==
+  dependencies:
+    expect "^29.2.1"
+    jest-snapshot "^29.2.1"
+
+"@jest/fake-timers@^29.2.1":
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.2.1.tgz#786d60e8cb60ca70c9f913cb49fcc77610c072bb"
+  integrity sha512-KWil+8fef7Uj/P/PTZlPKk1Pw117wAmr71VWFV8ZDtRtkwmTG8oY4IRf0Ss44J2y5CYRy8d/zLOhxyoGRENjvA==
+  dependencies:
+    "@jest/types" "^29.2.1"
+    "@sinonjs/fake-timers" "^9.1.2"
     "@types/node" "*"
-    jest-message-util "^26.6.2"
-    jest-mock "^26.6.2"
-    jest-util "^26.6.2"
+    jest-message-util "^29.2.1"
+    jest-mock "^29.2.1"
+    jest-util "^29.2.1"
 
-"@jest/globals@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a"
-  integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==
+"@jest/globals@^29.2.1":
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.2.1.tgz#6933beb8b4e43b990409a19c462fde7b71210e63"
+  integrity sha512-Z4EejYPP1OPVq2abk1+9urAwJqkgw5jB2UJGlPjb5ZwzPQF8WLMcigKEfFzZb2OHhEVPP0RZD0/DbVTY1R6iQA==
   dependencies:
-    "@jest/environment" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    expect "^26.6.2"
+    "@jest/environment" "^29.2.1"
+    "@jest/expect" "^29.2.1"
+    "@jest/types" "^29.2.1"
+    jest-mock "^29.2.1"
 
-"@jest/reporters@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6"
-  integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==
+"@jest/reporters@^29.2.1":
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.2.1.tgz#599e4376823751fdda50f2ca97243e013da10c4d"
+  integrity sha512-sCsfUKM/yIF4nNed3e/rIgVIS58EiASGMDEPWqItfLZ9UO1ALW2ASDNJzdWkxEt0T8o2Ztj619G0KKrvK+McAw==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/console" "^29.2.1"
+    "@jest/test-result" "^29.2.1"
+    "@jest/transform" "^29.2.1"
+    "@jest/types" "^29.2.1"
+    "@jridgewell/trace-mapping" "^0.3.15"
+    "@types/node" "*"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
-    glob "^7.1.2"
-    graceful-fs "^4.2.4"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
     istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^4.0.3"
+    istanbul-lib-instrument "^5.1.0"
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.0.2"
-    jest-haste-map "^26.6.2"
-    jest-resolve "^26.6.2"
-    jest-util "^26.6.2"
-    jest-worker "^26.6.2"
+    istanbul-reports "^3.1.3"
+    jest-message-util "^29.2.1"
+    jest-util "^29.2.1"
+    jest-worker "^29.2.1"
     slash "^3.0.0"
-    source-map "^0.6.0"
     string-length "^4.0.1"
-    terminal-link "^2.0.0"
-    v8-to-istanbul "^7.0.0"
-  optionalDependencies:
-    node-notifier "^8.0.0"
+    strip-ansi "^6.0.0"
+    v8-to-istanbul "^9.0.1"
 
-"@jest/source-map@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535"
-  integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==
+"@jest/schemas@^29.0.0":
+  version "29.0.0"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a"
+  integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA==
+  dependencies:
+    "@sinclair/typebox" "^0.24.1"
+
+"@jest/source-map@^29.2.0":
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.2.0.tgz#ab3420c46d42508dcc3dc1c6deee0b613c235744"
+  integrity sha512-1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.15"
     callsites "^3.0.0"
-    graceful-fs "^4.2.4"
-    source-map "^0.6.0"
+    graceful-fs "^4.2.9"
 
-"@jest/test-result@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18"
-  integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==
+"@jest/test-result@^29.2.1":
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.2.1.tgz#f42dbf7b9ae465d0a93eee6131473b8bb3bd2edb"
+  integrity sha512-lS4+H+VkhbX6z64tZP7PAUwPqhwj3kbuEHcaLuaBuB+riyaX7oa1txe0tXgrFj5hRWvZKvqO7LZDlNWeJ7VTPA==
   dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/console" "^29.2.1"
+    "@jest/types" "^29.2.1"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^26.6.3":
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17"
-  integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==
+"@jest/test-sequencer@^29.2.1":
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.2.1.tgz#cafd2c5f3528c70bd4cc243800459ac366e480cc"
+  integrity sha512-O/pnk0/xGj3lxPVNwB6HREJ7AYvUdyP2xo/s14/9Dtf091HoOeyIhWLKQE/4HzB8lNQBMo6J5mg0bHz/uCWK7w==
   dependencies:
-    "@jest/test-result" "^26.6.2"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^26.6.2"
-    jest-runner "^26.6.3"
-    jest-runtime "^26.6.3"
+    "@jest/test-result" "^29.2.1"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.2.1"
+    slash "^3.0.0"
 
-"@jest/transform@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"
-  integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==
+"@jest/transform@^29.2.1":
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.2.1.tgz#f3d8154edd19cdbcaf1d6646bd8f4ff7812318a2"
+  integrity sha512-xup+iEuaIRSQabQaeqxaQyN0vg1Dctrp9oTObQsNf3sZEowTIa5cANYuoyi8Tqhg4GCqEVLTf18KW7ii0UeFVA==
   dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/types" "^26.6.2"
-    babel-plugin-istanbul "^6.0.0"
+    "@babel/core" "^7.11.6"
+    "@jest/types" "^29.2.1"
+    "@jridgewell/trace-mapping" "^0.3.15"
+    babel-plugin-istanbul "^6.1.1"
     chalk "^4.0.0"
     convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-util "^26.6.2"
-    micromatch "^4.0.2"
-    pirates "^4.0.1"
+    fast-json-stable-stringify "^2.1.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.2.1"
+    jest-regex-util "^29.2.0"
+    jest-util "^29.2.1"
+    micromatch "^4.0.4"
+    pirates "^4.0.4"
     slash "^3.0.0"
-    source-map "^0.6.1"
-    write-file-atomic "^3.0.0"
+    write-file-atomic "^4.0.1"
 
 "@jest/types@^24.9.0":
   version "24.9.0"
@@ -1042,10 +1118,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@jest/types@^27.0.1", "@jest/types@^27.4.2":
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.4.2.tgz#96536ebd34da6392c2b7c7737d693885b5dd44a5"
-  integrity sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==
+"@jest/types@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
+  integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
@@ -1053,18 +1129,65 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
+"@jest/types@^29.2.1":
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.2.1.tgz#ec9c683094d4eb754e41e2119d8bdaef01cf6da0"
+  integrity sha512-O/QNDQODLnINEPAI0cl9U6zUIDXEWXt6IC1o2N2QENuos7hlGUIthlKyV4p6ki3TvXFX071blj8HUhgLGquPjw==
+  dependencies:
+    "@jest/schemas" "^29.0.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.8"
+    chalk "^4.0.0"
+
+"@jridgewell/gen-mapping@^0.1.0":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
+  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.0"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
+"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
+  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
 "@jridgewell/resolve-uri@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.3.tgz#b80093f4edbb5490c49746231513669c8f518acb"
   integrity sha512-fuIOnc81C5iRNevb/XPiM8Khp9bVjreydRQ37rt0C/dY0PAW1DRvEM3WrKX/5rStS5lbgwS0FCgqSndh9tvK5w==
 
-"@jridgewell/trace-mapping@^0.2.2":
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.2.2.tgz#77510cc2f6f3b92e78c78de216d42de631b1d7fb"
-  integrity sha512-I9AGQzMPEzQNJgib2YSqciYWazGsXSyu1rEEeaPeM1764ZtnfNTxA5bofzG/POMI3QcvpBUxwecOPZM6ZhkEpg==
+"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+
+"@jridgewell/source-map@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
+  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774"
+  integrity sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==
   dependencies:
     "@jridgewell/resolve-uri" "^3.0.3"
-    sourcemap-codec "1.4.8"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -1087,42 +1210,62 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@react-native-community/cli-clean@^9.0.0-alpha.3":
-  version "9.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-clean/-/cli-clean-9.0.0-alpha.3.tgz#d3cbd491c40cb23d933a221ed8e2481cb42efdda"
-  integrity sha512-djo73BdQ+O+KhsPGwfT9vZvWfkXyQLu2B31r9alOhREganoMMv2AogBIMQbRP0F/FLC3Ker/EzgJkuyqDUK28Q==
+"@qiwi/npm-registry-client@^8.9.1":
+  version "8.9.1"
+  resolved "https://registry.yarnpkg.com/@qiwi/npm-registry-client/-/npm-registry-client-8.9.1.tgz#1769f6501a436ec39c496ca0a9a2fab9db7718df"
+  integrity sha512-rZF+mG+NfijR0SHphhTLHRr4aM4gtfdwoAMY6we2VGQam8vkN1cxGG1Lg/Llrj8Dd0Mu6VjdFQRyMMRZxtZR2A==
+  dependencies:
+    concat-stream "^2.0.0"
+    graceful-fs "^4.2.4"
+    normalize-package-data "~1.0.1 || ^2.0.0 || ^3.0.0"
+    npm-package-arg "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^8.0.0"
+    once "^1.4.0"
+    request "^2.88.2"
+    retry "^0.12.0"
+    safe-buffer "^5.2.1"
+    semver "2 >=2.2.1 || 3.x || 4 || 5 || 7"
+    slide "^1.1.6"
+    ssri "^8.0.0"
+  optionalDependencies:
+    npmlog "2 || ^3.1.0 || ^4.0.0"
+
+"@react-native-community/cli-clean@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-clean/-/cli-clean-10.0.0.tgz#09cc4c63116e81d3765ffedecc38387bcc7b4483"
+  integrity sha512-9uHRicQXycqu55rSplQh2/o/nDdA5qDXiU09/s7/fJbUlCNUySy5rXw5FtbQv+Bj+bD9tXFoDRKN1ZnNHtT4QQ==
   dependencies:
-    "@react-native-community/cli-tools" "^9.0.0-alpha.3"
+    "@react-native-community/cli-tools" "^10.0.0"
     chalk "^4.1.2"
     execa "^1.0.0"
     prompts "^2.4.0"
 
-"@react-native-community/cli-config@^9.0.0-alpha.3":
-  version "9.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-config/-/cli-config-9.0.0-alpha.3.tgz#00bcebd691984120f970cb563511562da424bb1e"
-  integrity sha512-Eh2zX9hx1vp5nY6UMvATNiqs424i2eTBxewSr3Tp03esn83mdJlah0r70/rdPSAeU77Hp7KtibG82NxPwH8abg==
+"@react-native-community/cli-config@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-config/-/cli-config-10.0.0.tgz#25b87760153ffc3b5bad3018c485f17ce982fc74"
+  integrity sha512-cbJfncqFtONfPPFnfL4bgdYYZU+Muo6jQMgTnR+rbp6gNxTPUYioctHgXcvyJAubl886mr3lirfU31V+a96AqA==
   dependencies:
-    "@react-native-community/cli-tools" "^9.0.0-alpha.3"
+    "@react-native-community/cli-tools" "^10.0.0"
+    chalk "^4.1.2"
     cosmiconfig "^5.1.0"
     deepmerge "^3.2.0"
     glob "^7.1.3"
     joi "^17.2.1"
 
-"@react-native-community/cli-debugger-ui@^8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-8.0.0.tgz#98263dc525e65015e2d6392c940114028f87e8e9"
-  integrity sha512-u2jq06GZwZ9sRERzd9FIgpW6yv4YOW4zz7Ym/B8eSzviLmy3yI/8mxJtvlGW+J8lBsfMcQoqJpqI6Rl1nZy9yQ==
+"@react-native-community/cli-debugger-ui@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-10.0.0.tgz#4bb6d41c7e46449714dc7ba5d9f5b41ef0ea7c57"
+  integrity sha512-8UKLcvpSNxnUTRy8CkCl27GGLqZunQ9ncGYhSrWyKrU9SWBJJGeZwi2k2KaoJi5FvF2+cD0t8z8cU6lsq2ZZmA==
   dependencies:
     serve-static "^1.13.1"
 
-"@react-native-community/cli-doctor@^9.0.0-alpha.3":
-  version "9.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-doctor/-/cli-doctor-9.0.0-alpha.3.tgz#8e9bdccfd7b326199f5814e8e755ad615cdfb17b"
-  integrity sha512-iriyxzBVnadJBglcxrmUsjsJr+bpr1MafyeBp0ZuvOglZ7SNMbb3Q9dNhoS/2sYQ/1WQeWR92r8Zb0f6eSMFTA==
+"@react-native-community/cli-doctor@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-doctor/-/cli-doctor-10.0.0.tgz#13c9e921be5767de93f56dc37d76a65410a23318"
+  integrity sha512-w0GeAla0mEb0zo9CWvIxicaAtF+7oSnmIOPBJFXC5qYDnpHkYxsqkvM6eyLqmzZNs0sbB359BVg4ACNh/8zAPg==
   dependencies:
-    "@react-native-community/cli-config" "^9.0.0-alpha.3"
-    "@react-native-community/cli-platform-ios" "^9.0.0-alpha.3"
-    "@react-native-community/cli-tools" "^9.0.0-alpha.3"
+    "@react-native-community/cli-config" "^10.0.0"
+    "@react-native-community/cli-platform-ios" "^10.0.0"
+    "@react-native-community/cli-tools" "^10.0.0"
     chalk "^4.1.2"
     command-exists "^1.2.8"
     envinfo "^7.7.2"
@@ -1137,69 +1280,62 @@
     sudo-prompt "^9.0.0"
     wcwidth "^1.0.1"
 
-"@react-native-community/cli-hermes@^9.0.0-alpha.3":
-  version "9.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-hermes/-/cli-hermes-9.0.0-alpha.3.tgz#cbed6ac366944bf12f83b7a6a567661c0dde3a57"
-  integrity sha512-uHLeB6OvGYcPtL0/Qar/ae9xlP0yquzmwznm6XHAoMZe0aUmlaiHEE/TSjnLN2jvHqDxr9B/C/X/KZWADol+IA==
+"@react-native-community/cli-hermes@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-hermes/-/cli-hermes-10.0.0.tgz#9842ec6dd749036a84e5150728043ea4fa3a8ee2"
+  integrity sha512-4z4SYcMzaLs2ElZ/BRwb/JtFayiFXCqn8Ski9P9KkCBtibXq2KlqXVbHPkLynopgxyEvg4syBgEuzmzT+0YlOA==
   dependencies:
-    "@react-native-community/cli-platform-android" "^9.0.0-alpha.3"
-    "@react-native-community/cli-tools" "^9.0.0-alpha.3"
+    "@react-native-community/cli-platform-android" "^10.0.0"
+    "@react-native-community/cli-tools" "^10.0.0"
     chalk "^4.1.2"
     hermes-profile-transformer "^0.0.6"
     ip "^1.1.5"
 
-"@react-native-community/cli-platform-android@^9.0.0-alpha.3":
-  version "9.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-9.0.0-alpha.3.tgz#c66ce62f2d371bd6e8cdf5e66101e20c0d486d5a"
-  integrity sha512-yBNre6AfSJ1qvM8jwI/MFBS6s6hkK01cB2pKVNk1TOn9zj4lrd3ASocpLQt4C6jp1v37hZi9S4C7xM9zCT0FCw==
+"@react-native-community/cli-platform-android@10.0.0", "@react-native-community/cli-platform-android@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-10.0.0.tgz#9894a0b54de94da4d01f3b9db4e6b51ba112fa72"
+  integrity sha512-wUXq+//PagXVjG6ZedO+zIbNPkCsAiP+uiE45llFTsCtI6vFBwa6oJFHH6fhfeib4mOd7DvIh2Kktrpgyb6nBg==
   dependencies:
-    "@react-native-community/cli-tools" "^9.0.0-alpha.3"
+    "@react-native-community/cli-tools" "^10.0.0"
     chalk "^4.1.2"
     execa "^1.0.0"
-    fs-extra "^8.1.0"
     glob "^7.1.3"
-    jetifier "^1.6.2"
-    lodash "^4.17.15"
     logkitty "^0.7.1"
-    slash "^3.0.0"
 
-"@react-native-community/cli-platform-ios@^9.0.0-alpha.3":
-  version "9.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-9.0.0-alpha.3.tgz#f6e5400f2144f9e3a9a618e8f23a4ff622356638"
-  integrity sha512-EYycuZ2deeccRHPaxasnxUMxrv0gRSAqCcmQYkX0Wbvh236JWHiIMc6QhMInmcd79GZi+v9ByRiQ+lqk2LXfGA==
+"@react-native-community/cli-platform-ios@10.0.0", "@react-native-community/cli-platform-ios@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-10.0.0.tgz#91ee301620e509b44db5fd7c93eaf7ee992d097a"
+  integrity sha512-WLpXzZQ53zb1RhkpSDNHyBR3SIN3WObDRTEaR0TMXsXDeTj8/Eu2DPFpT+uEnD10ly/Y6/DqJsAt4Ku2X76klA==
   dependencies:
-    "@react-native-community/cli-tools" "^9.0.0-alpha.3"
+    "@react-native-community/cli-tools" "^10.0.0"
     chalk "^4.1.2"
     execa "^1.0.0"
     glob "^7.1.3"
-    js-yaml "^3.13.1"
-    lodash "^4.17.15"
     ora "^5.4.1"
-    plist "^3.0.2"
 
-"@react-native-community/cli-plugin-metro@^9.0.0-alpha.3":
-  version "9.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-9.0.0-alpha.3.tgz#a068d64e5f95d5affd4a5e22bca988f1a76bb001"
-  integrity sha512-IBOairc/gu7F13DK2trRKZ0GMZ7wU0ux8GGtkl2thCzeif2TG1mrdZfZkulYCGkKtEIJg43SjfsJyYe4oeh0VQ==
+"@react-native-community/cli-plugin-metro@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-10.0.0.tgz#404b0f7c7f04ed71e1dead55593f0ce44b4c3600"
+  integrity sha512-loeg2wu6taZ1YqyTJBBGmgSiQ1hyGYEO/Zzvto7eLq+eVj99NZtKqByS94tS5vi8KtZbrDxqFVFjkQ77JaoLXg==
   dependencies:
-    "@react-native-community/cli-server-api" "^9.0.0-alpha.3"
-    "@react-native-community/cli-tools" "^9.0.0-alpha.3"
+    "@react-native-community/cli-server-api" "^10.0.0"
+    "@react-native-community/cli-tools" "^10.0.0"
     chalk "^4.1.2"
-    metro "^0.70.1"
-    metro-config "^0.70.1"
-    metro-core "^0.70.1"
-    metro-react-native-babel-transformer "^0.70.1"
-    metro-resolver "^0.70.1"
-    metro-runtime "^0.70.1"
+    metro "0.73.5"
+    metro-config "0.73.5"
+    metro-core "0.73.5"
+    metro-react-native-babel-transformer "0.73.5"
+    metro-resolver "0.73.5"
+    metro-runtime "0.73.5"
     readline "^1.3.0"
 
-"@react-native-community/cli-server-api@^9.0.0-alpha.3":
-  version "9.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-9.0.0-alpha.3.tgz#ca39aa1494a71b0aa36494806a898014233473ee"
-  integrity sha512-iusGOqtWhnXUwIgLdMq821V03okOm7jDVwPYW8aQd6qpX1l2oTa15kubSMNYtBCZ3bAjYRTXPJp4WNpiLDPKQA==
+"@react-native-community/cli-server-api@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-10.0.0.tgz#b3f69f30285bed2019d4ee22879abb6b5c85b609"
+  integrity sha512-UXOYno0NMisMm8F61q1bG/HzVWkgvJvfuL5C9W036vo83y6oQGjjZBpIRWi/QF94BULz0hrdiPXFNXworLmAcQ==
   dependencies:
-    "@react-native-community/cli-debugger-ui" "^8.0.0"
-    "@react-native-community/cli-tools" "^9.0.0-alpha.3"
+    "@react-native-community/cli-debugger-ui" "^10.0.0"
+    "@react-native-community/cli-tools" "^10.0.0"
     compression "^1.7.1"
     connect "^3.6.5"
     errorhandler "^1.5.0"
@@ -1208,14 +1344,14 @@
     serve-static "^1.13.1"
     ws "^7.5.1"
 
-"@react-native-community/cli-tools@^9.0.0-alpha.3":
-  version "9.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-9.0.0-alpha.3.tgz#a6d3b96b0f680926c391ae6dec67f50dbd9d019b"
-  integrity sha512-yW908uJNGYXxO9fYOx3KMGIkDaW83BkxPeUCMRJ65DrVGy6KGaclWCwPqp1iWBmiqwCVRXwQbeRyQ+mYU1nc8w==
+"@react-native-community/cli-tools@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-10.0.0.tgz#51ec1775f699951837091cf84dc765e290377a53"
+  integrity sha512-cPUaOrahRcMJvJpBaoc/zpYPHoPqj91qV5KmvA9cJvKktY4rl/PFfUi1A0gTqqFhdH7qW1zkeyKo80lWq7NvxA==
   dependencies:
     appdirsjs "^1.2.4"
     chalk "^4.1.2"
-    lodash "^4.17.15"
+    find-up "^5.0.0"
     mime "^2.4.1"
     node-fetch "^2.6.0"
     open "^6.2.0"
@@ -1223,39 +1359,90 @@
     semver "^6.3.0"
     shell-quote "^1.7.3"
 
-"@react-native-community/cli-types@^9.0.0-alpha.0":
-  version "9.0.0-alpha.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-types/-/cli-types-9.0.0-alpha.0.tgz#b0809b868e1a2a0c326a0f218abdbb8ff7744272"
-  integrity sha512-pnQVEN9XcYfqIPKwRbzv5HRH3aEjyJYr3V2cOPOaCMuAKU1tWdHXakY1zfui1jTiQG6h6hOkmmMjr3j2vY1ndQ==
+"@react-native-community/cli-types@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-types/-/cli-types-10.0.0.tgz#046470c75ec18f8b3bd906e54e43a6f678e01a45"
+  integrity sha512-31oUM6/rFBZQfSmDQsT1DX/5fjqfxg7sf2u8kTPJK7rXVya5SRpAMaCXsPAG0omsmJxXt+J9HxUi3Ic+5Ux5Iw==
   dependencies:
     joi "^17.2.1"
 
-"@react-native-community/cli@^9.0.0-alpha.3":
-  version "9.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-9.0.0-alpha.3.tgz#794cfa5828fff8cea305830ac8ba5fcb68aebb51"
-  integrity sha512-XAMlrQGK6BVDTl9X2tyAgyp0GPHyr6Lm2WFLStYW9wh8Vm4ja/txbEKZw1vi3NPMhB/sTBarNRtoZ65MV0JguQ==
-  dependencies:
-    "@react-native-community/cli-clean" "^9.0.0-alpha.3"
-    "@react-native-community/cli-config" "^9.0.0-alpha.3"
-    "@react-native-community/cli-debugger-ui" "^8.0.0"
-    "@react-native-community/cli-doctor" "^9.0.0-alpha.3"
-    "@react-native-community/cli-hermes" "^9.0.0-alpha.3"
-    "@react-native-community/cli-plugin-metro" "^9.0.0-alpha.3"
-    "@react-native-community/cli-server-api" "^9.0.0-alpha.3"
-    "@react-native-community/cli-tools" "^9.0.0-alpha.3"
-    "@react-native-community/cli-types" "^9.0.0-alpha.0"
+"@react-native-community/cli@10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-10.0.0.tgz#46f68a1184014956dc237e12e6c2ca9b318a04db"
+  integrity sha512-KHV9/AbPeIK87jHP7iY07/HQG00J5AYF/dHz2rzqAZGB2WYFAbc5uoLRw90u/U2AcSeO7ep+4kawm+/B9LJreg==
+  dependencies:
+    "@react-native-community/cli-clean" "^10.0.0"
+    "@react-native-community/cli-config" "^10.0.0"
+    "@react-native-community/cli-debugger-ui" "^10.0.0"
+    "@react-native-community/cli-doctor" "^10.0.0"
+    "@react-native-community/cli-hermes" "^10.0.0"
+    "@react-native-community/cli-plugin-metro" "^10.0.0"
+    "@react-native-community/cli-server-api" "^10.0.0"
+    "@react-native-community/cli-tools" "^10.0.0"
+    "@react-native-community/cli-types" "^10.0.0"
     chalk "^4.1.2"
-    commander "^2.19.0"
+    commander "^9.4.1"
     execa "^1.0.0"
     find-up "^4.1.0"
     fs-extra "^8.1.0"
     graceful-fs "^4.1.3"
-    leven "^3.1.0"
-    lodash "^4.17.15"
-    minimist "^1.2.0"
     prompts "^2.4.0"
     semver "^6.3.0"
 
+"@react-native-community/eslint-config@*":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/eslint-config/-/eslint-config-3.2.0.tgz#42f677d5fff385bccf1be1d3b8faa8c086cf998d"
+  integrity sha512-ZjGvoeiBtCbd506hQqwjKmkWPgynGUoJspG8/MuV/EfKnkjCtBmeJvq2n+sWbWEvL9LWXDp2GJmPzmvU5RSvKQ==
+  dependencies:
+    "@babel/core" "^7.14.0"
+    "@babel/eslint-parser" "^7.18.2"
+    "@react-native-community/eslint-plugin" "^1.1.0"
+    "@typescript-eslint/eslint-plugin" "^5.30.5"
+    "@typescript-eslint/parser" "^5.30.5"
+    eslint-config-prettier "^8.5.0"
+    eslint-plugin-eslint-comments "^3.2.0"
+    eslint-plugin-ft-flow "^2.0.1"
+    eslint-plugin-jest "^26.5.3"
+    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"
+
+"@react-native-community/eslint-plugin@*", "@react-native-community/eslint-plugin@^1.1.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/eslint-plugin/-/eslint-plugin-1.3.0.tgz#9e558170c106bbafaa1ef502bd8e6d4651012bf9"
+  integrity sha512-+zDZ20NUnSWghj7Ku5aFphMzuM9JulqCW+aPXT6IfIXFbb8tzYTTOSeRFOtuekJ99ibW2fUCSsjuKNlwDIbHFg==
+
+"@react-native/assets@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@react-native/assets/-/assets-1.0.0.tgz#c6f9bf63d274bafc8e970628de24986b30a55c8e"
+  integrity sha512-KrwSpS1tKI70wuKl68DwJZYEvXktDHdZMG0k2AXD/rJVSlB23/X2CB2cutVR0HwNMJIal9HOUOBB2rVfa6UGtQ==
+
+"@react-native/eslint-plugin-specs@^0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@react-native/eslint-plugin-specs/-/eslint-plugin-specs-0.71.1.tgz#07b1395edeeda74349d28b214c31f871956b325d"
+  integrity sha512-rnn8U6vecXLAD3XldnzPlsfeCq2j1O8CIU7mQc95jBkNTRPoLePdPeghHwCuAZQevkFjY9FpqMJ7SwU7P40rhw==
+  dependencies:
+    "@babel/core" "^7.14.0"
+    "@babel/eslint-parser" "^7.18.2"
+    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
+    "@babel/preset-flow" "^7.17.12"
+    flow-parser "^0.185.0"
+    make-dir "^2.1.0"
+    pirates "^4.0.1"
+    react-native-codegen "*"
+    source-map-support "0.5.0"
+
+"@react-native/normalize-color@*", "@react-native/normalize-color@2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@react-native/normalize-color/-/normalize-color-2.1.0.tgz#939b87a9849e81687d3640c5efa2a486ac266f91"
+  integrity sha512-Z1jQI2NpdFJCVgpY+8Dq/Bt3d+YUi1928Q+/CZm/oh66fzM0RUl54vvuXlPJKybH4pdCZey1eDTPaLHkMPNgWA==
+
+"@react-native/polyfills@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@react-native/polyfills/-/polyfills-2.0.0.tgz#4c40b74655c83982c8cf47530ee7dc13d957b6aa"
+  integrity sha512-K0aGNn1TjalKj+65D7ycc1//H9roAQ51GJVk5ZJQFb2teECGmzd86bYDC0aYdbRf7gtovescq4Zt6FR0tgXiHQ==
+
 "@reactions/component@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@reactions/component/-/component-2.0.2.tgz#40f8c1c2c37baabe57a0c944edb9310dc1ec6642"
@@ -1277,6 +1464,11 @@
   resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
+"@sinclair/typebox@^0.24.1":
+  version "0.24.41"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.41.tgz#45470b8bae32a28f1e0501066d0bacbd8b772804"
+  integrity sha512-TJCgQurls4FipFvHeC+gfAzb+GGstL0TDwYJKQVtTeSvJIznWzP7g3bAd5gEBlr8+bIxqnWS9VGVWREDhmE8jA==
+
 "@sinonjs/commons@^1.7.0":
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
@@ -1284,22 +1476,17 @@
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
-  integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==
+"@sinonjs/fake-timers@^9.1.2":
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
+  integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
-
-"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
-  version "7.1.18"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.18.tgz#1a29abcc411a9c05e2094c98f9a1b7da6cdf49f8"
-  integrity sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==
+"@types/babel__core@^7.1.14":
+  version "7.1.19"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
+  integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1322,7 +1509,7 @@
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
   version "7.14.2"
   resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43"
   integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==
@@ -1334,10 +1521,10 @@
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
-"@types/graceful-fs@^4.1.2":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f"
-  integrity sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==
+"@types/graceful-fs@^4.1.3":
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
+  integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
   dependencies:
     "@types/node" "*"
 
@@ -1374,19 +1561,48 @@
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
 
 "@types/node@*":
-  version "13.13.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.4.tgz#1581d6c16e3d4803eb079c87d4ac893ee7501c2c"
-  integrity sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==
-
-"@types/normalize-package-data@^2.4.0":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
-  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
+  version "18.7.17"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.17.tgz#52438111ea98f77475470fc62d79b9eb96bb2c92"
+  integrity sha512-0UyfUnt02zIuqp7yC8RYtDkp/vo8bFaQ13KkSEvUAohPOAlnVNbj5Fi3fgPSuwzakS+EvvnnZ4x9y7i6ASaSPQ==
+
+"@types/node@^14.14.35":
+  version "14.18.28"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.28.tgz#ddb82da2fff476a8e827e8773c84c19d9c235278"
+  integrity sha512-CK2fnrQlIgKlCV3N2kM+Gznb5USlwA1KFX3rJVHmgVk6NJxFPuQ86pAcvKnu37IA4BGlSRz7sEE1lHL1aLZ/eQ==
+
+"@types/parsimmon@^1.10.1":
+  version "1.10.6"
+  resolved "https://registry.yarnpkg.com/@types/parsimmon/-/parsimmon-1.10.6.tgz#8fcf95990514d2a7624aa5f630c13bf2427f9cdd"
+  integrity sha512-FwAQwMRbkhx0J6YELkwIpciVzCcgEqXEbIrIn3a2P5d3kGEHQ3wVhlN3YdVepYP+bZzCYO6OjmD4o9TGOZ40rA==
+
+"@types/prettier@^2.1.5":
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.0.tgz#ea03e9f0376a4446f44797ca19d9c46c36e352dc"
+  integrity sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A==
+
+"@types/prop-types@*":
+  version "15.7.5"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
+  integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
+
+"@types/react@^18.0.18":
+  version "18.0.20"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.20.tgz#e4c36be3a55eb5b456ecf501bd4a00fd4fd0c9ab"
+  integrity sha512-MWul1teSPxujEHVwZl4a5HxQ9vVNsjTchVA+xRqv/VYGCuKGAU6UhfrTdF5aBefwD1BHUD8i/zq+O/vyCm/FrA==
+  dependencies:
+    "@types/prop-types" "*"
+    "@types/scheduler" "*"
+    csstype "^3.0.2"
+
+"@types/scheduler@*":
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
+  integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
 
-"@types/prettier@^2.0.0":
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.3.tgz#a3c65525b91fca7da00ab1a3ac2b5a2a4afbffbf"
-  integrity sha512-QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w==
+"@types/semver@^7.3.12":
+  version "7.3.13"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
+  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
 
 "@types/stack-utils@^2.0.0":
   version "2.0.1"
@@ -1419,56 +1635,166 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/experimental-utils@^5.0.0":
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.3.1.tgz#bbd8f9b67b4d5fdcb9d2f90297d8fcda22561e05"
-  integrity sha512-RgFn5asjZ5daUhbK5Sp0peq0SSMytqcrkNfU4pnDma2D8P3ElZ6JbYjY8IMSFfZAJ0f3x3tnO3vXHweYg0g59w==
+"@types/yargs@^17.0.8":
+  version "17.0.12"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.12.tgz#0745ff3e4872b4ace98616d4b7e37ccbd75f9526"
+  integrity sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ==
   dependencies:
-    "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.3.1"
-    "@typescript-eslint/types" "5.3.1"
-    "@typescript-eslint/typescript-estree" "5.3.1"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
+    "@types/yargs-parser" "*"
 
-"@typescript-eslint/scope-manager@5.3.1":
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.3.1.tgz#3cfbfbcf5488fb2a9a6fbbe97963ee1e8d419269"
-  integrity sha512-XksFVBgAq0Y9H40BDbuPOTUIp7dn4u8oOuhcgGq7EoDP50eqcafkMVGrypyVGvDYHzjhdUCUwuwVUK4JhkMAMg==
+"@typescript-eslint/eslint-plugin@^5.30.0":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.37.0.tgz#5ccdd5d9004120f28fc6e717fb4b5c9bddcfbc04"
+  integrity sha512-Fde6W0IafXktz1UlnhGkrrmnnGpAo1kyX7dnyHHVrmwJOn72Oqm3eYtddrpOwwel2W8PAK9F3pIL5S+lfoM0og==
   dependencies:
-    "@typescript-eslint/types" "5.3.1"
-    "@typescript-eslint/visitor-keys" "5.3.1"
+    "@typescript-eslint/scope-manager" "5.37.0"
+    "@typescript-eslint/type-utils" "5.37.0"
+    "@typescript-eslint/utils" "5.37.0"
+    debug "^4.3.4"
+    functional-red-black-tree "^1.0.1"
+    ignore "^5.2.0"
+    regexpp "^3.2.0"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.3.1":
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.3.1.tgz#afaa715b69ebfcfde3af8b0403bf27527912f9b7"
-  integrity sha512-bG7HeBLolxKHtdHG54Uac750eXuQQPpdJfCYuw4ZI3bZ7+GgKClMWM8jExBtp7NSP4m8PmLRM8+lhzkYnSmSxQ==
+"@typescript-eslint/eslint-plugin@^5.30.5":
+  version "5.42.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.42.0.tgz#36a8c0c379870127059889a9cc7e05c260d2aaa5"
+  integrity sha512-5TJh2AgL6+wpL8H/GTSjNb4WrjKoR2rqvFxR/DDTqYNk6uXn8BJMEcncLSpMbf/XV1aS0jAjYwn98uvVCiAywQ==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.42.0"
+    "@typescript-eslint/type-utils" "5.42.0"
+    "@typescript-eslint/utils" "5.42.0"
+    debug "^4.3.4"
+    ignore "^5.2.0"
+    natural-compare-lite "^1.4.0"
+    regexpp "^3.2.0"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.3.1":
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.1.tgz#50cc4bfb93dc31bc75e08ae52e29fcb786d606ec"
-  integrity sha512-PwFbh/PKDVo/Wct6N3w+E4rLZxUDgsoII/GrWM2A62ETOzJd4M6s0Mu7w4CWsZraTbaC5UQI+dLeyOIFF1PquQ==
+"@typescript-eslint/parser@^5.30.0", "@typescript-eslint/parser@^5.30.5":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.37.0.tgz#c382077973f3a4ede7453fb14cadcad3970cbf3b"
+  integrity sha512-01VzI/ipYKuaG5PkE5+qyJ6m02fVALmMPY3Qq5BHflDx3y4VobbLdHQkSMg9VPRS4KdNt4oYTMaomFoHonBGAw==
   dependencies:
-    "@typescript-eslint/types" "5.3.1"
-    "@typescript-eslint/visitor-keys" "5.3.1"
-    debug "^4.3.2"
-    globby "^11.0.4"
+    "@typescript-eslint/scope-manager" "5.37.0"
+    "@typescript-eslint/types" "5.37.0"
+    "@typescript-eslint/typescript-estree" "5.37.0"
+    debug "^4.3.4"
+
+"@typescript-eslint/scope-manager@5.37.0":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.37.0.tgz#044980e4f1516a774a418dafe701a483a6c9f9ca"
+  integrity sha512-F67MqrmSXGd/eZnujjtkPgBQzgespu/iCZ+54Ok9X5tALb9L2v3G+QBSoWkXG0p3lcTJsL+iXz5eLUEdSiJU9Q==
+  dependencies:
+    "@typescript-eslint/types" "5.37.0"
+    "@typescript-eslint/visitor-keys" "5.37.0"
+
+"@typescript-eslint/scope-manager@5.42.0":
+  version "5.42.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.42.0.tgz#e1f2bb26d3b2a508421ee2e3ceea5396b192f5ef"
+  integrity sha512-l5/3IBHLH0Bv04y+H+zlcLiEMEMjWGaCX6WyHE5Uk2YkSGAMlgdUPsT/ywTSKgu9D1dmmKMYgYZijObfA39Wow==
+  dependencies:
+    "@typescript-eslint/types" "5.42.0"
+    "@typescript-eslint/visitor-keys" "5.42.0"
+
+"@typescript-eslint/type-utils@5.37.0":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.37.0.tgz#43ed2f567ada49d7e33a6e4b6f9babd060445fe5"
+  integrity sha512-BSx/O0Z0SXOF5tY0bNTBcDEKz2Ec20GVYvq/H/XNKiUorUFilH7NPbFUuiiyzWaSdN3PA8JV0OvYx0gH/5aFAQ==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "5.37.0"
+    "@typescript-eslint/utils" "5.37.0"
+    debug "^4.3.4"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/type-utils@5.42.0":
+  version "5.42.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.42.0.tgz#4206d7192d4fe903ddf99d09b41d4ac31b0b7dca"
+  integrity sha512-HW14TXC45dFVZxnVW8rnUGnvYyRC0E/vxXShFCthcC9VhVTmjqOmtqj6H5rm9Zxv+ORxKA/1aLGD7vmlLsdlOg==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "5.42.0"
+    "@typescript-eslint/utils" "5.42.0"
+    debug "^4.3.4"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/types@5.37.0":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.37.0.tgz#09e4870a5f3af7af3f84e08d792644a87d232261"
+  integrity sha512-3frIJiTa5+tCb2iqR/bf7XwU20lnU05r/sgPJnRpwvfZaqCJBrl8Q/mw9vr3NrNdB/XtVyMA0eppRMMBqdJ1bA==
+
+"@typescript-eslint/types@5.42.0":
+  version "5.42.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.42.0.tgz#5aeff9b5eced48f27d5b8139339bf1ef805bad7a"
+  integrity sha512-t4lzO9ZOAUcHY6bXQYRuu+3SSYdD9TS8ooApZft4WARt4/f2Cj/YpvbTe8A4GuhT4bNW72goDMOy7SW71mZwGw==
+
+"@typescript-eslint/typescript-estree@5.37.0":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.37.0.tgz#956dcf5c98363bcb97bdd5463a0a86072ff79355"
+  integrity sha512-JkFoFIt/cx59iqEDSgIGnQpCTRv96MQnXCYvJi7QhBC24uyuzbD8wVbajMB1b9x4I0octYFJ3OwjAwNqk1AjDA==
+  dependencies:
+    "@typescript-eslint/types" "5.37.0"
+    "@typescript-eslint/visitor-keys" "5.37.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
     is-glob "^4.0.3"
-    semver "^7.3.5"
+    semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/visitor-keys@5.3.1":
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.3.1.tgz#c2860ff22939352db4f3806f34b21d8ad00588ba"
-  integrity sha512-3cHUzUuVTuNHx0Gjjt5pEHa87+lzyqOiHXy/Gz+SJOCW1mpw9xQHIIEwnKn+Thph1mgWyZ90nboOcSuZr/jTTQ==
+"@typescript-eslint/typescript-estree@5.42.0":
+  version "5.42.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.42.0.tgz#2592d24bb5f89bf54a63384ff3494870f95b3fd8"
+  integrity sha512-2O3vSq794x3kZGtV7i4SCWZWCwjEtkWfVqX4m5fbUBomOsEOyd6OAD1qU2lbvV5S8tgy/luJnOYluNyYVeOTTg==
   dependencies:
-    "@typescript-eslint/types" "5.3.1"
-    eslint-visitor-keys "^3.0.0"
+    "@typescript-eslint/types" "5.42.0"
+    "@typescript-eslint/visitor-keys" "5.42.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
 
-abab@^2.0.3, abab@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
-  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
+"@typescript-eslint/utils@5.37.0", "@typescript-eslint/utils@^5.10.0", "@typescript-eslint/utils@^5.30.0":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.37.0.tgz#7784cb8e91390c4f90ccaffd24a0cf9874df81b2"
+  integrity sha512-jUEJoQrWbZhmikbcWSMDuUSxEE7ID2W/QCV/uz10WtQqfOuKZUqFGjqLJ+qhDd17rjgp+QJPqTdPIBWwoob2NQ==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    "@typescript-eslint/scope-manager" "5.37.0"
+    "@typescript-eslint/types" "5.37.0"
+    "@typescript-eslint/typescript-estree" "5.37.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
+
+"@typescript-eslint/utils@5.42.0":
+  version "5.42.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.42.0.tgz#f06bd43b9a9a06ed8f29600273240e84a53f2f15"
+  integrity sha512-JZ++3+h1vbeG1NUECXQZE3hg0kias9kOtcQr3+JVQ3whnjvKuMyktJAAIj6743OeNPnGBmjj7KEmiDL7qsdnCQ==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.42.0"
+    "@typescript-eslint/types" "5.42.0"
+    "@typescript-eslint/typescript-estree" "5.42.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
+    semver "^7.3.7"
+
+"@typescript-eslint/visitor-keys@5.37.0":
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.37.0.tgz#7b72dd343295ea11e89b624995abc7103c554eee"
+  integrity sha512-Hp7rT4cENBPIzMwrlehLW/28EVCOcE9U1Z1BQTc8EA8v5qpr7GRGuG+U58V5tTY48zvUOA3KHvw3rA8tY9fbdA==
+  dependencies:
+    "@typescript-eslint/types" "5.37.0"
+    eslint-visitor-keys "^3.3.0"
+
+"@typescript-eslint/visitor-keys@5.42.0":
+  version "5.42.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.42.0.tgz#ee8d62d486f41cfe646632fab790fbf0c1db5bb0"
+  integrity sha512-QHbu5Hf/2lOEOwy+IUw0GoSCuAzByTAWWrOTKzTzsotiUnWFpuKnXcAhC9YztAf2EElQ0VvIK+pHJUPkM0q7jg==
+  dependencies:
+    "@typescript-eslint/types" "5.42.0"
+    eslint-visitor-keys "^3.3.0"
 
 abort-controller@^3.0.0:
   version "3.0.0"
@@ -1490,40 +1816,15 @@ accepts@^1.3.7, accepts@~1.3.3, accepts@~1.3.5:
     mime-types "~2.1.24"
     negotiator "0.6.2"
 
-acorn-globals@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
-  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
-  dependencies:
-    acorn "^7.1.1"
-    acorn-walk "^7.1.1"
-
-acorn-jsx@^5.3.1:
+acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
-  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
-
-acorn@^7.1.1, acorn@^7.4.0:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
-acorn@^8.2.4:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
-  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
-
-agent-base@6:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
-  dependencies:
-    debug "4"
+acorn@^8.5.0, acorn@^8.8.0:
+  version "8.8.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
+  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
 
 ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4:
   version "6.12.6"
@@ -1535,26 +1836,11 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.1:
-  version "8.9.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18"
-  integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
 anser@^1.4.9:
   version "1.4.9"
   resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.9.tgz#1f85423a5dcf8da4631a341665ff675b96845760"
   integrity sha512-AI+BjTeGt2+WFk4eWcqbQ7snZpDBt8SaLlj0RT2h5xfdWaiy51OjYvqwMrNzJLGy8iOAL6nKDITWO+rd4MkYEA==
 
-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
 ansi-escapes@^4.2.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
@@ -1571,16 +1857,26 @@ ansi-fragments@^0.2.1:
     slice-ansi "^2.0.0"
     strip-ansi "^5.0.0"
 
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
+
 ansi-regex@^4.0.0, ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
+  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
 
 ansi-regex@^5.0.0, ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
+
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -1596,18 +1892,15 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
-  dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
+ansi-styles@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
+  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
 anymatch@^3.0.3:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
@@ -1617,6 +1910,19 @@ appdirsjs@^1.2.4:
   resolved "https://registry.yarnpkg.com/appdirsjs/-/appdirsjs-1.2.4.tgz#3ab582acc9fdfaaa0c1f81b3a25422ad4d95f9d4"
   integrity sha512-WO5StDORR6JF/xYnXk/Fm0yu+iULaV5ULKuUw0Tu+jbgiTlSquaWBCgbpnsHLMXldf+fM3Gxn5p7vjond7He6w==
 
+aproba@^1.0.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
+are-we-there-yet@~1.1.2:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
+  integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -1624,6 +1930,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 aria-query@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
@@ -1647,14 +1958,14 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-includes@^3.1.1, array-includes@^3.1.3:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
-  integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
+array-includes@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb"
+  integrity sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
     get-intrinsic "^1.1.1"
     is-string "^1.0.7"
 
@@ -1668,14 +1979,15 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-array.prototype.flatmap@^1.2.4:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446"
-  integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==
+array.prototype.flatmap@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz#a7e8ed4225f4788a70cd910abcf0791e76a5534f"
+  integrity sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.19.0"
+    es-abstract "^1.19.2"
+    es-shim-unscopables "^1.0.0"
 
 asap@~2.0.6:
   version "2.0.6"
@@ -1716,25 +2028,15 @@ astral-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
   integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
-async@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
-
-async@^3.2.2:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
-  integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
+async@^3.2.2, async@^3.2.3:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
+  integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -1756,33 +2058,41 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
   integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
-axe-core@^4.0.2:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.5.tgz#78d6911ba317a8262bfee292aeafcc1e04b49cc5"
-  integrity sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==
+axe-core@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.2.tgz#dcf7fb6dea866166c3eab33d68208afe4d5f670c"
+  integrity sha512-LVAaGp/wkkgYJcjmHsoKx4juT1aQvJyPcW09MLCjVTh3V2cc6PnyempiLMNH5iMdfIX/zdbjUx2KDjMLCTdPeA==
 
 axobject-query@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
   integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
 
+babel-code-frame@^6.22.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
 babel-core@^7.0.0-bridge.0:
   version "7.0.0-bridge.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
   integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==
 
-babel-jest@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
-  integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==
+babel-jest@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.2.1.tgz#213c47e28072de11bdb98c9d29b89f2ab99664f1"
+  integrity sha512-gQJwArok0mqoREiCYhXKWOgUhElJj9DpnssW6GL8dG7ARYqHEhrM9fmPHTjdqEGRVXZAd6+imo3/Vwa8TjLcsw==
   dependencies:
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/babel__core" "^7.1.7"
-    babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^26.6.2"
+    "@jest/transform" "^29.2.1"
+    "@types/babel__core" "^7.1.14"
+    babel-plugin-istanbul "^6.1.1"
+    babel-preset-jest "^29.2.0"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
     slash "^3.0.0"
 
 babel-plugin-dynamic-import-node@^2.3.3:
@@ -1792,7 +2102,7 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-istanbul@^6.0.0:
+babel-plugin-istanbul@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
   integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
@@ -1803,14 +2113,14 @@ babel-plugin-istanbul@^6.0.0:
     istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d"
-  integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==
+babel-plugin-jest-hoist@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.2.0.tgz#23ee99c37390a98cfddf3ef4a78674180d823094"
+  integrity sha512-TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
-    "@types/babel__core" "^7.0.0"
+    "@types/babel__core" "^7.1.14"
     "@types/babel__traverse" "^7.0.6"
 
 babel-plugin-polyfill-corejs2@^0.2.0:
@@ -1898,12 +2208,12 @@ babel-preset-fbjs@^3.4.0:
     "@babel/plugin-transform-template-literals" "^7.0.0"
     babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0"
 
-babel-preset-jest@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee"
-  integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==
+babel-preset-jest@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.2.0.tgz#3048bea3a1af222e3505e4a767a974c95a7620dc"
+  integrity sha512-z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA==
   dependencies:
-    babel-plugin-jest-hoist "^26.6.2"
+    babel-plugin-jest-hoist "^29.2.0"
     babel-preset-current-node-syntax "^1.0.0"
 
 balanced-match@^1.0.0:
@@ -1911,7 +2221,7 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
-base64-js@^1.1.2, base64-js@^1.3.1, base64-js@^1.5.1:
+base64-js@^1.1.2, base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
@@ -1936,7 +2246,7 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-bl@^4.1.0:
+bl@^4.0.3, bl@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
   integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
@@ -1976,21 +2286,15 @@ braces@^3.0.1:
   dependencies:
     fill-range "^7.0.1"
 
-browser-process-hrtime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
-  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
-
-browserslist@^4.16.3, browserslist@^4.17.5:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
-  integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
+browserslist@^4.21.3, browserslist@^4.21.4:
+  version "4.21.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
+  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
   dependencies:
-    caniuse-lite "^1.0.30001286"
-    electron-to-chromium "^1.4.17"
-    escalade "^3.1.1"
-    node-releases "^2.0.1"
-    picocolors "^1.0.0"
+    caniuse-lite "^1.0.30001400"
+    electron-to-chromium "^1.4.251"
+    node-releases "^2.0.6"
+    update-browserslist-db "^1.0.9"
 
 bser@^2.0.0:
   version "2.0.0"
@@ -2012,6 +2316,16 @@ buffer@^5.5.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
+builtin-modules@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==
+
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==
+
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -2069,29 +2383,33 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e"
-  integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==
-
-caniuse-lite@^1.0.30001286:
-  version "1.0.30001300"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001300.tgz#11ab6c57d3eb6f964cba950401fd00a146786468"
-  integrity sha512-cVjiJHWGcNlJi8TZVKNMnvMid3Z3TTdDHmLDzlOdIiZq138Exvo0G+G0wTdVYolxKb4AYwC+38pxodiInVtJSA==
+camelcase@^6.0.0, camelcase@^6.2.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-capture-exit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
-  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
-  dependencies:
-    rsvp "^4.8.4"
+caniuse-lite@^1.0.30001400:
+  version "1.0.30001400"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001400.tgz#3038bee70d8b875604cd8833cb0e5e254ee0281a"
+  integrity sha512-Mv659Hn65Z4LgZdJ7ge5JTVbE3rqbJaaXgW5LEI9/tOaXclfIZ8DW7D7FCWWWmWiiPS7AC48S8kf3DApSxQdgA==
 
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^2.0.0, chalk@^2.0.1:
+chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2118,6 +2436,18 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
+charm@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
+  integrity sha512-wqW3VdPnlSWT4eRiYX+hcs+C6ViBPUWk1qTCd+37qw9kEm/a5n2qcyQDMBWvSYKN/ctqZzeXNQaeBjOetJJUkw==
+  dependencies:
+    inherits "^2.0.1"
+
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
@@ -2128,17 +2458,17 @@ ci-info@^3.2.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2"
   integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==
 
-cjs-module-lexer@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f"
-  integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==
+cjs-module-lexer@^1.0.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40"
+  integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==
 
-clang-format@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/clang-format/-/clang-format-1.2.4.tgz#4bb4b0a98180428deb093cf20982e9fc1af20b6c"
-  integrity sha512-sw+nrGUp3hvmANd1qF8vZPuezSYQAiXgGBiEtkXTtJnnu6b00fCqkkDIsnRKrNgg4nv6NYZE92ejvOMIXZoejw==
+clang-format@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/clang-format/-/clang-format-1.8.0.tgz#7779df1c5ce1bc8aac1b0b02b4e479191ef21d46"
+  integrity sha512-pK8gzfu55/lHzIpQ1givIbWfn3eXnU7SfxqIwVgnn5jEM6j4ZJYjpFqFs4iSBPNedzRMmfjYjuQhu657WAXHXw==
   dependencies:
-    async "^1.5.2"
+    async "^3.2.3"
     glob "^7.0.0"
     resolve "^1.1.6"
 
@@ -2178,6 +2508,15 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
 clone-deep@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -2197,6 +2536,11 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
+
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -2239,7 +2583,7 @@ colorette@^1.0.7:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
   integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
-combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -2251,10 +2595,15 @@ command-exists@^1.2.8:
   resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.8.tgz#715acefdd1223b9c9b37110a149c6392c2852291"
   integrity sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==
 
-commander@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+commander@^2.12.1, commander@^2.20.0:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commander@^9.4.1:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd"
+  integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==
 
 commander@~2.13.0:
   version "2.13.0"
@@ -2296,6 +2645,16 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
+concat-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
+  integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.0.2"
+    typedarray "^0.0.6"
+
 connect@^3.6.5:
   version "3.6.6"
   resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
@@ -2306,6 +2665,11 @@ connect@^3.6.5:
     parseurl "~1.3.2"
     utils-merge "1.0.1"
 
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
+
 convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
@@ -2319,12 +2683,11 @@ copy-descriptor@^0.1.0:
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-js-compat@^3.9.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.10.1.tgz#62183a3a77ceeffcc420d907a3e6fc67d9b27f1c"
-  integrity sha512-ZHQTdTPkqvw2CeHiZC970NNJcnwzT6YIueDMASKt+p3WbZsLXOcoD392SkcWhkC0wBBHhlfhqGKKsNCQUozYtg==
+  version "3.25.5"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.25.5.tgz#0016e8158c904f7b059486639e6e82116eafa7d9"
+  integrity sha512-ovcyhs2DEBUIE0MGEKHP4olCUW/XYte3Vroyxuh38rD1wAO4dHohsovUC4eAOuzFxE6b+RXvBU3UZ9o0YhUTkA==
   dependencies:
-    browserslist "^4.16.3"
-    semver "7.0.0"
+    browserslist "^4.21.4"
 
 core-js-pure@^3.19.0:
   version "3.19.1"
@@ -2368,7 +2731,7 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.2:
+cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -2377,27 +2740,15 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-cssom@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
-  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
-
-cssom@~0.3.6:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
-  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
-
-cssstyle@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
-  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
-  dependencies:
-    cssom "~0.3.6"
+csstype@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9"
+  integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==
 
-damerau-levenshtein@^1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d"
-  integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==
+damerau-levenshtein@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
+  integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
 dashdash@^1.12.0:
   version "1.14.1"
@@ -2406,15 +2757,6 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-data-urls@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
-  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
-  dependencies:
-    abab "^2.0.3"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
-
 dayjs@^1.8.15:
   version "1.8.15"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.15.tgz#7121bc04e6a7f2621ed6db566be4a8aaf8c3913e"
@@ -2427,10 +2769,10 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
-  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
@@ -2439,17 +2781,17 @@ decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decimal.js@^10.2.1:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
-  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
-
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
-deep-is@^0.1.3, deep-is@~0.1.3:
+dedent@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+  integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
+
+deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
@@ -2471,12 +2813,13 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+define-properties@^1.1.3, define-properties@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
+  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
   dependencies:
-    object-keys "^1.0.12"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
 
 define-property@^0.2.5:
   version "0.2.5"
@@ -2505,6 +2848,11 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
+
 denodeify@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631"
@@ -2515,6 +2863,15 @@ depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
+deprecated-react-native-prop-types@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/deprecated-react-native-prop-types/-/deprecated-react-native-prop-types-3.0.1.tgz#a275f84cd8519cd1665e8df3c99e9067d57a23ec"
+  integrity sha512-J0jCJcsk4hMlIb7xwOZKLfMpuJn6l8UtrPEzzQV5ewz5gvKNYakhBuq9h2rWX7YwHHJZFhU5W8ye7dB9oN8VcQ==
+  dependencies:
+    "@react-native/normalize-color" "*"
+    invariant "*"
+    prop-types "*"
+
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
@@ -2525,10 +2882,15 @@ detect-newline@^3.0.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-diff-sequences@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
-  integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
+diff-sequences@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.2.0.tgz#4c55b5b40706c7b5d2c5c75999a50c56d214e8f6"
+  integrity sha512-413SY5JpYeSBZxmenGEmCVQ8mCgtFJF0w9PROdaS6z987XC2Pd2GOKqOITLtMftmyFZqgtCOb/QA7/Z3ZXfzIw==
+
+diff@^3.2.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
 dir-glob@^3.0.1:
   version "3.0.1"
@@ -2551,13 +2913,6 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-domexception@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
-  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
-  dependencies:
-    webidl-conversions "^5.0.0"
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -2571,22 +2926,22 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.4.17:
-  version "1.4.49"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.49.tgz#5b6a3dc032590beef4be485a4b0b3fe7d0e3dfd7"
-  integrity sha512-k/0t1TRfonHIp8TJKfjBu2cKj8MqYTiEpOhci+q7CVEE5xnCQnx1pTa+V8b/sdhe4S3PR4p4iceEQWhGrKQORQ==
+electron-to-chromium@^1.4.251:
+  version "1.4.251"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.251.tgz#8b62448f3c591f0d32488df09454dda72dec96d5"
+  integrity sha512-k4o4cFrWPv4SoJGGAydd07GmlRVzmeDIJ6MaEChTUjk4Dmomn189tCicSzil2oyvbPoGgg2suwPDNWq4gWRhoQ==
 
-emittery@^0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82"
-  integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==
+emittery@^0.10.2:
+  version "0.10.2"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933"
+  integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emoji-regex@^9.0.0:
+emoji-regex@^9.2.2:
   version "9.2.2"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
@@ -2596,20 +2951,13 @@ encodeurl@~1.0.1, encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-end-of-stream@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
+end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
-enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
-  dependencies:
-    ansi-colors "^4.1.1"
-
 envinfo@^7.7.2:
   version "7.7.3"
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.3.tgz#4b2d8622e3e7366afb8091b23ed95569ea0208cc"
@@ -2637,31 +2985,41 @@ errorhandler@^1.5.0:
     accepts "~1.3.3"
     escape-html "~1.0.3"
 
-es-abstract@^1.19.0, es-abstract@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
-  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
+es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5:
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
+  integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
   dependencies:
     call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
+    function.prototype.name "^1.1.5"
     get-intrinsic "^1.1.1"
     get-symbol-description "^1.0.0"
     has "^1.0.3"
-    has-symbols "^1.0.2"
+    has-property-descriptors "^1.0.0"
+    has-symbols "^1.0.3"
     internal-slot "^1.0.3"
     is-callable "^1.2.4"
-    is-negative-zero "^2.0.1"
+    is-negative-zero "^2.0.2"
     is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.1"
+    is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
-    is-weakref "^1.0.1"
-    object-inspect "^1.11.0"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.0"
     object-keys "^1.1.1"
     object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.1"
+    regexp.prototype.flags "^1.4.3"
+    string.prototype.trimend "^1.0.5"
+    string.prototype.trimstart "^1.0.5"
+    unbox-primitive "^1.0.2"
+
+es-shim-unscopables@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
+  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+  dependencies:
+    has "^1.0.3"
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
@@ -2682,7 +3040,7 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -2697,34 +3055,10 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-escodegen@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
-  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^5.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
-eslint-config-fb-strict@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-fb-strict/-/eslint-config-fb-strict-26.0.0.tgz#a1d03fc53131d002d7ebcaad29eb84f1f260cb58"
-  integrity sha512-CjtTjz3QvDyoHAMjQfs+RjE5WJWBGyCRTRmzu1BTTefLi/fbbixt9j27eq2z+B7my9ooxZqlDcBbqcDFx6gR/A==
-  dependencies:
-    eslint-config-fbjs "^3.1.1"
-
-eslint-config-fbjs@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-fbjs/-/eslint-config-fbjs-3.1.1.tgz#f5b4c1df888693672116f000527a8df25d61b888"
-  integrity sha512-Vpyqz+ZcyLyiUGUdUfiQmZnxiQ4Nj/KDRKed/Y5qSm+xHbQJ5zcZUQwLUMWHQicpDHewsdXwlpUAblvy1DtGvg==
-
-eslint-config-prettier@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
-  integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
+eslint-config-prettier@^8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
+  integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
 
 eslint-plugin-babel@^5.3.1:
   version "5.3.1"
@@ -2741,87 +3075,94 @@ eslint-plugin-eslint-comments@^3.2.0:
     escape-string-regexp "^1.0.5"
     ignore "^5.0.5"
 
-eslint-plugin-flowtype@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-7.0.0.tgz#da07684b5f0caf7c42ed013c2d0c04dbaf2960f4"
-  integrity sha512-kW3eipG2Vth6e0apYqmFs05IHhFklJJNokYNiNEO5AIjm7H29oTDybYNB2bMULUYcf7iX7Wf3GdRhfBORKcT1g==
+eslint-plugin-ft-flow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-ft-flow/-/eslint-plugin-ft-flow-2.0.1.tgz#57d9a12ef02b7af8f9bd6ccd6bd8fa4034809716"
+  integrity sha512-dGBnCo+ok6H9p6Vw2oPFEM4vA9IEclRXQQAA/Zws51/L5zr3FDl9FxQiWGfaw0WaTIX5biiAxp/q1W5bGXjlVA==
   dependencies:
     lodash "^4.17.21"
     string-natural-compare "^3.0.1"
 
-eslint-plugin-jest@^25.2.4:
-  version "25.2.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-25.2.4.tgz#bb9f6a0bd1fd524ffb0b8b7a159cd70a58a1a793"
-  integrity sha512-HRyinpgmEdkVr7pNPaYPHCoGqEzpgk79X8pg/xCeoAdurbyQjntJQ4pTzHl7BiVEBlam/F1Qsn+Dk0HtJO7Aaw==
+eslint-plugin-jest@^26.5.3:
+  version "26.5.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-26.5.3.tgz#a3ceeaf4a757878342b8b00eca92379b246e5505"
+  integrity sha512-sICclUqJQnR1bFRZGLN2jnSVsYOsmPYYnroGCIMVSvTS3y8XR3yjzy1EcTQmk6typ5pRgyIWzbjqxK6cZHEZuQ==
   dependencies:
-    "@typescript-eslint/experimental-utils" "^5.0.0"
+    "@typescript-eslint/utils" "^5.10.0"
 
-eslint-plugin-jsx-a11y@^6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz#a2d84caa49756942f42f1ffab9002436391718fd"
-  integrity sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==
+eslint-plugin-jsx-a11y@^6.6.0:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.0.tgz#2c5ac12e013eb98337b9aa261c3b355275cc6415"
+  integrity sha512-kTeLuIzpNhXL2CwLlc8AHI0aFRwWHcg483yepO9VQiHzM9bZwJdzTkzBszbuPrbgGmq2rlX/FaT2fJQsjUSHsw==
   dependencies:
-    "@babel/runtime" "^7.11.2"
+    "@babel/runtime" "^7.18.3"
     aria-query "^4.2.2"
-    array-includes "^3.1.1"
+    array-includes "^3.1.5"
     ast-types-flow "^0.0.7"
-    axe-core "^4.0.2"
+    axe-core "^4.4.2"
     axobject-query "^2.2.0"
-    damerau-levenshtein "^1.0.6"
-    emoji-regex "^9.0.0"
+    damerau-levenshtein "^1.0.8"
+    emoji-regex "^9.2.2"
     has "^1.0.3"
-    jsx-ast-utils "^3.1.0"
+    jsx-ast-utils "^3.3.1"
     language-tags "^1.0.5"
+    minimatch "^3.1.2"
+    semver "^6.3.0"
 
-eslint-plugin-prettier@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0"
-  integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==
+eslint-plugin-lint@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-lint/-/eslint-plugin-lint-1.0.0.tgz#bfc98ad0d1b5ea437b0072ec735c459df4d084b5"
+  integrity sha512-hYl6F/lYLjycZmHYnpTk3dlliNxjy9breG/9URhdQmPZibmENjM378EPKvSdIDBOV+Zw/Z0d3EaJhLTjcWTovA==
+
+eslint-plugin-prettier@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
+  integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-react-hooks@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556"
-  integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==
+eslint-plugin-react-hooks@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
+  integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
 
 eslint-plugin-react-native-globals@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz#ee1348bc2ceb912303ce6bdbd22e2f045ea86ea2"
   integrity sha512-9aEPf1JEpiTjcFAmmyw8eiIXmcNZOqaZyHO77wgm0/dWfT/oxC1SrIq8ET38pMxHYrcB6Uew+TzUVsBeczF88g==
 
-eslint-plugin-react-native@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.11.0.tgz#c73b0886abb397867e5e6689d3a6a418682e6bac"
-  integrity sha512-7F3OTwrtQPfPFd+VygqKA2VZ0f2fz0M4gJmry/TRE18JBb94/OtMxwbL7Oqwu7FGyrdeIOWnXQbBAveMcSTZIA==
+eslint-plugin-react-native@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-4.0.0.tgz#eec41984abe4970bdd7c6082dff7a98a5e34d0bb"
+  integrity sha512-kMmdxrSY7A1WgdqaGC+rY/28rh7kBGNBRsk48ovqkQmdg5j4K+DaFmegENDzMrdLkoufKGRNkKX6bgSwQTCAxQ==
   dependencies:
     "@babel/traverse" "^7.7.4"
     eslint-plugin-react-native-globals "^0.1.1"
 
-eslint-plugin-react@^7.26.1:
-  version "7.26.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz#41bcfe3e39e6a5ac040971c1af94437c80daa40e"
-  integrity sha512-Lug0+NOFXeOE+ORZ5pbsh6mSKjBKXDXItUD2sQoT+5Yl0eoT82DqnXeTMfUare4QVCn9QwXbfzO/dBLjLXwVjQ==
+eslint-plugin-react@^7.30.1:
+  version "7.30.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.30.1.tgz#2be4ab23ce09b5949c6631413ba64b2810fd3e22"
+  integrity sha512-NbEvI9jtqO46yJA3wcRF9Mo0lF9T/jhdHqhCHXiXtD+Zcb98812wvokjWpU7Q4QH5edo6dmqrukxVvWWXHlsUg==
   dependencies:
-    array-includes "^3.1.3"
-    array.prototype.flatmap "^1.2.4"
+    array-includes "^3.1.5"
+    array.prototype.flatmap "^1.3.0"
     doctrine "^2.1.0"
-    estraverse "^5.2.0"
+    estraverse "^5.3.0"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
-    minimatch "^3.0.4"
-    object.entries "^1.1.4"
-    object.fromentries "^2.0.4"
-    object.hasown "^1.0.0"
-    object.values "^1.1.4"
-    prop-types "^15.7.2"
+    minimatch "^3.1.2"
+    object.entries "^1.1.5"
+    object.fromentries "^2.0.5"
+    object.hasown "^1.1.1"
+    object.values "^1.1.5"
+    prop-types "^15.8.1"
     resolve "^2.0.0-next.3"
     semver "^6.3.0"
-    string.prototype.matchall "^4.0.5"
+    string.prototype.matchall "^4.0.7"
 
-eslint-plugin-relay@^1.8.2:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-relay/-/eslint-plugin-relay-1.8.2.tgz#925f59231e39dfc076b3cbb39ef793c13381579e"
-  integrity sha512-bqIfXJnPMd6iHPitONSi8JqxrWQWaX4Rqk1shusKDlUu5vswUgoqOEGgqE8nDu6SmejBUZMz0vY+ROvq5wqOsw==
+eslint-plugin-relay@^1.8.3:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-relay/-/eslint-plugin-relay-1.8.3.tgz#3f320b79259c14c8112909568b208a08e7a9ebae"
+  integrity sha512-awyrwntUTZ7Z+lJUnniTCnJdZYr1dY2djQDARMx1P1y2BFMsBjtTljBK0lBEM7yiTHPBwVnE2OSnXxcD4yMb0A==
   dependencies:
     graphql "^14.0.0 || ^15.0.0"
 
@@ -2838,12 +3179,13 @@ eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
+eslint-scope@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
+  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
   dependencies:
-    eslint-visitor-keys "^1.1.0"
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
 
 eslint-utils@^3.0.0:
   version "3.0.0"
@@ -2852,77 +3194,71 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
 eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2"
-  integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==
-
-eslint@^7.32.0:
-  version "7.32.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
-  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
-  dependencies:
-    "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.3"
-    "@humanwhocodes/config-array" "^0.5.0"
+eslint-visitor-keys@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
+  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+
+eslint@^8.17.0, eslint@^8.19.0:
+  version "8.23.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.1.tgz#cfd7b3f7fdd07db8d16b4ac0516a29c8d8dca5dc"
+  integrity sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==
+  dependencies:
+    "@eslint/eslintrc" "^1.3.2"
+    "@humanwhocodes/config-array" "^0.10.4"
+    "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
+    "@humanwhocodes/module-importer" "^1.0.1"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
-    debug "^4.0.1"
+    debug "^4.3.2"
     doctrine "^3.0.0"
-    enquirer "^2.3.5"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.1"
+    eslint-scope "^7.1.1"
+    eslint-utils "^3.0.0"
+    eslint-visitor-keys "^3.3.0"
+    espree "^9.4.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.1.2"
-    globals "^13.6.0"
-    ignore "^4.0.6"
+    find-up "^5.0.0"
+    glob-parent "^6.0.1"
+    globals "^13.15.0"
+    globby "^11.1.0"
+    grapheme-splitter "^1.0.4"
+    ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    js-yaml "^3.13.1"
+    js-sdsl "^4.1.4"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
-    progress "^2.0.0"
-    regexpp "^3.1.0"
-    semver "^7.2.1"
-    strip-ansi "^6.0.0"
+    regexpp "^3.2.0"
+    strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
-    table "^6.0.9"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^7.3.0, espree@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+espree@^9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a"
+  integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==
   dependencies:
-    acorn "^7.4.0"
-    acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
+    acorn "^8.8.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.3.0"
 
-esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
+esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -2946,10 +3282,10 @@ estraverse@^4.1.1:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
   integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
 
-estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
-  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
 esutils@^2.0.2:
   version "2.0.2"
@@ -2966,11 +3302,6 @@ event-target-shim@^5.0.0, event-target-shim@^5.0.1:
   resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
   integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
 
-exec-sh@^0.3.2:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
-  integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
-
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
@@ -2984,19 +3315,19 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
-  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+execa@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
   dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
     is-stream "^2.0.0"
     merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
 exit@^0.1.2:
@@ -3017,17 +3348,16 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expect@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417"
-  integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==
+expect@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.2.1.tgz#25752d0df92d3daa5188dc8804de1f30759658cf"
+  integrity sha512-BJtA754Fba0YWRWHgjKUMTA3ltWarKgITXHQnbZ2mTxTXC4yMQlR0FI7HkB3fJYkhWBf4qjNiqvg3LDtXCcVRQ==
   dependencies:
-    "@jest/types" "^26.6.2"
-    ansi-styles "^4.0.0"
-    jest-get-type "^26.3.0"
-    jest-matcher-utils "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-regex-util "^26.0.0"
+    "@jest/expect-utils" "^29.2.1"
+    jest-get-type "^29.2.0"
+    jest-matcher-utils "^29.2.1"
+    jest-message-util "^29.2.1"
+    jest-util "^29.2.1"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
@@ -3092,10 +3422,10 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
-fast-glob@^3.1.1:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
-  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
+fast-glob@^3.2.9:
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
+  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -3103,12 +3433,12 @@ fast-glob@^3.1.1:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -3195,6 +3525,14 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -3208,20 +3546,15 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561"
   integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==
 
-flow-bin@^0.182.0:
-  version "0.182.0"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.182.0.tgz#1dacbd72465743670412ada015d3182deda6f966"
-  integrity sha512-Ux90c2sMfoV/VVjOEFT2OHFJFnyfoIbTK/5AKAMnU4Skfru1G+FyS5YLu3XxQl0R6mpA9+rrFlPfYZq/5B+J3w==
+flow-bin@^0.191.0:
+  version "0.191.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.191.0.tgz#9324c9498584b60575fd8d77a2897ee4f384443b"
+  integrity sha512-IhaDGoOtRDdGUJLjm7KQlHK8BAzOVJmpx+CIR6bCju4pF7zon2v7WNrds5706WZqDE3rD2c8cM4GdhDnIFYXtg==
 
-flow-parser@0.*:
-  version "0.163.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.163.0.tgz#c2d5c77c57c53e8357016a837f3e3af04a0c87a6"
-  integrity sha512-txOsBcZ1nKsKtoAsBFnArFdq0cnPCmEHI5S2jQIgU1ZO1xtWpg64TsZSRktsaOyoWLpAvVxPap4Qbdd/TCJ3FQ==
-
-flow-parser@^0.121.0:
-  version "0.121.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.121.0.tgz#9f9898eaec91a9f7c323e9e992d81ab5c58e618f"
-  integrity sha512-1gIBiWJNR0tKUNv8gZuk7l9rVX06OuLzY9AoGio7y/JT4V1IZErEMEq2TJS+PFcw/y0RshZ1J/27VfK1UQzYVg==
+flow-parser@0.*, flow-parser@^0.185.0:
+  version "0.185.0"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.185.0.tgz#56bde60805bad19b2934ebfc50c9485e5c5424f9"
+  integrity sha512-VWpXjEbQbIGQvB6CyWwx56wMioGZ6w2s8qJlFiuE3S7D8O+xE5t988i1u2TGFO5TLSzQPUhfIOzPpLYA93H9Jg==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -3233,15 +3566,6 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-form-data@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
-  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -3263,14 +3587,19 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
-fs-extra@^1.0.0:
+fs-constants@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950"
-  integrity sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
+fs-extra@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
+  integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==
   dependencies:
     graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    klaw "^1.0.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
 
 fs-extra@^8.1.0:
   version "8.1.0"
@@ -3281,32 +3610,78 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-minipass@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
+  dependencies:
+    minipass "^3.0.0"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^2.1.2, fsevents@^2.3.2:
+fsevents@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
+fstream@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function.prototype.name@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
+  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.0"
+    functions-have-names "^1.2.2"
+
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
+functions-have-names@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -3332,12 +3707,10 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
-get-stream@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
-  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
-  dependencies:
-    pump "^3.0.0"
+get-stream@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
 get-symbol-description@^1.0.0:
   version "1.0.0"
@@ -3366,15 +3739,22 @@ glob-parent@^5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+glob-parent@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
+glob@^7.0.0, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.1"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
@@ -3383,40 +3763,40 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d"
   integrity sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e"
-  integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==
+globals@^13.15.0:
+  version "13.16.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.16.0.tgz#9be4aca28f311aaeb974ea54978ebbb5e35ce46a"
+  integrity sha512-A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==
   dependencies:
     type-fest "^0.20.2"
 
-globby@^11.0.4:
-  version "11.0.4"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
-  integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
   dependencies:
     array-union "^2.1.0"
     dir-glob "^3.0.1"
-    fast-glob "^3.1.1"
-    ignore "^5.1.4"
-    merge2 "^1.3.0"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
     slash "^3.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+
+grapheme-splitter@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
 "graphql@^14.0.0 || ^15.0.0":
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.7.2.tgz#85ab0eeb83722977151b3feb4d631b5f2ab287ef"
   integrity sha512-AnnKk7hFQFmU/2I9YSQf3xw44ctnSFCfp3zE0N6W174gqe9fWG/2rKaKxROK7CcI3XtERpjEKFqts8o319Kf7A==
 
-growly@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
-  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
-
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -3430,10 +3810,17 @@ har-validator@~5.1.3:
     ajv "^6.12.3"
     har-schema "^2.0.0"
 
-has-bigints@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
-  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-bigints@^1.0.1, has-bigints@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
 has-flag@^3.0.0:
   version "3.0.0"
@@ -3445,10 +3832,17 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.1, has-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  dependencies:
+    get-intrinsic "^1.1.1"
+
+has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
 has-tostringtag@^1.0.0:
   version "1.0.0"
@@ -3457,6 +3851,11 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
+
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -3504,23 +3903,11 @@ hermes-eslint@0.8.0:
     hermes-estree "0.8.0"
     hermes-parser "0.8.0"
 
-hermes-estree@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.6.0.tgz#e866fddae1b80aec65fe2ae450a5f2070ad54033"
-  integrity sha512-2YTGzJCkhdmT6VuNprWjXnvTvw/3iPNw804oc7yknvQpNKo+vJGZmtvLLCghOZf0OwzKaNAzeIMp71zQbNl09w==
-
 hermes-estree@0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.8.0.tgz#530be27243ca49f008381c1f3e8b18fb26bf9ec0"
   integrity sha512-W6JDAOLZ5pMPMjEiQGLCXSSV7pIBEgRR5zGkxgmzGSXHOxqV5dC/M1Zevqpbm9TZDE5tu358qZf8Vkzmsc+u7Q==
 
-hermes-parser@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.6.0.tgz#00d14e91bca830b3c1457050fa4187400cb96328"
-  integrity sha512-Vf58jBZca2+QBLR9h7B7mdg8oFz2g5ILz1iVouZ5DOrOrAfBmPfJjdjDT8jrO0f+iJ4/hSRrQHqHIjSnTaLUDQ==
-  dependencies:
-    hermes-estree "0.6.0"
-
 hermes-parser@0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.8.0.tgz#116dceaba32e45b16d6aefb5c4c830eaeba2d257"
@@ -3535,17 +3922,12 @@ hermes-profile-transformer@^0.0.6:
   dependencies:
     source-map "^0.7.3"
 
-hosted-git-info@^2.1.4:
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
-html-encoding-sniffer@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
-  integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
+hosted-git-info@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
   dependencies:
-    whatwg-encoding "^1.0.5"
+    lru-cache "^6.0.0"
 
 html-escaper@^2.0.0:
   version "2.0.2"
@@ -3562,15 +3944,6 @@ http-errors@~1.6.2:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
-http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
-  dependencies:
-    "@tootallnate/once" "1"
-    agent-base "6"
-    debug "4"
-
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -3580,20 +3953,12 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-https-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
-  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
-human-signals@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
-  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24:
+iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -3605,15 +3970,10 @@ ieee754@^1.1.13:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
-ignore@^5.0.5, ignore@^5.1.4:
-  version "5.1.9"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb"
-  integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==
+ignore@^5.0.5, ignore@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
+  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
 image-size@^0.6.0:
   version "0.6.3"
@@ -3657,7 +4017,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -3700,7 +4060,7 @@ interpret@^1.0.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
   integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
 
-invariant@^2.2.4:
+invariant@*, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -3756,17 +4116,10 @@ is-callable@^1.1.4, is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-ci@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
-  dependencies:
-    ci-info "^2.0.0"
-
-is-core-module@^2.2.0, is-core-module@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
-  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
+is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.9.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
+  integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
   dependencies:
     has "^1.0.3"
 
@@ -3812,11 +4165,6 @@ is-directory@^0.3.1:
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
   integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
-is-docker@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
-  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
-
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -3834,6 +4182,13 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
+  dependencies:
+    number-is-nan "^1.0.0"
+
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -3861,10 +4216,10 @@ is-interactive@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
   integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
 
-is-negative-zero@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
-  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+is-negative-zero@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
+  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
 
 is-number-object@^1.0.4:
   version "1.0.6"
@@ -3885,18 +4240,13 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
-is-potential-custom-element-name@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
-  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
-
 is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -3905,10 +4255,12 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-shared-array-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
-  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
+is-shared-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
+  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+  dependencies:
+    call-bind "^1.0.2"
 
 is-stream@^1.1.0:
   version "1.1.0"
@@ -3934,7 +4286,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
@@ -3944,12 +4296,12 @@ is-unicode-supported@^0.1.0:
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
-is-weakref@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
-  integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==
+is-weakref@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
+  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
 
 is-windows@^1.0.2:
   version "1.0.2"
@@ -3961,13 +4313,6 @@ is-wsl@^1.1.0:
   resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
-is-wsl@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
-  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
-  dependencies:
-    is-docker "^2.0.0"
-
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -4000,20 +4345,10 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
   integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
 
-istanbul-lib-instrument@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
-  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
-  dependencies:
-    "@babel/core" "^7.7.5"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.0.0"
-    semver "^6.3.0"
-
-istanbul-lib-instrument@^5.0.4:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a"
-  integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==
+istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz#31d18bdd127f825dd02ea7bfdfd906f8ab840e9f"
+  integrity sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==
   dependencies:
     "@babel/core" "^7.12.3"
     "@babel/parser" "^7.14.7"
@@ -4039,118 +4374,132 @@ istanbul-lib-source-maps@^4.0.0:
     istanbul-lib-coverage "^3.0.0"
     source-map "^0.6.1"
 
-istanbul-reports@^3.0.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.3.tgz#4bcae3103b94518117930d51283690960b50d3c2"
-  integrity sha512-x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg==
+istanbul-reports@^3.1.3:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae"
+  integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jest-changed-files@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"
-  integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==
+jest-changed-files@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.2.0.tgz#b6598daa9803ea6a4dce7968e20ab380ddbee289"
+  integrity sha512-qPVmLLyBmvF5HJrY7krDisx6Voi8DmlV3GZYX0aFNbaQsZeoz1hfxcCMbqDGuQCxU1dJy9eYc2xscE8QrCCYaA==
   dependencies:
-    "@jest/types" "^26.6.2"
-    execa "^4.0.0"
-    throat "^5.0.0"
+    execa "^5.0.0"
+    p-limit "^3.1.0"
 
-jest-cli@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a"
-  integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==
+jest-circus@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.2.1.tgz#1385353d9bca6acf58f916068bbeffcfc95bef02"
+  integrity sha512-W+ZQQ5ln4Db2UZNM4NJIeasnhCdDhSuYW4eLgNAUi0XiSSpF634Kc5wiPvGiHvTgXMFVn1ZgWIijqhi9+kLNLg==
   dependencies:
-    "@jest/core" "^26.6.3"
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/environment" "^29.2.1"
+    "@jest/expect" "^29.2.1"
+    "@jest/test-result" "^29.2.1"
+    "@jest/types" "^29.2.1"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    co "^4.6.0"
+    dedent "^0.7.0"
+    is-generator-fn "^2.0.0"
+    jest-each "^29.2.1"
+    jest-matcher-utils "^29.2.1"
+    jest-message-util "^29.2.1"
+    jest-runtime "^29.2.1"
+    jest-snapshot "^29.2.1"
+    jest-util "^29.2.1"
+    p-limit "^3.1.0"
+    pretty-format "^29.2.1"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
+jest-cli@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.2.1.tgz#fbfa90b87b27a04e1041cc9d33ee80f32e2f2528"
+  integrity sha512-UIMD5aNqvPKpdlJSaeUAoLfxsh9TZvOkaMETx5qXnkboc317bcbb0eLHbIj8sFBHdcJAIAM+IRKnIU7Wi61MBw==
+  dependencies:
+    "@jest/core" "^29.2.1"
+    "@jest/test-result" "^29.2.1"
+    "@jest/types" "^29.2.1"
     chalk "^4.0.0"
     exit "^0.1.2"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
     import-local "^3.0.2"
-    is-ci "^2.0.0"
-    jest-config "^26.6.3"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
+    jest-config "^29.2.1"
+    jest-util "^29.2.1"
+    jest-validate "^29.2.1"
     prompts "^2.0.1"
-    yargs "^15.4.1"
+    yargs "^17.3.1"
 
-jest-config@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349"
-  integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==
+jest-config@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.2.1.tgz#2182af014d6c73978208626335db5134803dd183"
+  integrity sha512-EV5F1tQYW/quZV2br2o88hnYEeRzG53Dfi6rSG3TZBuzGQ6luhQBux/RLlU5QrJjCdq3LXxRRM8F1LP6DN1ycA==
   dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^26.6.3"
-    "@jest/types" "^26.6.2"
-    babel-jest "^26.6.3"
+    "@babel/core" "^7.11.6"
+    "@jest/test-sequencer" "^29.2.1"
+    "@jest/types" "^29.2.1"
+    babel-jest "^29.2.1"
     chalk "^4.0.0"
+    ci-info "^3.2.0"
     deepmerge "^4.2.2"
-    glob "^7.1.1"
-    graceful-fs "^4.2.4"
-    jest-environment-jsdom "^26.6.2"
-    jest-environment-node "^26.6.2"
-    jest-get-type "^26.3.0"
-    jest-jasmine2 "^26.6.3"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.2"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
-    micromatch "^4.0.2"
-    pretty-format "^26.6.2"
-
-jest-diff@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
-  integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
-  dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^26.6.2"
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
-
-jest-docblock@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5"
-  integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==
-  dependencies:
-    detect-newline "^3.0.0"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    jest-circus "^29.2.1"
+    jest-environment-node "^29.2.1"
+    jest-get-type "^29.2.0"
+    jest-regex-util "^29.2.0"
+    jest-resolve "^29.2.1"
+    jest-runner "^29.2.1"
+    jest-util "^29.2.1"
+    jest-validate "^29.2.1"
+    micromatch "^4.0.4"
+    parse-json "^5.2.0"
+    pretty-format "^29.2.1"
+    slash "^3.0.0"
+    strip-json-comments "^3.1.1"
 
-jest-each@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb"
-  integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==
+jest-diff@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.2.1.tgz#027e42f5a18b693fb2e88f81b0ccab533c08faee"
+  integrity sha512-gfh/SMNlQmP3MOUgdzxPOd4XETDJifADpT937fN1iUGz+9DgOu2eUPHH25JDkLVcLwwqxv3GzVyK4VBUr9fjfA==
   dependencies:
-    "@jest/types" "^26.6.2"
-    chalk "^4.0.0"
-    jest-get-type "^26.3.0"
-    jest-util "^26.6.2"
-    pretty-format "^26.6.2"
+    chalk "^4.0.0"
+    diff-sequences "^29.2.0"
+    jest-get-type "^29.2.0"
+    pretty-format "^29.2.1"
 
-jest-environment-jsdom@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e"
-  integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==
+jest-docblock@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.2.0.tgz#307203e20b637d97cee04809efc1d43afc641e82"
+  integrity sha512-bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A==
   dependencies:
-    "@jest/environment" "^26.6.2"
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    jest-mock "^26.6.2"
-    jest-util "^26.6.2"
-    jsdom "^16.4.0"
+    detect-newline "^3.0.0"
 
-jest-environment-node@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c"
-  integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==
+jest-each@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.2.1.tgz#6b0a88ee85c2ba27b571a6010c2e0c674f5c9b29"
+  integrity sha512-sGP86H/CpWHMyK3qGIGFCgP6mt+o5tu9qG4+tobl0LNdgny0aitLXs9/EBacLy3Bwqy+v4uXClqJgASJWcruYw==
   dependencies:
-    "@jest/environment" "^26.6.2"
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/types" "^29.2.1"
+    chalk "^4.0.0"
+    jest-get-type "^29.2.0"
+    jest-util "^29.2.1"
+    pretty-format "^29.2.1"
+
+jest-environment-node@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.2.1.tgz#f90311d0f0e8ef720349f83c97a076e403f90665"
+  integrity sha512-PulFKwEMz6nTAdLUwglFKei3b/LixwlRiqTN6nvPE1JtrLtlnpd6LXnFI1NFHYJGlTmIWilMP2n9jEtPPKX50g==
+  dependencies:
+    "@jest/environment" "^29.2.1"
+    "@jest/fake-timers" "^29.2.1"
+    "@jest/types" "^29.2.1"
     "@types/node" "*"
-    jest-mock "^26.6.2"
-    jest-util "^26.6.2"
+    jest-mock "^29.2.1"
+    jest-util "^29.2.1"
 
 jest-get-type@^24.9.0:
   version "24.9.0"
@@ -4162,71 +4511,30 @@ jest-get-type@^26.3.0:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
   integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
 
-jest-haste-map@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"
-  integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    "@types/graceful-fs" "^4.1.2"
-    "@types/node" "*"
-    anymatch "^3.0.3"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-regex-util "^26.0.0"
-    jest-serializer "^26.6.2"
-    jest-util "^26.6.2"
-    jest-worker "^26.6.2"
-    micromatch "^4.0.2"
-    sane "^4.0.3"
-    walker "^1.0.7"
-  optionalDependencies:
-    fsevents "^2.1.2"
+jest-get-type@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408"
+  integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==
 
-jest-haste-map@^27.3.1:
-  version "27.4.6"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.4.6.tgz#c60b5233a34ca0520f325b7e2cc0a0140ad0862a"
-  integrity sha512-0tNpgxg7BKurZeFkIOvGCkbmOHbLFf4LUQOxrQSMjvrQaQe3l6E8x6jYC1NuWkGo5WDdbr8FEzUxV2+LWNawKQ==
+jest-haste-map@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.2.1.tgz#f803fec57f8075e6c55fb5cd551f99a72471c699"
+  integrity sha512-wF460rAFmYc6ARcCFNw4MbGYQjYkvjovb9GBT+W10Um8q5nHq98jD6fHZMDMO3tA56S8XnmNkM8GcA8diSZfnA==
   dependencies:
-    "@jest/types" "^27.4.2"
-    "@types/graceful-fs" "^4.1.2"
+    "@jest/types" "^29.2.1"
+    "@types/graceful-fs" "^4.1.3"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-regex-util "^27.4.0"
-    jest-serializer "^27.4.0"
-    jest-util "^27.4.2"
-    jest-worker "^27.4.6"
+    graceful-fs "^4.2.9"
+    jest-regex-util "^29.2.0"
+    jest-util "^29.2.1"
+    jest-worker "^29.2.1"
     micromatch "^4.0.4"
-    walker "^1.0.7"
+    walker "^1.0.8"
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-jasmine2@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd"
-  integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==
-  dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^26.6.2"
-    "@jest/source-map" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    co "^4.6.0"
-    expect "^26.6.2"
-    is-generator-fn "^2.0.0"
-    jest-each "^26.6.2"
-    jest-matcher-utils "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-runtime "^26.6.3"
-    jest-snapshot "^26.6.2"
-    jest-util "^26.6.2"
-    pretty-format "^26.6.2"
-    throat "^5.0.0"
-
 jest-junit@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-10.0.0.tgz#c94b91c24920a327c9d2a075e897b2dba4af494b"
@@ -4238,204 +4546,201 @@ jest-junit@^10.0.0:
     uuid "^3.3.3"
     xml "^1.0.1"
 
-jest-leak-detector@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af"
-  integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==
+jest-leak-detector@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.2.1.tgz#ec551686b7d512ec875616c2c3534298b1ffe2fc"
+  integrity sha512-1YvSqYoiurxKOJtySc+CGVmw/e1v4yNY27BjWTVzp0aTduQeA7pdieLiW05wTYG/twlKOp2xS/pWuikQEmklug==
   dependencies:
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
+    jest-get-type "^29.2.0"
+    pretty-format "^29.2.1"
 
-jest-matcher-utils@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"
-  integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==
+jest-matcher-utils@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.2.1.tgz#2bf876c5f891b33786aadf5d65d5da5970744122"
+  integrity sha512-hUTBh7H/Mnb6GTpihbLh8uF5rjAMdekfW/oZNXUMAXi7bbmym2HiRpzgqf/zzkjgejMrVAkPdVSQj+32enlUww==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^26.6.2"
-    jest-get-type "^26.3.0"
-    pretty-format "^26.6.2"
+    jest-diff "^29.2.1"
+    jest-get-type "^29.2.0"
+    pretty-format "^29.2.1"
 
-jest-message-util@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07"
-  integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==
+jest-message-util@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.2.1.tgz#3a51357fbbe0cc34236f17a90d772746cf8d9193"
+  integrity sha512-Dx5nEjw9V8C1/Yj10S/8ivA8F439VS8vTq1L7hEgwHFn9ovSKNpYW/kwNh7UglaEgXO42XxzKJB+2x0nSglFVw==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^26.6.2"
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^29.2.1"
     "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    micromatch "^4.0.2"
-    pretty-format "^26.6.2"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^29.2.1"
     slash "^3.0.0"
-    stack-utils "^2.0.2"
+    stack-utils "^2.0.3"
 
-jest-mock@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302"
-  integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==
+jest-mock@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.2.1.tgz#a0d361cffcb28184fa9c5443adbf591fa5759775"
+  integrity sha512-NDphaY/GqyQpTfnTZiTqqpMaw4Z0I7XnB7yBgrT6IwYrLGxpOhrejYr4ANY4YvO2sEGdd8Tx/6D0+WLQy7/qDA==
   dependencies:
-    "@jest/types" "^26.6.2"
+    "@jest/types" "^29.2.1"
     "@types/node" "*"
+    jest-util "^29.2.1"
 
 jest-pnp-resolver@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
-jest-regex-util@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
-  integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
+jest-regex-util@^27.0.6:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz#4da143f7e9fd1e542d4aa69617b38e4a78365b95"
+  integrity sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==
 
-jest-regex-util@^27.4.0:
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.4.0.tgz#e4c45b52653128843d07ad94aec34393ea14fbca"
-  integrity sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==
+jest-regex-util@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.2.0.tgz#82ef3b587e8c303357728d0322d48bbfd2971f7b"
+  integrity sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA==
 
-jest-resolve-dependencies@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6"
-  integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==
+jest-resolve-dependencies@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.2.1.tgz#8d717dd41dc615fef1d412d395ea3deccfb1b9fa"
+  integrity sha512-o3mUGX2j08usj1jIAIE8KmUVpqVAn54k80kI27ldbZf2oJn6eghhB6DvJxjrcH40va9CQgWTfU5f2Ag/MoUqgQ==
   dependencies:
-    "@jest/types" "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-snapshot "^26.6.2"
+    jest-regex-util "^29.2.0"
+    jest-snapshot "^29.2.1"
 
-jest-resolve@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507"
-  integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==
+jest-resolve@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.2.1.tgz#a4d2f76db88aeb6ec5f5453c9a40b52483d17799"
+  integrity sha512-1dJTW76Z9622Viq4yRcwBuEXuzGtE9B2kdl05RC8Om/lAzac9uEgC+M8Q5osVidbuBPmxm8wSrcItYhca2ZAtQ==
   dependencies:
-    "@jest/types" "^26.6.2"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.2.1"
     jest-pnp-resolver "^1.2.2"
-    jest-util "^26.6.2"
-    read-pkg-up "^7.0.1"
-    resolve "^1.18.1"
+    jest-util "^29.2.1"
+    jest-validate "^29.2.1"
+    resolve "^1.20.0"
+    resolve.exports "^1.1.0"
     slash "^3.0.0"
 
-jest-runner@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"
-  integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==
+jest-runner@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.2.1.tgz#885afe64661cb2f51f84c1b97afb713d1093c124"
+  integrity sha512-PojFI+uVhQ4u4YZKCN/a3yU0/l/pJJXhq1sW3JpCp8CyvGBYGddRFPKZ1WihApusxqWRTHjBJmGyPWv6Av2lWA==
   dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/environment" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/console" "^29.2.1"
+    "@jest/environment" "^29.2.1"
+    "@jest/test-result" "^29.2.1"
+    "@jest/transform" "^29.2.1"
+    "@jest/types" "^29.2.1"
     "@types/node" "*"
     chalk "^4.0.0"
-    emittery "^0.7.1"
-    exit "^0.1.2"
-    graceful-fs "^4.2.4"
-    jest-config "^26.6.3"
-    jest-docblock "^26.0.0"
-    jest-haste-map "^26.6.2"
-    jest-leak-detector "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-resolve "^26.6.2"
-    jest-runtime "^26.6.3"
-    jest-util "^26.6.2"
-    jest-worker "^26.6.2"
-    source-map-support "^0.5.6"
-    throat "^5.0.0"
-
-jest-runtime@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b"
-  integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==
-  dependencies:
-    "@jest/console" "^26.6.2"
-    "@jest/environment" "^26.6.2"
-    "@jest/fake-timers" "^26.6.2"
-    "@jest/globals" "^26.6.2"
-    "@jest/source-map" "^26.6.2"
-    "@jest/test-result" "^26.6.2"
-    "@jest/transform" "^26.6.2"
-    "@jest/types" "^26.6.2"
-    "@types/yargs" "^15.0.0"
+    emittery "^0.10.2"
+    graceful-fs "^4.2.9"
+    jest-docblock "^29.2.0"
+    jest-environment-node "^29.2.1"
+    jest-haste-map "^29.2.1"
+    jest-leak-detector "^29.2.1"
+    jest-message-util "^29.2.1"
+    jest-resolve "^29.2.1"
+    jest-runtime "^29.2.1"
+    jest-util "^29.2.1"
+    jest-watcher "^29.2.1"
+    jest-worker "^29.2.1"
+    p-limit "^3.1.0"
+    source-map-support "0.5.13"
+
+jest-runtime@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.2.1.tgz#62e3a23c33710ae4d9c3304dda851a5fb225b574"
+  integrity sha512-PSQ880OoIW9y8E6/jjhGn3eQNgNc6ndMzCZaKqy357bv7FqCfSyYepu3yDC6Sp1Vkt+GhP2M/PVgldS2uZSFZg==
+  dependencies:
+    "@jest/environment" "^29.2.1"
+    "@jest/fake-timers" "^29.2.1"
+    "@jest/globals" "^29.2.1"
+    "@jest/source-map" "^29.2.0"
+    "@jest/test-result" "^29.2.1"
+    "@jest/transform" "^29.2.1"
+    "@jest/types" "^29.2.1"
+    "@types/node" "*"
     chalk "^4.0.0"
-    cjs-module-lexer "^0.6.0"
+    cjs-module-lexer "^1.0.0"
     collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
     glob "^7.1.3"
-    graceful-fs "^4.2.4"
-    jest-config "^26.6.3"
-    jest-haste-map "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-mock "^26.6.2"
-    jest-regex-util "^26.0.0"
-    jest-resolve "^26.6.2"
-    jest-snapshot "^26.6.2"
-    jest-util "^26.6.2"
-    jest-validate "^26.6.2"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.2.1"
+    jest-message-util "^29.2.1"
+    jest-mock "^29.2.1"
+    jest-regex-util "^29.2.0"
+    jest-resolve "^29.2.1"
+    jest-snapshot "^29.2.1"
+    jest-util "^29.2.1"
     slash "^3.0.0"
     strip-bom "^4.0.0"
-    yargs "^15.4.1"
-
-jest-serializer@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1"
-  integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==
-  dependencies:
-    "@types/node" "*"
-    graceful-fs "^4.2.4"
 
-jest-serializer@^27.4.0:
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.4.0.tgz#34866586e1cae2388b7d12ffa2c7819edef5958a"
-  integrity sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==
+jest-serializer@^27.0.6:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.1.tgz#81438410a30ea66fd57ff730835123dea1fb1f64"
+  integrity sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==
   dependencies:
     "@types/node" "*"
-    graceful-fs "^4.2.4"
-
-jest-snapshot@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84"
-  integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==
-  dependencies:
-    "@babel/types" "^7.0.0"
-    "@jest/types" "^26.6.2"
-    "@types/babel__traverse" "^7.0.4"
-    "@types/prettier" "^2.0.0"
+    graceful-fs "^4.2.9"
+
+jest-snapshot@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.2.1.tgz#f3843b3099c8fec7e6218dea18cc506f10ea5d30"
+  integrity sha512-KZdLD7iEz5M4ZYd+ezZ/kk73z+DtNbk/yJ4Qx7408Vb0CCuclJIZPa/HmIwSsCfIlOBNcYTKufr7x/Yv47oYlg==
+  dependencies:
+    "@babel/core" "^7.11.6"
+    "@babel/generator" "^7.7.2"
+    "@babel/plugin-syntax-jsx" "^7.7.2"
+    "@babel/plugin-syntax-typescript" "^7.7.2"
+    "@babel/traverse" "^7.7.2"
+    "@babel/types" "^7.3.3"
+    "@jest/expect-utils" "^29.2.1"
+    "@jest/transform" "^29.2.1"
+    "@jest/types" "^29.2.1"
+    "@types/babel__traverse" "^7.0.6"
+    "@types/prettier" "^2.1.5"
+    babel-preset-current-node-syntax "^1.0.0"
     chalk "^4.0.0"
-    expect "^26.6.2"
-    graceful-fs "^4.2.4"
-    jest-diff "^26.6.2"
-    jest-get-type "^26.3.0"
-    jest-haste-map "^26.6.2"
-    jest-matcher-utils "^26.6.2"
-    jest-message-util "^26.6.2"
-    jest-resolve "^26.6.2"
+    expect "^29.2.1"
+    graceful-fs "^4.2.9"
+    jest-diff "^29.2.1"
+    jest-get-type "^29.2.0"
+    jest-haste-map "^29.2.1"
+    jest-matcher-utils "^29.2.1"
+    jest-message-util "^29.2.1"
+    jest-util "^29.2.1"
     natural-compare "^1.4.0"
-    pretty-format "^26.6.2"
-    semver "^7.3.2"
+    pretty-format "^29.2.1"
+    semver "^7.3.5"
 
-jest-util@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
-  integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
+jest-util@^27.2.0:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz#3ba9771e8e31a0b85da48fe0b0891fb86c01c2f9"
+  integrity sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==
   dependencies:
-    "@jest/types" "^26.6.2"
+    "@jest/types" "^27.5.1"
     "@types/node" "*"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    is-ci "^2.0.0"
-    micromatch "^4.0.2"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
+    picomatch "^2.2.3"
 
-jest-util@^27.4.2:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.4.2.tgz#ed95b05b1adfd761e2cda47e0144c6a58e05a621"
-  integrity sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==
+jest-util@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.2.1.tgz#f26872ba0dc8cbefaba32c34f98935f6cf5fc747"
+  integrity sha512-P5VWDj25r7kj7kl4pN2rG/RN2c1TLfYYYZYULnS/35nFDjBai+hBeo3MDrYZS7p6IoY3YHZnt2vq4L6mKnLk0g==
   dependencies:
-    "@jest/types" "^27.4.2"
+    "@jest/types" "^29.2.1"
     "@types/node" "*"
     chalk "^4.0.0"
     ci-info "^3.2.0"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
 jest-validate@^24.9.0:
@@ -4450,7 +4755,7 @@ jest-validate@^24.9.0:
     leven "^3.1.0"
     pretty-format "^24.9.0"
 
-jest-validate@^26.5.2, jest-validate@^26.6.2:
+jest-validate@^26.5.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec"
   integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==
@@ -4462,50 +4767,60 @@ jest-validate@^26.5.2, jest-validate@^26.6.2:
     leven "^3.1.0"
     pretty-format "^26.6.2"
 
-jest-watcher@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975"
-  integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==
+jest-validate@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.2.1.tgz#db814ce12c4c7e4746044922762e56eb177d066c"
+  integrity sha512-DZVX5msG6J6DL5vUUw+++6LEkXUsPwB5R7fsfM7BXdz2Ipr0Ib046ak+8egrwAR++pvSM/5laxLK977ieIGxkQ==
   dependencies:
-    "@jest/test-result" "^26.6.2"
-    "@jest/types" "^26.6.2"
+    "@jest/types" "^29.2.1"
+    camelcase "^6.2.0"
+    chalk "^4.0.0"
+    jest-get-type "^29.2.0"
+    leven "^3.1.0"
+    pretty-format "^29.2.1"
+
+jest-watcher@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.2.1.tgz#1cb91f8aa9e77b1332af139944ad65e51430d7c3"
+  integrity sha512-7jFaHUaRq50l4w/f6RuY713bvI5XskMmjWCE54NGYcY74fLkShS8LucXJke1QfGnwDSCoIqGnGGGKPwdaBYz2Q==
+  dependencies:
+    "@jest/test-result" "^29.2.1"
+    "@jest/types" "^29.2.1"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    jest-util "^26.6.2"
+    emittery "^0.10.2"
+    jest-util "^29.2.1"
     string-length "^4.0.1"
 
-jest-worker@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
-  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
+jest-worker@^27.2.0:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
+  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
-    supports-color "^7.0.0"
+    supports-color "^8.0.0"
 
-jest-worker@^27.2.0, jest-worker@^27.4.6:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
-  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
+jest-worker@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.2.1.tgz#8ba68255438252e1674f990f0180c54dfa26a3b1"
+  integrity sha512-ROHTZ+oj7sBrgtv46zZ84uWky71AoYi0vEV9CdEtc1FQunsoAGe5HbQmW76nI5QWdvECVPrSi1MCVUmizSavMg==
   dependencies:
     "@types/node" "*"
+    jest-util "^29.2.1"
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest@^26.6.3:
-  version "26.6.3"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"
-  integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==
+jest@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-29.2.1.tgz#352ec0b81a0e436691d546d984cd7d8f72ffd26a"
+  integrity sha512-K0N+7rx+fv3Us3KhuwRSJt55MMpZPs9Q3WSO/spRZSnsalX8yEYOTQ1PiSN7OvqzoRX4JEUXCbOJRlP4n8m5LA==
   dependencies:
-    "@jest/core" "^26.6.3"
+    "@jest/core" "^29.2.1"
+    "@jest/types" "^29.2.1"
     import-local "^3.0.2"
-    jest-cli "^26.6.3"
-
-jetifier@^1.6.2:
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/jetifier/-/jetifier-1.6.4.tgz#6159db8e275d97980d26162897a0648b6d4a3222"
-  integrity sha512-+f/4OLeqY8RAmXnonI1ffeY1DR8kMNJPhv5WMFehchf7U71cjMQVKkOz1n6asz6kfVoAqKNWJz1A/18i18AcXA==
+    jest-cli "^29.2.1"
 
 joi@^17.2.1:
   version "17.3.0"
@@ -4518,19 +4833,36 @@ joi@^17.2.1:
     "@sideway/formula" "^3.0.0"
     "@sideway/pinpoint" "^2.0.0"
 
+js-sdsl@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.4.tgz#78793c90f80e8430b7d8dc94515b6c77d98a26a6"
+  integrity sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.0, js-yaml@^3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==
+
+js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.7.0:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -4566,39 +4898,6 @@ jscodeshift@^0.13.1:
     temp "^0.8.4"
     write-file-atomic "^2.3.0"
 
-jsdom@^16.4.0:
-  version "16.7.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
-  integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==
-  dependencies:
-    abab "^2.0.5"
-    acorn "^8.2.4"
-    acorn-globals "^6.0.0"
-    cssom "^0.4.4"
-    cssstyle "^2.3.0"
-    data-urls "^2.0.0"
-    decimal.js "^10.2.1"
-    domexception "^2.0.1"
-    escodegen "^2.0.0"
-    form-data "^3.0.0"
-    html-encoding-sniffer "^2.0.1"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
-    is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.0"
-    parse5 "6.0.1"
-    saxes "^5.0.1"
-    symbol-tree "^3.2.4"
-    tough-cookie "^4.0.0"
-    w3c-hr-time "^1.0.2"
-    w3c-xmlserializer "^2.0.0"
-    webidl-conversions "^6.1.0"
-    whatwg-encoding "^1.0.5"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.5.0"
-    ws "^7.4.6"
-    xml-name-validator "^3.0.0"
-
 jsesc@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
@@ -4624,11 +4923,6 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-json-schema-traverse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
-  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
-
 json-schema@0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
@@ -4639,24 +4933,22 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
+json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  integrity sha512-i/J297TW6xyj7sDFa7AmBPkQvLIxWr2kKPWI26tXydnZrzVAocNqn5DMNT1Mzk0vit1V5UkRM7C1KdVNp7Lmcg==
+  dependencies:
+    jsonify "~0.0.0"
+
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e"
-  integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==
-  dependencies:
-    minimist "^1.2.5"
-
-jsonfile@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
+json5@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
+  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
 
 jsonfile@^4.0.0:
   version "4.0.0"
@@ -4665,6 +4957,11 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+  integrity sha512-trvBk1ki43VZptdBI5rIlG4YOzyeH/WefQt5rj1grasPn4iiZWKet8nkgc4GlsAylaztn0qZfUYOiTsASJFdNA==
+
 jsprim@^1.2.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
@@ -4675,12 +4972,12 @@ jsprim@^1.2.2:
     json-schema "0.4.0"
     verror "1.10.0"
 
-"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
-  integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==
+"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.2.tgz#afe5efe4332cd3515c065072bd4d6b0aa22152bd"
+  integrity sha512-4ZCADZHRkno244xlNnn4AOG6sRQ7iBZ5BbgZ4vW4y5IZw7cVUD1PPeblm1xx/nfmMxPdt/LHsXZW8z/j58+l9Q==
   dependencies:
-    array-includes "^3.1.3"
+    array-includes "^3.1.5"
     object.assign "^4.1.2"
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
@@ -4707,13 +5004,6 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-klaw@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk=
-  optionalDependencies:
-    graceful-fs "^4.1.9"
-
 kleur@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -4749,14 +5039,6 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
 lines-and-columns@^1.1.6:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
@@ -4777,6 +5059,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -4792,12 +5081,7 @@ lodash.throttle@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
   integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
 
-lodash.truncate@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
-
-lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0:
+lodash@^4.17.19, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -4882,15 +5166,15 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.3.0:
+merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-metro-babel-register@0.71.3:
-  version "0.71.3"
-  resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.71.3.tgz#8495e0082bfa0f2d11e9802c7c8ed7944dde6b01"
-  integrity sha512-2GyH0bOsNolEkUnQ1bb818jIknuHVWAp5/YN1l9C/hhRHgTprNnTAeLpz89eToUGWGhYagJ7l4d9RQp612djvQ==
+metro-babel-register@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.73.5.tgz#1a7df21c5ed945b617246f5519c5315900ab29ec"
+  integrity sha512-zPTEkpfceLYYAcrGNKNpPnuVOo/DJRUmNYvGf3eB3tcvAnitPq+P+3EU+Q2uP02EdDVeIll6IZku5hT1zpJYdQ==
   dependencies:
     "@babel/core" "^7.14.0"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0"
@@ -4903,136 +5187,108 @@ metro-babel-register@0.71.3:
     babel-plugin-replace-ts-export-assignment "^0.0.2"
     escape-string-regexp "^1.0.5"
 
-metro-babel-transformer@0.70.3:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.70.3.tgz#dca61852be273824a4b641bd1ecafff07ff3ad1f"
-  integrity sha512-bWhZRMn+mIOR/s3BDpFevWScz9sV8FGktVfMlF1eJBLoX24itHDbXvTktKBYi38PWIKcHedh6THSFpJogfuwNA==
-  dependencies:
-    "@babel/core" "^7.14.0"
-    hermes-parser "0.6.0"
-    metro-source-map "0.70.3"
-    nullthrows "^1.1.1"
-
-metro-babel-transformer@0.71.3:
-  version "0.71.3"
-  resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.71.3.tgz#ca55850cc904178b740be123b77b58e81f156e4f"
-  integrity sha512-zsbD8MurKherTtwKY3To/dVNKCkPojX//apetyeVrAkJ7M9dw4+hqoglP3SraOlrL3jm/ufFPRZwC2Pr8V9ZQQ==
+metro-babel-transformer@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.73.5.tgz#e7ebe371cd8bf5df90b0e9153587b4d5089d2ce7"
+  integrity sha512-G3awAJ9of/R2jEg+MRokYcq/TNvMSxJipwybQ2NfwwSj5iLEmRH2YbwTx5w8f5qKgs2K4SS2pmBIs8qjdV6p3Q==
   dependencies:
     "@babel/core" "^7.14.0"
     hermes-parser "0.8.0"
-    metro-source-map "0.71.3"
+    metro-source-map "0.73.5"
     nullthrows "^1.1.1"
 
-metro-cache-key@0.70.3:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.70.3.tgz#898803db04178a8f440598afba7d82a9cf35abf7"
-  integrity sha512-0zpw+IcpM3hmGd5sKMdxNv3sbOIUYnMUvx1/yaM6vNRReSPmOLX0bP8fYf3CGgk8NEreZ1OHbVsuw7bdKt40Mw==
+metro-cache-key@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.73.5.tgz#efe2d72f30564a31b66f7eab1872dd12bda03db2"
+  integrity sha512-epEN4GCVkERmZdDeMPpWl7fpsgRNduTS84CAXZXDyWw9zHr0yd1Q+gF/HFkmsg6asOAg9EctuuXf2hFBJ0eP6w==
 
-metro-cache@0.70.3:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.70.3.tgz#42cf3cdf8a7b3691f3bef9a86bed38d4c5f6201f"
-  integrity sha512-iCix/+z812fUqa6KlOxaTkY6LQQDoXIe/VljXkGIvpygSCmYyhjQpfQVZEVVPezFmUBYXNdabdQ6cYx6JX3yMg==
+metro-cache@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.73.5.tgz#ee7da0cc0927c8e43f6e5031d029ac04fbe14cb5"
+  integrity sha512-eOvUDhWTusuYg+HcoCDsV+w2XtamHduq00FWGrfeS656HBx/jOhq7ufwpN8yKP6plv5U4V1k6MoEKhv218Dy0w==
   dependencies:
-    metro-core "0.70.3"
-    rimraf "^2.5.4"
+    metro-core "0.73.5"
+    rimraf "^3.0.2"
 
-metro-config@0.70.3, metro-config@^0.70.1:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.70.3.tgz#fe6f7330f679d5594e5724af7a69d4dbe1bb5bc3"
-  integrity sha512-SSCDjSTygoCgzoj61DdrBeJzZDRwQxUEfcgc6t6coxWSExXNR4mOngz0q4SAam49Bmjq9J2Jft6qUKnUTPrRgA==
+metro-config@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.73.5.tgz#ae308fcee174fed48a10c904045c84b15b5a054c"
+  integrity sha512-CvddMglr2k0FSBHuBSs/piazu5xuZvyAolB40ksCkfLu0nDbEqKZMSvIRGnkU/1H+OaY8wrcQmou0/L5/PT9Dw==
   dependencies:
     cosmiconfig "^5.0.5"
     jest-validate "^26.5.2"
-    metro "0.70.3"
-    metro-cache "0.70.3"
-    metro-core "0.70.3"
-    metro-runtime "0.70.3"
+    metro "0.73.5"
+    metro-cache "0.73.5"
+    metro-core "0.73.5"
+    metro-runtime "0.73.5"
 
-metro-core@0.70.3, metro-core@^0.70.1:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.70.3.tgz#bf4dda15a5185f5a7931de463a1b97ac9ef680a0"
-  integrity sha512-NzfHB/w5R7yLaOeU1tzPTbBzCRsYSvpKJkLMP0yudszKZzIAZqNdjoEJ9GZ688Wi0ynZxcU0BxukXh4my80ZBw==
+metro-core@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.73.5.tgz#1172db6aff4e3860fb4fd4236b8fbd5217249c04"
+  integrity sha512-gubog1DnAIWKMl0GGqQyMJ1ytt/A7y+8Z+E0PmpEFEySk0hMKexOYJ3PqijWilUBH2Od/lMo8TdDR7yIR01uIw==
   dependencies:
-    jest-haste-map "^27.3.1"
     lodash.throttle "^4.1.1"
-    metro-resolver "0.70.3"
+    metro-resolver "0.73.5"
+
+metro-file-map@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-file-map/-/metro-file-map-0.73.5.tgz#eda07ddd080e0e32ba7e5caed61ae2f18b21e7d2"
+  integrity sha512-F0snVq8ODO78L8vcX5d91LdfZBKDSLvC7kLe/wWmTI+YRNyTLTGja4WW+MPC0wr2JTNVGVdGQP8g9Ad5429VLg==
+  dependencies:
+    abort-controller "^3.0.0"
+    anymatch "^3.0.3"
+    debug "^2.2.0"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.2.4"
+    invariant "^2.2.4"
+    jest-regex-util "^27.0.6"
+    jest-serializer "^27.0.6"
+    jest-util "^27.2.0"
+    jest-worker "^27.2.0"
+    micromatch "^4.0.4"
+    nullthrows "^1.1.1"
+    walker "^1.0.7"
+  optionalDependencies:
+    fsevents "^2.3.2"
 
-metro-hermes-compiler@0.70.3:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-hermes-compiler/-/metro-hermes-compiler-0.70.3.tgz#ac7ed656fbcf0a59adcd010d3639e4cfdbc76b4f"
-  integrity sha512-W6WttLi4E72JL/NyteQ84uxYOFMibe0PUr9aBKuJxxfCq6QRnJKOVcNY0NLW0He2tneXGk+8ZsNz8c0flEvYqg==
+metro-hermes-compiler@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-hermes-compiler/-/metro-hermes-compiler-0.73.5.tgz#2c8f9e42717f90516a5d8b698fd8fdf434775932"
+  integrity sha512-20ZiicA0J4ylZtrsoOiR7bcM3scvu90iYA5P6bcSz2sKldF2dT30FkmCKcW4fMHhVx77uT3nSy5rb6IbcYfHwA==
 
-metro-inspector-proxy@0.70.3:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-inspector-proxy/-/metro-inspector-proxy-0.70.3.tgz#321c25b2261e76d8c4bcc39e092714adfcb50a14"
-  integrity sha512-qQoNdPGrmyoJSWYkxSDpTaAI8xyqVdNDVVj9KRm1PG8niSuYmrCCFGLLFsMvkVYwsCWUGHoGBx0UoAzVp14ejw==
+metro-inspector-proxy@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-inspector-proxy/-/metro-inspector-proxy-0.73.5.tgz#b6fb59f6384f99673ad90164008a9bc4390d9aca"
+  integrity sha512-8Tx2K37k5wFJgREMnDRekdZtPBZJ/NZlR/Dihy8Rkw6r9lKFM+mfEXKNlnxtG0kzlb3iD8wKD5aOECoKsWy0sg==
   dependencies:
     connect "^3.6.5"
     debug "^2.2.0"
     ws "^7.5.1"
-    yargs "^15.3.1"
+    yargs "^17.5.1"
 
-metro-memory-fs@0.71.3:
-  version "0.71.3"
-  resolved "https://registry.yarnpkg.com/metro-memory-fs/-/metro-memory-fs-0.71.3.tgz#3e2f5925828df7b4444329c643564bff3a4b824b"
-  integrity sha512-j+om4EqSDkXOGLuH9pnogPBeyJ6pJCZ7uedBIGw0v2YtanJc87ytkKIZDqOdU5SF12khaOvSwa13xRlmr+pZJQ==
+metro-memory-fs@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-memory-fs/-/metro-memory-fs-0.73.5.tgz#3424fd46decbd001706b639f8a2b60273a6b3872"
+  integrity sha512-HSLoCkyOoLNO9q+bpJXrxW5ElvcAbNTPv84EaRZ/tA6CdxcQz7wGc2RioifwF4efVmAy0TRgPN9AaoYO4MhKxw==
 
-metro-minify-uglify@0.70.3:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.70.3.tgz#2f28129ca5b8ef958f3e3fcf004c3707c7732e1e"
-  integrity sha512-oHyjV9WDqOlDE1FPtvs6tIjjeY/oP1PNUPYL1wqyYtqvjN+zzAOrcbsAAL1sv+WARaeiMsWkF2bwtNo+Hghoog==
+metro-minify-terser@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-minify-terser/-/metro-minify-terser-0.73.5.tgz#178cde6567f88a8fe9817fa3b0585918144a54e4"
+  integrity sha512-dzhQdlK+wKUwCrxnTo2h2fcPSDv2NOL3CnNBWEWzoxAWGuZasBDQlYq6ZKHQKEZ5FcwrATlKqgdsSFQdmdaxpw==
   dependencies:
-    uglify-es "^3.1.9"
+    terser "^5.15.0"
 
-metro-react-native-babel-preset@0.70.3:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.70.3.tgz#1c77ec4544ecd5fb6c803e70b21284d7483e4842"
-  integrity sha512-4Nxc1zEiHEu+GTdEMEsHnRgfaBkg8f/Td3+FcQ8NTSvs+xL3LBrQy6N07idWSQZHIdGFf+tTHvRfSIWLD8u8Tg==
+metro-minify-uglify@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.73.5.tgz#688c3913f83326d5864415244521d3bfb43b3056"
+  integrity sha512-kA4m3m+anYvu415lOY1UsYdoSVYWb1dsI125O54h/DORCq3vhFTiGxmZp41Z0h89jMbli8Omjgu7oVwR6oKN4g==
   dependencies:
-    "@babel/core" "^7.14.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.0.0"
-    "@babel/plugin-proposal-class-properties" "^7.0.0"
-    "@babel/plugin-proposal-export-default-from" "^7.0.0"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.0.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.0.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.0.0"
-    "@babel/plugin-syntax-export-default-from" "^7.0.0"
-    "@babel/plugin-syntax-flow" "^7.2.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.0.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.0.0"
-    "@babel/plugin-transform-arrow-functions" "^7.0.0"
-    "@babel/plugin-transform-async-to-generator" "^7.0.0"
-    "@babel/plugin-transform-block-scoping" "^7.0.0"
-    "@babel/plugin-transform-classes" "^7.0.0"
-    "@babel/plugin-transform-computed-properties" "^7.0.0"
-    "@babel/plugin-transform-destructuring" "^7.0.0"
-    "@babel/plugin-transform-exponentiation-operator" "^7.0.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
-    "@babel/plugin-transform-function-name" "^7.0.0"
-    "@babel/plugin-transform-literals" "^7.0.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.0.0"
-    "@babel/plugin-transform-parameters" "^7.0.0"
-    "@babel/plugin-transform-react-display-name" "^7.0.0"
-    "@babel/plugin-transform-react-jsx" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-self" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-source" "^7.0.0"
-    "@babel/plugin-transform-runtime" "^7.0.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
-    "@babel/plugin-transform-spread" "^7.0.0"
-    "@babel/plugin-transform-sticky-regex" "^7.0.0"
-    "@babel/plugin-transform-template-literals" "^7.0.0"
-    "@babel/plugin-transform-typescript" "^7.5.0"
-    "@babel/plugin-transform-unicode-regex" "^7.0.0"
-    "@babel/template" "^7.0.0"
-    react-refresh "^0.4.0"
+    uglify-es "^3.1.9"
 
-metro-react-native-babel-preset@0.71.3:
-  version "0.71.3"
-  resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.71.3.tgz#8e30b87c39342d9ffb4ccc619e7790ac60e16929"
-  integrity sha512-ym8xeoK/5fY/TsQPQXVnJN822NB9TZglxc2XVk+DM8kJO0XacWh2GtDRFeFHEehVsYWpIZeaDPF2XES+YU5mhA==
+metro-react-native-babel-preset@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.73.5.tgz#9b92f1ebc2b3d96f511c45a03f8e35e0fc46cc19"
+  integrity sha512-Ej6J8ozWSs6nrh0nwX7hgX4oPXUai40ckah37cSLu8qeED2XiEtfLV1YksTLafFE8fX0EieiP97U97dkOGHP4w==
   dependencies:
     "@babel/core" "^7.14.0"
     "@babel/plugin-proposal-async-generator-functions" "^7.0.0"
@@ -5053,7 +5309,6 @@ metro-react-native-babel-preset@0.71.3:
     "@babel/plugin-transform-classes" "^7.0.0"
     "@babel/plugin-transform-computed-properties" "^7.0.0"
     "@babel/plugin-transform-destructuring" "^7.0.0"
-    "@babel/plugin-transform-exponentiation-operator" "^7.0.0"
     "@babel/plugin-transform-flow-strip-types" "^7.0.0"
     "@babel/plugin-transform-function-name" "^7.0.0"
     "@babel/plugin-transform-literals" "^7.0.0"
@@ -5074,147 +5329,102 @@ metro-react-native-babel-preset@0.71.3:
     "@babel/template" "^7.0.0"
     react-refresh "^0.4.0"
 
-metro-react-native-babel-transformer@0.71.3:
-  version "0.71.3"
-  resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.71.3.tgz#7725cecffedf542fdb379fe59c1e19cf1d0f97b8"
-  integrity sha512-DTRIldy5Dt4/+YN9DXg+9ltyk1VPZkT0d8XERQ6Ln4/uwmeEUpc1MeaA72Te9TkpznCQElAR0vhupdoaHkPcoQ==
+metro-react-native-babel-transformer@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.73.5.tgz#fb1d48cc73ce26371cf2a115f702b7bf3bb5516b"
+  integrity sha512-CZYgUguqFTzV9vSOZb60p8qlp31aWz8aBB6OqoZ2gJday+n/1k+Y0yy6VPr/tfXJheuQYVIXKvG1gMmUDyxt+Q==
   dependencies:
     "@babel/core" "^7.14.0"
     babel-preset-fbjs "^3.4.0"
     hermes-parser "0.8.0"
-    metro-babel-transformer "0.71.3"
-    metro-react-native-babel-preset "0.71.3"
-    metro-source-map "0.71.3"
-    nullthrows "^1.1.1"
-
-metro-react-native-babel-transformer@^0.70.1:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.70.3.tgz#195597c32488f820aa9e441bbca7c04fe7de7a2d"
-  integrity sha512-WKBU6S/G50j9cfmFM4k4oRYprd8u3qjleD4so1E2zbTNILg+gYla7ZFGCAvi2G0ZcqS2XuGCR375c2hF6VVvwg==
-  dependencies:
-    "@babel/core" "^7.14.0"
-    babel-preset-fbjs "^3.4.0"
-    hermes-parser "0.6.0"
-    metro-babel-transformer "0.70.3"
-    metro-react-native-babel-preset "0.70.3"
-    metro-source-map "0.70.3"
+    metro-babel-transformer "0.73.5"
+    metro-react-native-babel-preset "0.73.5"
+    metro-source-map "0.73.5"
     nullthrows "^1.1.1"
 
-metro-resolver@0.70.3, metro-resolver@^0.70.1:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.70.3.tgz#c64fdd6d0a88fa62f3f99f87e539b5f603bd47bf"
-  integrity sha512-5Pc5S/Gs4RlLbziuIWtvtFd9GRoILlaRC8RZDVq5JZWcWHywKy/PjNmOBNhpyvtRlzpJfy/ssIfLhu8zINt1Mw==
+metro-resolver@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.73.5.tgz#031f12fa6ed9bb100420e7d5d5c2f1d3b10987a8"
+  integrity sha512-2J5TaNdt/OUxdpyfjPntw6oJksJFnP2vRQXdEOykJ/gGbkrzGQET/epw55pVlNRcioR8G5q7yhqnLZ128n1yyg==
   dependencies:
     absolute-path "^0.0.0"
 
-metro-runtime@0.70.3, metro-runtime@^0.70.1:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.70.3.tgz#09231b9d05dcbdfb5a13df0a45307273e6fe1168"
-  integrity sha512-22xU7UdXZacniTIDZgN2EYtmfau2pPyh97Dcs+cWrLcJYgfMKjWBtesnDcUAQy3PHekDYvBdJZkoQUeskYTM+w==
-  dependencies:
-    "@babel/runtime" "^7.0.0"
-
-metro-runtime@0.71.3:
-  version "0.71.3"
-  resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.71.3.tgz#e17a3100bb61e7ea66d38f1dcaa971357572b59d"
-  integrity sha512-1l7YYYY64wdphvPOUA3NDHVoYxuV6SEn8O6/WGGEqGj/M0focrue1ra3caoCPDUOJFWgHxh6FVaAXXTOltjNwg==
+metro-runtime@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.73.5.tgz#8c92c3947e97a8dede6347ba6a9844bfb8be8258"
+  integrity sha512-8QJOS7bhJmR6r/Gkki/qY9oX/DdxnLhS8FpdG1Xmm2hDeUVAug12ekWTiCRMu7d1CDVv1F8WvUz09QckZ0dO0g==
   dependencies:
     "@babel/runtime" "^7.0.0"
+    react-refresh "^0.4.0"
 
-metro-source-map@0.70.3:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.70.3.tgz#f5976108c18d4661eaa4d188c96713e5d67a903b"
-  integrity sha512-zsYtZGrwRbbGEFHtmMqqeCH9K9aTGNVPsurMOWCUeQA3VGyVGXPGtLMC+CdAM9jLpUyg6jw2xh0esxi+tYH7Uw==
-  dependencies:
-    "@babel/traverse" "^7.14.0"
-    "@babel/types" "^7.0.0"
-    invariant "^2.2.4"
-    metro-symbolicate "0.70.3"
-    nullthrows "^1.1.1"
-    ob1 "0.70.3"
-    source-map "^0.5.6"
-    vlq "^1.0.0"
-
-metro-source-map@0.71.3:
-  version "0.71.3"
-  resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.71.3.tgz#ffbb21d3ab5a137234bcf225336283e7e669ee0b"
-  integrity sha512-rMwDrYWFSC/J71N0XT8c/hf0q1tfvwNi8Tqa7lCCxmF0HUoPZSocY2lp7IcdZaxckpm++Nrrdc+D/jsG1JD5oQ==
+metro-source-map@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.73.5.tgz#67e14bd1fcc1074b9623640ca311cd99d07426fa"
+  integrity sha512-58p3zNWgUrqYYjFJb0KkZ+uJurTL4oz7i5T7577b3kvTYuJ0eK4y7rtYf8EwOfMYxRAn/m20aH1Y1fHTsLUwjQ==
   dependencies:
     "@babel/traverse" "^7.14.0"
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.20.0"
     invariant "^2.2.4"
-    metro-symbolicate "0.71.3"
+    metro-symbolicate "0.73.5"
     nullthrows "^1.1.1"
-    ob1 "0.71.3"
+    ob1 "0.73.5"
     source-map "^0.5.6"
     vlq "^1.0.0"
 
-metro-symbolicate@0.70.3:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.70.3.tgz#b039e5629c4ed0c999ea0496d580e1c98260f5cb"
-  integrity sha512-JTYkF1dpeDUssQ84juE1ycnhHki2ylJBBdJE1JHtfu5oC+z1ElDbBdPHq90Uvt8HbRov/ZAnxvv7Zy6asS+WCA==
-  dependencies:
-    invariant "^2.2.4"
-    metro-source-map "0.70.3"
-    nullthrows "^1.1.1"
-    source-map "^0.5.6"
-    through2 "^2.0.1"
-    vlq "^1.0.0"
-
-metro-symbolicate@0.71.3:
-  version "0.71.3"
-  resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.71.3.tgz#ba02b87742d2bed8e9a5a4cc0146ca8f6645c20b"
-  integrity sha512-fvcI9/1aSRviWnEGSrEVFYDS26r38PwLwKWpSl1GqEtwE6fgwlMeZKQbj+BIGYRSHXU48pIA/kJZc88oB4pjJA==
+metro-symbolicate@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.73.5.tgz#8de118be231decd55c8c70ed54deb308fdffceda"
+  integrity sha512-aIC8sDlaEdtn0dTt+64IFZFEATatFx3GtzRbJi0+jJx47RjDRiuCt9fzmTMLuadWwnbFK9ZfVMuWEXM9sdtQ7w==
   dependencies:
     invariant "^2.2.4"
-    metro-source-map "0.71.3"
+    metro-source-map "0.73.5"
     nullthrows "^1.1.1"
     source-map "^0.5.6"
     through2 "^2.0.1"
     vlq "^1.0.0"
 
-metro-transform-plugins@0.70.3:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.70.3.tgz#7fe87cd0d8979b4d5d6e375751d86188fff38fd9"
-  integrity sha512-dQRIJoTkWZN2IVS2KzgS1hs7ZdHDX3fS3esfifPkqFAEwHiLctCf0EsPgIknp0AjMLvmGWfSLJigdRB/dc0ASw==
+metro-transform-plugins@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.73.5.tgz#ac15053b8746fff3daf45338b9c1094cec9251cb"
+  integrity sha512-VQwWQ7Gtu55uFSN/8hhqfhLYhIa00EtVp06NfgR/XfkvD8EaFlk/4RxinOaWU+d42kZa2UMPCNVECd7UcvVuRA==
   dependencies:
     "@babel/core" "^7.14.0"
-    "@babel/generator" "^7.14.0"
+    "@babel/generator" "^7.20.0"
     "@babel/template" "^7.0.0"
     "@babel/traverse" "^7.14.0"
     nullthrows "^1.1.1"
 
-metro-transform-worker@0.70.3:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro-transform-worker/-/metro-transform-worker-0.70.3.tgz#62bfa28ebef98803531c4bcb558de5fc804c94ef"
-  integrity sha512-MtVVsnHhhBOp9GRLCdAb2mD1dTCsIzT4+m34KMRdBDCEbDIb90YafT5prpU8qbj5uKd0o2FOQdrJ5iy5zQilHw==
+metro-transform-worker@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro-transform-worker/-/metro-transform-worker-0.73.5.tgz#e88179bde91ec515b9b6f4b9ebbede507eec40d6"
+  integrity sha512-2JfEFWtynls94JjLyPNdoehgmGiSyiETD2b6lMcjfG9nLgoOJoPBaf0xHtfcql9jqnt7dvqLWmtvoWtq6c0ymA==
   dependencies:
     "@babel/core" "^7.14.0"
-    "@babel/generator" "^7.14.0"
+    "@babel/generator" "^7.20.0"
     "@babel/parser" "^7.14.0"
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.20.0"
     babel-preset-fbjs "^3.4.0"
-    metro "0.70.3"
-    metro-babel-transformer "0.70.3"
-    metro-cache "0.70.3"
-    metro-cache-key "0.70.3"
-    metro-hermes-compiler "0.70.3"
-    metro-source-map "0.70.3"
-    metro-transform-plugins "0.70.3"
+    metro "0.73.5"
+    metro-babel-transformer "0.73.5"
+    metro-cache "0.73.5"
+    metro-cache-key "0.73.5"
+    metro-hermes-compiler "0.73.5"
+    metro-source-map "0.73.5"
+    metro-transform-plugins "0.73.5"
     nullthrows "^1.1.1"
 
-metro@0.70.3, metro@^0.70.1:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/metro/-/metro-0.70.3.tgz#4290f538ab5446c7050e718b5c5823eea292c5c2"
-  integrity sha512-uEWS7xg8oTetQDABYNtsyeUjdLhH3KAvLFpaFFoJqUpOk2A3iygszdqmjobFl6W4zrvKDJS+XxdMR1roYvUhTw==
+metro@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/metro/-/metro-0.73.5.tgz#c233215ad278d6851a51f21421a6d0d49773f246"
+  integrity sha512-E7m69LNvm8Lg/stn0DI+ay/zksLff/FeZomZ90wBmO8vnO/HcQuN33R4ZC/Kgd8qwA0HYQ1J+UamITU/PhseAw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/core" "^7.14.0"
-    "@babel/generator" "^7.14.0"
+    "@babel/generator" "^7.20.0"
     "@babel/parser" "^7.14.0"
     "@babel/template" "^7.0.0"
     "@babel/traverse" "^7.14.0"
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.20.0"
     absolute-path "^0.0.0"
     accepts "^1.3.7"
     async "^3.2.2"
@@ -5224,42 +5434,42 @@ metro@0.70.3, metro@^0.70.1:
     debug "^2.2.0"
     denodeify "^1.2.1"
     error-stack-parser "^2.0.6"
-    fs-extra "^1.0.0"
     graceful-fs "^4.2.4"
-    hermes-parser "0.6.0"
+    hermes-parser "0.8.0"
     image-size "^0.6.0"
     invariant "^2.2.4"
-    jest-haste-map "^27.3.1"
     jest-worker "^27.2.0"
     lodash.throttle "^4.1.1"
-    metro-babel-transformer "0.70.3"
-    metro-cache "0.70.3"
-    metro-cache-key "0.70.3"
-    metro-config "0.70.3"
-    metro-core "0.70.3"
-    metro-hermes-compiler "0.70.3"
-    metro-inspector-proxy "0.70.3"
-    metro-minify-uglify "0.70.3"
-    metro-react-native-babel-preset "0.70.3"
-    metro-resolver "0.70.3"
-    metro-runtime "0.70.3"
-    metro-source-map "0.70.3"
-    metro-symbolicate "0.70.3"
-    metro-transform-plugins "0.70.3"
-    metro-transform-worker "0.70.3"
+    metro-babel-transformer "0.73.5"
+    metro-cache "0.73.5"
+    metro-cache-key "0.73.5"
+    metro-config "0.73.5"
+    metro-core "0.73.5"
+    metro-file-map "0.73.5"
+    metro-hermes-compiler "0.73.5"
+    metro-inspector-proxy "0.73.5"
+    metro-minify-terser "0.73.5"
+    metro-minify-uglify "0.73.5"
+    metro-react-native-babel-preset "0.73.5"
+    metro-resolver "0.73.5"
+    metro-runtime "0.73.5"
+    metro-source-map "0.73.5"
+    metro-symbolicate "0.73.5"
+    metro-transform-plugins "0.73.5"
+    metro-transform-worker "0.73.5"
     mime-types "^2.1.27"
     node-fetch "^2.2.0"
     nullthrows "^1.1.1"
-    rimraf "^2.5.4"
+    rimraf "^3.0.2"
     serialize-error "^2.1.0"
     source-map "^0.5.6"
     strip-ansi "^6.0.0"
     temp "0.8.3"
     throat "^5.0.0"
     ws "^7.5.1"
-    yargs "^15.3.1"
+    yargs "^17.5.1"
 
-micromatch@^3.1.10, micromatch@^3.1.4:
+micromatch@^3.1.10:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -5278,7 +5488,7 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.2, micromatch@^4.0.4:
+micromatch@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
   integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
@@ -5313,37 +5523,57 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-minimatch@^3.0.2, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+minimist@^1.2.5, minimist@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+
+minipass@^3.0.0, minipass@^3.1.1:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
+  integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
+  dependencies:
+    yallist "^4.0.0"
 
-minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+minizlib@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+  dependencies:
+    minipass "^3.0.0"
+    yallist "^4.0.0"
 
 mixin-deep@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+"mkdirp@>=0.5 0", mkdirp@^0.5.1:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
   dependencies:
-    minimist "0.0.8"
+    minimist "^1.2.6"
+
+mkdirp@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+mock-fs@^5.1.4:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-5.2.0.tgz#3502a9499c84c0a1218ee4bf92ae5bf2ea9b2b5e"
+  integrity sha512-2dF2R6YMSZbpip1V1WHKGLNjr/k48uQClqMVb5H3MOvwc9qhYis3/IWbj02qIg/Y8MDXKFF4c5v0rxx2o6xTZw==
 
 ms@2.0.0:
   version "2.0.0"
@@ -5377,6 +5607,11 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+natural-compare-lite@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
+  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -5410,64 +5645,51 @@ node-dir@^0.1.17:
     minimatch "^3.0.2"
 
 node-fetch@^2.2.0, node-fetch@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  dependencies:
+    whatwg-url "^5.0.0"
 
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
-node-modules-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
-  integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
-
-node-notifier@^8.0.0:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5"
-  integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==
-  dependencies:
-    growly "^1.3.0"
-    is-wsl "^2.2.0"
-    semver "^7.3.2"
-    shellwords "^0.1.1"
-    uuid "^8.3.0"
-    which "^2.0.2"
-
-node-releases@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
-  integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
+node-releases@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
+  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
 node-stream-zip@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.9.1.tgz#66d210204da7c60e2d6d685eb21a11d016981fd0"
   integrity sha512-7/Xs9gkuYF0WBimz5OrSc6UVKLDTxvBG2yLGtEK8PSx94d86o/6iQLvIe/140ATz35JDqHKWIxh3GcA3u5hB0w==
 
-normalize-package-data@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+"normalize-package-data@~1.0.1 || ^2.0.0 || ^3.0.0":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
   dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
+    hosted-git-info "^4.0.1"
+    is-core-module "^2.5.0"
+    semver "^7.3.4"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
 normalize-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
+"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^8.0.0":
+  version "8.1.5"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
+  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
+  dependencies:
+    hosted-git-info "^4.0.1"
+    semver "^7.3.4"
+    validate-npm-package-name "^3.0.0"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -5475,39 +5697,44 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npm-run-path@^4.0.0:
+npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
   dependencies:
     path-key "^3.0.0"
 
+"npmlog@2 || ^3.1.0 || ^4.0.0":
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
 nullthrows@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1"
   integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==
 
-nwsapi@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
-  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
 
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-ob1@0.70.3:
-  version "0.70.3"
-  resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.70.3.tgz#f48cd5a5abf54b0c423b1b06b6d4ff4d049816cb"
-  integrity sha512-Vy9GGhuXgDRY01QA6kdhToPd8AkLdLpX9GjH5kpqluVqTu70mgOm7tpGoJDZGaNbr9nJlJgnipqHJQRPORixIQ==
-
-ob1@0.71.3:
-  version "0.71.3"
-  resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.71.3.tgz#aa98b76e1038d016f4e0e42b5d1e7b009db3f0e0"
-  integrity sha512-SiCAg5YyrYyMvpgiri+B8DeUTTNdcvYNi+SR2ztH17Kv5X2moE+WPH7JI8UiLZrhlO5FQCUV5Dewzz0nXkF4Rg==
+ob1@0.73.5:
+  version "0.73.5"
+  resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.73.5.tgz#b80dc4a6f787044e3d8afde3c2d034ae23d05a86"
+  integrity sha512-MxQH/rCq9/COvgTQbjCldArmesGEidZVVQIn4vDUJvJJ8uMphXOTCBsgWTief2ugvb0WUimIaslKSA+qryFjjQ==
 
-object-assign@^4.1.1:
+object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -5521,12 +5748,12 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.11.0, object-inspect@^1.9.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
-  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
+object-inspect@^1.12.0, object-inspect@^1.9.0:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
+  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
 
-object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -5548,7 +5775,7 @@ object.assign@^4.1.0, object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
-object.entries@^1.1.4:
+object.entries@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
   integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
@@ -5557,7 +5784,7 @@ object.entries@^1.1.4:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
-object.fromentries@^2.0.4:
+object.fromentries@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251"
   integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==
@@ -5566,13 +5793,13 @@ object.fromentries@^2.0.4:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
-object.hasown@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5"
-  integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==
+object.hasown@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.1.tgz#ad1eecc60d03f49460600430d97f23882cf592a3"
+  integrity sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
 
 object.pick@^1.3.0:
   version "1.3.0"
@@ -5581,7 +5808,7 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.4:
+object.values@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
   integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
@@ -5609,10 +5836,10 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
-  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+onetime@^5.1.0, onetime@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
@@ -5623,18 +5850,6 @@ open@^6.2.0:
   dependencies:
     is-wsl "^1.1.0"
 
-optionator@^0.8.1:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
 optionator@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
@@ -5667,23 +5882,25 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-p-each-series@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
-  integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==
-
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 p-limit@^2.0.0, p-limit@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
-  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^3.0.2, p-limit@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
@@ -5698,6 +5915,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-try@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
@@ -5718,7 +5942,7 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse-json@^5.0.0:
+parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
@@ -5728,16 +5952,16 @@ parse-json@^5.0.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
-parse5@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
-  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
-
 parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
   integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
+parsimmon@^1.13.0:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/parsimmon/-/parsimmon-1.18.1.tgz#d8dd9c28745647d02fc6566f217690897eed7709"
+  integrity sha512-u7p959wLfGAhJpSDJVYXoyMCXWYwHia78HhRBWqk7AIbxdmlrfdp5wX0l3xv/iTSH5HvhN9K7o26hwwpgS5Nmw==
+
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -5789,21 +6013,19 @@ picocolors@^1.0.0:
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
 picomatch@^2.0.4, picomatch@^2.2.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
-  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
 pify@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-pirates@^4.0.0, pirates@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
-  integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
-  dependencies:
-    node-modules-regexp "^1.0.0"
+pirates@^4.0.0, pirates@^4.0.1, pirates@^4.0.4:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
+  integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
 
 pkg-dir@^3.0.0:
   version "3.0.0"
@@ -5819,14 +6041,6 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-plist@^3.0.2:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe"
-  integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==
-  dependencies:
-    base64-js "^1.5.1"
-    xmlbuilder "^9.0.7"
-
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -5837,11 +6051,6 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
 prettier-linter-helpers@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
@@ -5874,25 +6083,24 @@ pretty-format@^26.5.2, pretty-format@^26.6.2:
     ansi-styles "^4.0.0"
     react-is "^17.0.1"
 
-private@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
+pretty-format@^29.2.1:
+  version "29.2.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.2.1.tgz#86e7748fe8bbc96a6a4e04fa99172630907a9611"
+  integrity sha512-Y41Sa4aLCtKAXvwuIpTvcFBkyeYp2gdFWzXGA+ZNES3VwURIB165XO/z7CjETwzCCS53MjW/rLMyyqEnTtaOfA==
+  dependencies:
+    "@jest/schemas" "^29.0.0"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
 
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
   integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
 
-progress@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
-  integrity sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=
-
-promise@^8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-8.0.3.tgz#f592e099c6cddc000d538ee7283bb190452b0bf6"
-  integrity sha512-HeRDUL1RJiLhyA0/grn+PTShlBAcLuh/1BJGtrvjwbvRDCTLLMEz9rOGCV+R3vHY4MixIuoMEd9Yq/XvsTPcjw==
+promise@^8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-8.3.0.tgz#8cb333d1edeb61ef23869fbb8a4ea0279ab60e0a"
+  integrity sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==
   dependencies:
     asap "~2.0.6"
 
@@ -5904,16 +6112,16 @@ prompts@^2.0.1, prompts@^2.4.0:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prop-types@^15.7.2:
-  version "15.7.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
+prop-types@*, prop-types@^15.8.1:
+  version "15.8.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
+  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
   dependencies:
     loose-envify "^1.4.0"
     object-assign "^4.1.1"
-    react-is "^16.8.1"
+    react-is "^16.13.1"
 
-psl@^1.1.28, psl@^1.1.33:
+psl@^1.1.28:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
@@ -5946,20 +6154,20 @@ range-parser@~1.2.0:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
   integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
-react-devtools-core@4.24.0:
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.24.0.tgz#7daa196bdc64f3626b3f54f2ff2b96f7c4fdf017"
-  integrity sha512-Rw7FzYOOzcfyUPaAm9P3g0tFdGqGq2LLiAI+wjYcp6CsF3DeeMrRS3HZAho4s273C29G/DJhx0e8BpRE/QZNGg==
+react-devtools-core@^4.26.1:
+  version "4.26.1"
+  resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.26.1.tgz#2893fea58089be64c5356d5bd0eebda8d1bbf317"
+  integrity sha512-r1csa5n9nABVpSdAadwTG7K+SfgRJPc/Hdx89BkV5IlA1mEGgGi3ir630ST5D/xYlJQaY3VE75YGADgpNW7HIw==
   dependencies:
     shell-quote "^1.6.1"
     ws "^7"
 
-"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.1.0.tgz#61aaed3096d30eacf2a2127118b5b41387d32a67"
-  integrity sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==
+"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0, react-is@^18.2.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
+  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
-react-is@^16.8.1, react-is@^16.8.4:
+react-is@^16.13.1, react-is@^16.8.4:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -5969,6 +6177,31 @@ react-is@^17.0.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
+react-native-codegen@*:
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.72.0.tgz#b130e9798bbbc70a75e293b432438e65bda9d3c5"
+  integrity sha512-FoM//DIikIgdTurw+3EJyM4enZSKDdEswxhvWa/6eiRNzCegPFVLgk7WppGfJ084R3jEE2Q1e0IHu+nhff6LeA==
+  dependencies:
+    "@babel/parser" "^7.14.0"
+    flow-parser "^0.185.0"
+    jscodeshift "^0.13.1"
+    nullthrows "^1.1.1"
+
+react-native-codegen@^0.71.3:
+  version "0.71.3"
+  resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.71.3.tgz#75fbc591819050791319ebdb9fe341ee4df5c288"
+  integrity sha512-5AvdHVU1sAaXg05i0dG664ZTaCaIFaY1znV5vNsj+wUu6MGxNEUNbDKk9dxKUkkxOyk2KZOK5uhzWL0p5H5yZQ==
+  dependencies:
+    "@babel/parser" "^7.14.0"
+    flow-parser "^0.185.0"
+    jscodeshift "^0.13.1"
+    nullthrows "^1.1.1"
+
+react-native-gradle-plugin@^0.71.12:
+  version "0.71.12"
+  resolved "https://registry.yarnpkg.com/react-native-gradle-plugin/-/react-native-gradle-plugin-0.71.12.tgz#7f0000b3d9593288183a13889fd6225d0ab506b8"
+  integrity sha512-ILujN0C+cX5QHmm22MXbHqZR619OzV/VThLHFhe7qnzZWpPh8O4KSvbtezoYMiBbmowAfy8SQpohwlN3nv6wZQ==
+
 react-refresh@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.4.0.tgz#d421f9bd65e0e4b9822a399f14ac56bda9c92292"
@@ -5982,42 +6215,36 @@ react-shallow-renderer@^16.15.0:
     object-assign "^4.1.1"
     react-is "^16.12.0 || ^17.0.0 || ^18.0.0"
 
-react-test-renderer@18.1.0, react-test-renderer@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-18.1.0.tgz#35b75754834cf9ab517b6813db94aee0a6b545c3"
-  integrity sha512-OfuueprJFW7h69GN+kr4Ywin7stcuqaYAt1g7airM5cUgP0BoF5G5CXsPGmXeDeEkncb2fqYNECO4y18sSqphg==
+react-test-renderer@18.2.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-18.2.0.tgz#1dd912bd908ff26da5b9fca4fd1c489b9523d37e"
+  integrity sha512-JWD+aQ0lh2gvh4NM3bBM42Kx+XybOxCpgYK7F8ugAlpaTSnWsX+39Z4XkOykGZAHrjwwTZT3x3KxswVWxHPUqA==
   dependencies:
-    react-is "^18.1.0"
+    react-is "^18.2.0"
     react-shallow-renderer "^16.15.0"
-    scheduler "^0.22.0"
+    scheduler "^0.23.0"
 
-react@18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890"
-  integrity sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==
+react@18.2.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
+  integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
   dependencies:
     loose-envify "^1.1.0"
 
-read-pkg-up@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
-  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
-  dependencies:
-    find-up "^4.1.0"
-    read-pkg "^5.2.0"
-    type-fest "^0.8.1"
-
-read-pkg@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
-  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+readable-stream@^2.0.6, readable-stream@~2.3.6:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
   dependencies:
-    "@types/normalize-package-data" "^2.4.0"
-    normalize-package-data "^2.5.0"
-    parse-json "^5.0.0"
-    type-fest "^0.6.0"
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
 
-readable-stream@^3.4.0:
+readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -6026,19 +6253,6 @@ readable-stream@^3.4.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@~2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
 readline@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/readline/-/readline-1.3.0.tgz#c580d77ef2cfc8752b132498060dc9793a7ac01c"
@@ -6061,10 +6275,10 @@ rechoir@^0.6.2:
   dependencies:
     resolve "^1.1.6"
 
-regenerate-unicode-properties@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56"
-  integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==
+regenerate-unicode-properties@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
+  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
   dependencies:
     regenerate "^1.4.2"
 
@@ -6074,17 +6288,16 @@ regenerate@^1.4.2:
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
 regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.4:
-  version "0.13.5"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
-  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
+  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
 
-regenerator-transform@^0.14.2:
-  version "0.14.4"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
-  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
+regenerator-transform@^0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537"
+  integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==
   dependencies:
     "@babel/runtime" "^7.8.4"
-    private "^0.1.8"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
@@ -6094,48 +6307,44 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
-  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
+regexp.prototype.flags@^1.4.1, regexp.prototype.flags@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
+  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
+    functions-have-names "^1.2.2"
 
-regexpp@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
-  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+regexpp@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-regexpu-core@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3"
-  integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==
+regexpu-core@^5.1.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.1.tgz#a69c26f324c1e962e9ffd0b88b055caba8089139"
+  integrity sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==
   dependencies:
     regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.0.1"
-    regjsgen "^0.6.0"
-    regjsparser "^0.8.2"
+    regenerate-unicode-properties "^10.1.0"
+    regjsgen "^0.7.1"
+    regjsparser "^0.9.1"
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.0.0"
 
-regjsgen@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d"
-  integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==
+regjsgen@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.7.1.tgz#ee5ef30e18d3f09b7c369b76e7c2373ed25546f6"
+  integrity sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==
 
-regjsparser@^0.8.2:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f"
-  integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==
+regjsparser@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
   dependencies:
     jsesc "~0.5.0"
 
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
@@ -6177,11 +6386,6 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-require-from-string@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
@@ -6214,12 +6418,17 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.18.1:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
-  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
+resolve.exports@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
+  integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
+
+resolve@^1.1.6, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2:
+  version "1.22.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
+  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
   dependencies:
-    is-core-module "^2.8.1"
+    is-core-module "^2.9.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -6244,15 +6453,20 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
+
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^2.5.4, rimraf@~2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+rimraf@2:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
   dependencies:
     glob "^7.1.3"
 
@@ -6268,10 +6482,12 @@ rimraf@~2.2.6:
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
   integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=
 
-rsvp@^4.8.4:
-  version "4.8.5"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
-  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
+rimraf@~2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
 
 run-async@^2.4.0:
   version "2.4.1"
@@ -6297,7 +6513,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -6314,57 +6530,30 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sane@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
-  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
-  dependencies:
-    "@cnakazawa/watch" "^1.0.3"
-    anymatch "^2.0.0"
-    capture-exit "^2.0.0"
-    exec-sh "^0.3.2"
-    execa "^1.0.0"
-    fb-watchman "^2.0.0"
-    micromatch "^3.1.4"
-    minimist "^1.1.1"
-    walker "~1.0.5"
-
-saxes@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
-  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
+scheduler@^0.23.0:
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
+  integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
   dependencies:
-    xmlchars "^2.2.0"
+    loose-envify "^1.1.0"
 
-scheduler@^0.22.0:
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.22.0.tgz#83a5d63594edf074add9a7198b1bae76c3db01b8"
-  integrity sha512-6QAm1BgQI88NPYymgGQLCZgvep4FyePDWFpXVK+zNSUgHwlqpJy8VEh8Et0KxTACS4VWwMousBElAZOH9nkkoQ==
+"semver@2 >=2.2.1 || 3.x || 4 || 5 || 7", semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
   dependencies:
-    loose-envify "^1.1.0"
+    lru-cache "^6.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
+semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.2, semver@^7.3.5:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
 send@0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
@@ -6399,25 +6588,15 @@ serve-static@^1.13.1:
     parseurl "~1.3.2"
     send "0.16.2"
 
-set-blocking@^2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
-
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -6474,11 +6653,6 @@ shelljs@^0.8.5:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
-shellwords@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
-  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -6488,10 +6662,10 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
-  integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
 signedsource@^1.0.0:
   version "1.0.0"
@@ -6517,14 +6691,10 @@ slice-ansi@^2.0.0:
     astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
+slide@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+  integrity sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
@@ -6574,7 +6744,15 @@ source-map-support@0.5.0:
   dependencies:
     source-map "^0.6.0"
 
-source-map-support@^0.5.16, source-map-support@^0.5.6:
+source-map-support@0.5.13:
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-support@^0.5.16, source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -6587,7 +6765,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@^0.5.0, source-map@^0.5.6:
+source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -6602,11 +6780,6 @@ source-map@^0.7.3:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-sourcemap-codec@1.4.8:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
-  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
-
 spdx-correct@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -6629,9 +6802,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
-  integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
+  version "3.0.12"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779"
+  integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
@@ -6660,7 +6833,14 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-stack-utils@^2.0.2:
+ssri@^8.0.0:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
+  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
+  dependencies:
+    minipass "^3.1.1"
+
+stack-utils@^2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
   integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
@@ -6713,7 +6893,16 @@ string-natural-compare@^3.0.1:
   resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
   integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
 
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -6722,35 +6911,37 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string.prototype.matchall@^4.0.5:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"
-  integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==
+string.prototype.matchall@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz#8e6ecb0d8a1fb1fda470d81acecb2dba057a481d"
+  integrity sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
     get-intrinsic "^1.1.1"
-    has-symbols "^1.0.2"
+    has-symbols "^1.0.3"
     internal-slot "^1.0.3"
-    regexp.prototype.flags "^1.3.1"
+    regexp.prototype.flags "^1.4.1"
     side-channel "^1.0.4"
 
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+string.prototype.trimend@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
+  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
 
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+string.prototype.trimstart@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
+  integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -6766,6 +6957,13 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
+  dependencies:
+    ansi-regex "^2.0.0"
+
 strip-ansi@^5.0.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@@ -6795,6 +6993,11 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
+strip-json-comments@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
+
 strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
@@ -6805,6 +7008,11 @@ sudo-prompt@^9.0.0:
   resolved "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-9.1.1.tgz#73853d729770392caec029e2470db9c221754db0"
   integrity sha512-es33J1g2HjMpyAhz8lOR+ICmXXAqTuKbuXuUWLhOLew20oN9oUCgCJx615U/v7aioZg7IX5lIh9x34vwneu4pA==
 
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
+
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -6812,7 +7020,7 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0, supports-color@^7.1.0:
+supports-color@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
   integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
@@ -6826,34 +7034,33 @@ supports-color@^8.0.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-hyperlinks@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
-  integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
-  dependencies:
-    has-flag "^4.0.0"
-    supports-color "^7.0.0"
-
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
-symbol-tree@^3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
-  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
-
-table@^6.0.9:
-  version "6.7.3"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.7.3.tgz#255388439715a738391bd2ee4cbca89a4d05a9b7"
-  integrity sha512-5DkIxeA7XERBqMwJq0aHZOdMadBx4e6eDoFRuyT5VR82J0Ycg2DwM6GfA/EQAhJ+toRTaS1lIdSQCqgrmhPnlw==
+tar-stream@^2.1.4:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
   dependencies:
-    ajv "^8.0.1"
-    lodash.truncate "^4.4.2"
-    slice-ansi "^4.0.0"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
+    bl "^4.0.3"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
+tar@^6.1.11:
+  version "6.1.11"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^3.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
 
 temp@0.8.3:
   version "0.8.3"
@@ -6870,13 +7077,15 @@ temp@^0.8.4:
   dependencies:
     rimraf "~2.6.2"
 
-terminal-link@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
-  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
+terser@^5.15.0:
+  version "5.15.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.15.1.tgz#8561af6e0fd6d839669c73b92bdd5777d870ed6c"
+  integrity sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==
   dependencies:
-    ansi-escapes "^4.2.1"
-    supports-hyperlinks "^2.0.0"
+    "@jridgewell/source-map" "^0.3.2"
+    acorn "^8.5.0"
+    commander "^2.20.0"
+    source-map-support "~0.5.20"
 
 test-exclude@^6.0.0:
   version "6.0.0"
@@ -6917,6 +7126,13 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmp@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+  dependencies:
+    rimraf "^3.0.0"
+
 tmpl@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
@@ -6959,15 +7175,6 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-tough-cookie@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
-  dependencies:
-    psl "^1.1.33"
-    punycode "^2.1.1"
-    universalify "^0.1.2"
-
 tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
@@ -6976,22 +7183,46 @@ tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tr46@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
-  integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
-  dependencies:
-    punycode "^2.1.1"
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
-tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
 tslib@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e"
-  integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
+  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+
+tslint@5.14.0:
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.14.0.tgz#be62637135ac244fc9b37ed6ea5252c9eba1616e"
+  integrity sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ==
+  dependencies:
+    babel-code-frame "^6.22.0"
+    builtin-modules "^1.1.1"
+    chalk "^2.3.0"
+    commander "^2.12.1"
+    diff "^3.2.0"
+    glob "^7.1.1"
+    js-yaml "^3.7.0"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    resolve "^1.3.2"
+    semver "^5.3.0"
+    tslib "^1.8.0"
+    tsutils "^2.29.0"
+
+tsutils@^2.29.0:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
+  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
+  dependencies:
+    tslib "^1.8.1"
 
 tsutils@^3.21.0:
   version "3.21.0"
@@ -7019,13 +7250,6 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
-  dependencies:
-    prelude-ls "~1.1.2"
-
 type-detect@4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
@@ -7041,22 +7265,15 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-fest@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
-  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
-
-type-fest@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
-  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
-  dependencies:
-    is-typedarray "^1.0.0"
+typescript@4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
+  integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
 
 uglify-es@^3.1.9:
   version "3.3.9"
@@ -7066,14 +7283,14 @@ uglify-es@^3.1.9:
     commander "~2.13.0"
     source-map "~0.6.1"
 
-unbox-primitive@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+unbox-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
   dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
+    call-bind "^1.0.2"
+    has-bigints "^1.0.2"
+    has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
@@ -7100,16 +7317,16 @@ unicode-property-aliases-ecmascript@^2.0.0:
   integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
 
 union-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
     is-extendable "^0.1.1"
-    set-value "^0.4.3"
+    set-value "^2.0.1"
 
-universalify@^0.1.0, universalify@^0.1.2:
+universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
@@ -7127,6 +7344,14 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
+update-browserslist-db@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz#2924d3927367a38d5c555413a7ce138fc95fcb18"
+  integrity sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
@@ -7164,24 +7389,14 @@ uuid@^3.3.2, uuid@^3.3.3:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^8.3.0:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
-v8-compile-cache@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
-  integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
-
-v8-to-istanbul@^7.0.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1"
-  integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==
+v8-to-istanbul@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4"
+  integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.12"
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
-    source-map "^0.7.3"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
@@ -7191,6 +7406,13 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+validate-npm-package-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==
+  dependencies:
+    builtins "^1.0.3"
+
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -7210,21 +7432,7 @@ vlq@^1.0.0:
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-1.0.1.tgz#c003f6e7c0b4c1edd623fd6ee50bbc0d6a1de468"
   integrity sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w==
 
-w3c-hr-time@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
-  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
-  dependencies:
-    browser-process-hrtime "^1.0.0"
-
-w3c-xmlserializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
-  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
-  dependencies:
-    xml-name-validator "^3.0.0"
-
-walker@^1.0.7, walker@~1.0.5:
+walker@^1.0.7, walker@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
   integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
@@ -7238,41 +7446,23 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
-webidl-conversions@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
-  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
-
-webidl-conversions@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
-  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
-
-whatwg-encoding@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
-  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
-  dependencies:
-    iconv-lite "0.4.24"
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
 whatwg-fetch@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
   integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
 
-whatwg-mimetype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
-  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
-
-whatwg-url@^8.0.0, whatwg-url@^8.5.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
-  integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
   dependencies:
-    lodash "^4.7.0"
-    tr46 "^2.1.0"
-    webidl-conversions "^6.1.0"
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
 
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
@@ -7297,14 +7487,21 @@ which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-which@^2.0.1, which@^2.0.2:
+which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
-word-wrap@^1.2.3, word-wrap@~1.2.3:
+wide-align@^1.1.0:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
+  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
+  dependencies:
+    string-width "^1.0.2 || 2 || 3 || 4"
+
+word-wrap@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
@@ -7318,6 +7515,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -7332,57 +7538,45 @@ write-file-atomic@^2.3.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-file-atomic@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+write-file-atomic@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
   dependencies:
     imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
+    signal-exit "^3.0.7"
 
-ws@^6.1.4:
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
-  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
+ws@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
+  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7, ws@^7.4.6, ws@^7.5.1:
-  version "7.5.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
-  integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
-
-xml-name-validator@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
-  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
+ws@^7, ws@^7.5.1:
+  version "7.5.9"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
+  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
 xml@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
   integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
 
-xmlbuilder@^9.0.7:
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
-
-xmlchars@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
-  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
-
 xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
   integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
 y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
 yallist@^4.0.0:
   version "4.0.0"
@@ -7397,7 +7591,12 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs@^15.1.0, yargs@^15.3.1, yargs@^15.4.1:
+yargs-parser@^21.0.0:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
+yargs@^15.1.0, yargs@^15.3.1:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
   integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
@@ -7413,3 +7612,21 @@ yargs@^15.1.0, yargs@^15.3.1, yargs@^15.4.1:
     which-module "^2.0.0"
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
+
+yargs@^17.3.1, yargs@^17.5.1:
+  version "17.5.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e"
+  integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.0.0"
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==